RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao_mpegpes: Properly close file on error or uninit 

Avoids failing with "device busy" e.g. when reinitializing the ao.
Fixes bug #1746.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31871 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-07-30 18:28:02 +00:00 committed by Uoti Urpala
parent ff1da0cb35
commit 4bf28980f9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libao2/ao_mpegpes.c
View File

@ -117,25 +117,29 @@ static int init_device(int card)
if( (ioctl(vo_mpegpes_fd2,AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY) < 0))
{
mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO SELECT SOURCE: %s\n", strerror(errno));
return -1;
goto fail;
}
if((ioctl(vo_mpegpes_fd2,AUDIO_PLAY) < 0))
{
mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO PLAY: %s\n", strerror(errno));
return -1;
goto fail;
}
if((ioctl(vo_mpegpes_fd2,AUDIO_SET_AV_SYNC, true) < 0))
{
mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO SET AV SYNC: %s\n", strerror(errno));
return -1;
goto fail;
}
//FIXME: in vo_mpegpes audio was initialized as MUTEd
if((ioctl(vo_mpegpes_fd2,AUDIO_SET_MUTE, false) < 0))
{
mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO SET MUTE: %s\n", strerror(errno));
return -1;
goto fail;
}
return vo_mpegpes_fd2;
fail:
close(vo_mpegpes_fd2);
vo_mpegpes_fd2 = -1;
return -1;
}
#endif
@ -272,7 +276,9 @@ static int init(int rate,int channels,int format,int flags){
// close audio device
static void uninit(int immed){
if (vo_mpegpes_fd2 >= 0)
close(vo_mpegpes_fd2);
vo_mpegpes_fd2 = -1;
}
// stop playing and empty buffers (for seeking/pause)