Changeset 1850:ac565cd518e6 in roaraudio
- Timestamp:
- 05/23/09 08:04:43 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/midi.h
r1848 r1850 44 44 int g_midi_cb_playing; 45 45 46 int g_midi_clock_stream; 46 struct { 47 int stream; 48 uint_least32_t bph; // beats per hour 49 } g_midi_clock; 47 50 48 51 int midi_init (void); -
roard/midi.c
r1849 r1850 48 48 int midi_update(void) { 49 49 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); 52 52 53 53 return midi_cb_update(); … … 110 110 struct roar_stream_server * ss; 111 111 112 if ( (g_midi_clock _stream = streams_new()) == -1 ) {112 if ( (g_midi_clock.stream = streams_new()) == -1 ) { 113 113 ROAR_WARN("Error while initializing MIDI subsystem component clock"); 114 114 return -1; 115 115 } 116 116 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); 120 120 s = ROAR_STREAM(ss); 121 121 122 122 memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info)); 123 123 124 s->pos_rel_id = g_midi_clock _stream;124 s->pos_rel_id = g_midi_clock.stream; 125 125 126 126 s->info.codec = ROAR_CODEC_MIDI; … … 131 131 s->info.bits = 8; 132 132 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 ) { 134 134 ROAR_WARN("Error while initializing MIDI subsystem component clock"); 135 135 return -1; 136 136 } 137 137 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); 142 142 143 143 return 0;
Note: See TracChangeset
for help on using the changeset viewer.