diff options
| author | atmosfear <atmosfear@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-04 00:27:55 +0000 |
|---|---|---|
| committer | atmosfear <atmosfear@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-04 00:27:55 +0000 |
| commit | 5bc44560d04604c4349940875ae334f4ad8d7428 (patch) | |
| tree | 52a3336e5c022e47a58aa8d8411f8df84224cd65 /libao2 | |
| parent | 83f92dcb98569ee2d255328c81767ac5adc57f68 (diff) | |
| download | mpv-5bc44560d04604c4349940875ae334f4ad8d7428.tar.bz2 mpv-5bc44560d04604c4349940875ae334f4ad8d7428.tar.xz | |
Several small changes (like driver selection).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@984 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_sdl.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c index 59fd22a49e..13facebd6d 100644 --- a/libao2/ao_sdl.c +++ b/libao2/ao_sdl.c @@ -35,6 +35,10 @@ LIBAO_EXTERN(sdl) // ao_outburst // ao_buffersize +extern int verbose; +/* audio driver to be used by SDLlib */ +char *sdl_adriver; + // Samplesize used by the SDLlib AudioSpec struct #define SAMPLESIZE 512 @@ -121,9 +125,15 @@ static int init(int rate,int channels,int format,int flags){ int i; /* Allocate ring-buffer memory */ - for(i=0;i<NUM_BUFS;i++) buffer[i]=malloc(BUFFSIZE); + for(i=0;i<NUM_BUFS;i++) buffer[i]=(unsigned char *) malloc(BUFFSIZE); printf("SDL: Samplerate: %iHz Channels: %s Format %iBit\n", rate, (channels > 1) ? "Stereo" : "Mono", format); + + if(sdl_adriver) { + setenv("SDL_AUDIODRIVER", sdl_adriver, 1); + printf("SDL: using %s audio driver\n", sdl_adriver); + } + /* The desired audio frequency in samples-per-second. */ aspec.freq = rate; @@ -156,7 +166,7 @@ void callback(void *userdata, Uint8 *stream, int len); userdata is the pointer s return(0); } - printf("SDL buf size = %d\n",aspec.size); + if(verbose) printf("SDL: buf size = %d\n",aspec.size); if(ao_buffersize==-1) ao_buffersize=aspec.size; /* unsilence audio, if callback is ready */ @@ -167,6 +177,7 @@ void callback(void *userdata, Uint8 *stream, int len); userdata is the pointer s // close audio device static void uninit(){ + if(verbose) printf("SDL: Audio Subsystem shutting down!\n"); SDL_CloseAudio(); SDL_QuitSubSystem(SDL_INIT_AUDIO); } @@ -195,7 +206,7 @@ static int get_space(){ // return: number of bytes played static int play(void* data,int len,int flags){ -#if 0 +#if 1 int ret; /* Audio locking prohibits call of outputaudio */ |