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/capture_sound.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'recordmydesktop/src/capture_sound.c') diff --git a/recordmydesktop/src/capture_sound.c b/recordmydesktop/src/capture_sound.c index 4314984..3b69764 100644 --- a/recordmydesktop/src/capture_sound.c +++ b/recordmydesktop/src/capture_sound.c @@ -94,7 +94,8 @@ void *CaptureSound(ProgData *pdata){ #ifdef HAVE_LIBASOUND newbuf->data=(signed char *)malloc(frames*framesize); #else - newbuf->data=(signed char *)malloc(pdata->args.buffsize); + newbuf->data=(signed char *)malloc(((pdata->args.buffsize<<1)* + pdata->args.channels)); #endif newbuf->next=NULL; @@ -124,7 +125,8 @@ void *CaptureSound(ProgData *pdata){ do{ int temp_sret=read(pdata->sound_handle, &newbuf->data[sret], - pdata->args.buffsize-sret); + ((pdata->args.buffsize<<1)* + pdata->args.channels)-sret); if(temp_sret<0){ fprintf(stderr,"An error occured while reading from soundcard" "%s\n" @@ -133,7 +135,8 @@ void *CaptureSound(ProgData *pdata){ } else sret+=temp_sret; - }while(sretargs.buffsize); + }while(sret<((pdata->args.buffsize<<1)* + pdata->args.channels)); #endif //queue the new buffer pthread_mutex_lock(&pdata->sound_buffer_mutex); -- cgit v1.2.1