Changeset 1843:cc60d60e3d67 in roaraudio
- Timestamp:
- 05/23/09 04:51:20 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/midi.h
r1841 r1843 37 37 38 38 int g_console; 39 int g_midi_cb_stream; 39 40 40 41 uint32_t g_midi_cb_stoptime; … … 50 51 51 52 // cb = console beep 53 int midi_cb_init(void); 54 int midi_cb_free(void); 52 55 int midi_cb_play(float t, float freq, int override); 53 56 int midi_cb_update (void); -
roard/loop.c
r1750 r1843 105 105 #endif 106 106 107 midi_ cb_update();107 midi_update(); 108 108 // output_buffer_reinit(); 109 109 -
roard/midi.c
r1751 r1843 30 30 31 31 int midi_init (void) { 32 33 if ( midi_cb_init() == -1 ) { 34 ROAR_WARN("Can not initialize MIDI subsystem component CB"); 35 } 36 37 return 0; 38 } 39 int midi_free (void) { 40 return midi_cb_free(); 41 } 42 43 int midi_update(void) { 44 return midi_cb_update(); 45 } 46 47 48 int midi_cb_init (void) { 32 49 #ifdef _HAVE_CONSOLE 50 struct roar_stream * s; 51 struct roar_stream_server * ss; 33 52 int i; 34 53 char * files[] = { … … 42 61 43 62 g_console = -1; 44 g_midi_cb_stoptime = 0; 45 g_midi_cb_playing = 0; 63 g_midi_cb_stream = -1; 64 g_midi_cb_stoptime = 0; 65 g_midi_cb_playing = 0; 46 66 47 67 for (i = 0; files[i] != NULL; i++) { … … 50 70 } 51 71 52 if ( g_console != -1 ) { 53 return 0; 54 } else { 72 if ( g_console == -1 ) 73 return -1; 74 75 if ( (g_midi_cb_stream = streams_new()) == -1 ) { 76 ROAR_WARN("Error while initializing MIDI subsystem component CB"); 77 midi_cb_free(); 55 78 return -1; 56 79 } 80 81 streams_get(g_midi_cb_stream, &ss); 82 s = ROAR_STREAM(ss); 83 84 memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info)); 85 86 s->pos_rel_id = -1; 87 88 s->info.codec = 0; 89 ss->codec_orgi = 0; 90 91 s->info.channels = 1; 92 s->info.rate = 1193180; 93 s->info.bits = 8; 94 95 if ( streams_set_dir(g_midi_cb_stream, ROAR_DIR_BRIDGE, 1) == -1 ) { 96 ROAR_WARN("Error while initializing MIDI subsystem component CB"); 97 midi_cb_free(); 98 return -1; 99 } 100 101 streams_set_name(g_midi_cb_stream, "Console speaker bridge"); 102 103 streams_set_flag(g_midi_cb_stream, ROAR_FLAG_OUTPUT); 104 streams_set_flag(g_midi_cb_stream, ROAR_FLAG_PRIMARY); 105 106 return 0; 57 107 #else 108 g_console = -1; 109 g_midi_cb_stream = -1; 110 58 111 return -1; 59 112 #endif 60 113 } 61 114 62 int midi_ free (void) {115 int midi_cb_free (void) { 63 116 #ifdef _HAVE_CONSOLE 117 118 midi_cb_stop(); 119 120 if ( g_midi_cb_stream != -1 ) 121 streams_delete(g_midi_cb_stream); 122 64 123 if ( g_console != -1 ) 65 124 close(g_console); 125 66 126 return 0; 67 127 #else
Note: See TracChangeset
for help on using the changeset viewer.