blob: 345d6ec796cd25ce7938397e2e2a2612ccb24f37 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
Index: mythtv/libs/libmythtv/mythplayer.cpp
===================================================================
--- mythtv/libs/libmythtv/mythplayer.cpp (revision 2032ac013221e9367c9f720459e5e9f546caf66e)
+++ mythtv/libs/libmythtv/mythplayer.cpp (revision 0bf0880d3e7ff0f78d1b90953e1f48618421e62d)
@@ -3174,6 +3174,6 @@
QString subfn = player_ctx->m_buffer->GetSubtitleFilename();
TVState desiredState = player_ctx->GetState();
- bool isInProgress =
- desiredState == kState_WatchingRecording || kState_WatchingLiveTV;
+ bool isInProgress = (desiredState == kState_WatchingRecording ||
+ desiredState == kState_WatchingLiveTV);
if (GetSubReader())
GetSubReader()->LoadExternalSubtitles(subfn, isInProgress &&
Index: mythtv/libs/libmythtv/playercontext.cpp
===================================================================
--- mythtv/libs/libmythtv/playercontext.cpp (revision 2032ac013221e9367c9f720459e5e9f546caf66e)
+++ mythtv/libs/libmythtv/playercontext.cpp (revision 0bf0880d3e7ff0f78d1b90953e1f48618421e62d)
@@ -404,6 +404,6 @@
{
QString subfn = m_buffer->GetSubtitleFilename();
- bool isInProgress =
- desiredState == kState_WatchingRecording || kState_WatchingLiveTV;
+ bool isInProgress = (desiredState == kState_WatchingRecording ||
+ desiredState == kState_WatchingLiveTV);
if (!subfn.isEmpty() && player->GetSubReader())
player->GetSubReader()->LoadExternalSubtitles(subfn, isInProgress);
|