Skip to content

Commit

Permalink
libmythtv: Use the actual MythPlayer pause state
Browse files Browse the repository at this point in the history
Remove the pause member variable from PlayerContext and access the pause
state of the player directly. Fixes some inconsistencies in the pause
state and another step along the long road of removing PlayerContext
entirely.

Pimped from master 8c18a32

Closes #9665
  • Loading branch information
Mark Kendall committed Apr 12, 2011
1 parent 2a9d9f5 commit 4068639
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 71 deletions.
1 change: 1 addition & 0 deletions mythtv/libs/libmythtv/mythplayer.h
Expand Up @@ -173,6 +173,7 @@ class MPUBLIC MythPlayer
PIPLocation GetNextPIPLocation(void) const;

// Bool Gets
bool IsPaused(void) { return allpaused; }
bool GetRawAudioState(void) const;
bool GetLimitKeyRepeat(void) const { return limitKeyRepeat; }
bool GetEof(void);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/playercontext.cpp
Expand Up @@ -42,7 +42,7 @@ PlayerContext::PlayerContext(const QString &inUseID) :
// Fast forward state
ff_rew_state(0), ff_rew_index(0), ff_rew_speed(0),
// Other state
paused(false), playingState(kState_None),
playingState(kState_None),
errored(false),
// pseudo states
pseudoLiveTVRec(NULL), pseudoLiveTVState(kPseudoNormalLiveTV),
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythtv/playercontext.h
Expand Up @@ -184,7 +184,6 @@ class MPUBLIC PlayerContext
int ff_rew_index;
/// Caches value of ff_rew_speeds[ff_rew_index]
int ff_rew_speed;
bool paused;
TVState playingState;

bool errored;
Expand Down

0 comments on commit 4068639

Please sign in to comment.