← Back to branch summary

~ubuntu-branches/ubuntu/precise/mythtv/precise-updates

« back to all changes in this revision

Viewing changes to mythtv/libs/libmythtv/tvbrowsehelper.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2011-04-16 02:14:52 UTC
  • mfrom: (1.1.69 upstream)
  • Revision ID: james.westby@ubuntu.com-20110416021452-ujnlbzj4lspy7tzi
Tags: 2:0.24.0+fixes.20110416.9ba3ece-0ubuntu1
* New upstream checkout (9ba3ece)
* >>Upstream changes since last upload (2a9d9f5):
* [9ba3ece] Fixed update of some recording status transitions.
* [f6e282f] RSS Parsing: Check player tags to make sure they don't
  have child elements.
* [c1c7af0] Filter out NULL-characters from EIT before we save the
  data in the database.
* [1cfcb2b] Internet Content: Correct Blip.tv API URL.
* [4068639] libmythtv: Use the actual MythPlayer pause state
* Disable jamu and mirobridge bindings as they're current broke with
  0.24 and won't be fixed in time for release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mythtv/libs/libmythtv/tvbrowsehelper.cpp
6
6
#include "playercontext.h"
7
7
#include "remoteencoder.h"
8
8
#include "recordinginfo.h"
 
9
#include "mythplayer.h"
9
10
#include "tv_play.h"
10
11
 
11
12
#define GetPlayer(X,Y) GetPlayerHaveLock(X, Y, __FILE__ , __LINE__)
65
66
    if (m_ctx)
66
67
        return m_ctx == ctx;
67
68
 
68
 
    if (ctx->paused)
 
69
    bool paused = false;
 
70
    ctx->LockDeletePlayer(__FILE__, __LINE__);
 
71
    if (ctx->player)
 
72
        paused = ctx->player->IsPaused();
 
73
    ctx->UnlockDeletePlayer(__FILE__, __LINE__);
 
74
    if (paused)
69
75
        return false;
70
76
 
71
77
    m_tv->ClearOSD(ctx);