Changeset 5415:b0e383e49274 in roaraudio

Timestamp:

02/20/12 19:31:33 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Support MUTE flag on output streams as well (Closes: #194) (pr2)

Files:

• ChangeLog (modified) (1 diff)
• roard/streams.c (modified) (4 diffs)

ChangeLog

@@ -14 +14 @@
         * Updated debian init script (pr1)
         * Typos (Closes: #192) (pr2)
+        * Support MUTE flag on output streams as well (Closes: #194) (pr2)
 
 v. 0.4 - Fri Nov 11 2011 20:12 CET

roard/streams.c

@@ -2307 +2307 @@
  int     is_the_same     = 1;
  int     is_vol_eq       = 1;
+ int     is_muted;
  int     antiecho        = 0;
  ssize_t ret;
@@ -2391 +2392 @@
   is_the_same = 0;
 
- if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) ) {
+ is_muted = streams_get_flag(id, ROAR_FLAG_MUTE);
+
+ if ( !is_muted && !streams_get_flag(id, ROAR_FLAG_HWMIXER) ) {
   is_vol_eq = need_vol_change(g_sa->channels, &(ss->mixer)) ? 0 : 1;
  }
@@ -2398 +2401 @@
   antiecho = 1;
 
- if ( !is_the_same || !is_vol_eq || antiecho ) {
+ if ( !is_the_same || !is_vol_eq || antiecho || is_muted ) {
   olen = ROAR_OUTPUT_CALC_OUTBUFSIZE(&(s->info)); // we hope g_output_buffer_len
                                                   // is ROAR_OUTPUT_CALC_OUTBUFSIZE(g_sa) here
@@ -2433 +2436 @@
   }
 
+  ip = obuf;
+ }
+
+ if ( is_muted ) {
+  memset(obuf, 0, (g_sa->bits*ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels)/8);
   ip = obuf;
  }