Ticket #13442: mythplayer.cpp.diff

File mythplayer.cpp.diff, 1.6 KB (added by David Hampton, 11 months ago)
  • mythtv/libs/libmythtv/mythplayer.cpp

    diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
    index c09b31f18d..217f9ae46c 100644
    a b void MythPlayer::JumpToProgram(void) 
    31733173        pginfo->GetPlaybackURL(), RingBuffer::kLiveTVOpenTimeout);
    31743174    QString subfn = player_ctx->m_buffer->GetSubtitleFilename();
    31753175    TVState desiredState = player_ctx->GetState();
    3176     bool isInProgress =
    3177         desiredState == kState_WatchingRecording || kState_WatchingLiveTV;
     3176    bool isInProgress = (desiredState == kState_WatchingRecording ||
     3177                         desiredState == kState_WatchingLiveTV);
    31783178    if (GetSubReader())
    31793179        GetSubReader()->LoadExternalSubtitles(subfn, isInProgress &&
    31803180                                              !subfn.isEmpty());
  • mythtv/libs/libmythtv/playercontext.cpp

    diff --git a/mythtv/libs/libmythtv/playercontext.cpp b/mythtv/libs/libmythtv/playercontext.cpp
    index dadc848a23..d23f9b846d 100644
    a b bool PlayerContext::CreatePlayer(TV *tv, QWidget *widget, 
    403403    else
    404404    {
    405405        QString subfn = m_buffer->GetSubtitleFilename();
    406         bool isInProgress =
    407             desiredState == kState_WatchingRecording || kState_WatchingLiveTV;
     406        bool isInProgress = (desiredState == kState_WatchingRecording ||
     407                             desiredState == kState_WatchingLiveTV);
    408408        if (!subfn.isEmpty() && player->GetSubReader())
    409409            player->GetSubReader()->LoadExternalSubtitles(subfn, isInProgress);
    410410    }