Skip to content

Commit

Permalink
Merge branch 'master' into mythtv-rec2
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniel-kristjansson
daniel-kristjansson committed Jul 30, 2011
2 parents 65f3613 + db478c5 commit 17229be
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 52 deletions.
22 changes: 11 additions & 11 deletions mythtv/libs/libmythbase/mythcorecontext.cpp
View file
Expand Up @@ -281,7 +281,7 @@ MythSocket *MythCoreContext::ConnectCommandSocket(
const QString &hostname, int port, const QString &announce,
bool *p_proto_mismatch, bool gui, int maxConnTry, int setup_timeout)
{
MythSocket *m_serverSock = NULL;
MythSocket *serverSock = NULL;

{
QMutexLocker locker(&d->m_WOLInProgressLock);
Expand Down Expand Up @@ -313,13 +313,13 @@ MythSocket *MythCoreContext::ConnectCommandSocket(
QString("Connecting to backend server: %1:%2 (try %3 of %4)")
.arg(hostname).arg(port).arg(cnt).arg(maxConnTry));

m_serverSock = new MythSocket();
serverSock = new MythSocket();

int sleepms = 0;
if (m_serverSock->connect(hostname, port))
if (serverSock->connect(hostname, port))
{
if (SetupCommandSocket(
m_serverSock, announce, setup_timeout, proto_mismatch))
serverSock, announce, setup_timeout, proto_mismatch))
{
break;
}
Expand All @@ -329,8 +329,8 @@ MythSocket *MythCoreContext::ConnectCommandSocket(
if (p_proto_mismatch)
*p_proto_mismatch = true;

m_serverSock->DownRef();
m_serverSock = NULL;
serverSock->DownRef();
serverSock = NULL;
break;
}

Expand All @@ -355,10 +355,10 @@ MythSocket *MythCoreContext::ConnectCommandSocket(
sleepms = WOLsleepTime * 1000;
}

m_serverSock->DownRef();
m_serverSock = NULL;
serverSock->DownRef();
serverSock = NULL;

if (!m_serverSock && (cnt == 1))
if (!serverSock && (cnt == 1))
{
QCoreApplication::postEvent(
d->m_GUIcontext, new MythEvent("CONNECTION_FAILURE"));
Expand All @@ -375,7 +375,7 @@ MythSocket *MythCoreContext::ConnectCommandSocket(
d->m_WOLInProgressWaitCondition.wakeAll();
}

if (!m_serverSock && !proto_mismatch)
if (!serverSock && !proto_mismatch)
{
LOG(VB_GENERAL, LOG_ERR,
"Connection to master server timed out.\n\t\t\t"
Expand All @@ -389,7 +389,7 @@ MythSocket *MythCoreContext::ConnectCommandSocket(
d->m_GUIcontext, new MythEvent("CONNECTION_RESTABLISHED"));
}

return m_serverSock;
return serverSock;
}

MythSocket *MythCoreContext::ConnectEventSocket(const QString &hostname,
Expand Down
4 changes: 4 additions & 0 deletions mythtv/libs/libmythtv/mpegrecorder.cpp
View file
Expand Up @@ -1139,6 +1139,7 @@ void MpegRecorder::StartRecording(void)

LOG(VB_RECORD, LOG_INFO, LOC + "StartRecording finishing up");

pauseLock.lock();
if (_device_read_buffer)
{
if (_device_read_buffer->IsRunning())
Expand All @@ -1147,6 +1148,7 @@ void MpegRecorder::StartRecording(void)
delete _device_read_buffer;
_device_read_buffer = NULL;
}
pauseLock.unlock();

StopEncoding(readfd);

Expand All @@ -1168,8 +1170,10 @@ void MpegRecorder::StartRecording(void)

void MpegRecorder::StopRecording(void)
{
pauseLock.lock();
if (_device_read_buffer && _device_read_buffer->IsRunning())
_device_read_buffer->Stop();
pauseLock.unlock();
V4LRecorder::StopRecording();
}

Expand Down
6 changes: 5 additions & 1 deletion mythtv/libs/libmythtv/subtitlescreen.cpp
View file
Expand Up @@ -600,12 +600,16 @@ void SubtitleScreen::DisplayCC608Subtitles(void)
CC608Buffer* textlist = m_608reader->GetOutputText(changed);
if (!changed)
return;

if (textlist)
textlist->lock.lock();

DeleteAllChildren();

if (!textlist)
return;
if (textlist && textlist->buffers.empty())

if (textlist->buffers.empty())
{
SetRedraw();
textlist->lock.unlock();
Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythtv/tv_play.cpp
View file
Expand Up @@ -2836,10 +2836,8 @@ int TV::StartTimer(int interval, int line)
return x;
}

#include <cassert>
void TV::KillTimer(int id)
{
assert(id);
QObject::killTimer(id);
}

Expand Down
8 changes: 0 additions & 8 deletions mythtv/libs/libmythtv/tvbrowsehelper.cpp
View file
Expand Up @@ -81,14 +81,6 @@ bool TVBrowseHelper::BrowseStart(PlayerContext *ctx, bool skip_browse)
if (m_ctx)
return m_ctx == ctx;

bool paused = false;
ctx->LockDeletePlayer(__FILE__, __LINE__);
if (ctx->player)
paused = ctx->player->IsPaused();
ctx->UnlockDeletePlayer(__FILE__, __LINE__);
if (paused)
return false;

m_tv->ClearOSD(ctx);

ctx->LockPlayingInfo(__FILE__, __LINE__);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/main_helpers.cpp
View file
Expand Up @@ -231,7 +231,7 @@ void cleanup(void)
}

delete expirer;
expirer;
expirer = NULL;

delete jobqueue;
jobqueue = NULL;
Expand Down
57 changes: 30 additions & 27 deletions mythtv/programs/mythbackend/scheduler.cpp
View file
Expand Up @@ -4043,9 +4043,9 @@ void Scheduler::AddNotListed(void) {

while (result.next())
{
RecordingType rectype = RecordingType(result.value(18).toInt());
QDateTime startts(result.value(13).toDate(), result.value(14).toTime());
QDateTime endts( result.value(15).toDate(), result.value(16).toTime());
RecordingType rectype = RecordingType(result.value(21).toInt());
QDateTime startts(result.value(16).toDate(), result.value(17).toTime());
QDateTime endts( result.value(18).toDate(), result.value(19).toTime());

if (rectype == kTimeslotRecord)
{
Expand Down Expand Up @@ -4074,8 +4074,8 @@ void Scheduler::AddNotListed(void) {
}
}

QDateTime recstartts = startts.addSecs(result.value(22).toInt() * -60);
QDateTime recendts = endts.addSecs( result.value(23).toInt() * +60);
QDateTime recstartts = startts.addSecs(result.value(25).toInt() * -60);
QDateTime recendts = endts.addSecs( result.value(26).toInt() * +60);

if (recstartts >= recendts)
{
Expand All @@ -4091,38 +4091,41 @@ void Scheduler::AddNotListed(void) {
bool sor = (kSingleRecord == rectype) || (kOverrideRecord == rectype);

RecordingInfo *p = new RecordingInfo(
result.value(0).toString(),
(sor) ? result.value(1).toString() : QString(),
(sor) ? result.value(2).toString() : QString(),
result.value(3).toUInt(),
result.value(4).toUInt(),
QString(),

result.value(6).toUInt(),
result.value(7).toString(),
result.value(8).toString(),
result.value(9).toString(),
result.value(0).toString(), // Title
(sor) ? result.value(1).toString() : QString(), // Subtitle
(sor) ? result.value(2).toString() : QString(), // Description
result.value(3).toUInt(), // Season
result.value(4).toUInt(), // Episode
QString(), // Category

result.value(10).toString(), result.value(11).toString(),
result.value(6).toUInt(), // Chanid
result.value(7).toString(), // Channel number
result.value(8).toString(), // Call Sign
result.value(9).toString(), // Channel name

result.value(12).toString(), result.value(13).toString(),
result.value(14).toString(),
result.value(10).toString(), // Recgroup
result.value(11).toString(), // Playgroup

result.value(15).toInt(),
result.value(12).toString(), // Series ID
result.value(13).toString(), // Program ID
result.value(14).toString(), // Inetref

result.value(15).toInt(), // Rec priority

startts, endts,
recstartts, recendts,

rsNotListed,
rsNotListed, // Recording Status

result.value(20).toUInt(), RecordingType(result.value(21).toInt()),
result.value(20).toUInt(), // Recording ID
RecordingType(result.value(21).toInt()), // Recording type

RecordingDupInType(result.value(22).toInt()),
RecordingDupMethodType(result.value(23).toInt()),
RecordingDupInType(result.value(22).toInt()), // DupIn type
RecordingDupMethodType(result.value(23).toInt()), // Dup method

result.value(24).toUInt(),
result.value(24).toUInt(), // Find ID

result.value(25).toInt() == COMM_DETECT_COMMFREE);
result.value(27).toInt() == COMM_DETECT_COMMFREE); // Comm Free

tmpList.push_back(p);
}
Expand Down Expand Up @@ -4166,7 +4169,7 @@ void Scheduler::findAllScheduledPrograms(RecList &proglist)

while (result.next())
{
RecordingType rectype = RecordingType(result.value(18).toInt());
RecordingType rectype = RecordingType(result.value(21).toInt());
QDateTime startts;
QDateTime endts;
if (rectype == kSingleRecord ||
Expand Down
1 change: 0 additions & 1 deletion mythtv/programs/mythfrontend/main.cpp
View file
Expand Up @@ -1202,7 +1202,6 @@ static int reloadTheme(void)
{
LOG(VB_GENERAL, LOG_ERR, QString("Couldn't find theme '%1'")
.arg(themename));
cleanup();
return GENERIC_EXIT_NO_THEME;
}

Expand Down
3 changes: 3 additions & 0 deletions mythtv/programs/mythfrontend/playbackboxhelper.cpp
View file
Expand Up @@ -61,7 +61,10 @@ AvailableStatusType PBHEventHandler::CheckAvailability(const QStringList &slist)
if (it != m_checkAvailability.end())
m_checkAvailability.erase(it);
if (m_checkAvailability.empty() && m_checkAvailabilityTimerId)
{
killTimer(m_checkAvailabilityTimerId);
m_checkAvailabilityTimerId = 0;
}
}

if (cats.empty())
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythmetadatalookup/lookup.cpp
View file
Expand Up @@ -203,7 +203,7 @@ void LookerUpper::CopyRuleInetrefsToRecordings()
{
RecordingRule *rule = new RecordingRule();
rule->LoadByProgram(pginfo);
if (rule && rule->Load() && !rule->m_inetref.isEmpty())
if (!rule->m_inetref.isEmpty())
{
QString msg = QString("%1").arg(pginfo->GetTitle());
if (!pginfo->GetSubtitle().isEmpty())
Expand Down

0 comments on commit 17229be

Please sign in to comment.