Changeset 2489:266b1a6c9683 in roaraudio
- Timestamp:
- 08/24/09 00:34:37 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/ssynth.h
r2471 r2489 27 27 28 28 #include <roaraudio.h> 29 30 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 29 31 30 32 #define SSYNTH_NOTES_MAX 16 … … 82 84 #endif 83 85 86 #endif 87 84 88 //ll -
roard/loop.c
r2467 r2489 112 112 113 113 midi_reinit(); 114 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 114 115 ssynth_update(); 116 #endif 115 117 light_reinit(); 116 118 -
roard/midi.c
r2487 r2489 84 84 midi_check_bridge(g_midi_clock.stream); 85 85 86 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 86 87 midi_conv_mes2ssynth(); 88 #endif 87 89 88 90 #ifndef ROAR_WITHOUT_DCOMP_CB … … 426 428 #undef _nb 427 429 430 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 428 431 int midi_conv_mes2ssynth(void) { 429 432 struct roar_buffer * buf = g_midi_mess.buf; … … 444 447 return 0; 445 448 } 449 #endif 446 450 447 451 int midi_new_bufmes (struct roar_buffer ** buf, struct midi_message ** mes) { -
roard/roard.c
r2487 r2489 105 105 " --midi-console-enable - Enables the console based MIDI synth\n" 106 106 " --midi-console DEV - Set device for MIDI console\n" 107 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 107 108 " --ssynth-enable - Enable simple software synth\n" 108 109 " --ssynth-disable - Disable simple software synth\n" 110 #endif 109 111 ); 110 112 … … 704 706 } 705 707 708 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 706 709 if ( ssynth_init_config() == -1 ) { 707 710 ROAR_ERR("Can not init ssynth config!"); 708 711 return 1; 709 712 } 713 #endif 710 714 711 715 #ifdef ROAR_SUPPORT_LISTEN … … 951 955 952 956 } else if ( strcmp(k, "--ssynth-enable") == 0 ) { 957 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 953 958 ssynth_conf.enable = 1; 959 #else 960 ROAR_ERR("main(*): No support for ssynth compiled in"); 961 #endif 954 962 } else if ( strcmp(k, "--ssynth-disable") == 0 ) { 963 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 955 964 ssynth_conf.enable = 0; 965 #else 966 // we can safely ignore the disable 967 #endif 956 968 957 969 } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) { … … 1089 1101 } 1090 1102 1103 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 1091 1104 if ( ssynth_init() == -1 ) { 1092 1105 ROAR_ERR("Can not initialize ssynth subsystem"); 1093 1106 } 1107 #endif 1094 1108 1095 1109 if ( light_init(light_channels) == -1 ) { … … 1348 1362 streams_free(); 1349 1363 clients_free(); 1364 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 1350 1365 ssynth_free(); 1366 #endif 1351 1367 #ifndef ROAR_WITHOUT_DCOMP_CB 1352 1368 midi_cb_stop(); // stop console beep -
roard/ssynth.c
r2476 r2489 24 24 25 25 #include "roard.h" 26 27 #ifndef ROAR_WITHOUT_DCOMP_SSYNTH 26 28 27 29 float ssynth_polys[SSYNTH_POLY_POLYMAX][SSYNTH_POLY_COEFF] = { … … 303 305 } 304 306 307 #endif 308 305 309 //ll
Note: See TracChangeset
for help on using the changeset viewer.