diff options
author | Johns <johns98@gmx.net> | 2013-01-05 22:48:01 +0100 |
---|---|---|
committer | Johns <johns98@gmx.net> | 2013-01-05 22:48:01 +0100 |
commit | b24409323df32cfdb10f45f1705c59abb25e5041 (patch) | |
tree | 49f8b2515d8c66ed6f71317cb94bd07e8820bef1 | |
parent | 9ec27160264b831a3953f11fbf86af432e19f28e (diff) | |
download | vdr-plugin-softhddevice-b24409323df32cfdb10f45f1705c59abb25e5041.tar.gz vdr-plugin-softhddevice-b24409323df32cfdb10f45f1705c59abb25e5041.tar.bz2 |
Fix detach and attach bug.
-rw-r--r-- | softhddev.c | 5 | ||||
-rw-r--r-- | softhddevice.cpp | 2 | ||||
-rw-r--r-- | video.c | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/softhddev.c b/softhddev.c index fd51917..fd9397d 100644 --- a/softhddev.c +++ b/softhddev.c @@ -2810,6 +2810,9 @@ void MainThreadHook(void) // Suspend/Resume ////////////////////////////////////////////////////////////////////////////// + /// call VDR support function +extern void DelPip(void); + /** ** Suspend plugin. ** @@ -2827,6 +2830,8 @@ void Suspend(int video, int audio, int dox11) Debug(3, "[softhddev]%s:\n", __FUNCTION__); + DelPip(); // must stop PIP + MyVideoStream->SkipStream = 1; SkipAudio = 1; diff --git a/softhddevice.cpp b/softhddevice.cpp index 01cb305..24095a4 100644 --- a/softhddevice.cpp +++ b/softhddevice.cpp @@ -1542,7 +1542,7 @@ static void NewPip(int channel_nr) /** ** Stop PIP. */ -static void DelPip(void) +extern "C" void DelPip(void) { fprintf(stderr, "pip: stopped\n"); @@ -6594,6 +6594,7 @@ static void VdpauExit(void) VdpauDecoders[i] = NULL; } } + VdpauDecoderN = 0; if (VdpauDevice) { VdpauExitOutputQueue(); |