Author: awy
Date: Sat Sep 27 10:53:09 2008
New Revision: 3003
URL: http://svn.slimdevices.com?rev=3003&root=Jive&view=rev
Log:
Fix port of add-slience.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=3003&root=Jive&r1=3002&r2=3003&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Sat Sep 27 10:53:09 2008
@@ -40,8 +40,7 @@
const PaStreamCallbackTimeInfo *timeInfo,
PaStreamCallbackFlags statusFlags,
void *userData) {
- size_t bytes_used, len, skip_bytes = 0;
- //, add_bytes = 0;
+ size_t bytes_used, len, skip_bytes = 0, add_bytes = 0;
bool_t reached_start_point;
Uint8 *outputArray = (u8_t *)outputBuffer;
@@ -65,18 +64,18 @@
fifo_lock(&decode_fifo);
- //if (add_silence_bytes) {
- // add_bytes = add_silence_bytes;
- // if (add_bytes > len) add_bytes = len;
- // memset(outputBuffer, 0, add_bytes);
- // outputBuffer += add_bytes;
- // len -= add_bytes;
- // add_silence_bytes -= add_bytes;
- // if (!len) {
- // fifo_unlock(&decode_fifo);
- // return;
- // }
- //}
+ if (add_silence_bytes) {
+ add_bytes = add_silence_bytes;
+ if (add_bytes > len) add_bytes = len;
+ memset(outputArray, 0, add_bytes);
+ outputArray += add_bytes;
+ len -= add_bytes;
+ add_silence_bytes -= add_bytes;
+ if (!len) {
+ fifo_unlock(&decode_fifo);
+ return paContinue;
+ }
+ }
bytes_used = fifo_bytes_used(&decode_fifo);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
