summaryrefslogtreecommitdiff
path: root/dvbapi.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-09-15 13:00:58 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-09-15 13:00:58 +0200
commit7913b00daa6c95f4a8fdbc96793dc08f26a5f121 (patch)
tree7f3f93fed911b2380f8f869e1e5617e8cc55bcc7 /dvbapi.c
parent37754870e0868f41549c63941ed4a236751e70e4 (diff)
downloadvdr-7913b00daa6c95f4a8fdbc96793dc08f26a5f121.tar.gz
vdr-7913b00daa6c95f4a8fdbc96793dc08f26a5f121.tar.bz2
Pipe to Dolby Digital replay command closes all unused file descriptors to avoid crashing when OSD is on
Diffstat (limited to 'dvbapi.c')
-rw-r--r--dvbapi.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/dvbapi.c b/dvbapi.c
index 07999a01..829bc701 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
* DVD support initially written by Andreas Schultz <aschultz@warp10.net>
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
*
- * $Id: dvbapi.c 1.118 2001/09/15 10:42:35 kls Exp $
+ * $Id: dvbapi.c 1.119 2001/09/15 12:45:19 kls Exp $
*/
//#define DVDDEBUG 1
@@ -693,7 +693,7 @@ protected:
static int Speeds[];
cDvbApi *dvbApi;
int videoDev, audioDev;
- FILE *dolbyDev;
+ cPipe dolbyDev;
int blockInput, blockOutput;
ePlayModes playMode;
ePlayDirs playDir;
@@ -733,7 +733,6 @@ cPlayBuffer::cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev)
dvbApi = DvbApi;
videoDev = VideoDev;
audioDev = AudioDev;
- dolbyDev = NULL;
blockInput = blockOutput = false;
playMode = pmPlay;
playDir = pdForward;
@@ -743,16 +742,13 @@ cPlayBuffer::cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev)
canToggleAudioTrack = false;
audioTrack = 0xC0;
if (cDvbApi::AudioCommand()) {
- dolbyDev = popen(cDvbApi::AudioCommand(), "w");
- if (!dolbyDev)
+ if (!dolbyDev.Open(cDvbApi::AudioCommand(), "w"))
esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
}
}
cPlayBuffer::~cPlayBuffer()
{
- if (dolbyDev)
- pclose(dolbyDev);
}
void cPlayBuffer::Output(void)