Changeset 2487:10020ba41793 in roaraudio
- Timestamp:
- 08/24/09 00:16:38 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/midi.h
r2461 r2487 33 33 #endif 34 34 35 #ifndef ROAR_WITHOUT_DCOMP_CB 35 36 #define MIDI_CB_NOOVERRIDE 0 36 37 #define MIDI_CB_OVERRIDE 1 38 #endif 37 39 38 40 #define MIDI_RATE 31250 … … 76 78 int init; 77 79 int inited; 80 81 #ifndef ROAR_WITHOUT_DCOMP_CB 78 82 int init_cb; 79 83 char * console_dev; 84 #endif 80 85 } midi_config; 81 86 … … 98 103 } g_midi_mess; 99 104 105 #ifndef ROAR_WITHOUT_DCOMP_CB 100 106 struct { 101 107 int console; … … 104 110 int playing; 105 111 } g_midi_cb; 112 #endif 106 113 107 114 struct { … … 143 150 144 151 // cb = console beep 152 #ifndef ROAR_WITHOUT_DCOMP_CB 145 153 int midi_cb_init(void); 146 154 int midi_cb_free(void); … … 150 158 int midi_cb_stop (void); 151 159 int midi_cb_readbuf(void); 160 #endif 152 161 153 162 // dummys: -
roard/midi.c
r2462 r2487 32 32 midi_config.init = 1; 33 33 midi_config.inited = 0; 34 35 #ifndef ROAR_WITHOUT_DCOMP_CB 34 36 midi_config.init_cb = 0; 35 37 midi_config.console_dev = NULL; 38 #endif 36 39 37 40 return 0; … … 43 46 44 47 if ( midi_config.init ) { 48 #ifndef ROAR_WITHOUT_DCOMP_CB 45 49 if ( midi_config.init_cb ) { 46 50 if ( midi_cb_init() == -1 ) { … … 48 52 } 49 53 } 54 #endif 50 55 51 56 if ( midi_clock_init() == -1 ) { … … 66 71 return -1; 67 72 73 #ifndef ROAR_WITHOUT_DCOMP_CB 68 74 if ( midi_cb_free() == -1 ) 69 75 return -1; 76 #endif 70 77 71 78 return 0; … … 79 86 midi_conv_mes2ssynth(); 80 87 88 #ifndef ROAR_WITHOUT_DCOMP_CB 81 89 return midi_cb_update(); 90 #else 91 return 0; 92 #endif 82 93 } 83 94 … … 594 605 // CB: 595 606 607 #ifndef ROAR_WITHOUT_DCOMP_CB 596 608 int midi_cb_init (void) { 597 609 #ifdef _HAVE_CONSOLE … … 790 802 return 0; 791 803 } 804 #endif 792 805 793 806 // VIO: -
roard/roard.c
r2486 r2487 931 931 932 932 } else if ( strcmp(k, "--midi-no-console") == 0 ) { 933 #ifndef ROAR_WITHOUT_DCOMP_CB 933 934 midi_config.init_cb = 0; 935 #else 936 // no warning here as this is the disable option 937 #endif 934 938 } else if ( strcmp(k, "--midi-console-enable") == 0 ) { 939 #ifndef ROAR_WITHOUT_DCOMP_CB 935 940 midi_config.init_cb = 1; 941 #else 942 ROAR_ERR("main(*): No support for MIDI subsystem part CB compiled in"); 943 #endif 936 944 } else if ( strcmp(k, "--midi-console") == 0 ) { 945 #ifndef ROAR_WITHOUT_DCOMP_CB 937 946 midi_config.console_dev = argv[++i]; 938 947 midi_config.init_cb = 1; 948 #else 949 ROAR_ERR("main(*): No support for MIDI subsystem part CB compiled in"); 950 #endif 939 951 940 952 } else if ( strcmp(k, "--ssynth-enable") == 0 ) { … … 1337 1349 clients_free(); 1338 1350 ssynth_free(); 1351 #ifndef ROAR_WITHOUT_DCOMP_CB 1339 1352 midi_cb_stop(); // stop console beep 1353 #endif 1340 1354 midi_free(); 1341 1355 light_free();
Note: See TracChangeset
for help on using the changeset viewer.