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/encode_sound_buffer.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'recordmydesktop/src/encode_sound_buffer.c') diff --git a/recordmydesktop/src/encode_sound_buffer.c b/recordmydesktop/src/encode_sound_buffer.c index 0e8fa2c..c8a8781 100644 --- a/recordmydesktop/src/encode_sound_buffer.c +++ b/recordmydesktop/src/encode_sound_buffer.c @@ -28,11 +28,8 @@ #include void *EncodeSoundBuffer(ProgData *pdata){ -#ifdef HAVE_LIBASOUND int sampread=pdata->periodsize; -#else - int sampread=(pdata->args.buffsize>>1)/pdata->args.channels; -#endif + pdata->v_encoding_clean=0; while((pdata->running)){ float **vorbis_buffer; @@ -103,12 +100,8 @@ void *EncodeSoundBuffer(ProgData *pdata){ void SyncEncodeSoundBuffer(ProgData *pdata,signed char *buff){ float **vorbis_buffer; int count=0,i,j; -#ifdef HAVE_LIBASOUND int sampread=(buff!=NULL)?pdata->periodsize:0; -#else - int sampread=(buff!=NULL)?((pdata->args.buffsize>>1)/ - pdata->args.channels):0; -#endif + vorbis_buffer=vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp,sampread); for(i=0;iargs.channels;j++){ -- cgit v1.2.1