From f6ac7fe76fa58f16192b864108db0ec260066bdb Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Fri, 2 Jan 2009 14:58:33 +0000 Subject: [PATCH] reindented git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1222 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/AmAudioMixIn.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/core/AmAudioMixIn.cpp b/core/AmAudioMixIn.cpp index f8d0da93..749add01 100644 --- a/core/AmAudioMixIn.cpp +++ b/core/AmAudioMixIn.cpp @@ -116,27 +116,27 @@ int AmAudioMixIn::get(unsigned int user_ts, unsigned char* buffer, B->rewind(); } else { for (int i=0; i<(PCM16_B2S(len)); i++) { - pdest[i]+=(short)(((double)mix_buf[i])*l); - } - if (len>res) // audio from B is longer than from A - res = len; - } - B_mut.unlock(); - - return res; + pdest[i]+=(short)(((double)mix_buf[i])*l); + } + if (len>res) // audio from B is longer than from A + res = len; } + B_mut.unlock(); + + return res; } } +} - int AmAudioMixIn::put(unsigned int user_ts, unsigned char* buffer, unsigned int size) { - ERROR("writing not supported\n"); - return -1; - } +int AmAudioMixIn::put(unsigned int user_ts, unsigned char* buffer, unsigned int size) { + ERROR("writing not supported\n"); + return -1; +} - void AmAudioMixIn::mixin(AmAudioFile* f) { - B_mut.lock(); - B = f; - mixing = next_start_ts_i = false; /* so that mix in will re-start */ - B_mut.unlock(); - } +void AmAudioMixIn::mixin(AmAudioFile* f) { + B_mut.lock(); + B = f; + mixing = next_start_ts_i = false; /* so that mix in will re-start */ + B_mut.unlock(); +}