Browse files

Improved handling of 'Show the Program Guide when Start Live TV'.

There is no longer a need to hit the database for the appropriate action
and add a simulated keypress to the list of queued keypresses (and hope
the player is up and running before the keypress is processed).

Instead just start the guide when the player is ready.

Cherry plucked from 341efdf
  • Loading branch information...
1 parent 54a300f commit 54fcb928d38bf7a4d992b4c5d81cdfd84c864229 Mark Kendall committed Feb 9, 2011
Showing with 7 additions and 29 deletions.
  1. +5 −28 mythtv/libs/libmythtv/tv_play.cpp
  2. +2 −1 mythtv/libs/libmythtv/tv_play.h
View
33 mythtv/libs/libmythtv/tv_play.cpp
@@ -268,7 +268,7 @@ bool TV::StartTV(ProgramInfo *tvrec, uint flags)
else if (RemoteGetFreeRecorderCount())
{
VERBOSE(VB_PLAYBACK, LOC + "tv->LiveTV() -- begin");
- if (!tv->LiveTV(showDialogs, startInGuide))
+ if (!tv->LiveTV(showDialogs))
{
tv->SetExitPlayer(true, true);
quitAll = true;
@@ -279,6 +279,9 @@ bool TV::StartTV(ProgramInfo *tvrec, uint flags)
SendMythSystemEvent("LIVETV_STARTED");
}
+ if (!quitAll && (startInGuide || tv->StartLiveTVInGuide()))
+ tv->DoEditSchedule();
+
VERBOSE(VB_PLAYBACK, LOC + "tv->LiveTV() -- end");
}
else if (!ConfiguredTunerCards())
@@ -1333,9 +1336,8 @@ TVState TV::GetState(const PlayerContext *actx) const
/** \fn TV::LiveTV(bool,bool)
* \brief Starts LiveTV
* \param showDialogs if true error dialogs are shown, if false they are not
- * \param startInGuide if true the EPG will be shown upon entering LiveTV
*/
-bool TV::LiveTV(bool showDialogs, bool startInGuide)
+bool TV::LiveTV(bool showDialogs)
{
requestDelete = false;
allowRerecord = false;
@@ -1357,31 +1359,6 @@ bool TV::LiveTV(bool showDialogs, bool startInGuide)
.arg(db_idle_timeout*(1.0f/60000.0f)));
}
- if (startInGuide || db_start_in_guide)
- {
- MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("SELECT keylist FROM keybindings WHERE "
- "context = 'TV Playback' AND action = 'GUIDE' AND "
- "hostname = :HOSTNAME ;");
- query.bindValue(":HOSTNAME", gCoreContext->GetHostName());
-
- if (query.exec() && query.isActive() && query.size() > 0)
- {
- query.next();
-
- QKeySequence keyseq(query.value(0).toString());
-
- int keynum = keyseq[0];
- keynum &= ~Qt::UNICODE_ACCEL;
-
- QMutexLocker locker(&timerIdLock);
- keyList.push_front(
- new QKeyEvent(QEvent::KeyPress, keynum, 0, 0));
- if (!keyListTimerId)
- keyListTimerId = StartTimer(1, __LINE__);
- }
- }
-
ReturnPlayerLock(actx);
return true;
}
View
3 mythtv/libs/libmythtv/tv_play.h
@@ -196,7 +196,8 @@ class MPUBLIC TV : public QObject
bool HandleTrackAction(PlayerContext*, const QString &action);
// LiveTV commands
- bool LiveTV(bool showDialogs = true, bool startInGuide = false);
+ bool LiveTV(bool showDialogs = true);
+ bool StartLiveTVInGuide(void) { return db_start_in_guide; }
// Embedding commands for the guidegrid to use in LiveTV
bool StartEmbedding(PlayerContext*, WId wid, const QRect&);

0 comments on commit 54fcb92

Please sign in to comment.