From f39f779f299cd78a574999830699e30f92932f06 Mon Sep 17 00:00:00 2001 From: iovar Date: Fri, 2 Feb 2007 04:03:15 +0000 Subject: changed OSS buffer scheme, to work with frames(like ALSA) and reduce ifdefs git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@272 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/src/cache_audio.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'recordmydesktop/src/cache_audio.c') diff --git a/recordmydesktop/src/cache_audio.c b/recordmydesktop/src/cache_audio.c index edcabb3..bff4df2 100644 --- a/recordmydesktop/src/cache_audio.c +++ b/recordmydesktop/src/cache_audio.c @@ -33,6 +33,8 @@ void *CacheSoundBuffer(ProgData *pdata){ #ifdef HAVE_LIBASOUND int framesize=((snd_pcm_format_width(SND_PCM_FORMAT_S16_LE))/8)* pdata->args.channels; +#else + int framesize=pdata->args.channels<<1;//Always signed 16 bit data #endif while((pdata->running)){ SndBuffer *buff; @@ -58,15 +60,8 @@ void *CacheSoundBuffer(ProgData *pdata){ //advance the list pdata->sound_buffer=pdata->sound_buffer->next; pthread_mutex_unlock(&pdata->sound_buffer_mutex); -#ifdef HAVE_LIBASOUND fwrite(buff->data,1,pdata->periodsize*framesize, pdata->cache_data->afp); -#else - fwrite(buff->data,1,pdata->args.buffsize, - pdata->cache_data->afp); -#endif - - pdata->avd-=pdata->periodtime; free(buff->data); -- cgit v1.2.1