diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
index b7d6534..16671d4 100644
a
|
b
|
void SubtitleScreen::DisplayAVSubtitles(void) |
204 | 204 | { |
205 | 205 | if (!m_player || !m_subreader) |
206 | 206 | return; |
| 207 | |
| 208 | VideoOutput *videoOut = m_player->GetVideoOutput(); |
| 209 | VideoFrame *currentFrame = videoOut ? videoOut->GetLastShownFrame() : NULL; |
| 210 | |
| 211 | if (!currentFrame || !videoOut) |
| 212 | return; |
| 213 | |
| 214 | // RenderAssTrack moved here so it runs every frame(needed to clear subtitles) |
| 215 | #ifdef USING_LIBASS |
| 216 | RenderAssTrack(currentFrame->timecode); |
| 217 | #endif |
207 | 218 | |
208 | 219 | AVSubtitles* subs = m_subreader->GetAVSubtitles(); |
209 | 220 | QMutexLocker lock(&(subs->lock)); |
210 | 221 | if (subs->buffers.empty()) |
211 | 222 | return; |
212 | 223 | |
213 | | VideoOutput *videoOut = m_player->GetVideoOutput(); |
214 | | VideoFrame *currentFrame = videoOut ? videoOut->GetLastShownFrame() : NULL; |
215 | | |
216 | | if (!currentFrame || !videoOut) |
217 | | return; |
218 | 224 | |
219 | 225 | float tmp = 0.0; |
220 | 226 | QRect dummy; |
… |
… |
void SubtitleScreen::DisplayAVSubtitles(void) |
339 | 344 | } |
340 | 345 | m_subreader->FreeAVSubtitle(subtitle); |
341 | 346 | } |
342 | | #ifdef USING_LIBASS |
343 | | RenderAssTrack(currentFrame->timecode); |
344 | | #endif |
345 | 347 | } |
346 | 348 | |
347 | 349 | void SubtitleScreen::DisplayTextSubtitles(void) |