diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | utils/vlc_codec/libadlmidi.c | 19 |
2 files changed, 21 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e51b86d..646e84a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,20 +5,26 @@ project (libADLMIDI C CXX) # Strip garbage if(APPLE) set(LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -dead_strip") -ELSEIF(NOT MSVC AND NOT MSDOS) +elseif(NOT MSVC AND NOT MSDOS) set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os -s -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-s") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -s -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-s") set(LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Wl,--gc-sections -Wl,-s") -ENDIF() +endif() -IF(NOT MSVC AND NOT MSDOS) +if(NOT MSVC AND NOT MSDOS) # Global optimization flags set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-omit-frame-pointer") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-omit-frame-pointer") # Turn on all warnings set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") -ENDIF() +# Deny undefined symbols + if(NOT APPLE) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined" ) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + endif() +endif() if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") diff --git a/utils/vlc_codec/libadlmidi.c b/utils/vlc_codec/libadlmidi.c index 396d059..64909f3 100644 --- a/utils/vlc_codec/libadlmidi.c +++ b/utils/vlc_codec/libadlmidi.c @@ -77,12 +77,14 @@ vlc_module_begin () set_callbacks (Open, Close) add_loadfile ("adlmidi-custombank", "", SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false) - //add_bool ("synth-chorus", true, CHORUS_TEXT, CHORUS_TEXT, false) - //add_float ("synth-gain", .5, GAIN_TEXT, GAIN_LONGTEXT, false) - // change_float_range (0., 10.) - //add_integer ("synth-polyphony", 256, POLYPHONY_TEXT, POLYPHONY_LONGTEXT, false) - // change_integer_range (1, 65535) - //add_bool ("synth-reverb", true, REVERB_TEXT, REVERB_TEXT, true) + /* + add_bool ("synth-chorus", true, CHORUS_TEXT, CHORUS_TEXT, false) + add_float ("synth-gain", .5, GAIN_TEXT, GAIN_LONGTEXT, false) + change_float_range (0., 10.) + add_integer ("synth-polyphony", 256, POLYPHONY_TEXT, POLYPHONY_LONGTEXT, false) + change_integer_range (1, 65535) + add_bool ("synth-reverb", true, REVERB_TEXT, REVERB_TEXT, true) + */ add_integer ("adlmidi-sample-rate", 44100, SAMPLE_RATE_TEXT, SAMPLE_RATE_TEXT, true) change_integer_range (22050, 96000) add_integer ("adlmidi-emulated-chips", 6, EMULATED_CHIPS_TEXT, EMULATED_CHIPS_TEXT, true) @@ -107,7 +109,6 @@ static const struct ADLMIDI_AudioFormat g_output_format = 2 * sizeof(float) }; -//static int DecodeBlock (decoder_t *p_dec, block_t *p_block); //For different version #if (LIBVLC_VERSION_MAJOR >= 3) static int DecodeBlock (decoder_t *p_dec, block_t *p_block); #else @@ -162,7 +163,7 @@ static int Open (vlc_object_t *p_this) #else p_dec->pf_decode_audio = DecodeBlock; #endif - return VLC_SUCCESS;//VLCDEC_SUCCESS + return VLC_SUCCESS; } @@ -177,6 +178,7 @@ static void Close (vlc_object_t *p_this) static void Flush (decoder_t *p_dec) { decoder_sys_t *p_sys = p_dec->p_sys; + #if (LIBVLC_VERSION_MAJOR >= 3) date_Set (&p_sys->end_date, VLC_TS_INVALID); #else @@ -326,3 +328,4 @@ drop: return p_out; #endif } + |