Permalink
Browse files

Cleanup trailing whitespace in recorders directory

  • Loading branch information...
jpoet committed Jan 6, 2013
1 parent c48c55f commit a336ace5de02a5deb5f8391023fa7f196fdce7a0
@@ -1285,7 +1285,7 @@ void NuppelVideoRecorder::DoV4L1(void)
gettimeofday(&stm, &tzone);
continue;
}
if (!request_pause && mainpaused)
{
mainpaused = false;
@@ -1381,7 +1381,7 @@ bool NuppelVideoRecorder::SetFormatV4L2(void)
}
else
{
// we need to convert the buffer - we can't deal with uyvy
// we need to convert the buffer - we can't deal with uyvy
// directly.
if (inpixfmt == FMT_YUV422P)
{
@@ -1644,7 +1644,7 @@ void NuppelVideoRecorder::DoV4L2(void)
gettimeofday(&stm, &tzone);
continue;
}
if (!request_pause && mainpaused)
{
mainpaused = false;
@@ -1880,7 +1880,7 @@ void NuppelVideoRecorder::DoMJPEG(void)
gettimeofday(&stm, &tzone);
continue;
}
if (!request_pause && mainpaused)
{
mainpaused = false;
@@ -2407,7 +2407,7 @@ void NuppelVideoRecorder::doAudioThread(void)
unpauseWait.wait(&pauseLock, 100);
continue;
}
if (!request_pause && audiopaused)
{
audiopaused = false;
@@ -2700,7 +2700,7 @@ void NuppelVideoRecorder::doWriteThread(void)
unpauseWait.wait(&pauseLock, 100);
continue;
}
if (!request_pause && writepaused)
{
writepaused = false;
@@ -76,7 +76,7 @@ void ASIRecorder::run(void)
_error = "MPEGStreamData pointer has not been set";
LOG(VB_GENERAL, LOG_ERR, LOC + _error);
Close();
return;
return;
}
{
@@ -101,7 +101,7 @@ void ASIStreamHandler::Return(ASIStreamHandler * & ref)
}
ASIStreamHandler::ASIStreamHandler(const QString &device) :
StreamHandler(device),
StreamHandler(device),
_device_num(-1), _buf_size(-1), _fd(-1),
_packet_size(TSPacket::kSize), _clock_source(kASIInternalClock),
_rx_mode(kASIRXSyncOnActualConvertTo188), _drb(NULL), _mpts(NULL)
@@ -190,13 +190,13 @@ bool AudioInputALSA::PrepHwParams(void)
}
uint buffer_time = 64000; // 64 msec
uint period_time = buffer_time / 4;
if (AlsaBad(snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &period_time, NULL),
if (AlsaBad(snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &period_time, NULL),
"failed to set period time"))
return false;
if (AlsaBad(snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time, NULL),
if (AlsaBad(snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time, NULL),
"failed to set buffer time"))
return false;
if (AlsaBad(snd_pcm_hw_params_get_period_size(hwparams, &period_size, NULL),
if (AlsaBad(snd_pcm_hw_params_get_period_size(hwparams, &period_size, NULL),
"failed to get period size"))
return false;
@@ -356,7 +356,7 @@ bool CetonStreamHandler::TuneProgram(uint program)
QStringList program_list = GetProgramList();
if (!program_list.contains(QString::number(program)))
{
LOG(VB_GENERAL, LOG_ERR, LOC +
LOG(VB_GENERAL, LOG_ERR, LOC +
QString("TuneProgram(%1) - Requested program not in the program list")
.arg(program));
return false;
@@ -444,7 +444,7 @@ uint CetonStreamHandler::GetProgramNumber(void) const
.arg(prog).arg(i));
uint prognum = prog.toUInt();
if (prognum != 0)
if (prognum != 0)
return prognum;
usleep(100000);
@@ -764,7 +764,7 @@ bool DarwinFirewireDevice::UpdatePlugRegisterPrivate(
new_plug_val &= ~(0x03<<14);
new_plug_val |= (new_speed & 0x03) << 14;
old_plug_val = EndianU32_NtoB(old_plug_val);
old_plug_val = EndianU32_NtoB(old_plug_val);
new_plug_val = EndianU32_NtoB(new_plug_val);
return (kIOReturnSuccess == (*fw_handle)->CompareSwap(
@@ -370,7 +370,7 @@ bool DTVChannel::SetChannelByString(const QString &channum)
int pcrpid = -1;
vector<uint> pids;
vector<uint> types;
pid_cache_t::iterator pit = pid_cache.begin();
pid_cache_t::iterator pit = pid_cache.begin();
for (; pit != pid_cache.end(); ++pit)
{
if (!pit->GetStreamID())
@@ -371,8 +371,8 @@ static QDateTime ts_to_qdatetime(
}
static const uint frameRateMap[16] = {
0, 23796, 24000, 25000, 29970, 30000, 50000, 59940, 60000,
0, 0, 0, 0, 0, 0, 0
0, 23796, 24000, 25000, 29970, 30000, 50000, 59940, 60000,
0, 0, 0, 0, 0, 0, 0
};
/** \fn DTVRecorder::FindMPEG2Keyframes(const TSPacket* tspacket)
@@ -470,7 +470,7 @@ bool DTVRecorder::FindMPEG2Keyframes(const TSPacket* tspacket)
}
else if (PESStreamID::MPEG2ExtensionStartCode == stream_id)
{
if (bytes_left >= 1)
if (bytes_left >= 1)
{
ext_type = (bufptr[0] >> 4);
switch(ext_type)
@@ -491,7 +491,7 @@ bool DTVRecorder::FindMPEG2Keyframes(const TSPacket* tspacket)
/* check if we must repeat the frame */
_repeat_pict = 1;
if (repeat_first_field)
if (repeat_first_field)
{
if (_progressive_sequence)
{
@@ -500,7 +500,7 @@ bool DTVRecorder::FindMPEG2Keyframes(const TSPacket* tspacket)
else
_repeat_pict = 3;
}
else if (progressive_frame)
else if (progressive_frame)
{
_repeat_pict = 2;
}
@@ -841,7 +841,7 @@ bool DTVRecorder::FindH264Keyframes(const TSPacket *tspacket)
}
// we now know where the PES payload is
// normally, we should have used 6, but use 5 because the for
// normally, we should have used 6, but use 5 because the for
// loop will bump i
i += 5 + pes_header_length;
_pes_synced = true;
@@ -912,7 +912,7 @@ bool DTVRecorder::FindH264Keyframes(const TSPacket *tspacket)
LOG(VB_RECORD, LOG_INFO, LOC +
QString("FindH264Keyframes: timescale: %1, tick: %2, framerate: %3")
.arg( m_h264_parser.GetTimeScale() )
.arg( m_h264_parser.GetTimeScale() )
.arg( m_h264_parser.GetUnitsInTick() )
.arg( frameRate ) );
m_frameRate = frameRate;
@@ -1074,7 +1074,7 @@ void DTVRecorder::FindPSKeyFrames(const uint8_t *buffer, uint len)
AspectChange((AspectRatio)aspectRatio, _frames_written_count);
}
if (height && width &&
if (height && width &&
(height != m_videoHeight || m_videoWidth != width))
{
m_videoHeight = height;
@@ -712,7 +712,7 @@ bool DVBPIDInfo::Close(const QString &dvb_dev)
int err = close(tmp);
if (err < 0)
{
LOG(VB_GENERAL, LOG_ERR,
LOG(VB_GENERAL, LOG_ERR,
LOC + QString("Failed to close mux (pid 0x%1)")
.arg(_pid, 0, 16) + ENO);
@@ -11,7 +11,7 @@
#include <QMap>
// for usleep
#include <unistd.h>
#include <unistd.h>
// MythTV headers
#include "linuxfirewiredevice.h"
@@ -103,7 +103,7 @@ void HDHRRecorder::run(void)
if (!_stream_handler->IsRunning())
{
_error = "Stream handler died unexpectedly.";
_error = "Stream handler died unexpectedly.";
LOG(VB_GENERAL, LOG_ERR, LOC + _error);
}
}
@@ -192,7 +192,7 @@ void RecorderBase::SetIntOption(RecordingProfile *profile, const QString &name)
if (setting)
SetOption(name, setting->getValue().toInt());
else
LOG(VB_GENERAL, LOG_ERR, LOC +
LOG(VB_GENERAL, LOG_ERR, LOC +
QString("SetIntOption(...%1): Option not in profile.").arg(name));
}
@@ -189,7 +189,7 @@ SignalMonitor::SignalMonitor(int _capturecardnum, ChannelBase *_channel,
capturecardnum(_capturecardnum), flags(wait_for_mask),
update_rate(25), minimum_update_rate(5),
update_done(false), notify_frontend(true),
tablemon(false), eit_scan(false),
tablemon(false), eit_scan(false),
signalLock (QObject::tr("Signal Lock"), "slock",
1, true, 0, 1, 0),
signalStrength(QObject::tr("Signal Power"), "signal",
@@ -53,7 +53,7 @@ void StreamHandler::AddListener(MPEGStreamData *data,
.arg((uint64_t)data,0,16));
if (!data)
{
LOG(VB_GENERAL, LOG_ERR, LOC +
LOG(VB_GENERAL, LOG_ERR, LOC +
QString("AddListener(0x%1) -- null data")
.arg((uint64_t)data,0,16));
return;
@@ -353,7 +353,7 @@ int V4LChannel::SetFreqTable(const QString &tablename)
listname = (char *)chanlists[i].name;
}
LOG(VB_CHANNEL, LOG_ERR,
LOG(VB_CHANNEL, LOG_ERR,
QString("Channel(%1)::SetFreqTable(): Invalid "
"frequency table name %2, using %3.").
arg(device).arg(name).arg((char *)chanlists[1].name));
@@ -441,7 +441,7 @@ bool V4LChannel::Tune(uint64_t frequency, QString inputname)
if (ioctlval >= 0)
{
isTunerCapLow = (mod.capability & V4L2_TUNER_CAP_LOW);
LOG(VB_CHANNEL, LOG_INFO,
LOG(VB_CHANNEL, LOG_INFO,
QString(" name: %1").arg((char *)mod.name));
LOG(VB_CHANNEL, LOG_INFO, QString("CapLow: %1").arg(isTunerCapLow));
}

0 comments on commit a336ace

Please sign in to comment.