aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2012-01-03 12:56:39 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2012-01-03 12:57:03 +0100
commit73062ae1112e5772db34d81693ab7d1f8345d1ae (patch)
treef5f815cf05ffe210b53c9c1154eb493e2498327d
parent6e17ae50ec058409318e4cbd057fba0b8fab77d0 (diff)
downloadcornucopia-gnutoo/gta04-fsoaudiod-forwarder.tar.gz
cornucopia-gnutoo/gta04-fsoaudiod-forwarder.tar.bz2
cornucopia-gnutoo/gta04-fsoaudiod-forwarder.zip
fsoaudiod: gsmvoice_alsa_forwarder : code cleanupgnutoo/gta04-fsoaudiod-forwarder
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/plugin.vala11
1 files changed, 1 insertions, 10 deletions
diff --git a/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/plugin.vala b/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/plugin.vala
index bfe5fe8f..3f706bba 100644
--- a/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/plugin.vala
+++ b/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/plugin.vala
@@ -133,7 +133,6 @@ public class PlaybackFromModem : FsoFramework.AbstractObject
private FsoAudio.PcmDevice modemPCM;
private FsoAudio.PcmDevice codecPCM;
-// private Mutex bufferMutex = new Mutex();
private RingBuffer transferBuffer;
private int bufferSize;
private int numFrames;
@@ -212,10 +211,8 @@ public class PlaybackFromModem : FsoFramework.AbstractObject
stderr.printf("frames: %ld \n",(long)frames);
}
-// bufferMutex.lock();
transferBuffer.write( buffer,(int)frames * this.frameSize );
- // bufferMutex.unlock();
- this.conditionalWait.broadcast();
+ this.conditionalWait.broadcast();
}
}
@@ -225,7 +222,6 @@ public class PlaybackFromModem : FsoFramework.AbstractObject
}
catch ( RingError e )
{
- // bufferMutex.unlock();
logger.warning( @"Record RingBuffer error: $(e.message)" );
}
}
@@ -243,13 +239,9 @@ public class PlaybackFromModem : FsoFramework.AbstractObject
this.transferBuffer.logInfos();
transferBuffer.logInfos();
- // if ( transferBuffer.avail < this.numFrames * this.frameSize )
- // continue;
try
{
-// bufferMutex.lock();
transferBuffer.read( buffer,this.numFrames * this.frameSize );
- // bufferMutex.unlock();
frames = codecPCM.writei( buffer, this.numFrames );
if ( frames == -Posix.EPIPE)
@@ -266,7 +258,6 @@ public class PlaybackFromModem : FsoFramework.AbstractObject
}
catch ( RingError e )
{
-// bufferMutex.unlock();
logger.warning( @"Playback RingBuffer error: $(e.message)" );
play_silence( 1 );
}