Ticket #2434: patch.txt

File patch.txt, 1.5 KB (added by anonymous, 19 years ago)
Line 
1Index: libs/libmythtv/NuppelVideoPlayer.cpp
2===================================================================
3--- libs/libmythtv/NuppelVideoPlayer.cpp (revision 11141)
4+++ libs/libmythtv/NuppelVideoPlayer.cpp (working copy)
5@@ -453,7 +453,7 @@
6
7 if (wait && !video_actually_paused)
8 {
9- while (!videoThreadPaused.wait(1000))
10+ while (pausevideo && !videoThreadPaused.wait(1000))
11 {
12 if (eof)
13 return;
14@@ -3299,11 +3299,15 @@
15 {
16 PauseVideo();
17
18- DoRewind();
19+ if (GetVideoPause())
20+ {
21+ DoRewind();
22
23- UnpauseVideo();
24- while (GetVideoPause())
25- usleep(1000);
26+ UnpauseVideo();
27+ while (GetVideoPause())
28+ usleep(1000);
29+ }
30+
31 }
32 rewindtime = 0;
33 }
34@@ -3315,16 +3319,18 @@
35 if (fftime >= 5)
36 {
37 PauseVideo();
38-
39- if (fftime >= 5)
40+
41+ if (GetVideoPause())
42+ {
43 DoFastForward();
44
45- if (eof)
46- continue;
47+ if (eof)
48+ continue;
49
50- UnpauseVideo();
51- while (GetVideoPause())
52- usleep(1000);
53+ UnpauseVideo();
54+ while (GetVideoPause())
55+ usleep(1000);
56+ }
57 }
58
59 fftime = 0;