Changeset 192:5956b24ab8be in roaraudio

Timestamp:

07/20/08 18:32:23 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added g_midi_cb_playing

Location:

roard

Files:

• include/midi.h (modified) (1 diff)
• midi.c (modified) (5 diffs)

roard/include/midi.h

@@ -17 +17 @@
 
 uint32_t g_midi_cb_stoptime;
+int g_midi_cb_playing;
+
 
 int midi_init (void);

roard/midi.c

@@ -14 +14 @@
                   };
 
- g_console = -1;
+ g_console          = -1;
  g_midi_cb_stoptime = 0;
+ g_midi_cb_playing  = 0;
 
  for (i = 0; files[i] != NULL; i++) {
@@ -42 +43 @@
 #define MIDI_CB_OVERRIDE   1
 */
- if ( g_midi_cb_stoptime && override != MIDI_CB_OVERRIDE )
+ if ( g_midi_cb_playing && override != MIDI_CB_OVERRIDE )
   return -1;
 
  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;
@@ -52 +54 @@
 
 int midi_cb_update (void) {
+ if ( !g_midi_cb_playing )
+  return 0;
+
  if ( g_midi_cb_stoptime <= g_pos )
   midi_cb_stop();
@@ -64 +69 @@
   return -1;
 
- if ( ioctl(g_console, KIOCSOUND, (int)(1193180.0/freq)) == -1 )
+ if ( ioctl(g_console, KIOCSOUND, freq == 0 ? 0 : (int)(1193180.0/freq)) == -1 )
   return -1;
 
@@ -75 +80 @@
 int midi_cb_stop (void) {
 #ifdef __linux__
+ g_midi_cb_playing = 0;
  return midi_cb_start(0);
 #else