Changeset 2947:6e20c99e1025 in roaraudio

Timestamp:

10/16/09 23:43:08 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for waveform mixer to use volume control

Location:

roard

Files:

• include/waveform.h (modified) (2 diffs)
• loop.c (modified) (1 diff)
• waveform.c (modified) (2 diffs)

roard/include/waveform.h

@@ -30 +30 @@
 struct {
  int stream;
+ struct roar_stream_server * ss;
 } g_waveform_mixer;
 
@@ -35 +36 @@
 int waveform_free  (void);
 
+int waveform_update_mixer (void);
+
 #endif
 

roard/loop.c

@@ -104 +104 @@
    alive = 0;
 
+  if ( waveform_update_mixer() == -1 )
+   alive = 0;
+
 /*
   // while in standby we still need to write out our buffer to not run in an endless loop without

roard/waveform.c

@@ -32 +32 @@
   return -1;
 
+ g_waveform_mixer.ss = ss;
+
  s = ROAR_STREAM(ss);
 
@@ -45 +47 @@
 }
 
+int waveform_update_mixer (void) {
+ if ( !need_vol_change(ROAR_STREAM(g_waveform_mixer.ss)->info.channels, &(g_waveform_mixer.ss->mixer)) )
+  return 0;
+
+ roar_amp_pcm(g_output_buffer, g_sa->bits, g_output_buffer,
+              ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels,
+              &(g_waveform_mixer.ss->mixer));
+
+ return 0;
+}
+
 //ll