Changeset 1884:b3c32577c9c3 in roaraudio

Timestamp:

05/23/09 21:28:38 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use mute flag to enable speacker driver

File:

• roard/midi.c (modified) (4 diffs)

roard/midi.c

@@ -604 +604 @@
  g_midi_cb.stoptime = ROAR_MATH_OVERFLOW_ADD(g_pos, samples_per_sec*t);
  midi_cb_start(freq);
- g_midi_cb.playing = 1;
 
  return 0;
@@ -610 +609 @@
 
 int midi_cb_update (void) {
-/*
- if ( midi_cb_readbuf() == -1 )
-  return -1;
-*/
+
+ if ( !streams_get_flag(g_midi_cb.stream, ROAR_FLAG_MUTE) ) {
+  if ( midi_cb_readbuf() == -1 )
+   return -1;
+ } else if ( g_midi_cb.playing ) {
+  midi_cb_stop();
+ }
 
  if ( !g_midi_cb.playing )
   return 0;
 
+/*
  if ( g_midi_cb.stoptime <= g_pos )
   midi_cb_stop();
+*/
 
  ROAR_DBG("midi_cb_update(void) = ?");
@@ -635 +639 @@
   return -1;
 
+ g_midi_cb.playing = 1;
+
  return 0;
 #else
@@ -643 +649 @@
 int midi_cb_stop (void) {
 #ifdef __linux__
+ int ret;
+
+ ret = midi_cb_start(0);
  g_midi_cb.playing = 0;
- return midi_cb_start(0);
+
+ return ret;
 #else
  return -1;