RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 17:42:17 +00:00
Code Issues Releases Wiki Activity

non-blocking open - patch by Fredrik Kuivinen <freku045@student.liu.se>

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5205 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-03-19 19:16:01 +00:00
parent dbfd7500d4
commit 3027484518
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libao2/ao_oss.c
View File

@ -7,6 +7,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
#include <string.h>
//#include <sys/soundcard.h> //#include <sys/soundcard.h>
#include "../config.h" #include "../config.h"
@ -101,12 +103,18 @@ static int init(int rate,int channels,int format,int flags){
if (verbose) if (verbose)
printf("audio_setup: using '%s' dsp device\n", dsp); printf("audio_setup: using '%s' dsp device\n", dsp);
audio_fd=open(dsp, O_WRONLY); audio_fd=open(dsp, O_WRONLY | O_NONBLOCK);
if(audio_fd<0){ if(audio_fd<0){
printf("Can't open audio device %s -> nosound\n",dsp); printf("Can't open audio device %s: %s -> no sound\n", dsp, strerror(errno));
return 0; return 0;
} }
/* Remove the non-blocking flag */
if(fcntl(audio_fd, F_SETFL, 0) < 0) {
printf("Can't make filedescriptor non-blocking: %s -> no sound\n", strerror(errno));
return 0;
}
ao_data.bps=channels*rate; ao_data.bps=channels*rate;
if(format != AFMT_U8 && format != AFMT_S8) if(format != AFMT_U8 && format != AFMT_S8)
ao_data.bps*=2; ao_data.bps*=2;
@ -203,9 +211,9 @@ static void uninit(){
// stop playing and empty buffers (for seeking/pause) // stop playing and empty buffers (for seeking/pause)
static void reset(){ static void reset(){
uninit(); uninit();
audio_fd=open(dsp, O_WRONLY); audio_fd=open(dsp, O_WRONLY | O_NONBLOCK);
if(audio_fd<0){ if(audio_fd < 0 || fcntl(audio_fd, F_SETFL, 0) < 0){
printf("\nFatal error: *** CANNOT RE-OPEN / RESET AUDIO DEVICE ***\n"); printf("\nFatal error: *** CANNOT RE-OPEN / RESET AUDIO DEVICE *** %s\n", strerror(errno));
return; return;
} }