Changeset 1850:ac565cd518e6 in roaraudio


Ignore:
Timestamp:
05/23/09 08:04:43 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

started grouping g_midi_*_* to g_midi_*.* structs

Location:
roard
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • roard/include/midi.h

    r1848 r1850  
    4444int      g_midi_cb_playing; 
    4545 
    46 int g_midi_clock_stream; 
     46struct { 
     47 int stream; 
     48 uint_least32_t bph; // beats per hour 
     49} g_midi_clock; 
    4750 
    4851int midi_init (void); 
  • roard/midi.c

    r1849 r1850  
    4848int midi_update(void) { 
    4949 
    50  if ( g_midi_clock_stream != -1 ) 
    51   midi_check_bridge(g_midi_clock_stream); 
     50 if ( g_midi_clock.stream != -1 ) 
     51  midi_check_bridge(g_midi_clock.stream); 
    5252 
    5353 return midi_cb_update(); 
     
    110110 struct roar_stream_server * ss; 
    111111 
    112  if ( (g_midi_clock_stream = streams_new()) == -1 ) { 
     112 if ( (g_midi_clock.stream = streams_new()) == -1 ) { 
    113113  ROAR_WARN("Error while initializing MIDI subsystem component clock"); 
    114114  return -1; 
    115115 } 
    116116 
    117  midi_vio_set_dummy(g_midi_clock_stream); 
    118  
    119  streams_get(g_midi_clock_stream, &ss); 
     117 midi_vio_set_dummy(g_midi_clock.stream); 
     118 
     119 streams_get(g_midi_clock.stream, &ss); 
    120120 s = ROAR_STREAM(ss); 
    121121 
    122122 memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info)); 
    123123 
    124  s->pos_rel_id    =  g_midi_clock_stream; 
     124 s->pos_rel_id    =  g_midi_clock.stream; 
    125125 
    126126 s->info.codec    =  ROAR_CODEC_MIDI; 
     
    131131 s->info.bits     =  8; 
    132132 
    133  if ( streams_set_dir(g_midi_clock_stream, ROAR_DIR_BRIDGE, 1) == -1 ) { 
     133 if ( streams_set_dir(g_midi_clock.stream, ROAR_DIR_BRIDGE, 1) == -1 ) { 
    134134  ROAR_WARN("Error while initializing MIDI subsystem component clock"); 
    135135  return -1; 
    136136 } 
    137137 
    138  streams_set_name(g_midi_clock_stream, "MIDI Clock"); 
    139  
    140  streams_set_flag(g_midi_clock_stream, ROAR_FLAG_PRIMARY); 
    141  streams_set_flag(g_midi_clock_stream, ROAR_FLAG_SYNC); 
     138 streams_set_name(g_midi_clock.stream, "MIDI Clock"); 
     139 
     140 streams_set_flag(g_midi_clock.stream, ROAR_FLAG_PRIMARY); 
     141 streams_set_flag(g_midi_clock.stream, ROAR_FLAG_SYNC); 
    142142 
    143143 return 0; 
Note: See TracChangeset for help on using the changeset viewer.