[Jive-Checkins] r3244 - /7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c

[tom]

Author: tom
Date: Thu Oct 30 10:00:57 2008
New Revision: 3244

URL: http://svn.slimdevices.com?rev=3244&root=Jive&view=rev
Log:
Support independent effect and music volume.

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=3244&root=Jive&r1=3243&r2=3244&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 
Thu Oct 30 10:00:57 2008
@@ -9,6 +9,7 @@
 #include "common.h"
 
 #include "audio/fifo.h"
+#include "audio/fixed_math.h"
 #include "audio/mqueue.h"
 #include "audio/decode/decode.h"
 #include "audio/decode/decode_priv.h"
@@ -25,6 +26,8 @@
 /* Stream sample rate */
 static bool_t change_sample_rate;
 static u32_t stream_sample_rate;
+
+static fft_fixed lgain, rgain;
 
 
 static void decode_portaudio_openstream(void);
@@ -57,9 +60,7 @@
                memset(outputArray, 0, len);
 
                /* mix in sound effects */
-               decode_sample_mix(outputArray, len);
-
-               return paContinue;
+               goto mixin_effects;
        }
 
        fifo_lock(&decode_fifo);
@@ -74,8 +75,7 @@
                if (add_silence_ms < 2)
                        add_silence_ms = 0;
                if (!len) {
-                       fifo_unlock(&decode_fifo);
-                       return paContinue;
+                       goto unlock_mixin_effects;
                }
        }
 
@@ -96,8 +96,7 @@
                current_audio_state |= DECODE_STATE_UNDERRUN;
                memset(outputArray, 0, len);
 
-               fifo_unlock(&decode_fifo);
-               return paContinue;
+               goto unlock_mixin_effects;
        }
 
        if (bytes_used < len) {
@@ -128,7 +127,8 @@
        }
 
        while (bytes_used) {
-               size_t wrap, bytes_write;
+               size_t wrap, bytes_write, samples_write;
+               sample_t *output_ptr, *decode_ptr;
 
                wrap = fifo_bytes_until_rptr_wrap(&decode_fifo);
 
@@ -137,7 +137,15 @@
                        bytes_write = wrap;
                }
 
-               memcpy(outputArray, decode_fifo_buf + decode_fifo.rptr, 
bytes_write);
+               samples_write = BYTES_TO_SAMPLES(bytes_write);
+
+               output_ptr = (sample_t *)outputArray;
+               decode_ptr = (sample_t *)(decode_fifo_buf + decode_fifo.rptr);
+               while (samples_write--) {
+                       *(output_ptr++) = fixed_mul(lgain, *(decode_ptr++));
+                       *(output_ptr++) = fixed_mul(rgain, *(decode_ptr++));
+               }
+
                fifo_rptr_incby(&decode_fifo, bytes_write);
                decode_elapsed_samples += BYTES_TO_SAMPLES(bytes_write);
 
@@ -148,12 +156,15 @@
        reached_start_point = decode_check_start_point();
        if (reached_start_point && current_sample_rate != stream_sample_rate) {
                change_sample_rate = true;
-
-               fifo_unlock(&decode_fifo);
-               return paComplete;
-       }
-
+       }
+
+ unlock_mixin_effects:
        fifo_unlock(&decode_fifo);
+
+ mixin_effects:
+       /* mix in sound effects */
+       decode_sample_mix(outputBuffer, SAMPLES_TO_BYTES(framesPerBuffer));
+
        return paContinue;
 }
 
@@ -299,9 +310,10 @@
 }
 
 
-static void decode_portaudio_gain(s32_t lgain, s32_t rgain)
+static void decode_portaudio_gain(s32_t left_gain, s32_t right_gain)
 {
-       printf("fixme gain %d,%d\n", lgain, rgain);
+       lgain = left_gain;
+       rgain = right_gain;
 }
 
 

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins