Author: sayer
Date: 2009-01-02 15:58:33 +0100 (Fri, 02 Jan 2009)
New Revision: 1222
Modified:
trunk/core/AmAudioMixIn.cpp
Log:
reindented
Modified: trunk/core/AmAudioMixIn.cpp
===================================================================
--- trunk/core/AmAudioMixIn.cpp 2009-01-02 14:57:35 UTC (rev 1221)
+++ trunk/core/AmAudioMixIn.cpp 2009-01-02 14:58:33 UTC (rev 1222)
@@ -116,27 +116,27 @@
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();
+ 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;
- }
+ 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();
+}
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
