diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 000000000..6b70e5def --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,359 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.0) + +PROJECT(lmms) + +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) +SET(CMAKE_BUILD_TYPE relwithdebinfo) + +CMAKE_POLICY(SET CMP0005 NEW) + +INCLUDE(AddFileDependencies) +INCLUDE(CheckIncludeFiles) +INCLUDE(FindPkgConfig) + + +SET(VERSION_MAJOR "0") +SET(VERSION_MINOR "4") +SET(VERSION_PATCH "0") +SET(VERSION_SUFFIX "beta") +SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +IF(VERSION_SUFFIX) + SET (VERSION "${VERSION}-${VERSION_SUFFIX}") +ENDIF(VERSION_SUFFIX) +ADD_DEFINITIONS(-D'LMMS_VERSION="${VERSION}"') +IF(WIN32) + SET(LMMS_BUILD_WIN32 1) +ELSE(LINUX) + SET(LMMS_BUILD_LINUX 1) +ENDIF(WIN32) + + +OPTION(WANT_ALSA "Include ALSA (Advanced Linux Sound Architecture) support" ON) +OPTION(WANT_CAPS "Include C* Audio Plugin Suite (LADSPA plugins)" ON) +OPTION(WANT_FFTW3F "Include SpectrumAnalyzer plugin" ON) +OPTION(WANT_JACK "Include JACK (Jack Audio Connection Kit) support" ON) +OPTION(WANT_OGGVORBIS "Include OGG/Vorbis support" ON) +OPTION(WANT_PULSEAUDIO "Include PulseAudio support" ON) +OPTION(WANT_SDL "Include SDL (Simple DirectMedia Layer) support" ON) +OPTION(WANT_SF2 "Include SoundFont2 player plugin" ON) +OPTION(WANT_STK "Include Stk (Synthesis Toolkit) support" ON) +OPTION(WANT_SYSTEM_SR "Use system's libsamplerate" ON) +OPTION(WANT_TAP "Include Tom's Audio Processing (LADSPA plugins)" ON) +OPTION(WANT_VST "Include VST support" ON) +OPTION(WANT_PCH "Use precompiled headers" OFF) + + +MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") +EXEC_PROGRAM( uname ARGS "-m"OUTPUT_VARIABLE Machine ) +MESSAGE("Machine: ${Machine}") +IF(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" ) + MESSAGE("-- This is an 32 bit machine") + SET(HOST_IS_64BIT FALSE) +ELSE(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" ) + IF(${Machine} MATCHES "x86_64") + MESSAGE("-- This is an 64 bit machine") + SET(HOST_IS_64BIT TRUE) + ELSE(${Machine} MATCHES "x86_64") + MESSAGE("Can't identify this machine. Assuming 32 bit platform ") + SET(HOST_IS_64BIT FALSE) + ENDIF(${Machine} MATCHES "x86_64") +ENDIF(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" ) + + +IF(HOST_IS_64BIT) + SET(LIB_DIR lib64) +ELSE(HOST_IS_64BIT) + SET(LIB_DIR lib) +ENDIF(HOST_IS_64BIT) +SET(PLUGIN_DIR ${LIB_DIR}/lmms) +SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share) +SET(LMMS_DATA_DIR ${DATA_DIR}/lmms) + + +CHECK_INCLUDE_FILES(stdint.h LMMS_HAVE_STDINT_H) +CHECK_INCLUDE_FILES(pthread.h LMMS_HAVE_PTHREAD_H) +CHECK_INCLUDE_FILES(unistd.h LMMS_HAVE_UNISTD_H) +CHECK_INCLUDE_FILES(sys/types.h LMMS_HAVE_SYS_TYPES_H) +CHECK_INCLUDE_FILES(sys/ipc.h LMMS_HAVE_SYS_IPC_H) +CHECK_INCLUDE_FILES(sys/shm.h LMMS_HAVE_SYS_SHM_H) +CHECK_INCLUDE_FILES(sys/time.h LMMS_HAVE_SYS_TIME_H) +CHECK_INCLUDE_FILES(sys/wait.h LMMS_HAVE_SYS_WAIT_H) +CHECK_INCLUDE_FILES(sys/select.h LMMS_HAVE_SYS_SELECT_H) +CHECK_INCLUDE_FILES(stdarg.h LMMS_HAVE_STDARG_H) +CHECK_INCLUDE_FILES(signal.h LMMS_HAVE_SIGNAL_H) +CHECK_INCLUDE_FILES(sched.h LMMS_HAVE_SCHED_H) +CHECK_INCLUDE_FILES(sys/soundcard.h LMMS_HAVE_SYS_SOUNDCARD_H) +CHECK_INCLUDE_FILES(soundcard.h LMMS_HAVE_SOUNDCARD_H) +CHECK_INCLUDE_FILES(fcntl.h LMMS_HAVE_FCNTL_H) +CHECK_INCLUDE_FILES(sys/ioctl.h LMMS_HAVE_SYS_IOCTL_H) +CHECK_INCLUDE_FILES(ctype.h LMMS_HAVE_CTYPE_H) +CHECK_INCLUDE_FILES(string.h LMMS_HAVE_STRING_H) + + +# check for Qt4 +FIND_PACKAGE(Qt4 REQUIRED) +SET(QT_USE_QTXML 1) +STRING(REGEX REPLACE "[^/]+$" "translations/" QT_TRANSLATIONS_DIR "${QT_MKSPECS_DIR}") +IF(EXISTS "${QT_TRANSLATIONS_DIR}") + ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"') +ENDIF(EXISTS "${QT_TRANSLATIONS_DIR}") +IF(NOT WIN32) + STRING(REGEX REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}") +ENDIF(NOT WIN32) +INCLUDE(${QT_USE_FILE}) + +# check for libsndfile +PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11) + + +IF(WANT_CAPS) +SET(LMMS_HAVE_CAPS TRUE) +ENDIF(WANT_CAPS) + +IF(WANT_TAP) +SET(LMMS_HAVE_TAP TRUE) +ENDIF(WANT_TAP) + + +# check for SDL +IF(WANT_SDL) + FIND_PACKAGE(SDL) + IF(SDL_FOUND) + SET(LMMS_HAVE_SDL TRUE) + ENDIF(SDL_FOUND) +ENDIF(WANT_SDL) + + +# check for Stk +IF(WANT_STK) + FIND_PACKAGE(STK) + IF(STK_FOUND) + SET(LMMS_HAVE_STK TRUE) + ELSE(STK_FOUND) + SET(STK_INCLUDE_DIR "") + ENDIF(STK_FOUND) +ENDIF(WANT_STK) + + +# check for PulseAudio +IF(WANT_PULSEAUDIO) + FIND_PACKAGE(PulseAudio) + IF(PULSEAUDIO_FOUND) + SET(LMMS_HAVE_PULSEAUDIO TRUE) + ELSE(PULSEAUDIO_FOUND) + SET(PULSEAUDIO_INCLUDE_DIR "") + ENDIF(PULSEAUDIO_FOUND) +ENDIF(WANT_PULSEAUDIO) + + +# check for OGG/Vorbis-libraries +IF(WANT_OGGVORBIS) + FIND_PACKAGE(OggVorbis) + IF(OGGVORBIS_FOUND) + SET(LMMS_HAVE_OGGVORBIS TRUE) + ENDIF(OGGVORBIS_FOUND) +ENDIF(WANT_OGGVORBIS) + + +# check whether to enable OSS-support +IF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H) + SET(LMMS_HAVE_OSS TRUE) +ENDIF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H) + + +# check for ALSA +IF(WANT_ALSA) + INCLUDE(FindAlsa) + ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/alsaconfig.h) + IF(ALSA_FOUND) + SET(LMMS_HAVE_ALSA TRUE) + ENDIF(ALSA_FOUND) +ENDIF(WANT_ALSA) + + +# check for JACK +IF(WANT_JACK) + PKG_CHECK_MODULES(JACK jack>=0.77) + IF(JACK_FOUND) + SET(LMMS_HAVE_JACK TRUE) + ENDIF(JACK_FOUND) +ENDIF(WANT_JACK) + + +# check for FFTW3F-library +IF(WANT_FFTW3F) + PKG_CHECK_MODULES(FFTW3F fftw3f>=3.0.0) + IF(FFTW3F_FOUND) + SET(LMMS_HAVE_FFTW3F TRUE) + ENDIF(FFTW3F_FOUND) +ENDIF(WANT_FFTW3F) + + +# check for Fluidsynth +IF(WANT_SF2) + PKG_CHECK_MODULES(FLUIDSYNTH fluidsynth>=1.0.7) + IF(FLUIDSYNTH_FOUND) + SET(LMMS_HAVE_FLUIDSYNTH TRUE) + ENDIF(FLUIDSYNTH_FOUND) +ENDIF(WANT_SF2) + + +# check for WINE +if(WANT_VST) + INCLUDE(CheckLibraryExists) + INCLUDE(CheckIncludeFileCXX) + SET(CMAKE_REQUIRED_FLAGS_ORIG ${CMAKE_REQUIRED_FLAGS}) + SET(CMAKE_REQUIRED_INCLUDES_ORIG ${CMAKE_REQUIRED_INCLUDES}) + SET(CMAKE_CXX_COMPILER_ORIG ${CMAKE_CXX_COMPILER}) + IF(HOST_IS_64BIT) + SET(CMAKE_REQUIRED_FLAGS -m32 ${CMAKE_REQUIRED_FLAGS}) + ENDIF(HOST_IS_64BIT) + CHECK_LIBRARY_EXISTS(wine wine_init "" HAVE_LIBWINE) + SET(CMAKE_CXX_COMPILER /usr/bin/wineg++) + SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CMAKE_INSTALL_PREFIX}/include/wine/windows /usr/include/wine/windows) + CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H) + SET(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER_ORIG}) + SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_ORIG}) + SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_ORIG}) + IF(HAVE_LIBWINE AND HAVE_WINDOWS_H) + SET(LMMS_HAVE_VST TRUE) + ENDIF(HAVE_LIBWINE AND HAVE_WINDOWS_H) +ENDIF(WANT_VST) + + +# check for libsamplerate +IF(WANT_SYSTEM_SR) + PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.3) + IF(SAMPLERATE_FOUND) + SET(LMMS_HAVE_SAMPLERATE TRUE) + ELSE(SAMPLERATE_FOUND) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate) + INCLUDE(ChecksForLibSamplerate) + SET(LIBSAMPLERATE_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_sinc.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/high_qual_coeffs.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/mid_qual_coeffs.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/fastest_coeffs.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/common.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/config.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/float_cast.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_zoh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_linear.c) + ENDIF(SAMPLERATE_FOUND) +ENDIF(WANT_SYSTEM_SR) + + + +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lmmsconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/lmmsconfig.h) + + +FILE(GLOB lmms_INCLUDES include/*.h) +FILE(GLOB lmms_UI src/gui/dialogs/*.ui) +FILE(GLOB_RECURSE lmms_SOURCES src/*.cpp) + +SET(lmms_MOC ${lmms_INCLUDES}) + +SET(lmms_EMBEDDED_RESOURCES AUTHORS COPYING) + +QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -DLMMS_HAVE_ALSA) +QT4_WRAP_UI(lmms_UI_out ${lmms_UI}) + + +# embedded resources stuff +ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp) +GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION) +SET(ER_H embedded_resources.h) + +# we somehow have to make LMMS-binary depend on MOC-files +ADD_FILE_DEPENDENCIES(${ER_H} ${lmms_MOC_out}) + +ADD_CUSTOM_COMMAND(OUTPUT ${ER_H} COMMAND ${BIN2RES} ARGS ${lmms_EMBEDDED_RESOURCES} > ${ER_H} DEPENDS ${BIN2RES}) + + +# make sub-directories +ADD_SUBDIRECTORY(plugins) +ADD_SUBDIRECTORY(data) + +# +# build LMMS-binary +# +ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS}) + +INCLUDE_DIRECTORIES( include . ${SDL_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS}) +LINK_DIRECTORIES( ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS} ) +LINK_LIBRARIES(${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES}) + +ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${ER_H} ${lmms_UI_out}) +SET_TARGET_PROPERTIES(lmms PROPERTIES COMPILE_FLAGS "-D_FORTIFY_SOURCE=0") +IF(NOT WIN32) + SET_TARGET_PROPERTIES(lmms PROPERTIES COMPILE_FLAGS "-fPIC") +ENDIF(NOT WIN32) +INSTALL(TARGETS lmms RUNTIME DESTINATION bin) + + + +IF(WANT_PCH) + FIND_PACKAGE(PCHSupport) + IF(PCHSupport_FOUND) + SET(USE_PCH TRUE) + ADD_DEFINITIONS(-DUSE_PCH) + MESSAGE(STATUS "Enabling precompiled headers for GCC ${gcc_compiler_version}") + ADD_PRECOMPILED_HEADER(lmms pch include/pch.h) + ENDIF(PCHSupport_FOUND) +ENDIF(WANT_PCH) + +SET(ADDITIONAL_MAKE_CLEAN_FILES ${ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h pch.h.gch/*) + + +# +# display configuration information +# + +MESSAGE("\n" +"Installation Summary\n" +"--------------------\n" +"* Install Directory : ${CMAKE_INSTALL_PREFIX}\n" +"* Build type : ${CMAKE_BUILD_TYPE}\n" +"* Use precompiled headers : ${USE_PCH}\n" +"* Use system's libsamplerate : ${LMMS_HAVE_SAMPLERATE}\n" +) + +MESSAGE( +"Supported audio interfaces\n" +"--------------------------\n" +"* ALSA : ${LMMS_HAVE_ALSA}\n" +"* JACK : ${LMMS_HAVE_JACK}\n" +"* OSS : ${LMMS_HAVE_OSS}\n" +"* PulseAudio : ${LMMS_HAVE_PULSEAUDIO}\n" +"* SDL : ${LMMS_HAVE_SDL}\n" +) + +MESSAGE( +"Supported MIDI interfaces\n" +"-------------------------\n" +"* ALSA : ${LMMS_HAVE_ALSA}\n" +"* OSS : ${LMMS_HAVE_OSS}\n" +"* WinMM : ${LMMS_BUILD_WIN32}\n" +) + +MESSAGE( +"Supported sample-file formats\n" +"-----------------------------\n" +"* WAVE : TRUE\n" +"* OGG/VORBIS : ${LMMS_HAVE_OGGVORBIS}\n" +) + +MESSAGE( +"Optional plugins\n" +"----------------\n" +"* SoundFont2 player : ${LMMS_HAVE_FLUIDSYNTH}\n" +"* Stk Mallets : ${LMMS_HAVE_STK}\n" +"* VST-instrument hoster : ${LMMS_HAVE_VST}\n" +"* VST-effect hoster : ${LMMS_HAVE_VST}\n" +"* SpectrumAnalyzer : ${LMMS_HAVE_FFTW3F}\n" +"* CAPS LADSPA plugins : ${LMMS_HAVE_CAPS}\n" +"* TAP LADSPA plugins : ${LMMS_HAVE_TAP}\n" +) + diff --git a/ChangeLog b/ChangeLog index f093683b2..58dad6cc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,328 @@ +2008-07-22 Tobias Doerffel + + * cmake/modules/FindAlsa.cmake: + * cmake/modules/FindOggVorbis.cmake: + * cmake/modules/FindSTK.cmake: + * cmake/modules/FindPCHSupport.cmake: + * cmake/modules/config-alsa.h.cmake: + * cmake/modules/InstallHelpers.cmake: + * cmake/modules/FindPulseAudio.cmake: + * cmake/modules/ChecksForLibSamplerate.cmake: + * cmake/modules/BuildPlugin.cmake: + * plugins/patman/patman.cpp: + * plugins/patman/CMakeLists.txt: + * plugins/ladspa_effect/ladspa_effect.cpp: + * plugins/ladspa_effect/tap/tap_deesser.c: + * plugins/ladspa_effect/tap/tap_sigmoid.c: + * plugins/ladspa_effect/tap/tap_doubler.c: + * plugins/ladspa_effect/tap/ladspa-local.h: + * plugins/ladspa_effect/tap/tap_eqbw.c: + * plugins/ladspa_effect/tap/tap_pinknoise.c: + * plugins/ladspa_effect/tap/tap_chorusflanger.c: + * plugins/ladspa_effect/tap/tap_limiter.c: + * plugins/ladspa_effect/tap/tap_eq.c: + * plugins/ladspa_effect/tap/tap_vibrato.c: + * plugins/ladspa_effect/tap/tap_autopan.c: + * plugins/ladspa_effect/tap/tap_pitch.c: + * plugins/ladspa_effect/tap/tap_dynamics_st.c: + * plugins/ladspa_effect/tap/tap_echo.c: + * plugins/ladspa_effect/tap/tap_tremolo.c: + * plugins/ladspa_effect/tap/tap_tubewarmth.c: + * plugins/ladspa_effect/tap/tap_dynamics_m.c: + * plugins/ladspa_effect/tap/tap_reflector.c: + * plugins/ladspa_effect/tap/tap_reverb.c: + * plugins/ladspa_effect/tap/tap_rotspeak.c: + * plugins/ladspa_effect/tap/CMakeLists.txt: + * plugins/ladspa_effect/ladspa_control_dialog.cpp: + * plugins/ladspa_effect/caps/basics.h: + * plugins/ladspa_effect/caps/CMakeLists.txt: + * plugins/ladspa_effect/ladspa_controls.cpp: + * plugins/ladspa_effect/CMakeLists.txt: + * plugins/organic/organic.cpp: + * plugins/organic/CMakeLists.txt: + * plugins/lb302/lb302.cpp: + * plugins/lb302/CMakeLists.txt: + * plugins/lb303/lb303.cpp: + * plugins/lb303/CMakeLists.txt: + * plugins/bass_booster/bassbooster_controls.cpp: + * plugins/bass_booster/CMakeLists.txt: + * plugins/stereo_matrix/stereomatrix_controls.cpp: + * plugins/stereo_matrix/CMakeLists.txt: + * plugins/bit_invader/bit_invader.cpp: + * plugins/bit_invader/CMakeLists.txt: + * plugins/vst_effect/vst_effect_controls.cpp: + * plugins/vst_effect/CMakeLists.txt: + * plugins/vibed/CMakeLists.txt: + * plugins/vibed/nine_button_selector.cpp: + * plugins/vibed/vibed.cpp: + * plugins/triple_oscillator/CMakeLists.txt: + * plugins/triple_oscillator/triple_oscillator.cpp: + * plugins/live_tool/live_tool.cpp: + * plugins/live_tool/CMakeLists.txt: + * plugins/peak_controller_effect/peak_controller_effect.cpp: + * plugins/peak_controller_effect/peak_controller_effect_controls.cpp: + * plugins/peak_controller_effect/CMakeLists.txt: + * plugins/audio_file_processor/audio_file_processor.cpp: + * plugins/audio_file_processor/CMakeLists.txt: + * plugins/stk/mallets/mallets.cpp: + * plugins/stk/mallets/CMakeLists.txt: + * plugins/stk/CMakeLists.txt: + * plugins/stereo_enhancer/stereoenhancer_controls.cpp: + * plugins/stereo_enhancer/CMakeLists.txt: + * plugins/sf2_player/patches_dialog.cpp: + * plugins/sf2_player/sf2_player.cpp: + * plugins/sf2_player/CMakeLists.txt: + * plugins/vestige/vestige.cpp: + * plugins/vestige/CMakeLists.txt: + * plugins/vst_base/lvsl_client.cpp: + * plugins/vst_base/CMakeLists.txt: + * plugins/ladspa_browser/ladspa_browser.cpp: + * plugins/ladspa_browser/ladspa_description.cpp: + * plugins/ladspa_browser/ladspa_port_dialog.cpp: + * plugins/ladspa_browser/CMakeLists.txt: + * plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp: + * plugins/spectrum_analyzer/CMakeLists.txt: + * plugins/kicker/kicker.cpp: + * plugins/kicker/CMakeLists.txt: + * plugins/flp_import/CMakeLists.txt: + * plugins/flp_import/unrtf/output.c: + * plugins/flp_import/unrtf/html.c: + * plugins/flp_import/unrtf/malloc.c: + * plugins/flp_import/unrtf/parse.c: + * plugins/flp_import/unrtf/attr.c: + * plugins/flp_import/unrtf/word.c: + * plugins/flp_import/unrtf/util.c: + * plugins/flp_import/unrtf/convert.c: + * plugins/flp_import/unrtf/hash.c: + * plugins/flp_import/unrtf/error.c: + * plugins/midi_import/CMakeLists.txt: + * plugins/CMakeLists.txt: + * Makefile.svn: + * include/midi_dummy.h: + * include/midi_alsa_raw.h: + * include/config_mgr.h: + * include/audio_file_wave.h: + * include/audio_file_ogg.h: + * include/ladspa_manager.h: + * include/ladspa_control.h: + * include/ladspa.h: + * include/midi_oss.h: + * include/pch.h: + * include/sample_buffer.h: + * include/audio_dummy.h: + * include/midi_mapper.h: + * include/audio_pulseaudio.h: + * include/audio_sdl.h: + * include/micro_timer.h: + * include/audio_jack.h: + * include/project_renderer.h: + * include/midi_alsa_seq.h: + * include/ladspa-1.1.h: + * include/setup_dialog.h: + * include/export_project_dialog.h: + * include/midi_client.h: + * include/audio_device.h: + * include/audio_oss.h: + * include/audio_alsa.h: + * src/gui/piano_roll.cpp: + * src/gui/track_container_view.cpp: + * src/gui/plugin_browser.cpp: + * src/gui/controller_dialog.cpp: + * src/gui/automatable_model_view.cpp: + * src/gui/effect_select_dialog.cpp: + * src/gui/effect_control_dialog.cpp: + * src/gui/fx_mixer_view.cpp: + * src/gui/main_window.cpp: + * src/gui/song_editor.cpp: + * src/gui/setup_dialog.cpp: + * src/gui/controller_connection_dialog.cpp: + * src/gui/file_browser.cpp: + * src/gui/widgets/ladspa_control_view.cpp: + * src/gui/widgets/track_label_button.cpp: + * src/gui/widgets/graph.cpp: + * src/gui/widgets/visualization_widget.cpp: + * src/gui/widgets/combobox.cpp: + * src/gui/widgets/tab_widget.cpp: + * src/gui/widgets/midi_port_menu.cpp: + * src/gui/widgets/led_checkbox.cpp: + * src/gui/widgets/side_bar_widget.cpp: + * src/gui/widgets/controller_rack_view.cpp: + * src/gui/widgets/kmultitabbar.cpp: + * src/gui/widgets/caption_menu.cpp: + * src/gui/widgets/instrument_sound_shaping_view.cpp: + * src/gui/widgets/rename_dialog.cpp: + * src/gui/widgets/envelope_and_lfo_view.cpp: + * src/gui/widgets/pixmap_button.cpp: + * src/gui/widgets/knob.cpp: + * src/gui/widgets/instrument_function_views.cpp: + * src/gui/widgets/fade_button.cpp: + * src/gui/widgets/cpuload_widget.cpp: + * src/gui/widgets/tab_bar.cpp: + * src/gui/widgets/automatable_slider.cpp: + * src/gui/widgets/group_box.cpp: + * src/gui/widgets/lcd_spinbox.cpp: + * src/gui/widgets/rubberband.cpp: + * src/gui/widgets/tool_button.cpp: + * src/gui/widgets/controller_view.cpp: + * src/gui/widgets/project_notes.cpp: + * src/gui/widgets/fader.cpp: + * src/gui/widgets/effect_rack_view.cpp: + * src/gui/widgets/effect_view.cpp: + * src/gui/widgets/nstate_button.cpp: + * src/gui/widgets/automatable_button.cpp: + * src/gui/widgets/tempo_sync_knob.cpp: + * src/gui/export_project_dialog.cpp: + * src/gui/automation_editor.cpp: + * src/gui/bb_editor.cpp: + * src/gui/about_dialog.cpp: + * src/tracks/sample_track.cpp: + * src/tracks/bb_track.cpp: + * src/tracks/instrument_track.cpp: + * src/tracks/pattern.cpp: + * src/3rdparty/samplerate/src_sinc.c: + * src/3rdparty/samplerate/config.h: + * src/core/midi/midi_controller.cpp: + * src/core/midi/midi_mapper.cpp: + * src/core/midi/midi_oss.cpp: + * src/core/midi/midi_port.cpp: + * src/core/midi/midi_alsa_seq.cpp: + * src/core/midi/midi_alsa_raw.cpp: + * src/core/song.cpp: + * src/core/track_container.cpp: + * src/core/bb_track_container.cpp: + * src/core/config_mgr.cpp: + * src/core/automatable_model.cpp: + * src/core/audio/audio_alsa.cpp: + * src/core/audio/audio_file_wave.cpp: + * src/core/audio/audio_sdl.cpp: + * src/core/audio/audio_oss.cpp: + * src/core/audio/audio_jack.cpp: + * src/core/audio/audio_pulseaudio.cpp: + * src/core/audio/audio_file_ogg.cpp: + * src/core/envelope_and_lfo_parameters.cpp: + * src/core/main.cpp: + * src/core/mixer.cpp: + * src/core/combobox_model.cpp: + * src/core/instrument_sound_shaping.cpp: + * src/core/project_renderer.cpp: + * src/core/meter_model.cpp: + * src/core/ladspa_manager.cpp: + * src/core/instrument_functions.cpp: + * src/core/controller_connection.cpp: + * src/core/ladspa_control.cpp: + * src/core/track.cpp: + * src/core/piano.cpp: + * src/core/timeline.cpp: + * src/core/surround_area.cpp: + * src/core/sample_buffer.cpp: + * src/core/mv_base.cpp: + * src/core/automation_pattern.cpp: + * src/core/lfo_controller.cpp: + * src/core/controller.cpp: + * src/core/peak_controller.cpp: + * data/locale/CMakeLists.txt: + * data/track_icons/CMakeLists.txt: + * data/samples/CMakeLists.txt: + * data/presets/PluckedStringSynth/Default.cs.xml: + * data/presets/VeSTige/Default.cs.xml: + * data/presets/CMakeLists.txt: + * data/themes/CMakeLists.txt: + * data/projects/CMakeLists.txt: + * data/CMakeLists.txt: + * lmmsconfig.h.in: + * CMakeLists.txt: + migrated build-system to CMAKE + + * plugins/patman/Makefile.am: + * plugins/ladspa_effect/tap/Makefile.am: + * plugins/ladspa_effect/caps/Makefile.am: + * plugins/ladspa_effect/Makefile.am: + * plugins/organic/Makefile.am: + * plugins/lb302/Makefile.am: + * plugins/lb303/Makefile.am: + * plugins/bass_booster/Makefile.am: + * plugins/stereo_matrix/Makefile.am: + * plugins/bit_invader/Makefile.am: + * plugins/vst_effect/Makefile.am: + * plugins/vibed/Makefile.am: + * plugins/triple_oscillator/Makefile.am: + * plugins/live_tool/Makefile.am: + * plugins/peak_controller_effect/Makefile.am: + * plugins/audio_file_processor/Makefile.am: + * plugins/stk/mallets/Makefile.am: + * plugins/stk/Makefile.am: + * plugins/stereo_enhancer/Makefile.am: + * plugins/sf2_player/Makefile.am: + * plugins/vestige/Makefile.am: + * plugins/vst_base/Makefile.am: + * plugins/ladspa_browser/Makefile.am: + * plugins/spectrum_analyzer/Makefile.am: + * plugins/kicker/Makefile.am: + * plugins/Makefile.am: + * plugins/flp_import/Makefile.am: + * plugins/midi_import/Makefile.am: + * data/locale/Makefile.am: + * data/track_icons/Makefile.am: + * data/midi-maps/Makefile.am: + * data/samples/effects/Makefile.am: + * data/samples/stringsnpads/Makefile.am: + * data/samples/basses/Makefile.am: + * data/samples/shapes/Makefile.am: + * data/samples/latin/Makefile.am: + * data/samples/Makefile.am: + * data/samples/bassloopes/Makefile.am: + * data/samples/drums/Makefile.am: + * data/samples/instruments/Makefile.am: + * data/samples/misc/Makefile.am: + * data/samples/drumsynth/effects/Makefile.am: + * data/samples/drumsynth/misc_synth/Makefile.am: + * data/samples/drumsynth/tr606/Makefile.am: + * data/samples/drumsynth/cr78/Makefile.am: + * data/samples/drumsynth/tr808/Makefile.am: + * data/samples/drumsynth/magnetboy/Makefile.am: + * data/samples/drumsynth/tr909/Makefile.am: + * data/samples/drumsynth/misc_fx/Makefile.am: + * data/samples/drumsynth/misc/Makefile.am: + * data/samples/drumsynth/electro/Makefile.am: + * data/samples/drumsynth/ferraro/Makefile.am: + * data/samples/drumsynth/linn/Makefile.am: + * data/samples/drumsynth/r_b/Makefile.am: + * data/samples/drumsynth/tr77/Makefile.am: + * data/samples/drumsynth/misc_bass/Makefile.am: + * data/samples/drumsynth/misc_perc/Makefile.am: + * data/samples/drumsynth/latin/Makefile.am: + * data/samples/drumsynth/instrument/Makefile.am: + * data/samples/drumsynth/misc_electro/Makefile.am: + * data/samples/drumsynth/Makefile.am: + * data/samples/drumsynth/acoustic/Makefile.am: + * data/samples/drumsynth/misc_hats/Makefile.am: + * data/samples/drumsynth/farfisa/Makefile.am: + * data/samples/drumsynth/jorgensohn/Makefile.am: + * data/samples/drumsynth/cr8000/Makefile.am: + * data/samples/drumsynth/misc_claps/Makefile.am: + * data/samples/beats/Makefile.am: + * data/presets/AudioFileProcessor/Makefile.am: + * data/presets/Organic/Makefile.am: + * data/presets/PluckedStringSynth/Makefile.am: + * data/presets/VeSTige/Makefile.am: + * data/presets/BitInvader/Makefile.am: + * data/presets/Makefile.am: + * data/presets/TripleOscillator/Makefile.am: + * data/themes/Makefile.am: + * data/projects/covers/Makefile.am: + * data/projects/recorded_loops/Makefile.am: + * data/projects/cool_songs/Makefile.am: + * data/projects/tutorials/Makefile.am: + * data/projects/demos/Makefile.am: + * data/projects/Makefile.am: + * data/projects/misc/Makefile.am: + * data/projects/templates/Makefile.am: + * data/Makefile.am: + * Makefile.am: + * acinclude.m4: + * configure.in: + removed old autotools-files + 2008-07-18 Tobias Doerffel * plugins/ladspa_effect/tap/tap_deesser.c: diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 6d82ea226..000000000 --- a/Makefile.am +++ /dev/null @@ -1,565 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I m4 - -dist-hook: - rm -rf `find $(distdir) -name \*.moc` - - -#install-exec-hook: -# cd $(DESTDIR)$(bindir) ; \ -# strip lmms - - -if HAVE_RPM -$(PACKAGE)-$(VERSION).tar.gz: dist - -# Rule to build RPM distribution package -rpm: $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).spec - cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@ - rpmbuild -ba $(PACKAGE).spec -endif - -if BUILD_WIN32 -win32-pkg: all - mkdir -p tmp/lmms/data - mkdir -p tmp/lmms/plugins/ladspa/ - cp lmms.exe tmp/lmms - find plugins/ -name "*.dll" -maxdepth 2 -exec cp '{}' tmp/lmms/plugins/ ';' - rm -f tmp/lmms/plugins/caps.dll tmp/lmms/plugins/tap*.dll - cp plugins/ladspa_effect/caps/caps.dll tmp/lmms/plugins/ladspa/ - cp plugins/ladspa_effect/tap/tap*.dll tmp/lmms/plugins/ladspa/ - PWD=`pwd` - cd data && make DESTDIR=$(PWD)/tmp/lmms/ install - if [ -d tmp/lmms/opt/mingw ] ; then mv tmp/lmms/opt/mingw/share/lmms/* tmp/lmms/data/ && rm -rf tmp/lmms/opt ; else mv tmp/lmms/usr/share/lmms/* tmp/lmms/data/ && rm -rf tmp/lmms/usr ; fi - cp /opt/mingw/bin/QtCore4.dll tmp/lmms - cp /opt/mingw/bin/QtGui4.dll tmp/lmms - cp /opt/mingw/bin/QtXml4.dll tmp/lmms - cp /opt/mingw/bin/libz.dll tmp/lmms - cp /opt/mingw/bin/libsndfile-1.dll tmp/lmms - cp /opt/mingw/bin/libvorbis*.dll tmp/lmms - cp /opt/mingw/bin/libogg-0.dll tmp/lmms - cp /opt/mingw/bin/libfluidsynth-1.dll tmp/lmms - cp /opt/mingw/bin/libfftw3f-3.dll tmp/lmms - cp /opt/mingw/bin/SDL.dll tmp/lmms - cp /opt/mingw/i586-mingw32/bin/mingwm10.dll tmp/lmms - cp -L COPYING tmp/lmms/LICENSE.TXT - cp -L README tmp/lmms/README.TXT - /opt/mingw/bin/i586-mingw32-strip tmp/lmms/lmms.exe - mv tmp/lmms tmp/lmms-$(VERSION) - cd tmp && zip -r -9 ../$(PACKAGE)-$(VERSION)-bin-win32.zip lmms-$(VERSION)/* - rm -rf tmp -endif - - -SUBDIRS = buildtools data plugins - - -INCLUDES = -I$(srcdir)/include -I. -#-I/usr/include/wine -I/usr/include/wine/windows -bin_PROGRAMS = lmms - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) - - -ui_%.uic: $(srcdir)/src/gui/dialogs/%.ui - $(UIC) -o $@ $< - -%.moc: $(srcdir)/include/%.h - $(MOC) -o $@ $< - -%.ts: - $(LUPDATE) $(lmms_SOURCES) `find plugins/ -type f -name "*.cpp"` -ts data/locale/$@ - -%.qm: %.ts - $(LRELEASE) data/locale/$< - - -man1_MANS = lmms.1 - - -lmms_MOC = \ - ./about_dialog.moc \ - ./automatable_model.moc \ - ./automatable_model_view.moc \ - ./automatable_button.moc \ - ./automatable_slider.moc \ - ./automation_editor.moc \ - ./automation_pattern.moc \ - ./automation_track.moc \ - ./bb_editor.moc \ - ./bb_track_container.moc \ - ./bb_track.moc \ - ./caption_menu.moc \ - ./instrument_track.moc \ - ./combobox.moc \ - ./combobox_model.moc \ - ./controller.moc \ - ./controller_connection.moc \ - ./controller_connection_dialog.moc \ - ./controller_dialog.moc \ - ./controller_rack_view.moc \ - ./controller_view.moc \ - ./cpuload_widget.moc \ - ./effect_control_dialog.moc \ - ./effect_select_dialog.moc \ - ./envelope_and_lfo_parameters.moc \ - ./envelope_and_lfo_view.moc \ - ./export_project_dialog.moc \ - ./fade_button.moc \ - ./fader.moc \ - ./file_browser.moc \ - ./fx_mixer_view.moc \ - ./graph.moc \ - ./group_box.moc \ - ./instrument_functions.moc \ - ./instrument_function_views.moc \ - ./instrument_sound_shaping.moc \ - ./instrument_sound_shaping_view.moc \ - ./kmultitabbar.moc \ - ./knob.moc \ - ./ladspa_control.moc \ - ./ladspa_control_view.moc \ - ./lcd_spinbox.moc \ - ./led_checkbox.moc \ - ./lfo_controller.moc \ - ./main_window.moc \ - ./meter_model.moc \ - ./midi_alsa_seq.moc \ - ./midi_controller.moc \ - ./midi_port.moc \ - ./midi_port_menu.moc \ - ./mixer.moc \ - ./mv_base.moc \ - ./track_label_button.moc \ - ./nstate_button.moc \ - ./pattern.moc \ - ./peak_controller.moc \ - ./piano_roll.moc \ - ./piano.moc \ - ./pixmap_button.moc \ - ./plugin_browser.moc \ - ./project_notes.moc \ - ./project_renderer.moc \ - ./effect_view.moc \ - ./effect_rack_view.moc \ - ./rubberband.moc \ - ./rename_dialog.moc \ - ./sample_buffer.moc \ - ./sample_track.moc \ - ./setup_dialog.moc \ - ./side_bar.moc \ - ./side_bar_widget.moc \ - ./song.moc \ - ./song_editor.moc \ - ./surround_area.moc \ - ./tab_bar.moc \ - ./tab_button.moc \ - ./tab_widget.moc \ - ./tempo_sync_knob.moc \ - ./timeline.moc \ - ./tool_button.moc \ - ./track_container.moc \ - ./track_container_view.moc \ - ./track.moc \ - ./visualization_widget.moc - -lmms_UIC = \ - ui_export_project.uic - - - -BUILT_SOURCES = $(lmms_MOC) $(lmms_UIC) - - - -lmms_EMBEDDED_RESOURCES = $(srcdir)/AUTHORS $(srcdir)/COPYING - -./embedded_resources.h: $(lmms_EMBEDDED_RESOURCES) - $(BIN2RES) $(lmms_EMBEDDED_RESOURCES) > $@ - -./embed.o: ./embedded_resources.h - - -if USE_3RDPARTY_LIBSRC -LIBSAMPLERATE_SOURCES = $(srcdir)/src/3rdparty/samplerate/samplerate.c \ - $(srcdir)/src/3rdparty/samplerate/samplerate.h \ - $(srcdir)/src/3rdparty/samplerate/src_sinc.c \ - $(srcdir)/src/3rdparty/samplerate/high_qual_coeffs.h \ - $(srcdir)/src/3rdparty/samplerate/mid_qual_coeffs.h \ - $(srcdir)/src/3rdparty/samplerate/fastest_coeffs.h \ - $(srcdir)/src/3rdparty/samplerate/common.h \ - $(srcdir)/src/3rdparty/samplerate/float_cast.h \ - $(srcdir)/src/3rdparty/samplerate/src_zoh.c \ - $(srcdir)/src/3rdparty/samplerate/src_linear.c - -SAMPLERATE_HEADER = $(srcdir)/src/3rdparty/samplerate/samplerate.h -endif - -THIRD_PARTY_CODE=$(LIBSAMPLERATE_SOURCES) - - - -lmms_SOURCES = \ - $(srcdir)/src/core/automatable_model.cpp \ - $(srcdir)/src/core/automation_pattern.cpp \ - $(srcdir)/src/core/base64.cpp \ - $(srcdir)/src/core/bb_track_container.cpp \ - $(srcdir)/src/core/clipboard.cpp \ - $(srcdir)/src/core/combobox_model.cpp \ - $(srcdir)/src/core/config_mgr.cpp \ - $(srcdir)/src/core/controller.cpp \ - $(srcdir)/src/core/controller_connection.cpp \ - $(srcdir)/src/core/drumsynth.cpp \ - $(srcdir)/src/core/effect_chain.cpp \ - $(srcdir)/src/core/effect.cpp \ - $(srcdir)/src/core/engine.cpp \ - $(srcdir)/src/core/envelope_and_lfo_parameters.cpp \ - $(srcdir)/src/core/instrument_sound_shaping.cpp \ - $(srcdir)/src/core/fx_mixer.cpp \ - $(srcdir)/src/core/import_filter.cpp \ - $(srcdir)/src/core/inline_automation.cpp \ - $(srcdir)/src/core/instrument.cpp \ - $(srcdir)/src/core/instrument_functions.cpp \ - $(srcdir)/src/core/journalling_object.cpp \ - $(srcdir)/src/core/ladspa_2_lmms.cpp \ - $(srcdir)/src/core/ladspa_manager.cpp \ - $(srcdir)/src/core/ladspa_control.cpp \ - $(srcdir)/src/core/lfo_controller.cpp \ - $(srcdir)/src/core/main.cpp \ - $(srcdir)/src/core/meter_model.cpp \ - $(srcdir)/src/core/mixer.cpp \ - $(srcdir)/src/core/mmp.cpp \ - $(srcdir)/src/core/mv_base.cpp \ - $(srcdir)/src/core/note.cpp \ - $(srcdir)/src/core/note_play_handle.cpp \ - $(srcdir)/src/core/oscillator.cpp \ - $(srcdir)/src/core/peak_controller.cpp \ - $(srcdir)/src/core/piano.cpp \ - $(srcdir)/src/core/plugin.cpp \ - $(srcdir)/src/core/preset_preview_play_handle.cpp \ - $(srcdir)/src/core/project_journal.cpp \ - $(srcdir)/src/core/project_renderer.cpp \ - $(srcdir)/src/core/project_version.cpp \ - $(srcdir)/src/core/sample_buffer.cpp \ - $(srcdir)/src/core/sample_play_handle.cpp \ - $(srcdir)/src/core/serializing_object.cpp \ - $(srcdir)/src/core/song.cpp \ - $(srcdir)/src/core/surround_area.cpp \ - $(srcdir)/src/core/timeline.cpp \ - $(srcdir)/src/core/tool.cpp \ - $(srcdir)/src/core/track.cpp \ - $(srcdir)/src/core/track_container.cpp \ - $(srcdir)/src/core/audio/audio_alsa.cpp \ - $(srcdir)/src/core/audio/audio_device.cpp \ - $(srcdir)/src/core/audio/audio_file_device.cpp \ - $(srcdir)/src/core/audio/audio_file_ogg.cpp \ - $(srcdir)/src/core/audio/audio_file_wave.cpp \ - $(srcdir)/src/core/audio/audio_jack.cpp \ - $(srcdir)/src/core/audio/audio_oss.cpp \ - $(srcdir)/src/core/audio/audio_port.cpp \ - $(srcdir)/src/core/audio/audio_pulseaudio.cpp \ - $(srcdir)/src/core/audio/audio_sample_recorder.cpp \ - $(srcdir)/src/core/audio/audio_sdl.cpp \ - $(srcdir)/src/core/midi/midi_alsa_raw.cpp \ - $(srcdir)/src/core/midi/midi_alsa_seq.cpp \ - $(srcdir)/src/core/midi/midi_client.cpp \ - $(srcdir)/src/core/midi/midi_controller.cpp \ - $(srcdir)/src/core/midi/midi_oss.cpp \ - $(srcdir)/src/core/midi/midi_port.cpp \ - $(srcdir)/src/gui/about_dialog.cpp \ - $(srcdir)/src/gui/automatable_model_view.cpp \ - $(srcdir)/src/gui/automation_editor.cpp \ - $(srcdir)/src/gui/bb_editor.cpp \ - $(srcdir)/src/gui/controller_connection_dialog.cpp \ - $(srcdir)/src/gui/controller_dialog.cpp \ - $(srcdir)/src/gui/effect_control_dialog.cpp \ - $(srcdir)/src/gui/effect_select_dialog.cpp \ - $(srcdir)/src/gui/embed.cpp \ - $(srcdir)/src/gui/export_project_dialog.cpp \ - $(srcdir)/src/gui/file_browser.cpp \ - $(srcdir)/src/gui/fx_mixer_view.cpp \ - $(srcdir)/src/gui/lfo_controller_dialog.cpp \ - $(srcdir)/src/gui/lmms_style.cpp \ - $(srcdir)/src/gui/main_window.cpp \ - $(srcdir)/src/gui/peak_controller_dialog.cpp \ - $(srcdir)/src/gui/piano_roll.cpp \ - $(srcdir)/src/gui/plugin_browser.cpp \ - $(srcdir)/src/gui/setup_dialog.cpp \ - $(srcdir)/src/gui/song_editor.cpp \ - $(srcdir)/src/gui/string_pair_drag.cpp \ - $(srcdir)/src/gui/track_container_view.cpp \ - $(srcdir)/src/gui/dialogs/export_project.ui \ - $(srcdir)/src/gui/widgets/automatable_button.cpp \ - $(srcdir)/src/gui/widgets/automatable_slider.cpp \ - $(srcdir)/src/gui/widgets/caption_menu.cpp \ - $(srcdir)/src/gui/widgets/combobox.cpp \ - $(srcdir)/src/gui/widgets/controller_rack_view.cpp \ - $(srcdir)/src/gui/widgets/controller_view.cpp \ - $(srcdir)/src/gui/widgets/cpuload_widget.cpp \ - $(srcdir)/src/gui/widgets/effect_rack_view.cpp \ - $(srcdir)/src/gui/widgets/effect_view.cpp \ - $(srcdir)/src/gui/widgets/fade_button.cpp \ - $(srcdir)/src/gui/widgets/fader.cpp \ - $(srcdir)/src/gui/widgets/graph.cpp \ - $(srcdir)/src/gui/widgets/group_box.cpp \ - $(srcdir)/src/gui/widgets/envelope_and_lfo_view.cpp \ - $(srcdir)/src/gui/widgets/instrument_function_views.cpp \ - $(srcdir)/src/gui/widgets/instrument_midi_io_view.cpp \ - $(srcdir)/src/gui/widgets/instrument_sound_shaping_view.cpp \ - $(srcdir)/src/gui/widgets/kmultitabbar.cpp \ - $(srcdir)/src/gui/widgets/knob.cpp \ - $(srcdir)/src/gui/widgets/ladspa_control_view.cpp \ - $(srcdir)/src/gui/widgets/lcd_spinbox.cpp \ - $(srcdir)/src/gui/widgets/led_checkbox.cpp \ - $(srcdir)/src/gui/widgets/meter_dialog.cpp \ - $(srcdir)/src/gui/widgets/midi_port_menu.cpp \ - $(srcdir)/src/gui/widgets/track_label_button.cpp \ - $(srcdir)/src/gui/widgets/nstate_button.cpp \ - $(srcdir)/src/gui/widgets/pixmap_button.cpp \ - $(srcdir)/src/gui/widgets/project_notes.cpp \ - $(srcdir)/src/gui/widgets/rubberband.cpp \ - $(srcdir)/src/gui/widgets/rename_dialog.cpp \ - $(srcdir)/src/gui/widgets/side_bar_widget.cpp \ - $(srcdir)/src/gui/widgets/tab_bar.cpp \ - $(srcdir)/src/gui/widgets/tab_widget.cpp \ - $(srcdir)/src/gui/widgets/text_float.cpp \ - $(srcdir)/src/gui/widgets/tempo_sync_knob.cpp \ - $(srcdir)/src/gui/widgets/tool_button.cpp \ - $(srcdir)/src/gui/widgets/tooltip.cpp \ - $(srcdir)/src/gui/widgets/visualization_widget.cpp \ - $(srcdir)/src/tracks/automation_track.cpp \ - $(srcdir)/src/tracks/bb_track.cpp \ - $(srcdir)/src/tracks/instrument_track.cpp \ - $(srcdir)/src/tracks/pattern.cpp \ - $(srcdir)/src/tracks/sample_track.cpp \ - $(srcdir)/include/aeffectx.h \ - $(srcdir)/include/debug.h \ - $(srcdir)/include/detuning_helper.h \ - $(srcdir)/include/drumsynth.h \ - $(srcdir)/include/main_window.h \ - $(srcdir)/include/audio_alsa.h \ - $(srcdir)/include/audio_device.h \ - $(srcdir)/include/audio_dummy.h \ - $(srcdir)/include/audio_file_device.h \ - $(srcdir)/include/audio_file_ogg.h \ - $(srcdir)/include/audio_file_wave.h \ - $(srcdir)/include/audio_jack.h \ - $(srcdir)/include/audio_oss.h \ - $(srcdir)/include/audio_pulseaudio.h \ - $(srcdir)/include/audio_sample_recorder.h \ - $(srcdir)/include/audio_sdl.h \ - $(srcdir)/include/automation_editor.h \ - $(srcdir)/include/automation_pattern.h \ - $(srcdir)/include/automation_track.h \ - $(srcdir)/include/interpolation.h \ - $(srcdir)/include/lmms_constants.h \ - $(srcdir)/include/lmms_math.h \ - $(srcdir)/include/lmms_style.h \ - $(srcdir)/include/mixer.h \ - $(srcdir)/include/pattern.h \ - $(srcdir)/include/inline_automation.h \ - $(srcdir)/include/instrument_track.h \ - $(srcdir)/include/note.h \ - $(srcdir)/include/volume.h \ - $(srcdir)/include/panning.h \ - $(srcdir)/include/song.h \ - $(srcdir)/include/song_editor.h \ - $(srcdir)/include/plugin.h \ - $(srcdir)/include/plugin_view.h \ - $(srcdir)/include/instrument.h \ - $(srcdir)/include/instrument_view.h \ - $(srcdir)/include/bb_editor.h \ - $(srcdir)/include/bb_track_container.h \ - $(srcdir)/include/piano.h \ - $(srcdir)/include/fx_mixer.h \ - $(srcdir)/include/fx_mixer_view.h \ - $(srcdir)/include/pixmap_button.h \ - $(srcdir)/include/rename_dialog.h \ - $(srcdir)/include/project_renderer.h \ - $(srcdir)/include/export_project_dialog.h \ - $(srcdir)/include/note_play_handle.h \ - $(srcdir)/include/piano_roll.h \ - $(srcdir)/include/basic_filters.h \ - $(srcdir)/include/envelope_and_lfo_parameters.h \ - $(srcdir)/include/envelope_and_lfo_view.h \ - $(srcdir)/include/instrument_sound_shaping.h \ - $(srcdir)/include/envelope_and_lfo_parameters.h \ - $(srcdir)/include/about_dialog.h \ - $(srcdir)/include/oscillator.h \ - $(srcdir)/include/instrument_functions.h \ - $(srcdir)/include/instrument_function_views.h \ - $(srcdir)/include/instrument_sound_shaping_view.h \ - $(srcdir)/include/fader.h \ - $(srcdir)/include/mv_base.h \ - $(srcdir)/include/automatable_model.h \ - $(srcdir)/include/graph.h \ - $(srcdir)/include/group_box.h \ - $(srcdir)/include/tab_widget.h \ - $(srcdir)/include/knob.h \ - $(srcdir)/include/file_browser.h \ - $(srcdir)/include/plugin_browser.h \ - $(srcdir)/include/templates.h \ - $(srcdir)/include/gui_templates.h \ - $(srcdir)/include/surround_area.h \ - $(srcdir)/include/kmultitabbar.h \ - $(srcdir)/include/side_bar.h \ - $(srcdir)/include/side_bar_widget.h \ - $(srcdir)/include/track.h \ - $(srcdir)/include/track_container.h \ - $(srcdir)/include/track_container_view.h \ - $(srcdir)/include/bb_track.h \ - $(srcdir)/include/caption_menu.h \ - $(srcdir)/include/sample_track.h \ - $(srcdir)/include/sample_buffer.h \ - $(srcdir)/include/track_label_button.h \ - $(srcdir)/include/play_handle.h \ - $(srcdir)/include/mmp.h \ - $(srcdir)/include/midi.h \ - $(srcdir)/include/midi_alsa_raw.h \ - $(srcdir)/include/midi_client.h \ - $(srcdir)/include/midi_controller.h \ - $(srcdir)/include/midi_event_processor.h \ - $(srcdir)/include/midi_oss.h \ - $(srcdir)/include/midi_port.h \ - $(srcdir)/include/midi_port_menu.h \ - $(srcdir)/include/midi_time.h \ - $(srcdir)/include/clipboard.h \ - $(srcdir)/include/types.h \ - $(srcdir)/include/update_event.h \ - $(srcdir)/include/embed.h \ - $(srcdir)/include/timeline.h \ - $(srcdir)/include/config_mgr.h \ - $(srcdir)/include/tab_bar.h \ - $(srcdir)/include/tab_button.h \ - $(srcdir)/include/project_notes.h \ - $(srcdir)/include/project_version.h \ - $(srcdir)/include/visualization_widget.h \ - $(srcdir)/include/endian_handling.h \ - $(srcdir)/include/preset_preview_play_handle.h \ - $(srcdir)/include/sample_play_handle.h \ - $(srcdir)/include/nstate_button.h \ - $(srcdir)/include/midi_dummy.h \ - $(srcdir)/include/lcd_spinbox.h \ - $(srcdir)/include/tooltip.h \ - $(srcdir)/include/automatable_button.h \ - $(srcdir)/include/automatable_slider.h \ - $(srcdir)/include/led_checkbox.h \ - $(srcdir)/include/text_float.h \ - $(srcdir)/include/tempo_sync_knob.h \ - $(srcdir)/include/setup_dialog.h \ - $(srcdir)/include/dummy_plugin.h \ - $(srcdir)/include/dummy_instrument.h \ - $(srcdir)/include/instrument_play_handle.h \ - $(srcdir)/include/string_pair_drag.h \ - $(srcdir)/include/instrument_midi_io_view.h \ - $(srcdir)/include/audio_port.h \ - $(srcdir)/include/tool.h \ - $(srcdir)/include/tool_button.h \ - $(srcdir)/include/cpuload_widget.h \ - $(srcdir)/include/custom_events.h \ - $(srcdir)/include/midi_alsa_seq.h \ - $(srcdir)/include/micro_timer.h \ - $(srcdir)/include/fade_button.h \ - $(srcdir)/include/fifo_buffer.h \ - $(srcdir)/include/combobox.h \ - $(srcdir)/include/combobox_model.h \ - $(srcdir)/include/rubberband.h \ - $(srcdir)/include/base64.h \ - $(srcdir)/include/journalling_object.h \ - $(srcdir)/include/serializing_object.h \ - $(srcdir)/include/project_journal.h \ - $(srcdir)/include/shared_object.h \ - $(srcdir)/include/import_filter.h \ - $(srcdir)/include/engine.h \ - $(srcdir)/include/effect.h \ - $(srcdir)/include/effect_chain.h \ - $(srcdir)/include/effect_controls.h \ - $(srcdir)/include/effect_control_dialog.h \ - $(srcdir)/include/effect_rack_view.h \ - $(srcdir)/include/effect_select_dialog.h \ - $(srcdir)/include/effect_view.h \ - $(srcdir)/include/dummy_effect.h \ - $(srcdir)/include/ladspa-1.1.h \ - $(srcdir)/include/sweep_oscillator.h \ - $(srcdir)/include/meter_dialog.h \ - $(srcdir)/include/meter_model.h \ - $(srcdir)/include/effect_lib.h \ - $(srcdir)/include/ladspa_manager.h \ - $(srcdir)/include/ladspa_2_lmms.h \ - $(srcdir)/include/ladspa_control.h \ - $(srcdir)/include/ladspa_control_view.h \ - $(srcdir)/include/ladspa_base.h \ - $(srcdir)/include/controller.h \ - $(srcdir)/include/controller_connection.h \ - $(srcdir)/include/controller_rack_view.h \ - $(srcdir)/include/controller_view.h \ - $(srcdir)/include/controller_dialog.h \ - $(srcdir)/include/controller_connection_dialog.h \ - $(srcdir)/include/lfo_controller.h \ - $(srcdir)/include/peak_controller.h \ - $(THIRD_PARTY_CODE) - -lmms_includedir = $(pkgincludedir) -lmms_include_HEADERS = $(wildcard include/*.h include/lmmsconfig.h) $(SAMPLERATE_HEADER) $(srcdir)/src/gui/embed.cpp - - - -EXTRA_DIST = $(lmms_EMBEDDED_RESOURCES) lmms.1 - - -CLEANFILES = $(lmms_MOC) ./embedded_resources.h liblmms-imp.a - -if HAVE_LIBSDL -LIB_SDL_LDADD = -lSDL -endif - -if HAVE_LIBASOUND -LIB_ASOUND_LDADD = -lasound -endif - -if HAVE_LIBJACK -LIB_JACK_LDADD = -ljack -endif - -if HAVE_LIBVORBIS -if BUILD_WIN32 -LIB_VORBIS_LDADD = -lvorbis-0 -lvorbisenc-2 -lvorbisfile-3 -logg-0 -else -LIB_VORBIS_LDADD = -lvorbis -lvorbisenc -lvorbisfile -endif -endif - -if USE_3RDPARTY_LIBSRC -else -LIB_SRC_LDADD = -lsamplerate -endif - -if HAVE_LIBSF -if BUILD_LINUX -LIB_SF_LDADD = -lsndfile -else -LIB_SF_LDADD = -lsndfile-1 -endif -endif - -if HAVE_LIBPULSE -LIB_PA_LDADD = -lpulse -endif - -if BUILD_LINUX -lmms_LDFLAGS = -rdynamic -endif - -if BUILD_WIN32 -lmms_LDFLAGS = -Wl,-out-implib=liblmms-imp.a - -lmms_win_resources.o: lmms.rc - $(WINDRES) -o $@ $< -WIN32_RES_LDADD = lmms_win_resources.o -endif - -lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_PA_LDADD) $(WIN32_RES_LDADD) - -#-rpath $(pkglibdir) - diff --git a/Makefile.svn b/Makefile.svn deleted file mode 100644 index 8825ab7a6..000000000 --- a/Makefile.svn +++ /dev/null @@ -1,22 +0,0 @@ -all: - @echo - @echo Creating neccessary files for configuring and building LMMS - @echo - @echo \ \* Creating aclocal.m4 - @aclocal - @echo \ \* Running libtoolize - @libtoolize -c -f - @echo \ \* Creating config.h.in - @autoheader - @echo \ \* Creating Makefile templates - @automake -ac - @echo \ \* Creating configure - @autoconf - @echo \ \* Cleaning up - @rm -rf autom4te.cache/ - @echo - @echo ...done\! If something failed make sure you\'ve installed autoconf, - @echo automake and libtool. - @echo Otherwise you can run now configure \(if you did not so far\) and then make. - @echo - diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 09bde010a..000000000 --- a/acinclude.m4 +++ /dev/null @@ -1,681 +0,0 @@ -# Check for Qt compiler flags, linker flags, and binary packages -AC_DEFUN([gw_CHECK_QT], -[ -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PATH_X]) - -case "${prefix}" in - /opt/mingw*) - ;; - *) - AC_PATH_PROG([PKGCONFIG], [pkg-config]) - ;; -esac - -# Only search manually if no pkgconfig -if test -z "$PKGCONFIG" ; then - AC_MSG_CHECKING([QTDIR]) - AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory [default=$QTDIR]], QTDIR=$withval) - # Check that QTDIR is defined or that --with-qtdir given - if test x"$QTDIR" = x ; then - # some usual Qt-locations - QT_SEARCH="/usr /usr/lib/qt4 /usr/share/qt4 /usr/local/Trolltech/Qt-4.3.0 /usr/local/Trolltech/Qt-4.3.1 /usr/local/Trolltech/Qt-4.3.2 /usr/local/Trolltech/Qt-4.3.3 /usr/local/Trolltech/Qt-4.3.4" - else - QT_SEARCH=$QTDIR - QTDIR="" - fi - for i in $QT_SEARCH ; do - QT_INCLUDE_SEARCH="include/qt4 include" - for j in $QT_INCLUDE_SEARCH ; do - if test -f $i/$j/Qt/qglobal.h -a x$QTDIR = x ; then - QTDIR=$i - QT_INCLUDES=$i/$j - fi - done - done - if test x"$QTDIR" = x ; then - AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given]) - fi - AC_MSG_RESULT([$QTDIR]) - - # Change backslashes in QTDIR to forward slashes to prevent escaping - # problems later on in the build process, mainly for Cygwin build - # environment using MSVC as the compiler - # TODO: Use sed instead of perl - QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'` - - AC_MSG_CHECKING([Qt includes]) - # Check where includes are located - if test x"$QT_INCLUDES" = x ; then - AC_MSG_ERROR([*** could not find Qt-includes! Make sure you have the Qt-devel-files installed!]) - fi - AC_MSG_RESULT([$QT_INCLUDES]) -fi - -# Search for available Qt translations -AH_TEMPLATE(QT_TRANSLATIONS_DIR, [Define to Qt translations directory]) -AC_MSG_CHECKING([Qt translations]) -QT_TRANSLATIONS_SEARCH="$QTDIR /usr/share/qt4 /usr/local/qt /usr/local/Trolltech/Qt-4.3.0 /usr/local/Trolltech/Qt-4.3.1" -for i in $QT_TRANSLATIONS_SEARCH ; do - if test -d $i/translations -a x$QT_TRANSLATIONS = x ; then - QT_TRANSLATIONS=$i/translations - fi -done -if test x"$QT_TRANSLATIONS" = x ; then - AC_MSG_ERROR([*** not found! Either install Qt i18n files or define QT_TRANSLATIONS.]) -fi -AC_DEFINE_UNQUOTED(QT_TRANSLATIONS_DIR, "$QT_TRANSLATIONS") -AC_MSG_RESULT([$QT_TRANSLATIONS]) - -# First try to set QTHOSTDIR according to pkg-config -# -if test -n "$PKGCONFIG" ; then - QTHOSTDIR=$(pkg-config QtCore --variable=prefix) -fi - -if test -z "$QTHOSTDIR" ; then - case "${prefix}" in - /opt/mingw*) - QTHOSTDIR=/usr - ;; - *) - if test -n "$QTDIR" ; then - QTHOSTDIR="$QTDIR" - else - QTHOSTDIR=/usr - fi - ;; - esac -fi - - -# Check that moc is in path -AC_CHECK_PROG(MOC, moc-qt4, $QTHOSTDIR/bin/moc-qt4,,$QTHOSTDIR/bin/) -if test x$MOC = x ; then - AC_CHECK_PROG(MOC, moc, $QTHOSTDIR/bin/moc,,$QTHOSTDIR/bin/) - if test x$MOC = x ; then - AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!]) - fi -fi - -# Check that uic is in path -AC_CHECK_PROG(UIC, uic-qt4, $QTHOSTDIR/bin/uic-qt4,,$QTHOSTDIR/bin/) -if test x$UIC = x ; then - AC_CHECK_PROG(UIC, uic, $QTHOSTDIR/bin/uic,,$QTHOSTDIR/bin/) - if test x$UIC = x ; then - AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!]) - fi -fi - -# Check that rcc is in path -AC_CHECK_PROG(RCC, rcc-qt4, $QTHOSTDIR/bin/rcc-qt4,,$QTHOSTDIR/bin/) -if test x$RCC = x ; then - AC_CHECK_PROG(RCC, rcc, $QTHOSTDIR/bin/rcc,,$QTHOSTDIR/bin/) - if test x$RCC = x ; then - AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!]) - fi -fi - -# lupdate is the Qt translation-update utility. -AC_CHECK_PROG(LUPDATE, lupdate-qt4, $QTHOSTDIR/bin/lupdate-qt4,,$QTHOSTDIR/bin/) -if test x$LUPDATE = x ; then - AC_CHECK_PROG(LUPDATE, lupdate, $QTHOSTDIR/bin/lupdate,,$QTHOSTDIR/bin/) - if test x$LUPDATE = x ; then - AC_MSG_WARN([*** not found! It's not needed just for compiling but should be part of a proper Qt-devel-tools-installation!]) - fi -fi - -# lrelease is the Qt translation-release utility. -AC_CHECK_PROG(LRELEASE, lrelease-qt4, $QTHOSTDIR/bin/lrelease-qt4,,$QTHOSTDIR/bin/) -if test x$LRELEASE = x ; then - AC_CHECK_PROG(LRELEASE, lrelease, $QTHOSTDIR/bin/lrelease,,$QTHOSTDIR/bin/) - if test x$LRELEASE = x ; then - AC_MSG_WARN([*** not found! It's not needed just for compiling but should be part of a proper Qt-devel-tools-installation!]) - fi -fi - -# construct CXXFLAGS -if test -n "$PKGCONFIG" ; then - QT_CXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml) -fi - -if test -z "$QT_CXXFLAGS" ; then - QT_CXXFLAGS="-I$QT_INCLUDES -I$QT_INCLUDES/Qt -D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_XML_LIB -DQT_THREAD_SUPPORT" -fi - -AC_MSG_CHECKING([QT_CXXFLAGS]) -AC_MSG_RESULT([$QT_CXXFLAGS]) - - -# check libraries -AC_MSG_CHECKING([Qt4 libraries]) - -if test -n "$PKGCONFIG" ; then - QT_LIB=$(pkg-config --libs QtCore QtGui QtXml) -fi - -if test -z "$QT_LIB" ; then - case "${host}" in - *mingw32) - QT_LIBS=`ls $QTDIR/lib/libQt*.a 2> /dev/null` - if test "x$QT_LIBS" = x; then - AC_MSG_ERROR([*** Couldn't find any Qt4 libraries]) - fi - QT_LIB="-L$QTDIR/bin -lQtCore4 -lQtXml4 -lQtNetwork4 -lQtGui4" - # Check that windres is in path - AC_PATH_PROGS([WINDRES],[i586-mingw32-windres windres],,[${prefix}/bin:$PATH]) - if test x$WINDRES = x ; then - AC_MSG_ERROR([*** not found! Make sure you have mingw32 binutils installed!]) - fi - ;; - *) - QT_LIBS=`ls $QTDIR/lib64/libQt*.so 2> /dev/null` - if test "x$QT_LIBS" = x; then - QT_LIBS=`ls $QTDIR/lib/libQt*.so 2> /dev/null` - if test "x$QT_LIBS" = x; then - AC_MSG_ERROR([*** Couldn't find any Qt4 libraries]) - fi - QT_LIB="-L$QTDIR/lib -L$QTDIR/lib/qt4" - else - QT_LIB="-L$QTDIR/lib64 -L$QTDIR/lib64/qt4" - fi - QT_LIB="$QT_LIB -lQtCore -lQtXml -lQtNetwork -lQtGui" - ;; - esac -fi -AC_MSG_RESULT([found: $QT_LIB]) - -QT_LDADD="$QT_LIB" - - - - -AC_SUBST(QT_CXXFLAGS) -AC_SUBST(QT_LDADD) - - -]) - - - -dnl @synopsis AC_C_FIND_ENDIAN -dnl -dnl Determine endian-ness of target processor. -dnl @version 1.1 Mar 03 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Majority written from scratch to replace the standard autoconf macro -dnl AC_C_BIGENDIAN. Only part remaining from the original it the invocation -dnl of the AC_TRY_RUN macro. -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. - -dnl Find endian-ness in the following way: -dnl 1) Look in . -dnl 2) If 1) fails, look in and . -dnl 3) If 1) and 2) fails and not cross compiling run a test program. -dnl 4) If 1) and 2) fails and cross compiling then guess based on target. - -AC_DEFUN([AC_C_FIND_ENDIAN], -[AC_CACHE_CHECK(processor byte ordering, - ac_cv_c_byte_order, - -# Initialize to unknown -ac_cv_c_byte_order=unknown - -if test x$ac_cv_header_endian_h = xyes ; then - - # First try which should set BYTE_ORDER. - - [AC_TRY_LINK([ - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - [AC_TRY_LINK([ - #include - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=big - )] - - fi - -if test $ac_cv_c_byte_order = unknown ; then - - [AC_TRY_LINK([ - #include - #include - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif - ], return 0 ;, - - [AC_TRY_LINK([ - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - [AC_TRY_LINK([ - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - )] - - fi - -if test $ac_cv_c_byte_order = unknown ; then - if test $cross_compiling = yes ; then - # This is the last resort. Try to guess the target processor endian-ness - # by looking at the target CPU type. - [ - case "$target_cpu" in - alpha* | i?86* | mipsel* | ia64*) - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=1 - ;; - - m68* | mips* | powerpc* | hppa* | sparc*) - ac_cv_c_big_endian=1 - ac_cv_c_little_endian=0 - ;; - - esac - ] - else - AC_TRY_RUN( - [[ - int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [sizeof (long) - 1] == 1); - } - ]], , ac_cv_c_byte_order=big, - ac_cv_c_byte_order=unknown - ) - - AC_TRY_RUN( - [[int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [0] == 1); - }]], , ac_cv_c_byte_order=little, - ac_cv_c_byte_order=unknown - ) - fi - fi - -) -] - -if test $ac_cv_c_byte_order = big ; then - ac_cv_c_big_endian=1 - ac_cv_c_little_endian=0 -elif test $ac_cv_c_byte_order = little ; then - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=1 -else - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=0 - - AC_MSG_WARN([[*****************************************************************]]) - AC_MSG_WARN([[*** Not able to determine endian-ness of target processor. ]]) - AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in ]]) - AC_MSG_WARN([[*** src/config.h may need to be hand editied. ]]) - AC_MSG_WARN([[*****************************************************************]]) - fi - -)# AC_C_FIND_ENDIAN - -dnl @synopsis AC_C99_FUNC_LRINT -dnl -dnl Check whether C99's lrint function is available. -dnl @version 1.3 Feb 12 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([AC_C99_FUNC_LRINT], -[AC_CACHE_CHECK(for lrint, - ac_cv_c99_lrint, -[ -lrint_save_CFLAGS=$CFLAGS -CFLAGS="-O2 -lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no) - -CFLAGS=$lrint_save_CFLAGS - -]) - -if test "$ac_cv_c99_lrint" = yes; then - AC_DEFINE(HAVE_LRINT, 1, - [Define if you have C99's lrint function.]) -fi -])# AC_C99_FUNC_LRINT -dnl @synopsis AC_C99_FUNC_LRINTF -dnl -dnl Check whether C99's lrintf function is available. -dnl @version 1.3 Feb 12 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([AC_C99_FUNC_LRINTF], -[AC_CACHE_CHECK(for lrintf, - ac_cv_c99_lrintf, -[ -lrintf_save_CFLAGS=$CFLAGS -CFLAGS="-O2 -lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -], if (!lrintf(3.14159)) lrintf(2.7183);, ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no) - -CFLAGS=$lrintf_save_CFLAGS - -]) - -if test "$ac_cv_c99_lrintf" = yes; then - AC_DEFINE(HAVE_LRINTF, 1, - [Define if you have C99's lrintf function.]) -fi -])# AC_C99_FUNC_LRINTF -dnl @synopsis AC_C99_FUNC_LLRINT -dnl -dnl Check whether C99's llrint function is available. -dnl @version 1.1 Sep 30 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([AC_C99_FUNC_LLRINT], -[AC_CACHE_CHECK(for llrint, - ac_cv_c99_llrint, -[ -llrint_save_CFLAGS=$CFLAGS -CFLAGS="-O2 -lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -#include -], int64_t x ; x = llrint(3.14159) ;, ac_cv_c99_llrint=yes, ac_cv_c99_llrint=no) - -CFLAGS=$llrint_save_CFLAGS - -]) - -if test "$ac_cv_c99_llrint" = yes; then - AC_DEFINE(HAVE_LLRINT, 1, - [Define if you have C99's llrint function.]) -fi -])# AC_C99_FUNC_LLRINT - - - -dnl @synopsis AC_C_CLIP_MODE -dnl -dnl Determine the clipping mode when converting float to int. -dnl @version 1.0 May 17 2003 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. - - - -dnl Find the clipping mode in the following way: -dnl 1) If we are not cross compiling test it. -dnl 2) IF we are cross compiling, assume that clipping isn't done correctly. - -AC_DEFUN([AC_C_CLIP_MODE], -[AC_CACHE_CHECK(processor clipping capabilities, - ac_cv_c_clip_type, - -# Initialize to unknown -ac_cv_c_clip_positive=unknown -ac_cv_c_clip_negative=unknown - -if test $ac_cv_c_clip_positive = unknown ; then - AC_TRY_RUN( - [[ - #define _ISOC9X_SOURCE 1 - #define _ISOC99_SOURCE 1 - #define __USE_ISOC99 1 - #define __USE_ISOC9X 1 - #include - int main (void) - { double fval ; - int k, ival ; - - fval = 1.0 * 0x7FFFFFFF ; - for (k = 0 ; k < 100 ; k++) - { ival = (lrint (fval)) >> 24 ; - if (ival != 127) - return 1 ; - - fval *= 1.2499999 ; - } ; - - return 0 ; - } - ]], - ac_cv_c_clip_positive=yes, - ac_cv_c_clip_positive=no, - ac_cv_c_clip_positive=unknown - ) - - AC_TRY_RUN( - [[ - #define _ISOC9X_SOURCE 1 - #define _ISOC99_SOURCE 1 - #define __USE_ISOC99 1 - #define __USE_ISOC9X 1 - #include - int main (void) - { double fval ; - int k, ival ; - - fval = -8.0 * 0x10000000 ; - for (k = 0 ; k < 100 ; k++) - { ival = (lrint (fval)) >> 24 ; - if (ival != -128) - return 1 ; - - fval *= 1.2499999 ; - } ; - - return 0 ; - } - ]], - ac_cv_c_clip_negative=yes, - ac_cv_c_clip_negative=no, - ac_cv_c_clip_negative=unknown - ) - - fi - -if test $ac_cv_c_clip_positive = yes ; then - ac_cv_c_clip_positive=1 -else - ac_cv_c_clip_positive=0 - fi - -if test $ac_cv_c_clip_negative = yes ; then - ac_cv_c_clip_negative=1 -else - ac_cv_c_clip_negative=0 - fi - -[[ -case "$ac_cv_c_clip_positive$ac_cv_c_clip_negative" in - "00") - ac_cv_c_clip_type="none" - ;; - "10") - ac_cv_c_clip_type="positive" - ;; - "01") - ac_cv_c_clip_type="negative" - ;; - "11") - ac_cv_c_clip_type="both" - ;; - esac - ]] - -) -] - -)# AC_C_CLIP_MODE - - -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/ax_prefix_config_h.html -dnl -AC_DEFUN([AX_PREFIX_CONFIG_H],[AC_REQUIRE([AC_CONFIG_HEADER]) -AC_CONFIG_COMMANDS([ifelse($1,,$PACKAGE-config.h,$1)],[dnl -AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl -AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl -AS_VAR_PUSHDEF([_PKG],[ac_prefix_conf_PKG])dnl -AS_VAR_PUSHDEF([_LOW],[ac_prefix_conf_LOW])dnl -AS_VAR_PUSHDEF([_UPP],[ac_prefix_conf_UPP])dnl -AS_VAR_PUSHDEF([_INP],[ac_prefix_conf_INP])dnl -m4_pushdef([_script],[conftest.prefix])dnl -m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl -_OUT=`echo ifelse($1, , $PACKAGE-config.h, $1)` -_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"` -_PKG=`echo ifelse($2, , LMMS, $2)` -_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"` -_UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:" -e "/^@<:@m4_cr_digits@:>@/s/^/_/"` -_INP=`echo ifelse($3, , _, $3)` -if test "$ac_prefix_conf_INP" = "_"; then - for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue - test -f "$ac_prefix_conf_INP" && continue - case $ac_file in - *.h) test -f $ac_file && _INP=$ac_file ;; - *) - esac - done -fi -if test "$_INP" = "_"; then - case "$_OUT" in - */*) _INP=`basename "$_OUT"` - ;; - *-*) _INP=`echo "$_OUT" | sed -e "s/@<:@_symbol@:>@*-//"` - ;; - *) _INP=config.h - ;; - esac -fi -if test -z "$_PKG" ; then - AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H]) -else - if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then - _INP="$srcdir/$_INP" - fi fi - AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines) - if test -f $_INP ; then - echo "s/@%:@undef *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/" > _script - # no! these are things like socklen_t, const, vfork - # echo "s/@%:@undef *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/" >> _script - echo "s/@%:@def[]ine *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1 \\" >> _script - echo "@%:@def[]ine $_UPP""_\\1 \\2 \\" >> _script - echo "@%:@endif/" >>_script - # no! these are things like socklen_t, const, vfork - # echo "s/@%:@def[]ine *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1 \\" >> _script - # echo "@%:@define $_LOW""_\\1 \\2 \\" >> _script - # echo "@%:@endif/" >> _script - # now executing _script on _DEF input to create _OUT output file - echo "@%:@ifndef $_DEF" >$tmp/pconfig.h - echo "@%:@def[]ine $_DEF 1" >>$tmp/pconfig.h - echo ' ' >>$tmp/pconfig.h - echo /'*' $_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h - - sed -f _script $_INP >>$tmp/pconfig.h - echo ' ' >>$tmp/pconfig.h - echo '/* once:' $_DEF '*/' >>$tmp/pconfig.h - echo "@%:@endif" >>$tmp/pconfig.h - if cmp -s $_OUT $tmp/pconfig.h 2>/dev/null; then - AC_MSG_NOTICE([$_OUT is unchanged]) - else - ac_dir=`AS_DIRNAME(["$_OUT"])` - AS_MKDIR_P(["$ac_dir"]) - rm -f "$_OUT" - mv $tmp/pconfig.h "$_OUT" - fi -# cp _script _configs.sed - else - AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT]) - fi - rm -f conftest.* -fi -m4_popdef([_symbol])dnl -m4_popdef([_script])dnl -AS_VAR_POPDEF([_INP])dnl -AS_VAR_POPDEF([_UPP])dnl -AS_VAR_POPDEF([_LOW])dnl -AS_VAR_POPDEF([_PKG])dnl -AS_VAR_POPDEF([_DEF])dnl -AS_VAR_POPDEF([_OUT])dnl -],[PACKAGE="$PACKAGE"])]) - - diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake new file mode 100644 index 000000000..24f2b1f83 --- /dev/null +++ b/cmake/modules/BuildPlugin.cmake @@ -0,0 +1,72 @@ +# BuildPlugin.cmake - Copyright (c) 2008 Tobias Doerffel +# +# description: build LMMS-plugin +# usage: BUILD_PLUGIN( MOCFILES EMBEDDED_RESOURCES UICFILES ) + +MACRO(CAR var) + SET(${var} ${ARGV1}) +ENDMACRO(CAR) + +MACRO(CDR var junk) + SET(${var} ${ARGN}) +ENDMACRO(CDR) + +MACRO(PARSE_ARGUMENTS prefix arg_names option_names) + SET(DEFAULT_ARGS) + FOREACH(arg_name ${arg_names}) + SET(${prefix}_${arg_name}) + ENDFOREACH(arg_name) + FOREACH(option ${option_names}) + SET(${prefix}_${option} FALSE) + ENDFOREACH(option) + + SET(current_arg_name DEFAULT_ARGS) + SET(current_arg_list) + FOREACH(arg ${ARGN}) + SET(larg_names ${arg_names}) + LIST(FIND larg_names "${arg}" is_arg_name) + IF (is_arg_name GREATER -1) + SET(${prefix}_${current_arg_name} ${current_arg_list}) + SET(current_arg_name ${arg}) + SET(current_arg_list) + ELSE (is_arg_name GREATER -1) + SET(loption_names ${option_names}) + LIST(FIND loption_names "${arg}" is_option) + IF (is_option GREATER -1) + SET(${prefix}_${arg} TRUE) + ELSE (is_option GREATER -1) + SET(current_arg_list ${current_arg_list} ${arg}) + ENDIF (is_option GREATER -1) + ENDIF (is_arg_name GREATER -1) + ENDFOREACH(arg) + SET(${prefix}_${current_arg_name} ${current_arg_list}) +ENDMACRO(PARSE_ARGUMENTS) + +MACRO(BUILD_PLUGIN) + PARSE_ARGUMENTS(PLUGIN "MOCFILES;EMBEDDED_RESOURCES;UICFILES" "" ${ARGN} ) + CAR(PLUGIN_NAME ${PLUGIN_DEFAULT_ARGS}) + CDR(PLUGIN_SOURCES ${PLUGIN_DEFAULT_ARGS}) + + INCLUDE_DIRECTORIES(. ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/gui) + + ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME}) + + LIST(LENGTH PLUGIN_EMBEDDED_RESOURCES ER_LEN) + IF(ER_LEN) + SET(ER_H embedded_resources.h) + + ADD_CUSTOM_COMMAND(OUTPUT ${ER_H} + COMMAND ${BIN2RES} + ARGS ${PLUGIN_EMBEDDED_RESOURCES} > ${ER_H}) + ENDIF(ER_LEN) + + QT4_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES}) + QT4_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES}) + FOREACH(f ${PLUGIN_SOURCES}) + ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out}) + ENDFOREACH(f) + ADD_LIBRARY( ${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES}) + INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_DIR}) + SET(ADDITIONAL_MAKE_CLEAN_FILES ${ER_H} ${plugin_MOC_out}) +ENDMACRO(BUILD_PLUGIN) + diff --git a/cmake/modules/ChecksForLibSamplerate.cmake b/cmake/modules/ChecksForLibSamplerate.cmake new file mode 100644 index 000000000..d3719ca1f --- /dev/null +++ b/cmake/modules/ChecksForLibSamplerate.cmake @@ -0,0 +1,76 @@ +# +# some tests migrated from libsamplerate's acinclude.m4 - Tobias Doerffel, 2008 +# + +INCLUDE(CheckCSourceCompiles) +INCLUDE(CheckCSourceRuns) + +SET(CMAKE_REQUIRED_LIBRARIES_ORIG ${CMAKE_REQUIRED_LIBRARIES}) +SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} -lm) +SET(C99_MATH " #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 + #define __USE_ISOC99 1 + #define __USE_ISOC9X 1 + + #include + ") +SET(TEST_LRINT "int main( void ) + { + if (!lrint(3.14159)) lrint(2.7183); + return( 0 ); + }") +SET(TEST_LRINTF "int main( void ) + { + if (!lrintf(3.14159)) lrintf(2.7183); + return( 0 ); + }") +CHECK_C_SOURCE_COMPILES("${C99_MATH}${TEST_LRINT}" HAVE_LRINT) +CHECK_C_SOURCE_COMPILES("${C99_MATH}${TEST_LRINTF}" HAVE_LRINTF) + + +CHECK_C_SOURCE_RUNS(" + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 + #define __USE_ISOC99 1 + #define __USE_ISOC9X 1 + #include + int main (void) + { double fval ; + int k, ival ; + + fval = 1.0 * 0x7FFFFFFF ; + for (k = 0 ; k < 100 ; k++) + { ival = (lrint (fval)) >> 24 ; + if (ival != 127) + return 1 ; + + fval *= 1.2499999 ; + } ; + + return 0 ; + } + " CPU_CLIPS_POSITIVE) +CHECK_C_SOURCE_RUNS(" + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 + #define __USE_ISOC99 1 + #define __USE_ISOC9X 1 + #include + int main (void) + { double fval ; + int k, ival ; + + fval = -8.0 * 0x10000000 ; + for (k = 0 ; k < 100 ; k++) + { ival = (lrint (fval)) >> 24 ; + if (ival != -128) + return 1 ; + + fval *= 1.2499999 ; + } ; + + return 0 ; + } + " CPU_CLIPS_NEGATIVE) +SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_ORIG}) + diff --git a/cmake/modules/FindAlsa.cmake b/cmake/modules/FindAlsa.cmake new file mode 100644 index 000000000..e114cf8f8 --- /dev/null +++ b/cmake/modules/FindAlsa.cmake @@ -0,0 +1,69 @@ +# Alsa check, based on libkmid/configure.in.in. +# Only the support for Alsa >= 0.9.x was included; 0.5.x was dropped (but feel free to re-add it if you need it) +# It defines ... +# It offers the following macros: +# ALSA_CONFIGURE_FILE(config_header) - generate a config.h, typical usage: +# ALSA_CONFIGURE_FILE(${CMAKE_BINARY_DIR}/config-alsa.h) +# ALSA_VERSION_STRING(version_string) looks for alsa/version.h and reads the version string into +# the first argument passed to the macro + +# Copyright (c) 2006, David Faure, +# Copyright (c) 2007, Matthias Kretz +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +include(CheckIncludeFiles) +include(CheckIncludeFileCXX) +include(CheckLibraryExists) + +# Already done by toplevel +find_library(ASOUND_LIBRARY asound) +set(ASOUND_LIBRARY_DIR "") +if(ASOUND_LIBRARY) + get_filename_component(ASOUND_LIBRARY_DIR ${ASOUND_LIBRARY} PATH) +endif(ASOUND_LIBRARY) + +check_library_exists(asound snd_seq_create_simple_port "${ASOUND_LIBRARY_DIR}" HAVE_LIBASOUND2) +if(HAVE_LIBASOUND2) + message(STATUS "Found ALSA: ${ASOUND_LIBRARY}") +else(HAVE_LIBASOUND2) + message(STATUS "ALSA not found") +endif(HAVE_LIBASOUND2) +set(ALSA_FOUND ${HAVE_LIBASOUND2}) + +find_path(ALSA_INCLUDES alsa/version.h) + +macro(ALSA_VERSION_STRING _result) + # check for version in alsa/version.h + if(ALSA_INCLUDES) + file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT) + string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT}) + else(ALSA_INCLUDES) + message(STATUS "ALSA version not known. ALSA output will probably not work correctly.") + endif(ALSA_INCLUDES) +endmacro(ALSA_VERSION_STRING _result) + + +get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) +macro(ALSA_CONFIGURE_FILE _destFile) + check_include_files(sys/soundcard.h LMMS_HAVE_SYS_SOUNDCARD_H) + check_include_files(machine/soundcard.h LMMS_HAVE_MACHINE_SOUNDCARD_H) + + check_include_files(linux/awe_voice.h LMMS_HAVE_LINUX_AWE_VOICE_H) + check_include_files(awe_voice.h LMMS_HAVE_AWE_VOICE_H) + check_include_files(/usr/src/sys/i386/isa/sound/awe_voice.h LMMS_HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H) + check_include_files(/usr/src/sys/gnu/i386/isa/sound/awe_voice.h LMMS_HAVE__USR_SRC_SYS_GNU_I386_ISA_SOUND_AWE_VOICE_H) + + check_include_file_cxx(sys/asoundlib.h LMMS_HAVE_SYS_ASOUNDLIB_H) + check_include_file_cxx(alsa/asoundlib.h LMMS_HAVE_ALSA_ASOUNDLIB_H) + + check_library_exists(asound snd_pcm_resume "${ASOUND_LIBRARY_DIR}" ASOUND_HAS_SND_PCM_RESUME) + if(ASOUND_HAS_SND_PCM_RESUME) + set(HAVE_SND_PCM_RESUME 1) + endif(ASOUND_HAS_SND_PCM_RESUME) + + configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile}) +endmacro(ALSA_CONFIGURE_FILE _destFile) + +mark_as_advanced(ALSA_INCLUDES ASOUND_LIBRARY) diff --git a/cmake/modules/FindOggVorbis.cmake b/cmake/modules/FindOggVorbis.cmake new file mode 100644 index 000000000..79a9ab406 --- /dev/null +++ b/cmake/modules/FindOggVorbis.cmake @@ -0,0 +1,86 @@ +# - Try to find the OggVorbis libraries +# Once done this will define +# +# OGGVORBIS_FOUND - system has OggVorbis +# OGGVORBIS_VERSION - set either to 1 or 2 +# OGGVORBIS_INCLUDE_DIR - the OggVorbis include directory +# OGGVORBIS_LIBRARIES - The libraries needed to use OggVorbis +# OGG_LIBRARY - The Ogg library +# VORBIS_LIBRARY - The Vorbis library +# VORBISFILE_LIBRARY - The VorbisFile library +# VORBISENC_LIBRARY - The VorbisEnc library + +# Copyright (c) 2006, Richard Laerkaeng, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +include (CheckLibraryExists) + +find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h) +find_path(OGG_INCLUDE_DIR ogg/ogg.h) + +find_library(OGG_LIBRARY NAMES ogg) +find_library(VORBIS_LIBRARY NAMES vorbis) +find_library(VORBISFILE_LIBRARY NAMES vorbisfile) +find_library(VORBISENC_LIBRARY NAMES vorbisenc) + + +if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY) + set(OGGVORBIS_FOUND TRUE) + + set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY}) + + set(_CMAKE_REQUIRED_LIBRARIES_TMP ${CMAKE_REQUIRED_LIBRARIES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${OGGVORBIS_LIBRARIES}) + check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2) + set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_TMP}) + + if (HAVE_LIBVORBISENC2) + set (OGGVORBIS_VERSION 2) + else (HAVE_LIBVORBISENC2) + set (OGGVORBIS_VERSION 1) + endif (HAVE_LIBVORBISENC2) + +else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY) + set (OGGVORBIS_VERSION) + set(OGGVORBIS_FOUND FALSE) +endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY) + + +if (OGGVORBIS_FOUND) + if (NOT OggVorbis_FIND_QUIETLY) + message(STATUS "Found OggVorbis: ${OGGVORBIS_LIBRARIES}") + endif (NOT OggVorbis_FIND_QUIETLY) +else (OGGVORBIS_FOUND) + if (OggVorbis_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find OggVorbis libraries") + endif (OggVorbis_FIND_REQUIRED) + if (NOT OggVorbis_FIND_QUITELY) + message(STATUS "Could NOT find OggVorbis libraries") + endif (NOT OggVorbis_FIND_QUITELY) +endif (OGGVORBIS_FOUND) + +#check_include_files(vorbis/vorbisfile.h HAVE_VORBISFILE_H) +#check_library_exists(ogg ogg_page_version "" HAVE_LIBOGG) +#check_library_exists(vorbis vorbis_info_init "" HAVE_LIBVORBIS) +#check_library_exists(vorbisfile ov_open "" HAVE_LIBVORBISFILE) +#check_library_exists(vorbisenc vorbis_info_clear "" HAVE_LIBVORBISENC) +#check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2) + +#if (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC) +# message(STATUS "Ogg/Vorbis found") +# set (VORBIS_LIBS "-lvorbis -logg") +# set (VORBISFILE_LIBS "-lvorbisfile") +# set (VORBISENC_LIBS "-lvorbisenc") +# set (OGGVORBIS_FOUND TRUE) +# if (HAVE_LIBVORBISENC2) +# set (HAVE_VORBIS 2) +# else (HAVE_LIBVORBISENC2) +# set (HAVE_VORBIS 1) +# endif (HAVE_LIBVORBISENC2) +#else (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC) +# message(STATUS "Ogg/Vorbis not found") +#endif (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC) + diff --git a/cmake/modules/FindPCHSupport.cmake b/cmake/modules/FindPCHSupport.cmake new file mode 100644 index 000000000..29c984d2c --- /dev/null +++ b/cmake/modules/FindPCHSupport.cmake @@ -0,0 +1,127 @@ +# - Try to find precompiled headers support for GCC 3.4 and 4.x +# Once done this will define: +# +# Variable: +# PCHSupport_FOUND +# +# Macro: +# ADD_PRECOMPILED_HEADER + +IF(CMAKE_COMPILER_IS_GNUCXX) + EXEC_PROGRAM( + ${CMAKE_CXX_COMPILER} + ARGS --version + OUTPUT_VARIABLE _compiler_output) + STRING(REGEX REPLACE ".* ([0-9]\\.[0-9]\\.[0-9]) .*" "\\1" + gcc_compiler_version ${_compiler_output}) + #MESSAGE("GCC Version: ${gcc_compiler_version}") + IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") + SET(PCHSupport_FOUND TRUE) + ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") + IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") + SET(PCHSupport_FOUND TRUE) + ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") + ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") + IF(PCHSupport_FOUND) + ADD_DEFINITIONS( -DUSE_PCH=1 ) + ELSE(PCHSupport_FOUND) + ADD_DEFINITIONS( -DUSE_PCH=0 ) + ENDIF(PCHSupport_FOUND) +ENDIF(CMAKE_COMPILER_IS_GNUCXX) + + +# ADD_PRECOMPILED_HEADER( targetName HEADERS _inputs ) +MACRO(ADD_PRECOMPILED_HEADER _targetName _inputs ) + FOREACH (_current_FILE ${ARGN}) + + GET_FILENAME_COMPONENT(_name ${_current_FILE} NAME) + SET(_source "${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}") + SET(_outdir "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch") + MAKE_DIRECTORY(${_outdir}) + SET(_output "${_outdir}/${CMAKE_BUILD_TYPE}.c++") + STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name) + SET(_compiler_FLAGS ${${_flags_var_name}}) + + GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES) + FOREACH(item ${_directory_flags}) + LIST(APPEND _compiler_FLAGS "-I${item}") + ENDFOREACH(item) + + GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) + LIST(APPEND _compiler_FLAGS ${_directory_flags}) + + # some hacks for Qt4 - Tobias Doerffel, 2008 + STRING(TOUPPER "COMPILE_DEFINITIONS_${CMAKE_BUILD_TYPE}" CD) + GET_DIRECTORY_PROPERTY(_directory_flags ${CD} ) + FOREACH(item ${_directory_flags}) + LIST(APPEND _compiler_FLAGS "-D${item}") + ENDFOREACH(item) + GET_DIRECTORY_PROPERTY(_directory_flags COMPILE_DEFINITIONS) + FOREACH(item ${_directory_flags}) + LIST(APPEND _compiler_FLAGS "-D${item}") + ENDFOREACH(item) + + SEPARATE_ARGUMENTS(_compiler_FLAGS) + #MESSAGE("_compiler_FLAGS: ${_compiler_FLAGS}") + #message("${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source}") + ADD_CUSTOM_COMMAND( + OUTPUT ${_output} + COMMAND ${CMAKE_CXX_COMPILER} + ${_compiler_FLAGS} + ${COMPILE_DEFINITIONS} + -x c++-header + -o ${_output} ${_source} + DEPENDS ${_source} ) + ADD_CUSTOM_TARGET(${_targetName}_gch DEPENDS ${_output}) + ADD_DEPENDENCIES(${_targetName} ${_targetName}_gch) + #SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-include ${_name} -Winvalid-pch -H") + #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include ${_name} -Winvalid-pch") + SET_TARGET_PROPERTIES(${_targetName} PROPERTIES + COMPILE_FLAGS "-include ${_name} -Winvalid-pch" + ) + ENDFOREACH (_current_FILE) +ENDMACRO(ADD_PRECOMPILED_HEADER) + +# ADD_PRECOMPILED_HEADER_INPLACE( targetName HEADERS _inputs ) +MACRO(ADD_PRECOMPILED_HEADER_INPLACE _targetName _inputs ) + STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name) + SET(_compiler_FLAGS ${${_flags_var_name}}) + + GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES) + FOREACH(item ${_directory_flags}) + LIST(APPEND _compiler_FLAGS "-I${item}") + ENDFOREACH(item) + + GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) + LIST(APPEND _compiler_FLAGS ${_directory_flags}) + + SEPARATE_ARGUMENTS(_compiler_FLAGS) + #MESSAGE("_compiler_FLAGS: ${_compiler_FLAGS}") + MAKE_DIRECTORY("${CMAKE_CURRENT_BINARY_DIR}/gch") + FOREACH (_current_FILE ${ARGN}) + + GET_FILENAME_COMPONENT(_name ${_current_FILE} NAME) + SET(_source "${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}") + SET(_output "${CMAKE_CURRENT_BINARY_DIR}/gch/${_name}.gch") + #message("${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source}") + ADD_CUSTOM_COMMAND( + OUTPUT ${_output} + COMMAND ${CMAKE_CXX_COMPILER} + ${_compiler_FLAGS} + -x c++-header + -fPIC + -o ${_output} ${_source} + DEPENDS ${_source} ) + LIST(APPEND GCH_FILES ${_output}) + ENDFOREACH (_current_FILE) + + #MESSAGE("GCH_FILES: ${GCH_FILES}") + FOREACH (GCH_FILE ${GCH_FILES}) + SET_DIRECTORY_PROPERTIES( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GCH_FILE} ) + ENDFOREACH (GCH_FILE) + SEPARATE_ARGUMENTS(GCH_FILES) + ADD_CUSTOM_TARGET(${_targetName}_gch DEPENDS ${GCH_FILES}) + ADD_DEPENDENCIES(${_targetName} ${_targetName}_gch) + INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/gch/) + SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "-Winvalid-pch") +ENDMACRO(ADD_PRECOMPILED_HEADER_INPLACE) diff --git a/cmake/modules/FindPulseAudio.cmake b/cmake/modules/FindPulseAudio.cmake new file mode 100644 index 000000000..8ea2616cf --- /dev/null +++ b/cmake/modules/FindPulseAudio.cmake @@ -0,0 +1,59 @@ +# - Try to find PulseAudioSimple +# Once done this will define +# +# PULSEAUDIO_FOUND - system has PulseAudioSimple +# PULSEAUDIO_INCLUDE_DIR - the PulseAudioSimple include directory +# PULSEAUDIO_LIBRARIES - the libraries needed to use PulseAudioSimple +# PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudioSimple +# +IF(NO_PULSE) + message(status "") +ELSE(NO_PULSE) + +IF (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARIES) + # in cache already + SET(PULSEAUDIO_FIND_QUIETLY TRUE) +ENDIF (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARIES) + +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(FindPkgConfig) + pkg_check_modules(PA libpulse) + set(_PASIncDir ${PA_INCLUDE_DIRS}) + set(_PASLinkDir ${PA_LIBRARY_DIRS}) + set(_PASLinkFlags ${PA_LDFLAGS}) + set(_PASCflags ${PA_CFLAGS}) + SET(PULSEAUDIO_DEFINITIONS ${_PASCflags}) +ENDIF (NOT WIN32) + +FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h + PATHS + ${_PASIncDir} + PATH_SUFFIXES pulse + ) + +FIND_LIBRARY(PULSEAUDIO_LIBRARIES NAMES pulse libpulse + PATHS + ${_PASLinkDir} + ) + +IF (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARIES) + SET(PULSEAUDIO_FOUND TRUE) +ELSE (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARIES) + SET(PULSEAUDIO_FOUND FALSE) +ENDIF (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARIES) + +IF (PULSEAUDIO_FOUND) + IF (NOT PULSEAUDIO_FIND_QUIETLY) + MESSAGE(STATUS "Found PulseAudio Simple: ${PULSEAUDIO_LIBRARIES}") + ENDIF (NOT PULSEAUDIO_FIND_QUIETLY) + SET(USE_PULSE_ 1) +ELSE (PULSEAUDIO_FOUND) + MESSAGE(STATUS "Could NOT find LibXml2") +ENDIF (PULSEAUDIO_FOUND) + +MARK_AS_ADVANCED(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARIES) + +ENDIf(NO_PULSE) + diff --git a/cmake/modules/FindSTK.cmake b/cmake/modules/FindSTK.cmake new file mode 100644 index 000000000..4647ab89d --- /dev/null +++ b/cmake/modules/FindSTK.cmake @@ -0,0 +1,20 @@ +FIND_PATH(STK_INCLUDE_DIR Stk.h /usr/include/stk /usr/local/include/stk) + +FIND_LIBRARY(STK_LIBRARY NAMES stk PATH /usr/lib /usr/local/lib) + +IF (STK_INCLUDE_DIR AND STK_LIBRARY) + SET(STK_FOUND TRUE) +ENDIF (STK_INCLUDE_DIR AND STK_LIBRARY) + + +IF (STK_FOUND) + IF (NOT STK_FIND_QUIETLY) + MESSAGE(STATUS "Found STK: ${STK_LIBRARY}") + SET(HAVE_STK TRUE) + ENDIF (NOT STK_FIND_QUIETLY) +ELSE (STK_FOUND) + IF (STK_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find STK") + ENDIF (STK_FIND_REQUIRED) +ENDIF (STK_FOUND) + diff --git a/cmake/modules/InstallHelpers.cmake b/cmake/modules/InstallHelpers.cmake new file mode 100644 index 000000000..fb7896072 --- /dev/null +++ b/cmake/modules/InstallHelpers.cmake @@ -0,0 +1,45 @@ +# +# install all files matching certain wildcards below ${LMMS_DATA_DIR}/ +# +# example: +# +# INSTALL_DATA_SUBDIRS("samples" "*.ogg;*.wav;*.flac") +# +# Copyright (c) 2008 Tobias Doerffel +# + + +# helper-macro +MACRO(LIST_CONTAINS var value) + SET(${var}) + FOREACH (value2 ${ARGN}) + IF (${value} STREQUAL ${value2}) + SET(${var} TRUE) + ENDIF (${value} STREQUAL ${value2}) + ENDFOREACH (value2) +ENDMACRO(LIST_CONTAINS) + + +MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards) + FOREACH(_wildcard ${_wildcards}) + FILE(GLOB_RECURSE files ${_wildcard}) + SET(SUBDIRS) + + FOREACH(_item ${files}) + GET_FILENAME_COMPONENT(_file "${_item}" PATH) + STRING(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" _file "${_file}") + LIST_CONTAINS(contains _file ${SUBDIRS}) + IF(NOT contains) + LIST(APPEND SUBDIRS "${_file}") + ENDIF(NOT contains) + ENDFOREACH(_item ${files}) + + FOREACH(_item ${SUBDIRS}) + FILE(GLOB files "${_item}/${_wildcard}") + FOREACH(_file ${files}) + INSTALL(FILES "${_file}" DESTINATION "${LMMS_DATA_DIR}/${_subdir}/${_item}/") + ENDFOREACH(_file ${files}) + ENDFOREACH(_item ${SUBDIRS}) + ENDFOREACH(_wildcard ${_wildcards}) +ENDMACRO(INSTALL_DATA_SUBDIRS) + diff --git a/cmake/modules/config-alsa.h.cmake b/cmake/modules/config-alsa.h.cmake new file mode 100644 index 000000000..9ecb90802 --- /dev/null +++ b/cmake/modules/config-alsa.h.cmake @@ -0,0 +1,34 @@ +/* Define to 1 if you have the header file. */ +#cmakedefine LMMS_HAVE_LINUX_AWE_VOICE_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine LMMS_HAVE_SYS_AWE_VOICE_H 1 + +/* Define to 1 if you have the + header file. */ +#cmakedefine LMMS_HAVE__USR_SRC_SYS_GNU_I386_ISA_SOUND_AWE_VOICE_H 1 + +/* Define to 1 if you have the + header file. */ +#cmakedefine LMMS_HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine LMMS_HAVE_AWE_VOICE_H 1 + +/* Define if you have libasound.so.2 (required for ALSA 0.9.x support) */ +#cmakedefine LMMS_HAVE_LIBASOUND2 1 + +/* Define if libasound has snd_pcm_resume() */ +#cmakedefine LMMS_HAVE_SND_PCM_RESUME 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine LMMS_HAVE_ALSA_ASOUNDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine LMMS_HAVE_SYS_ASOUNDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine LMMS_HAVE_SYS_SOUNDCARD_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine LMMS_HAVE_MACHINE_SOUNDCARD_H 1 diff --git a/configure.in b/configure.in deleted file mode 100644 index d96b9e515..000000000 --- a/configure.in +++ /dev/null @@ -1,967 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.50) -AC_INIT(lmms, 0.4.0-alpha2, lmms-devel/at/lists/dot/sf/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.4.0-alpha2) -AX_PREFIX_CONFIG_H([include/lmmsconfig.h]) - -AM_CONFIG_HEADER(config.h) - -# Checks for programs. -AC_PROG_CXX -AC_PROG_CC -AC_LIBTOOL_WIN32_DLL -AC_PROG_LN_S -AC_PROG_GCC_TRADITIONAL -AM_PROG_LIBTOOL - -if ! test -z "${prefix}" -o "${prefix}" = "NONE" ; then - CFLAGS="$CFLAGS -I${prefix}/include" - CPPFLAGS="$CPPFLAGS -I${prefix}/include" - LDFLAGS="$LDFLAGS -L${prefix}/bin" -fi - -if ! test -z "${libdir}" ; then - CPPFLAGS="$CPPFLAGS -DLIBDIR='\"${libdir}\"'" -fi - -AH_TEMPLATE(BUILD_LINUX, [Build LMMS for Linux]) -AH_TEMPLATE(BUILD_WIN32, [Build LMMS for Win32]) -AH_TEMPLATE(WIN32, [Build LMMS for Win32]) -AC_ARG_WITH(linux, - [ --with-linux explicit build LMMS for Linux], [ build_linux=true ], [ build_linux=false ]) -AC_ARG_WITH(win32, - [ --with-win32 explicit build LMMS for Win32], [ build_win32=true ], [ build_win32=false ]) -AC_MSG_CHECKING([platform to build for]) -if test "x$build_win32" = "xtrue" ; then - AC_MSG_RESULT([Win32, will enable support for it]) - AC_DEFINE(BUILD_WIN32) - AC_DEFINE(WIN32) - build_linux="false" - build_win32="true" -else -# if test `uname -s | tr -s 'LINUX' 'linux'` = "linux" -o "x$build_linux" = "xyes" ; then - AC_MSG_RESULT([Linux, will enable support for it]) - AC_DEFINE(BUILD_LINUX) - build_linux="true" - build_win32="false" -# if uname -s | grep MINGW32 ; then -# else -# AC_MSG_ERROR([*** non usable found... Run ./configure --help to see a list of available platforms, you can also specify explicit, if your platform was not recognized properly. Otherwise your platform isn't supported yet. In this case please contact the maintainer (see README)]) - #fi -fi - -AM_CONDITIONAL(BUILD_WIN32, test "$build_win32" = "true") -AM_CONDITIONAL(BUILD_LINUX, test "$build_linux" = "true") - - -# -fomit-frame-pointer crashes wine on Ubuntu Dapper--Danny 7/21/06 -#DEFAULTFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las" -DEFAULTFLAGS="-O2 -fPIC" #"-floop-optimize2 -fgcse-sm -fgcse-las" - -# Tested with GCC 4.0--needs to be tested with 4.1--Danny 7/21/06 -#if test "x`$CC --version|head -1|cut -d\ -f3|cut -d. -f1`" = "x4" ; then -# DEFAULTFLAGS="$DEFAULTFLAGS -ftree-vectorize -ftree-loop-linear" -# if test "x`$CC --version|head -1|cut -d\ -f3|cut -d. -f2`" != "x0" ; then -# DEFAULTFLAGS="$DEFAULTFLAGS -funsafe-loop-optimizations" -# fi -#fi - -CFLAGS="$DEFAULTFLAGS $CFLAGS" -CXXFLAGS="$DEFAULTFLAGS $CXXFLAGS" - -AC_PATH_XTRA -gw_CHECK_QT - - -# checks for header files. -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([stdint.h sys/times.h fcntl.h memory.h string.h sys/ioctl.h unistd.h stdlib.h pthread.h sys/ipc.h sys/shm.h sys/time.h sys/select.h sys/types.h sys/wait.h stdarg.h signal.h sched.h ctype.h]) - -# checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_HEADER_TIME -AC_STRUCT_TM -AC_C_VOLATILE -AC_C_BIGENDIAN -AC_CHECK_TYPES([mode_t, off_t, pid_t, size_t, ssize_t, long long]) - - -# checks for library functions. -AC_FUNC_ALLOCA -AC_FUNC_MALLOC -AC_FUNC_MEMCMP -AC_TYPE_SIGNAL - -AC_CHECK_FUNCS([usleep pipe sprintf]) - - - -# search for include-path of SDL (just for supporting the FreeBSD-guys.... ;-) -for i in SDL SDL10 SDL11 SDL12 ; do - FOUND="" - AC_CHECK_HEADER($i/SDL.h, FOUND="true") - if test "$FOUND" = "true" ; then - SDL_INC_PATH="$i" - break - fi -done - - -AH_TEMPLATE(SDL_SDL_H, [Define to location of SDL.h]) -AH_TEMPLATE(SDL_SDL_AUDIO_H, [Define to location of SDL_audio.h]) - -OLD_LIBS="$LIBS" -#LIBS="$LIBS -lpthread" - -# check for SDL-lib -AC_ARG_WITH(sdl, - AS_HELP_STRING([--without-sdl], - [disable support for SDL-audio-output]), , - [ with_sdlaudio=yes ]) -AH_TEMPLATE(HAVE_SDL_SDL_AUDIO_H, [Define to 1 if you have the <$SDL_INC_PATH/SDL_audio.h> header file.]) -if test "x$with_sdlaudio" = "xyes" -a ! -z "$SDL_INC_PATH"; then - AC_CHECK_HEADER($SDL_INC_PATH/SDL_audio.h, HAVE_SDL_SDL_AUDIO_H="true") - AC_CHECK_LIB([SDL], [SDL_OpenAudio], HAVE_LIBSDL="true", HAVE_SDL_SDL_AUDIO_H="") -fi -if test ! -z "$HAVE_SDL_SDL_AUDIO_H" ; then - AC_DEFINE_UNQUOTED(SDL_SDL_H, <$SDL_INC_PATH/SDL.h>) - AC_DEFINE_UNQUOTED(SDL_SDL_AUDIO_H, <$SDL_INC_PATH/SDL_audio.h>) - AC_DEFINE(HAVE_SDL_SDL_AUDIO_H) -fi -AM_CONDITIONAL(HAVE_LIBSDL, test ! -z "$HAVE_SDL_SDL_AUDIO_H") - - -LIBS="$OLD_LIBS" - - -# check for ALSA-lib -AC_ARG_WITH(asound, - AS_HELP_STRING([--without-asound], - [disable support for ALSA-sound-output]), , - [ with_asound=yes ]) -AH_TEMPLATE(HAVE_ALSA_ASOUNDLIB_H, [Define to 1 if you have the header file.]) -if test "x$with_asound" = "xyes" ; then - AC_CHECK_HEADER(alsa/asoundlib.h, HAVE_ALSA_ASOUNDLIB_H="true") - AC_CHECK_LIB([asound], [snd_pcm_open], HAVE_LIBASOUND="true", HAVE_ALSA_ASOUNDLIB_H="") -fi -if test ! -z "$HAVE_ALSA_ASOUNDLIB_H" ; then - AC_DEFINE(HAVE_ALSA_ASOUNDLIB_H) -fi -AM_CONDITIONAL(HAVE_LIBASOUND, test ! -z "$HAVE_ALSA_ASOUNDLIB_H") - - -# check for OSS -AC_ARG_WITH(oss, - AS_HELP_STRING([--without-oss], - [disable support for OSS-sound-output]), , - [ with_oss=yes ]) -AH_TEMPLATE(HAVE_SYS_SOUNDCARD_H, [Define to 1 if you have the header file.]) -AH_TEMPLATE(HAVE_SOUNDCARD_H, [Define to 1 if you have the header file.]) -if test "x$with_oss" = "xyes" ; then - AC_CHECK_HEADER(sys/soundcard.h, HAVE_SYS_SOUNDCARD_H="true") - AC_CHECK_HEADER(soundcard.h, HAVE_SOUNDCARD_H="true") -fi -if test ! -z "$HAVE_SYS_SOUNDCARD_H" ; then - AC_DEFINE(HAVE_SYS_SOUNDCARD_H) -fi -if test ! -z "$HAVE_SOUNDCARD_H" ; then - AC_DEFINE(HAVE_SOUNDCARD_H) -fi - - -# check for JACK -AC_ARG_WITH(jack, - AS_HELP_STRING([--without-jack], - [disable support for JACK-transport]), , - [ with_jack=yes ]) -AH_TEMPLATE(HAVE_JACK_JACK_H, [Define to 1 if you have the header file.]) -AH_TEMPLATE(OLD_JACK, [Define to 1 if your JACK-version doesnt know about jack_client_open() etc.]) -if test "x$with_jack" = "xyes" ; then - AC_CHECK_HEADER(jack/jack.h, HAVE_JACK_JACK_H="true") - AC_CHECK_LIB([jack], [jack_client_new], HAVE_LIBJACK="true", HAVE_JACK_JACK_H="") - AC_CHECK_LIB([jack], [jack_client_open], JACK_CLIENT_OPEN="true") - if test -z "$JACK_CLIENT_OPEN" ; then - AC_DEFINE(OLD_JACK) - fi -fi -if test ! -z "$HAVE_JACK_JACK_H" ; then - AC_DEFINE(HAVE_JACK_JACK_H) -fi -AM_CONDITIONAL(HAVE_LIBJACK, test ! -z "$HAVE_JACK_JACK_H") - - -# check for PulseAudio -AC_ARG_WITH(pulseaudio, - AS_HELP_STRING([--without-pulseaudio], - [disable support for PulseAudio-sound-output]), , - [ with_pulseaudio=yes ]) -AH_TEMPLATE(HAVE_PULSE_PULSEAUDIO_H, [Define to 1 if you have the header file.]) -if test "x$with_pulseaudio" = "xyes" ; then - AC_CHECK_HEADER(pulse/pulseaudio.h, HAVE_PULSE_PULSEAUDIO_H="true") - AC_CHECK_LIB([pulse], [pa_mainloop_new], HAVE_LIBPULSE="true", HAVE_PULSE_PULSEAUDIO_H="") -fi -if test ! -z "$HAVE_PULSE_PULSEAUDIO_H" ; then - AC_DEFINE(HAVE_PULSE_PULSEAUDIO_H) -fi -AM_CONDITIONAL(HAVE_LIBPULSE, test ! -z "$HAVE_PULSE_PULSEAUDIO_H") - - -# check for proper WINE-installation and existing Steinberg headers -AC_ARG_WITH(vst, - AS_HELP_STRING([--without-vst], - [disable support for builtin VST-plugin-hosting]), , [ with_vst=yes ]) -if test "x$with_vst" = "xyes" ; then - - if echo $CFLAGS $CXXFLAGS | grep "fomit-frame-pointer" > /dev/null ; then - AC_MSG_ERROR([*** passing -fomit-frame-pointer as compiler-flag will break LMMS' VST-support so either disable VST-support using --without-vst or remove it from compiler-flags]) - fi - - if test "$build_linux" = "true" ; then - AC_CHECK_PROG(WINECXX, wineg++, /usr/bin/wineg++,,/usr/bin) - - if test "x`uname -m`" != "xx86_64" ; then - AC_CHECK_LIB([wine], [wine_init], true) - else - AMD64_BUILD=yes - OLDCFLAGS="$CFLAGS" - CFLAGS="-m32 $CFLAGS" - AC_CHECK_LIB([wine], [wine_init], true) - CFLAGS="$OLDCFLAGS" - fi - - if test ! -z "$WINECXX" ; then - AC_LANG_PUSH(C++) -# CXXFLAGS="$CXXFLAGS -I${prefix}/include/wine/windows" - OLDCXX="$CXX" - OLDCPPFLAGS="$CPPFLAGS" - CXX="$WINECXX" - CPPFLAGS="$CPPFLAGS -I${prefix}/include/wine/windows" - CPPFLAGS+=" -I/usr/include/wine/windows" - AC_CHECK_HEADER(windows.h, HAVE_WINDOWS_H="true") - CXX="$OLDCXX" - CPPFLAGS="$OLDCPPFLAGS" - AC_LANG_POP(C++) - if test -z "$HAVE_WINDOWS_H" ; then - WINECXX="" - fi - fi - fi -fi -AM_CONDITIONAL(VST_SUPPORT, test ! -z "$WINECXX") -AM_CONDITIONAL(AMD64_BUILD, test "x$AMD64_BUILD" = "xyes") - - -# check for LADSPA-SDK -AH_TEMPLATE(HAVE_LADSPA_H, [Define to 1 if you have the header file.]) -AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA_H="true") -if test ! -z "$HAVE_LADSPA_H" ; then - AC_DEFINE(HAVE_LADSPA_H) -fi -#AM_CONDITIONAL(HAVE_LADSPA_H, test ! -z "$HAVE_LADSPA_H") - - -# check for STK -AC_LANG_PUSH(C++) -AC_ARG_WITH(stk, - AS_HELP_STRING([--without-stk], [disable support for STK plugins]), , - [ with_stk=yes ]) -AH_TEMPLATE(HAVE_STK_H, [Define to 1 if you have the header file.]) -if test "x$with_stk" = "xyes" ; then - AC_CHECK_HEADER([stk/Stk.h], HAVE_STK_H="true") - AC_CHECK_LIB([stk], [main], HAVE_STK="true", HAVE_STK_H="", - [-ljack -lasound]) -fi -if test ! -z "$HAVE_STK_H" ; then - AC_DEFINE(HAVE_STK_H) - AC_SUBST(stk_includes, [/usr/include/stk]) - AC_SUBST(stk_lib, [/usr/lib]) -fi -AM_CONDITIONAL(STK_SUPPORT, test ! -z "$HAVE_STK_H") -AC_LANG_POP(C++) - - -# check for vorbis-lib -AC_ARG_WITH(vorbis, - AS_HELP_STRING([--without-vorbis], - [disable support for exporting project to OGG-files and loading OGG-samples]), , - [ with_vorbis=yes ]) -AH_TEMPLATE(HAVE_VORBIS_CODEC_H, [Define to 1 if you have the header file.]) -AH_TEMPLATE(HAVE_VORBIS_VORBISENC_H, [Define to 1 if you have the header file.]) -AH_TEMPLATE(HAVE_VORBIS_VORBISFILE_H, [Define to 1 if you have the header file.]) -if test "x$with_vorbis" = "xyes" ; then - OGG_SUPPORT="true" - AC_CHECK_HEADER(vorbis/codec.h, HAVE_VORBIS_CODEC_H="true",OGG_SUPPORT="") - AC_CHECK_HEADER(vorbis/vorbisenc.h, HAVE_VORBIS_VORBISENC_H="true",OGG_SUPPORT="") - AC_CHECK_HEADER(vorbis/vorbisfile.h, HAVE_VORBIS_VORBISFILE_H="true",OGG_SUPPORT="") - if [ "$build_win32" = "true" ] ; then - AC_CHECK_LIB([vorbis-0], [vorbis_analysis], HAVE_LIBVORBIS="true", OGG_SUPPORT="") - else - AC_CHECK_LIB([vorbis], [vorbis_analysis], HAVE_LIBVORBIS="true", OGG_SUPPORT="") - fi -fi -if test ! -z "$OGG_SUPPORT" ; then - AC_DEFINE(HAVE_VORBIS_CODEC_H) - AC_DEFINE(HAVE_VORBIS_VORBISENC_H) - AC_DEFINE(HAVE_VORBIS_VORBISFILE_H) -fi -AM_CONDITIONAL(HAVE_LIBVORBIS, test ! -z "$OGG_SUPPORT") - - -# check for libFLAC -AC_ARG_WITH(flac, - AS_HELP_STRING([--without-flac], - [disable support for internal encoding/decoding with FLAC]), , - [ with_flac=yes ]) -AH_TEMPLATE(HAVE_FLAC_STREAM_ENCODER_H, [Define to 1 if you have the header file.]) -AH_TEMPLATE(HAVE_FLAC_STREAM_DECODER_H, [Define to 1 if you have the header file.]) -if test "x$with_flac" = "xyes" ; then - AC_CHECK_HEADER(FLAC/stream_encoder.h, HAVE_FLAC_STREAM_ENCODER_H="true") - AC_CHECK_HEADER(FLAC/stream_decoder.h, HAVE_FLAC_STREAM_DECODER_H="true") - AC_CHECK_LIB([FLAC], [FLAC__stream_encoder_new], HAVE_LIBFLAC="true") -fi -if test ! -z "$HAVE_FLAC_STREAM_ENCODER_H" -a ! -z "$HAVE_FLAC_STREAM_DECODER_H" -a ! -z "$HAVE_LIBFLAC"; then - AC_DEFINE(HAVE_FLAC_STREAM_ENCODER_H) - AC_DEFINE(HAVE_FLAC_STREAM_DECODER_H) -fi -AM_CONDITIONAL(HAVE_LIBFLAC, test ! -z "$HAVE_LIBFLAC") - - -# check for libsamplerate -AC_CHECK_HEADER(samplerate.h, HAVE_SAMPLERATE_H="true") -AC_CHECK_LIB([samplerate], [src_simple], HAVE_LIBSRC="true", HAVE_SAMPLERATE_H="") -AH_TEMPLATE(USE_3RDPARTY_LIBSRC, [Define to 1 if you do not have the header file.]) -AM_CONDITIONAL(USE_3RDPARTY_LIBSRC, test -z "$HAVE_SAMPLERATE_H") -if test -z "$HAVE_SAMPLERATE_H" ; then - AC_DEFINE(USE_3RDPARTY_LIBSRC) - AC_CHECK_FUNCS(malloc calloc free memcpy memmove) - - AC_CHECK_LIB([m],floor) - AC_CHECK_FUNCS(floor ceil fmod) - AC_CHECK_SIZEOF(int,0) - AC_CHECK_SIZEOF(long,0) - AC_CHECK_SIZEOF(float,4) - AC_CHECK_SIZEOF(double,8) - AC_C_FIND_ENDIAN - - AC_DEFINE_UNQUOTED(CPU_IS_BIG_ENDIAN, ${ac_cv_c_big_endian}, - [Target processor is big endian.]) - AC_DEFINE_UNQUOTED(CPU_IS_LITTLE_ENDIAN, ${ac_cv_c_little_endian}, - [Target processor is little endian.]) - - AC_C99_FUNC_LRINT - AC_C99_FUNC_LRINTF - # AC_C99_FUNC_LLRINT Don't need this (yet?). - - case "x$ac_cv_c99_lrint$ac_cv_c99_lrintf" in - xyesyes) - ;; - *) - AC_MSG_WARN([[*** Missing C99 standard functions lrint() and lrintf().]]) - AC_MSG_WARN([[*** This may cause benign compiler warnings on some systems (ie Solaris).]]) - ;; - esac - - #==================================================================================== - # Determine if the processor can do clipping on float to int conversions. - - AC_C_CLIP_MODE - - AC_DEFINE_UNQUOTED(CPU_CLIPS_POSITIVE, ${ac_cv_c_clip_positive}, - [Target processor clips on positive float to int conversion.]) - AC_DEFINE_UNQUOTED(CPU_CLIPS_NEGATIVE, ${ac_cv_c_clip_negative}, - [Target processor clips on negative float to int conversion.]) - AC_DEFINE([COMPILER_IS_GCC],1, [Set to 1 if the compile is GNU GCC.]) - GCC_MAJOR_VERSION=`$CC -dumpversion | sed "s/\..*//"` - AC_DEFINE_UNQUOTED([GCC_MAJOR_VERSION],${GCC_MAJOR_VERSION}, [Major version of GCC or 3 otherwise.]) - -fi - -# Check for fluidsynth -AC_ARG_WITH(fluidsynth, - AS_HELP_STRING([--without-fluidsynth], [disable support for Soundfont plugins]), , - [ with_fluidsynth=yes ]) -AH_TEMPLATE(HAVE_FLUIDSYNTH_H, [Define to 1 if you have the header file.]) -if test "x$with_fluidsynth" = "xyes" ; then - FLUIDSYNTH_SUPPORT="true" - AC_CHECK_HEADER([fluidsynth.h], HAVE_FLUIDSYNTH_H="true", FLUIDSYNTH_SUPPORT="") - if [ "$build_win32" = "true" ] ; then - AC_CHECK_LIB([fluidsynth-1], [new_fluid_synth], HAVE_FLUIDSYNTH="true", FLUIDSYNTH_SUPPORT="") - else - AC_CHECK_LIB([fluidsynth], [new_fluid_synth], HAVE_FLUIDSYNTH="true", FLUIDSYNTH_SUPPORT="") - fi -fi -if test ! -z "$FLUIDSYNTH_SUPPORT" ; then - AC_DEFINE(HAVE_FLUIDSYNTH_H) - AC_SUBST(fluidsynth_includes, [/usr/include]) - AC_SUBST(fluidsynth_lib, [/usr/lib]) -fi -AM_CONDITIONAL(FLUIDSYNTH_SUPPORT, test ! -z "$FLUIDSYNTH_SUPPORT") - - -# libsndfile-stuff -AC_ARG_WITH(libsf, - AS_HELP_STRING([--without-libsf], - [disable support for importing files via libsndfile]), , - [ with_libsf=yes ]) -AH_TEMPLATE(HAVE_SNDFILE_H, [Define to 1 if you have the header file.]) -if test "x$with_libsf" = "xyes" ; then - AC_CHECK_HEADER(sndfile.h, HAVE_SNDFILE_H="true") - if [ "$build_win32" = "true" ] ; then - AC_CHECK_LIB([sndfile-1], [sf_open], HAVE_LIBSF="true", HAVE_SNDFILE_H="") - else - AC_CHECK_LIB([sndfile], [sf_open], HAVE_LIBSF="true", HAVE_SNDFILE_H="") - AC_MSG_CHECKING([version of libsndfile]) - AH_TEMPLATE(OLD_SNDFILE, [Define to 1 if libsndfile < 1.0.11]) - OLD_LIBS="$LIBS" - LIBS="$LIBS -lsndfile" - AC_RUN_IFELSE([ #include - int main( void ) - { - SF_INFO si; - ( void )sf_open( "", SFM_READ, &si ); - return 0; - }], - AC_MSG_RESULT([>= 1.0.11]), - AC_MSG_RESULT([< 1.0.11]) - AC_DEFINE(OLD_SNDFILE) - ) - LIBS="$OLD_LIBS" - fi -fi -if test ! -z "$HAVE_SNDFILE_H" ; then - AC_DEFINE(HAVE_SNDFILE_H) -fi -AM_CONDITIONAL(HAVE_LIBSF, test ! -z "$HAVE_SNDFILE_H") - -if test -z "$HAVE_SNDFILE_H" -a -z "$OGG_SUPPORT" ; then - AC_MSG_ERROR([*** neither libsndfile nor libvorbis (or according devel-files) were found which would make LMMS unable to load any samples so please install at least one of the packages and try again!]) -fi - - - -# check for fftw3-lib -AC_ARG_WITH(fftw3, - AS_HELP_STRING([--without-fftw3], - [disable support for FFTW3]), , - [ with_fftw3=yes ]) -AH_TEMPLATE(HAVE_FFTW3_H, [Define to 1 if you have the header file.]) -if test "x$with_fftw3" = "xyes" ; then - AC_CHECK_HEADER(fftw3.h, HAVE_FFTW3_H="true") - if [ "$build_win32" = "true" ] ; then - AC_CHECK_LIB([fftw3f-3], [fftwf_execute], HAVE_LIBFFTW3="true", HAVE_FFTW3_H="") - else - AC_CHECK_LIB([fftw3f], [fftwf_execute], HAVE_LIBFFTW3="true", HAVE_FFTW3_H="") - fi -fi -if test ! -z "$HAVE_FFTW3_H" ; then - AC_DEFINE(HAVE_FFTW3_H) -fi -AM_CONDITIONAL(HAVE_LIBFFTW3, test ! -z "$HAVE_FFTW3_H") - - - - -# check whether to disable surround-support -AC_MSG_CHECKING([whether to disable surround-support]) -AH_TEMPLATE(DISABLE_SURROUND, [Define if you want to disable surround-support in LMMS.]) -AC_ARG_ENABLE([surround], - AS_HELP_STRING([--disable-surround], - [compile LMMS without surround-support]), - [ENABLE_SURROUND=$enableval]) -if test "x$ENABLE_SURROUND" = "xno" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(DISABLE_SURROUND) -else - AC_MSG_RESULT(no) -fi - - -# check whether to disable single-source-compile -#AC_MSG_CHECKING([whether to enable single-source-compile]) -# AH_TEMPLATE(SINGLE_SOURCE_COMPILE, [Define if you want to enable single-source-compile.]) -#AC_ARG_ENABLE([ssc], -# AS_HELP_STRING([--enable-ssc], -# [enable single-source-compile]), [ENABLE_SSC=$enableval]) -#if test "x$ENABLE_SSC" = "xyes" ; then -# AC_MSG_RESULT(yes) -# # AC_DEFINE(SINGLE_SOURCE_COMPILE) -# CXXFLAGS="$CXXFLAGS -DSINGLE_SOURCE_COMPILE" -#else -# AC_MSG_RESULT(no) -#fi - - - -# check whether compiler of current platform supports attribute regparm(x) -AC_ARG_ENABLE([fastcall], - AS_HELP_STRING([--enable-fastcall], - [enable fastcall (regparm-attribute)]), [ENABLE_FASTCALL=$enableval]) -if test "x$ENABLE_FASTCALL" = "xyes" ; then - AC_MSG_CHECKING([whether we can use function-attribute regparm(x) on current platform]) - AH_TEMPLATE(FASTCALL, [Define to any attribute, speeding up function-calls]) - AC_RUN_IFELSE([ int __attribute__((regparm(3))) foo( int a, int b, int c ) - { return( a=b=c ); } - int __attribute__((regparm(3))) main( void ) - { return( foo(2,1,0) ); }], - AC_MSG_RESULT(yes) - AC_DEFINE(FASTCALL, [__attribute__((regparm(3)))]), - AC_MSG_RESULT(no) - AC_DEFINE_UNQUOTED(FASTCALL,[]) - ) -else - AC_DEFINE_UNQUOTED(FASTCALL,[]) -fi - - -AC_MSG_CHECKING([whether floorf is known by compiler]) -AH_TEMPLATE(floorf, [Define to floor if floorf is not known]) -AC_TRY_LINK([#include ], [ floorf ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT([no - will use floor instead]) - AC_DEFINE(floorf, floor) - ) - -AC_MSG_CHECKING([whether powf is known by compiler]) -AH_TEMPLATE(powf, [Define to pow if powf is not known]) -AC_TRY_LINK([#include ], [ powf ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT([no - will use pow instead]) - AC_DEFINE(powf, pow) - ) - -AC_MSG_CHECKING([whether fabsf is known by compiler]) -AH_TEMPLATE(fabsf, [Define to pow if fabsf is not known]) -AC_TRY_LINK([#include ], [ fabsf ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT([no - will use fabs instead]) - AC_DEFINE(fabsf, fabs) - ) - -AC_MSG_CHECKING([whether logf is known by compiler]) -AH_TEMPLATE(logf, [Define to lof if logf is not known]) -AC_TRY_LINK([#include ], [ logf ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT([no - will use log instead]) - AC_DEFINE(logf, log) - ) - - -# check whether to enable debugging-code -AC_MSG_CHECKING([whether to enable debugging-code]) -AH_TEMPLATE(LMMS_DEBUG, [Define if you want to disable debbuging-code in LMMS.]) -AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug], - [compile LMMS with additional debugging support]), - [DEBUG=$enableval]) -if test "x$DEBUG" = "xyes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(LMMS_DEBUG) -else - AC_MSG_RESULT(no) -fi - - -AC_MSG_CHECKING([whether to ship CAPS]) -AC_ARG_WITH([caps], - AS_HELP_STRING([--without-caps], - [do not ship C* Audio Plugin Suite]), , - [ with_caps=yes ]) -if test "x$with_caps" = "xyes" ; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AM_CONDITIONAL(SHIP_CAPS, test "x$with_caps" = "xyes") - - -AC_MSG_CHECKING([whether to ship TAP plugins]) -AC_ARG_WITH([tap], - AS_HELP_STRING([--without-tap], - [do not ship TAP plugins]), , - [ with_tap=yes ]) -if test "x$with_tap" = "xyes" ; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AM_CONDITIONAL(SHIP_TAP, test "x$with_tap" = "xyes") - - -if [ "$build_win32" = "true" ] ; then - BIN2RES=`pwd`/buildtools/bin2res.exe -else - BIN2RES=`pwd`/buildtools/bin2res -fi -AC_SUBST(BIN2RES) - - -# check for rpm SOURCES path -echo -n "checking for rpm sources path... " -RPMSOURCEDIR="NOT-FOUND" -for directory in packages OpenLinux redhat RedHat rpm RPM "" ; do - if test -d /usr/src/${directory}/SOURCES ; then - RPMSOURCEDIR="/usr/src/${directory}/SOURCES/" - fi -done -echo "$RPMSOURCEDIR" -AM_CONDITIONAL(HAVE_RPM, test "$RPMSOURCEDIR" != "NOT-FOUND") -AC_SUBST(RPMSOURCEDIR) - -lmmsdatadir="$datadir/$PACKAGE" -AC_SUBST(lmmsdatadir) - - -EXTRA_WARNINGS="-Wno-unused-parameter -Wunsafe-loop-optimizations -Wdisabled-optimization" -if test "x$CXX" == "xg++" ; then - CXXFLAGS="-ansi -Wall $EXTRA_WARNINGS $CXXFLAGS -fno-exceptions" -fi - -LDFLAGS="$LDFLAGS -L/usr/local/lib" -CXXFLAGS="$CXXFLAGS -I/usr/local/include" - -AC_CONFIG_FILES([Makefile - lmms.rc - buildtools/Makefile - data/Makefile - data/locale/Makefile - data/midi-maps/Makefile - data/presets/Makefile - data/presets/AudioFileProcessor/Makefile - data/presets/BitInvader/Makefile - data/presets/Organic/Makefile - data/presets/PluckedStringSynth/Makefile - data/presets/TripleOscillator/Makefile - data/presets/VeSTige/Makefile - data/projects/Makefile - data/projects/cool_songs/Makefile - data/projects/covers/Makefile - data/projects/demos/Makefile - data/projects/misc/Makefile - data/projects/recorded_loops/Makefile - data/projects/templates/Makefile - data/projects/tutorials/Makefile - data/samples/Makefile - data/samples/basses/Makefile - data/samples/bassloopes/Makefile - data/samples/beats/Makefile - data/samples/drums/Makefile - data/samples/drumsynth/Makefile - data/samples/drumsynth/acoustic/Makefile - data/samples/drumsynth/cr78/Makefile - data/samples/drumsynth/cr8000/Makefile - data/samples/drumsynth/effects/Makefile - data/samples/drumsynth/electro/Makefile - data/samples/drumsynth/farfisa/Makefile - data/samples/drumsynth/ferraro/Makefile - data/samples/drumsynth/instrument/Makefile - data/samples/drumsynth/jorgensohn/Makefile - data/samples/drumsynth/latin/Makefile - data/samples/drumsynth/linn/Makefile - data/samples/drumsynth/magnetboy/Makefile - data/samples/drumsynth/misc/Makefile - data/samples/drumsynth/misc_bass/Makefile - data/samples/drumsynth/misc_claps/Makefile - data/samples/drumsynth/misc_electro/Makefile - data/samples/drumsynth/misc_fx/Makefile - data/samples/drumsynth/misc_hats/Makefile - data/samples/drumsynth/misc_perc/Makefile - data/samples/drumsynth/misc_synth/Makefile - data/samples/drumsynth/r_b/Makefile - data/samples/drumsynth/tr606/Makefile - data/samples/drumsynth/tr77/Makefile - data/samples/drumsynth/tr808/Makefile - data/samples/drumsynth/tr909/Makefile - data/samples/effects/Makefile - data/samples/instruments/Makefile - data/samples/latin/Makefile - data/samples/misc/Makefile - data/samples/shapes/Makefile - data/samples/stringsnpads/Makefile - data/themes/Makefile - data/track_icons/Makefile - plugins/Makefile - plugins/audio_file_processor/Makefile - plugins/bass_booster/Makefile - plugins/bit_invader/Makefile - plugins/flp_import/Makefile - plugins/kicker/Makefile - plugins/ladspa_browser/Makefile - plugins/ladspa_effect/Makefile - plugins/ladspa_effect/caps/Makefile - plugins/ladspa_effect/tap/Makefile - plugins/lb303/Makefile - plugins/live_tool/Makefile - plugins/midi_import/Makefile - plugins/organic/Makefile - plugins/patman/Makefile - plugins/peak_controller_effect/Makefile - plugins/sf2_player/Makefile - plugins/spectrum_analyzer/Makefile - plugins/stk/Makefile - plugins/stk/mallets/Makefile - plugins/triple_oscillator/Makefile - plugins/vestige/Makefile - plugins/vibed/Makefile - plugins/vst_base/Makefile - plugins/vst_effect/Makefile - plugins/stereo_enhancer/Makefile - plugins/stereo_matrix/Makefile - lmms.spec]) -LOCAL_EXTRA_PLUGINS -AC_OUTPUT - -with_warnings="false" - -echo -echo - -PLUGINS_TO_BUILD="" - - -if test -z "$HAVE_ALSA_ASOUNDLIB_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have ALSA-library installed and/or ALSA-lib-development-" - echo " = package is missing. This will disable support for sound-output via ALSA!" - echo " = Consider installing the missing packages for using the full power of LMMS." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* ALSA for audio- and MIDI-input/output" -fi - - - -if test -z "$HAVE_JACK_JACK_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have JACK-library installed and/or JACK-lib-development-" - echo " = package is missing. This will disable support for JACK-transport." - echo " = This is no problem but you'll miss the great possibilities of interacting" - echo " = with other sound-applications in realtime!" - echo " = Consider installing the missing packages for using the full power of LMMS." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* JACK for audio-input/output" -fi - - - - -if test -z "$HAVE_SOUNDCARD_H" -a -z "$HAVE_SYS_SOUNDCARD_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have soundcard.h which is neccessary for outputting " - echo " = sound via OSS under Linux/BSD/Solaris." - echo " = This will also disable support for MIDI using OSS." - echo " = If you're building for a different platform or do not need OSS-support, you" - echo " = can ignore this warning." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* OSS for audio- and MIDI-input/output" -fi - - - - -if test -z "$HAVE_SDL_SDL_AUDIO_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have SDL-library installed and/or SDL-lib-development-" - echo " = package is missing. This will disable support for sound-output via SDL, " - echo " = which is important, if you're using sound-daemons (arts, ESD etc.)" - echo " = When compiling without SDL, you'll always have to kill your sound-daemon" - echo " = before using LMMS...!" - echo " = Consider installing the missing packages for using the full power of LMMS." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* SDL for audio-output" -fi - - - -if test -z "$OGG_SUPPORT" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have libvorbis installed and/or libvorbis-development-" - echo " = package is missing. This will disable support for exporting songs to" - echo " = OGG-files! You'll not be able to use the samples coming with LMMS since " - ecoh " = libsndfile currently has no OGG-support!" - echo " = Consider installing the missing packages for using the full power of LMMS." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* libvorbis for encoding/decoding OGG-files" -fi - - - -if test -z "$HAVE_SNDFILE_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have libsndfile installed and/or libsndfile-development-" - echo " = package is missing. This is not that fatal as long as you have SDL_sound" - echo " = installed. Otherwise it's strongly recommended to install libsndfile and" - echo " = libvorbis for being able to use samples within LMMS." - echo " = Consider installing the missing packages for using the full power of LMMS." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* libsndfile for sample-decoding" -fi - - -if test -z "$HAVE_SAMPLERATE_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have libsamplerate installed and/or libsamplerate-" - echo " = development-package is missing. If you ignore this warning the" - echo " = according source-code of libsamplerate will be directly compiled into" - echo " = LMMS which is no problem at all. If you're building official LMMS-packages" - echo " = for a distribution DO NOT IGNORE THIS WARNING." - echo " =" -fi - - - - -PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins" -if test -z "$HAVE_LADSPA_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = As the header file ladspa.h could not be found on your system, a version" - echo " = shipped with LMMS will be used. This is no problem at all but generally" - echo " = it's better to use files being customized to your system/distribution." - echo " = If you encounter problems related to LADSPA-support, try to install" - echo " = LADSPA-SDK-package (ladspa-sdk, ladspa-dev or similiar) and run configure" - echo " = again." - echo " =" - with_warnings="true" -fi - - - -if test -z "$HAVE_STK_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have STK installed and/or STK-development-package" - echo " = (Debian/Ubuntu: libstk0-dev) is missing. Without this package, the " - echo " = STK instrument plugins (\"Mallets\") won't be built." - echo " = Consider installing the missing packages for using the full power of LMMS." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* STK instrument plugins" -fi - - - -if test -z "$FLUIDSYNTH_SUPPORT" ; then - if test "x$with_fluidsynth" = "xyes" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have Fluidsynth development files." - echo " = The SoundFont2 Player plugin will be ignored." - echo " = Consider installing fluidsynth for the full power of LMMS." - echo " =" - echo " = To remove this warning, please pass" - echo " = " - echo " = --without-fluidsynth" - echo " =" - with_warnings="true" - fi -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* SoundFont2 Player plugin" -fi - - - -if test -z "$HAVE_FFTW3_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have FFTW3-library installed and/or FFTW3-development-" - echo " = package (Debian/Ubuntu: libfftw3-dev) is missing. Without this package, the" - echo " = Spectrum Analyzer plugin won't be built." - echo " = Consider installing the missing packages for using the full power of LMMS." - echo " =" - with_warnings="true" -else - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* Spectrum Analyzer plugin" -fi - - - -if test ! -z "$WINECXX" ; then - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LMMS VST Support Layer (LVSL) for built-in VST-plugin usage" -else - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You don't seem to have installed WINE or it's development-packages (headers," - echo " = winegcc etc.) which are neccessary for building LMMS with built-in" - echo " = VST-support." - echo " = If you do not intend to use VST-plugins with LMMS you can ignore this " - echo " = warning." - echo " = Consider installing the missing packages (Debian: libwine-dev," - echo " = Ubuntu: wine-dev, openSUSE: wine-devel) for using the full power of LMMS." - echo " =" - with_warnings="true" -fi - - -echo -echo -echo "LMMS will be able to use $PLUGINS_TO_BUILD" | sed -e "s/\\\n/\n/g" | sed -e "s/\\\t/\t/g" | sed -e "s/\\\\\*/\*/g" -echo -echo -echo " ============================" -echo " === LMMS - INFORMATION ===================================================" -echo " ============================" -echo " =" -if test "$with_warnings" = "false" ; then - echo " = LMMS has been configured successfully. Now you can build it by typing 'make'." - echo " = After the compilation-process has finished, you can install LMMS by" - echo " = typing 'make install' (do this as \"root\"!)." -else - echo " = LMMS has been configured, but there were one or more warnings you should" - echo " = not ignore. First try to solve the mentioned problems before" - echo " = proceeding. Otherwise don't complain, if LMMS doesn't run the way" - echo " = you might expect..." -fi -echo " =" -echo " = If there're problems while compiling LMMS, please send a mail to " -echo " = lmms-devel \[at\] lists.sf.net!" -echo " =" -echo - diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 000000000..0813368d8 --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,11 @@ +ADD_SUBDIRECTORY(locale) +ADD_SUBDIRECTORY(presets) +ADD_SUBDIRECTORY(projects) +ADD_SUBDIRECTORY(samples) +ADD_SUBDIRECTORY(themes) +ADD_SUBDIRECTORY(track_icons) + +INSTALL(FILES lmms DESTINATION ${DATA_DIR}/menu) +INSTALL(FILES lmms.desktop DESTINATION ${DATA_DIR}/applications) +INSTALL(FILES lmms.xml DESTINATION ${DATA_DIR}/mime/packages) + diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 3b6ec740b..000000000 --- a/data/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -SUBDIRS = locale midi-maps presets projects samples themes track_icons - -menudir = $(datadir)/menu -menu_DATA = lmms - -applicationsdir = $(datadir)/applications -applications_DATA = lmms.desktop - -mimedir = $(datadir)/mime/packages -mime_DATA = lmms.xml - -EXTRA_DIST = $(menu_DATA) $(applications_DATA) $(mime_DATA) - diff --git a/data/locale/CMakeLists.txt b/data/locale/CMakeLists.txt new file mode 100644 index 000000000..5d4bba807 --- /dev/null +++ b/data/locale/CMakeLists.txt @@ -0,0 +1,3 @@ +FILE(GLOB QM_FILES *.qm) +INSTALL(FILES ${QM_FILES} DESTINATION ${LMMS_DATA_DIR}/locale) + diff --git a/data/locale/Makefile.am b/data/locale/Makefile.am deleted file mode 100644 index a58117760..000000000 --- a/data/locale/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -localedir = $(lmmsdatadir)/locale - -locale_DATA = *.qm -locale_TSOURCES = *.ts - -EXTRA_DIST = $(locale_DATA) $(locale_TSOURCES) - diff --git a/data/midi-maps/Makefile.am b/data/midi-maps/Makefile.am deleted file mode 100644 index 955892672..000000000 --- a/data/midi-maps/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -midimapsdir = $(lmmsdatadir)/midi-maps/ - -midimaps_DATA = gm.map \ - YamahaPSR400.map \ - YamahaPSR500.map \ - YamahaPSS790.map \ - YamahaQY10.map - -EXTRA_DIST = $(midimaps_DATA) - diff --git a/data/presets/AudioFileProcessor/Makefile.am b/data/presets/AudioFileProcessor/Makefile.am deleted file mode 100644 index 634c12d70..000000000 --- a/data/presets/AudioFileProcessor/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -afppresetsdir = $(lmmsdatadir)/presets/AudioFileProcessor - -afppresets_DATA = *.cs.xml - -EXTRA_DIST = $(afppresets_DATA) - diff --git a/data/presets/BitInvader/Makefile.am b/data/presets/BitInvader/Makefile.am deleted file mode 100644 index 7094a3c73..000000000 --- a/data/presets/BitInvader/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -bipresetsdir = $(lmmsdatadir)/presets/BitInvader -bipresets_DATA = *.cs.xml - -EXTRA_DIST = $(bipresets_DATA) - diff --git a/data/presets/CMakeLists.txt b/data/presets/CMakeLists.txt new file mode 100644 index 000000000..2534f4a67 --- /dev/null +++ b/data/presets/CMakeLists.txt @@ -0,0 +1,4 @@ +INCLUDE(InstallHelpers) + +INSTALL_DATA_SUBDIRS("presets" "*.cs.xml") + diff --git a/data/presets/Makefile.am b/data/presets/Makefile.am deleted file mode 100644 index 511a2f50d..000000000 --- a/data/presets/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = AudioFileProcessor BitInvader Organic PluckedStringSynth TripleOscillator VeSTige - diff --git a/data/presets/Organic/Makefile.am b/data/presets/Organic/Makefile.am deleted file mode 100644 index 7ba3b5637..000000000 --- a/data/presets/Organic/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -psspresetsdir = $(lmmsdatadir)/presets/Organic - -psspresets_DATA = *.cs.xml - -EXTRA_DIST = $(psspresets_DATA) - diff --git a/data/presets/PluckedStringSynth/Default.cs.xml b/data/presets/PluckedStringSynth/Default.cs.xml deleted file mode 100644 index ea3ca79c8..000000000 --- a/data/presets/PluckedStringSynth/Default.cs.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/data/presets/PluckedStringSynth/Makefile.am b/data/presets/PluckedStringSynth/Makefile.am deleted file mode 100644 index fd0181261..000000000 --- a/data/presets/PluckedStringSynth/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -psspresetsdir = $(lmmsdatadir)/presets/PluckedStringSynth - -psspresets_DATA = *.cs.xml - -EXTRA_DIST = $(psspresets_DATA) - diff --git a/data/presets/TripleOscillator/Makefile.am b/data/presets/TripleOscillator/Makefile.am deleted file mode 100644 index ec7f96fb5..000000000 --- a/data/presets/TripleOscillator/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -topresetsdir = $(lmmsdatadir)/presets/TripleOscillator - -topresets_DATA = *.cs.xml - -EXTRA_DIST = $(topresets_DATA) - diff --git a/data/presets/VeSTige/Default.cs.xml b/data/presets/VeSTige/Default.cs.xml deleted file mode 100644 index b67299853..000000000 --- a/data/presets/VeSTige/Default.cs.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/data/presets/VeSTige/Makefile.am b/data/presets/VeSTige/Makefile.am deleted file mode 100644 index 7dc119bfa..000000000 --- a/data/presets/VeSTige/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -vstpresetsdir = $(lmmsdatadir)/presets/VeSTige - -vstpresets_DATA = *.cs.xml - -EXTRA_DIST = $(vstpresets_DATA) - diff --git a/data/projects/CMakeLists.txt b/data/projects/CMakeLists.txt new file mode 100644 index 000000000..236cf1e9f --- /dev/null +++ b/data/projects/CMakeLists.txt @@ -0,0 +1,6 @@ +INCLUDE(InstallHelpers) + +INSTALL_DATA_SUBDIRS("projects" "*.mmp") +INSTALL_DATA_SUBDIRS("projects" "*.mmpz") + + diff --git a/data/projects/Makefile.am b/data/projects/Makefile.am deleted file mode 100644 index 0640cc815..000000000 --- a/data/projects/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = cool_songs covers demos misc recorded_loops templates tutorials - diff --git a/data/projects/cool_songs/Makefile.am b/data/projects/cool_songs/Makefile.am deleted file mode 100644 index ed0b7063b..000000000 --- a/data/projects/cool_songs/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -coolsongsdir = $(lmmsdatadir)/projects/cool_songs - -coolsongs_DATA = *.mmp* - -EXTRA_DIST = $(coolsongs_DATA) - diff --git a/data/projects/covers/Makefile.am b/data/projects/covers/Makefile.am deleted file mode 100644 index 8a133f404..000000000 --- a/data/projects/covers/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -coversdir = $(lmmsdatadir)/projects/covers - -covers_DATA = *.mmpz - -EXTRA_DIST = $(covers_DATA) - diff --git a/data/projects/demos/Makefile.am b/data/projects/demos/Makefile.am deleted file mode 100644 index 54bd84197..000000000 --- a/data/projects/demos/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -demosdir = $(lmmsdatadir)/projects/demos - -demos_DATA = *.mmp* - -EXTRA_DIST = $(demos_DATA) - diff --git a/data/projects/misc/Makefile.am b/data/projects/misc/Makefile.am deleted file mode 100644 index 68e812d60..000000000 --- a/data/projects/misc/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscdir = $(lmmsdatadir)/projects/misc - -misc_DATA = *.mmp* - -EXTRA_DIST = $(misc_DATA) - diff --git a/data/projects/recorded_loops/Makefile.am b/data/projects/recorded_loops/Makefile.am deleted file mode 100644 index 054b7543e..000000000 --- a/data/projects/recorded_loops/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -recordedloopsdir = $(lmmsdatadir)/projects/recorded_loops - -#recordedloops_DATA = *.mmp - -#EXTRA_DIST = $(recordedloops_DATA) - diff --git a/data/projects/templates/Makefile.am b/data/projects/templates/Makefile.am deleted file mode 100644 index d9c684e99..000000000 --- a/data/projects/templates/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -templatesdir = $(lmmsdatadir)/projects/templates - -templates_DATA = *.mpt - -EXTRA_DIST = $(templates_DATA) - diff --git a/data/projects/tutorials/Makefile.am b/data/projects/tutorials/Makefile.am deleted file mode 100644 index b98549f7c..000000000 --- a/data/projects/tutorials/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -tutorialsdir = $(lmmsdatadir)/projects/tutorials - -tutorials_DATA = *.mmp* - -EXTRA_DIST = $(tutorials_DATA) - diff --git a/data/samples/CMakeLists.txt b/data/samples/CMakeLists.txt new file mode 100644 index 000000000..96c7cd0d8 --- /dev/null +++ b/data/samples/CMakeLists.txt @@ -0,0 +1,4 @@ +INCLUDE(InstallHelpers) + +INSTALL_DATA_SUBDIRS("samples" "*.wav;*.ogg;*.ds") + diff --git a/data/samples/Makefile.am b/data/samples/Makefile.am deleted file mode 100644 index 51b7e5b82..000000000 --- a/data/samples/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = basses bassloopes beats drums drumsynth effects instruments latin misc shapes stringsnpads - diff --git a/data/samples/basses/Makefile.am b/data/samples/basses/Makefile.am deleted file mode 100644 index 843acefbc..000000000 --- a/data/samples/basses/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -bassessamplesdir = $(lmmsdatadir)/samples/basses - -bassessamples_DATA = *.ogg - -EXTRA_DIST = $(bassessamples_DATA) - diff --git a/data/samples/bassloopes/Makefile.am b/data/samples/bassloopes/Makefile.am deleted file mode 100644 index fb1b486b0..000000000 --- a/data/samples/bassloopes/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -bassloopessamplesdir = $(lmmsdatadir)/samples/bassloopes - -bassloopessamples_DATA = *.ogg - -EXTRA_DIST = $(bassloopessamples_DATA) - diff --git a/data/samples/beats/Makefile.am b/data/samples/beats/Makefile.am deleted file mode 100644 index 6de81ff14..000000000 --- a/data/samples/beats/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -beatssamplesdir = $(lmmsdatadir)/samples/beats - -beatssamples_DATA = *.ogg - -EXTRA_DIST = $(beatssamples_DATA) - diff --git a/data/samples/drums/Makefile.am b/data/samples/drums/Makefile.am deleted file mode 100644 index eac8db9c6..000000000 --- a/data/samples/drums/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -drumssamplesdir = $(lmmsdatadir)/samples/drums - -drumssamples_DATA = *.ogg - -EXTRA_DIST = $(drumssamples_DATA) - diff --git a/data/samples/drumsynth/Makefile.am b/data/samples/drumsynth/Makefile.am deleted file mode 100644 index ea86b364a..000000000 --- a/data/samples/drumsynth/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = acoustic cr78 cr8000 effects electro farfisa ferraro instrument jorgensohn latin linn magnetboy misc misc_bass misc_claps misc_electro misc_fx misc_hats misc_perc misc_synth r_b tr606 tr77 tr808 tr909 diff --git a/data/samples/drumsynth/acoustic/Makefile.am b/data/samples/drumsynth/acoustic/Makefile.am deleted file mode 100644 index e7af2b7f9..000000000 --- a/data/samples/drumsynth/acoustic/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -acousticdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/acoustic - -acousticdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(acousticdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/cr78/Makefile.am b/data/samples/drumsynth/cr78/Makefile.am deleted file mode 100644 index 7c13aeeaa..000000000 --- a/data/samples/drumsynth/cr78/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -cr78drumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/cr78 - -cr78drumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(cr78drumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/cr8000/Makefile.am b/data/samples/drumsynth/cr8000/Makefile.am deleted file mode 100644 index a1c04161d..000000000 --- a/data/samples/drumsynth/cr8000/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -cr8000drumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/cr8000 - -cr8000drumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(cr8000drumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/effects/Makefile.am b/data/samples/drumsynth/effects/Makefile.am deleted file mode 100644 index 3263be52e..000000000 --- a/data/samples/drumsynth/effects/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -effectsdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/effects - -effectsdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(effectsdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/electro/Makefile.am b/data/samples/drumsynth/electro/Makefile.am deleted file mode 100644 index fc4d36358..000000000 --- a/data/samples/drumsynth/electro/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -electrodrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/electro - -electrodrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(electrodrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/farfisa/Makefile.am b/data/samples/drumsynth/farfisa/Makefile.am deleted file mode 100644 index 82b3a0407..000000000 --- a/data/samples/drumsynth/farfisa/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -farfisadrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/farfisa - -farfisadrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(farfisadrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/ferraro/Makefile.am b/data/samples/drumsynth/ferraro/Makefile.am deleted file mode 100644 index e92525863..000000000 --- a/data/samples/drumsynth/ferraro/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -ferrarodrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/ferraro - -ferrarodrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(ferrarodrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/instrument/Makefile.am b/data/samples/drumsynth/instrument/Makefile.am deleted file mode 100644 index 618827104..000000000 --- a/data/samples/drumsynth/instrument/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -instrumentdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/instrument - -instrumentdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(instrumentdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/jorgensohn/Makefile.am b/data/samples/drumsynth/jorgensohn/Makefile.am deleted file mode 100644 index 72ca4215b..000000000 --- a/data/samples/drumsynth/jorgensohn/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -jorgensohndrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/jorgensohn - -jorgensohndrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(jorgensohndrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/latin/Makefile.am b/data/samples/drumsynth/latin/Makefile.am deleted file mode 100644 index 330fc5700..000000000 --- a/data/samples/drumsynth/latin/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -latindrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/latin - -latindrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(latindrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/linn/Makefile.am b/data/samples/drumsynth/linn/Makefile.am deleted file mode 100644 index bb8084d9a..000000000 --- a/data/samples/drumsynth/linn/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -linndrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/linn - -linndrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(linndrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/magnetboy/Makefile.am b/data/samples/drumsynth/magnetboy/Makefile.am deleted file mode 100644 index 1a12a36dc..000000000 --- a/data/samples/drumsynth/magnetboy/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -magnetboydrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/magnetboy - -magnetboydrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(magnetboydrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc/Makefile.am b/data/samples/drumsynth/misc/Makefile.am deleted file mode 100644 index 9f0931ca7..000000000 --- a/data/samples/drumsynth/misc/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc - -miscdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(miscdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc_bass/Makefile.am b/data/samples/drumsynth/misc_bass/Makefile.am deleted file mode 100644 index 1727468fc..000000000 --- a/data/samples/drumsynth/misc_bass/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscbassdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc_bass - -miscbassdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(miscbassdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc_claps/Makefile.am b/data/samples/drumsynth/misc_claps/Makefile.am deleted file mode 100644 index 81dd109bb..000000000 --- a/data/samples/drumsynth/misc_claps/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscclapsdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc_claps - -miscclapsdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(miscclapsdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc_electro/Makefile.am b/data/samples/drumsynth/misc_electro/Makefile.am deleted file mode 100644 index efff0d3e6..000000000 --- a/data/samples/drumsynth/misc_electro/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscelectrodrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc_electro - -miscelectrodrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(miscelectrodrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc_fx/Makefile.am b/data/samples/drumsynth/misc_fx/Makefile.am deleted file mode 100644 index 14dd36735..000000000 --- a/data/samples/drumsynth/misc_fx/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscfxdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc_fx - -miscfxdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(miscfxdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc_hats/Makefile.am b/data/samples/drumsynth/misc_hats/Makefile.am deleted file mode 100644 index 7f34b9660..000000000 --- a/data/samples/drumsynth/misc_hats/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -mischatsdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc_hats - -mischatsdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(mischatsdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc_perc/Makefile.am b/data/samples/drumsynth/misc_perc/Makefile.am deleted file mode 100644 index 6d3862ef4..000000000 --- a/data/samples/drumsynth/misc_perc/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscpercdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc_perc - -miscpercdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(miscpercdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/misc_synth/Makefile.am b/data/samples/drumsynth/misc_synth/Makefile.am deleted file mode 100644 index 483b9b9fc..000000000 --- a/data/samples/drumsynth/misc_synth/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscsynthdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/misc_synth - -miscsynthdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(miscsynthdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/r_b/Makefile.am b/data/samples/drumsynth/r_b/Makefile.am deleted file mode 100644 index 6d1e0798c..000000000 --- a/data/samples/drumsynth/r_b/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -rbdrumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/r_b - -rbdrumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(rbdrumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/tr606/Makefile.am b/data/samples/drumsynth/tr606/Makefile.am deleted file mode 100644 index 6ec83181e..000000000 --- a/data/samples/drumsynth/tr606/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -tr606drumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/tr606 - -tr606drumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(tr606drumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/tr77/Makefile.am b/data/samples/drumsynth/tr77/Makefile.am deleted file mode 100644 index 4280e9511..000000000 --- a/data/samples/drumsynth/tr77/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -tr77drumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/tr77 - -tr77drumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(tr77drumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/tr808/Makefile.am b/data/samples/drumsynth/tr808/Makefile.am deleted file mode 100644 index 5fe507944..000000000 --- a/data/samples/drumsynth/tr808/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -tr808drumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/tr808 - -tr808drumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(tr808drumsynthsamples_DATA) - diff --git a/data/samples/drumsynth/tr909/Makefile.am b/data/samples/drumsynth/tr909/Makefile.am deleted file mode 100644 index 266151b27..000000000 --- a/data/samples/drumsynth/tr909/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -tr909drumsynthsamplesdir = $(lmmsdatadir)/samples/drumsynth/tr909 - -tr909drumsynthsamples_DATA = *.ds - -EXTRA_DIST = $(tr909drumsynthsamples_DATA) - diff --git a/data/samples/effects/Makefile.am b/data/samples/effects/Makefile.am deleted file mode 100644 index a1b79c790..000000000 --- a/data/samples/effects/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -effectssamplesdir = $(lmmsdatadir)/samples/effects - -effectssamples_DATA = *.ogg - -EXTRA_DIST = $(effectssamples_DATA) - diff --git a/data/samples/instruments/Makefile.am b/data/samples/instruments/Makefile.am deleted file mode 100644 index ba6788b54..000000000 --- a/data/samples/instruments/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -instrumentssamplesdir = $(lmmsdatadir)/samples/instruments - -instrumentssamples_DATA = *.ogg - -EXTRA_DIST = $(instrumentssamples_DATA) - diff --git a/data/samples/latin/Makefile.am b/data/samples/latin/Makefile.am deleted file mode 100644 index c1ca07265..000000000 --- a/data/samples/latin/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -latinsamplesdir = $(lmmsdatadir)/samples/latin - -latinsamples_DATA = *.ogg - -EXTRA_DIST = $(latinsamples_DATA) - diff --git a/data/samples/misc/Makefile.am b/data/samples/misc/Makefile.am deleted file mode 100644 index db3b44803..000000000 --- a/data/samples/misc/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -miscsamplesdir = $(lmmsdatadir)/samples/misc - -miscsamples_DATA = *.ogg - -EXTRA_DIST = $(miscsamples_DATA) - diff --git a/data/samples/shapes/Makefile.am b/data/samples/shapes/Makefile.am deleted file mode 100644 index f7e7a5973..000000000 --- a/data/samples/shapes/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -shapessamplesdir = $(lmmsdatadir)/samples/shapes - -shapessamples_DATA = *.wav *.ogg - -EXTRA_DIST = $(shapessamples_DATA) - diff --git a/data/samples/stringsnpads/Makefile.am b/data/samples/stringsnpads/Makefile.am deleted file mode 100644 index 18a179ddf..000000000 --- a/data/samples/stringsnpads/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -stringsnpadssamplesdir = $(lmmsdatadir)/samples/stringsnpads - -stringsnpadssamples_DATA = *.ogg - -EXTRA_DIST = $(stringsnpadssamples_DATA) - diff --git a/data/themes/CMakeLists.txt b/data/themes/CMakeLists.txt new file mode 100644 index 000000000..10d8df727 --- /dev/null +++ b/data/themes/CMakeLists.txt @@ -0,0 +1,4 @@ +INCLUDE(InstallHelpers) + +INSTALL_DATA_SUBDIRS("themes" "*.png;*.css") + diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am deleted file mode 100644 index 0d0a120ed..000000000 --- a/data/themes/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -theme_defaultdir = $(lmmsdatadir)/themes/default -theme_default_DATA = default/*.png default/style.css - -theme_blue_scenedir = $(lmmsdatadir)/themes/blue_scene -theme_blue_scene_DATA = blue_scene/*.png - -plugin_theme_blue_scenedir = $(lmmsdatadir)/themes/blue_scene/plugins -plugin_theme_blue_scene_DATA = blue_scene/plugins/*.png - -theme_llamadir = $(lmmsdatadir)/themes/llama -theme_llama_DATA = llama/*.png - - -EXTRA_DIST = $(theme_default_DATA) $(theme_blue_scene_DATA) $(plugin_theme_blue_scene_DATA) $(theme_llama_DATA) - diff --git a/data/track_icons/CMakeLists.txt b/data/track_icons/CMakeLists.txt new file mode 100644 index 000000000..b509d776e --- /dev/null +++ b/data/track_icons/CMakeLists.txt @@ -0,0 +1,3 @@ +FILE(GLOB PNG_FILES *.png) +INSTALL(FILES ${PNG_FILES} DESTINATION ${LMMS_DATA_DIR}/track_icons) + diff --git a/data/track_icons/Makefile.am b/data/track_icons/Makefile.am deleted file mode 100644 index abaee96a9..000000000 --- a/data/track_icons/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -trackiconsdir = $(lmmsdatadir)/track_icons - -trackicons_DATA = *.png - -EXTRA_DIST = $(trackicons_DATA) - diff --git a/include/audio_alsa.h b/include/audio_alsa.h index d7f1a4356..1718f81f7 100644 --- a/include/audio_alsa.h +++ b/include/audio_alsa.h @@ -28,11 +28,7 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_ALSA_ASOUNDLIB_H - -#ifndef ALSA_SUPPORT -#define ALSA_SUPPORT -#endif +#ifdef LMMS_HAVE_ALSA // older ALSA-versions might require this #define ALSA_PCM_NEW_HW_PARAMS_API diff --git a/include/audio_device.h b/include/audio_device.h index 8cbd96c80..488fb1ff9 100644 --- a/include/audio_device.h +++ b/include/audio_device.h @@ -103,8 +103,6 @@ public: virtual void saveSettings( void ) = 0; - - public slots: virtual void show( void ) { parentWidget()->show(); diff --git a/include/audio_dummy.h b/include/audio_dummy.h index 25efdcad9..5ef9a38ae 100644 --- a/include/audio_dummy.h +++ b/include/audio_dummy.h @@ -67,8 +67,6 @@ public: { } - - public slots: virtual void show( void ) { parentWidget()->hide(); diff --git a/include/audio_file_ogg.h b/include/audio_file_ogg.h index 52aa3ef46..0cc9a8ef1 100644 --- a/include/audio_file_ogg.h +++ b/include/audio_file_ogg.h @@ -29,7 +29,7 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_VORBIS_CODEC_H +#ifdef LMMS_HAVE_OGGVORBIS #include diff --git a/include/audio_file_wave.h b/include/audio_file_wave.h index 20aab818b..49796fcb4 100644 --- a/include/audio_file_wave.h +++ b/include/audio_file_wave.h @@ -31,9 +31,7 @@ #include "lmmsconfig.h" #include "audio_file_device.h" -#ifdef LMMS_HAVE_SNDFILE_H #include -#endif class audioFileWave : public audioFileDevice @@ -79,29 +77,8 @@ private: void finishEncoding( void ); -#if LMMS_HAVE_SNDFILE_H SF_INFO m_si; SNDFILE * m_sf; -#else - int m_bytesWritten; - - struct waveFileHeader - { - char riff_id[4]; // "RIFF" - Uint32 total_bytes; // total filesize-8 - char wave_fmt_str[8]; // "WAVEfmt" - Uint32 bitrate_1; // bitrate, e.g. 16 - Uint16 uncompressed; // 1 if PCM - Uint16 channels; // 1 = mono 2 = stereo - Uint32 sample_rate; // sample-rate e.g. 44100 - Uint32 bytes_per_second; // sample-rate*channels* - // (bitrate/8) - Uint16 block_alignment; // channels*(bitrate/8) - Uint16 bitrate_2; // bitrate, e.g. 16 - char data_chunk_id[4]; // "data" - Uint32 data_bytes; // total size of sample-data - } m_waveFileHeader; -#endif } ; diff --git a/include/audio_jack.h b/include/audio_jack.h index 424103950..3fcf54ed1 100644 --- a/include/audio_jack.h +++ b/include/audio_jack.h @@ -28,9 +28,7 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_JACK_JACK_H - -#define JACK_SUPPORT +#ifdef LMMS_HAVE_JACK #include diff --git a/include/audio_oss.h b/include/audio_oss.h index 0fdb8a802..8fc3a5985 100644 --- a/include/audio_oss.h +++ b/include/audio_oss.h @@ -28,15 +28,11 @@ #include "lmmsconfig.h" -#if defined LMMS_HAVE_SYS_SOUNDCARD_H || defined LMMS_HAVE_SOUNDCARD_H - -#define OSS_SUPPORT - +#ifdef LMMS_HAVE_OSS #include "audio_device.h" - class lcdSpinBox; class QLineEdit; diff --git a/include/audio_pulseaudio.h b/include/audio_pulseaudio.h index 6ecc55c3c..83cfae8a0 100644 --- a/include/audio_pulseaudio.h +++ b/include/audio_pulseaudio.h @@ -28,11 +28,7 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_PULSE_PULSEAUDIO_H - -#ifndef PULSEAUDIO_SUPPORT -#define PULSEAUDIO_SUPPORT -#endif +#ifdef LMMS_HAVE_PULSEAUDIO #include diff --git a/include/audio_sdl.h b/include/audio_sdl.h index 7a4df6a14..862ca533b 100644 --- a/include/audio_sdl.h +++ b/include/audio_sdl.h @@ -28,16 +28,10 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_SDL_SDL_AUDIO_H - -#ifndef SDL_AUDIO_SUPPORT -#define SDL_AUDIO_SUPPORT -#endif - - -#include LMMS_SDL_SDL_H -#include LMMS_SDL_SDL_AUDIO_H +#ifdef LMMS_HAVE_SDL +#include +#include #include "audio_device.h" diff --git a/include/config_mgr.h b/include/config_mgr.h index c95366775..dcc59df17 100644 --- a/include/config_mgr.h +++ b/include/config_mgr.h @@ -139,7 +139,7 @@ public: return( m_ladDir ); } -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK const QString & stkDir( void ) const { return( m_stkDir ); @@ -186,7 +186,7 @@ private: QString m_vstDir; QString m_flDir; QString m_ladDir; -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK QString m_stkDir; #endif QStringList m_recentlyOpenedProjects; diff --git a/include/export_project_dialog.h b/include/export_project_dialog.h index 7b86e1dd6..ce0f47fe1 100644 --- a/include/export_project_dialog.h +++ b/include/export_project_dialog.h @@ -29,7 +29,7 @@ #include -#include "ui_export_project.uic" +#include "ui_export_project.h" class projectRenderer; diff --git a/include/ladspa-1.1.h b/include/ladspa.h similarity index 100% rename from include/ladspa-1.1.h rename to include/ladspa.h diff --git a/include/ladspa_control.h b/include/ladspa_control.h index d90793eed..72de0aa18 100644 --- a/include/ladspa_control.h +++ b/include/ladspa_control.h @@ -26,14 +26,7 @@ #ifndef _LADSPA_CONTROL_H #define _LADSPA_CONTROL_H -#include "lmmsconfig.h" - -#ifdef LMMS_HAVE_LADSPA_H #include -#else -#include "ladspa-1.1.h" -#endif - #include "automatable_model.h" #include "knob.h" diff --git a/include/ladspa_manager.h b/include/ladspa_manager.h index a446b1456..404572e1b 100644 --- a/include/ladspa_manager.h +++ b/include/ladspa_manager.h @@ -28,14 +28,7 @@ #ifndef _LADSPA_MANAGER_H #define _LADSPA_MANAGER_H -#include "lmmsconfig.h" - -#ifdef LMMS_HAVE_LADSPA_H #include -#else -#include "ladspa-1.1.h" -#endif - #include #include diff --git a/include/micro_timer.h b/include/micro_timer.h index e8f3e0bdf..2f0e19319 100644 --- a/include/micro_timer.h +++ b/include/micro_timer.h @@ -53,7 +53,7 @@ public: gettimeofday( &begin, NULL ); } - inline Uint32 elapsed( void ) const + inline int elapsed( void ) const { struct timeval now; gettimeofday( &now, NULL ); diff --git a/include/midi_alsa_raw.h b/include/midi_alsa_raw.h index 76785a79d..e069afa2c 100644 --- a/include/midi_alsa_raw.h +++ b/include/midi_alsa_raw.h @@ -28,11 +28,7 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_ALSA_ASOUNDLIB_H - -#ifndef ALSA_SUPPORT -#define ALSA_SUPPORT -#endif +#ifdef LMMS_HAVE_ALSA #include diff --git a/include/midi_alsa_seq.h b/include/midi_alsa_seq.h index 37d432fcd..a9a185192 100644 --- a/include/midi_alsa_seq.h +++ b/include/midi_alsa_seq.h @@ -28,16 +28,10 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_ALSA_ASOUNDLIB_H - -#ifndef ALSA_SUPPORT -#define ALSA_SUPPORT -#endif +#ifdef LMMS_HAVE_ALSA #include -#endif - #include #include @@ -132,7 +126,6 @@ private slots: private: virtual void run( void ); -#ifdef ALSA_SUPPORT snd_seq_t * m_seqHandle; struct ports @@ -146,7 +139,6 @@ private: int m_queueID; volatile bool m_quit; -#endif QTimer m_portListUpdateTimer; QStringList m_readablePorts; @@ -163,3 +155,5 @@ signals: #endif +#endif + diff --git a/include/midi_client.h b/include/midi_client.h index 149cc7be5..27c92b5e3 100644 --- a/include/midi_client.h +++ b/include/midi_client.h @@ -110,8 +110,6 @@ public: virtual void saveSettings( void ) = 0; - - public slots: virtual void show( void ) { parentWidget()->show(); diff --git a/include/midi_dummy.h b/include/midi_dummy.h index 18860c4be..bb7bf79d4 100644 --- a/include/midi_dummy.h +++ b/include/midi_dummy.h @@ -63,8 +63,6 @@ public: { } - - public slots: virtual void show( void ) { parentWidget()->hide(); diff --git a/include/midi_mapper.h b/include/midi_mapper.h index 53bb60887..5812e81bc 100644 --- a/include/midi_mapper.h +++ b/include/midi_mapper.h @@ -1,3 +1,4 @@ +#if 0 /* * midi_mapper.h - MIDI-mapper for any midiDevice * @@ -100,3 +101,4 @@ private: #endif +#endif diff --git a/include/midi_oss.h b/include/midi_oss.h index 7ec2d096f..1304d176a 100644 --- a/include/midi_oss.h +++ b/include/midi_oss.h @@ -26,13 +26,12 @@ #ifndef _MIDI_OSS_H #define _MIDI_OSS_H -#include "audio_oss.h" +#include "lmmsconfig.h" -#ifdef OSS_SUPPORT +#ifdef LMMS_HAVE_OSS - -#include -#include +#include +#include #include "midi_client.h" diff --git a/plugins/ladspa_effect/tap/ladspa-local.h b/include/pch.h similarity index 82% rename from plugins/ladspa_effect/tap/ladspa-local.h rename to include/pch.h index 322d0a912..6d258d342 100644 --- a/plugins/ladspa_effect/tap/ladspa-local.h +++ b/include/pch.h @@ -1,5 +1,5 @@ /* - * ladspa-local.h - include correct LADSPA-header + * pch.h - file which is used for precompiled headers * * Copyright (c) 2008 Tobias Doerffel * @@ -22,13 +22,15 @@ * */ +#ifndef _PCH_H_hsd +#define _PCH_H_hsd -#include "lmmsconfig.h" +#include +#include +#include + +#include + +#include "mixer.h" -#ifdef LMMS_HAVE_LADSPA_H -#include -#else -#include "ladspa-1.1.h" #endif - - diff --git a/include/project_renderer.h b/include/project_renderer.h index 648b392d8..4d8076b46 100644 --- a/include/project_renderer.h +++ b/include/project_renderer.h @@ -36,7 +36,7 @@ public: enum ExportFileFormats { WaveFile, -#ifdef LMMS_HAVE_VORBIS_CODEC_H +#ifdef LMMS_HAVE_OGGVORBIS OggFile, #endif NumFileFormats diff --git a/include/sample_buffer.h b/include/sample_buffer.h index 648653a63..365bcac20 100644 --- a/include/sample_buffer.h +++ b/include/sample_buffer.h @@ -200,12 +200,10 @@ private: void update( bool _keep_settings = FALSE ); -#ifdef LMMS_HAVE_SNDFILE_H f_cnt_t decodeSampleSF( const char * _f, int_sample_t * & _buf, ch_cnt_t & _channels, sample_rate_t & _sample_rate ); -#endif -#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H +#ifdef LMMS_HAVE_OGGVORBIS f_cnt_t decodeSampleOGGVorbis( const char * _f, int_sample_t * & _buf, ch_cnt_t & _channels, sample_rate_t & _sample_rate ); diff --git a/include/setup_dialog.h b/include/setup_dialog.h index 9bf2867fb..6e9a01aa1 100644 --- a/include/setup_dialog.h +++ b/include/setup_dialog.h @@ -122,7 +122,7 @@ private: QLineEdit * m_adLineEdit; QLineEdit * m_fdLineEdit; QLineEdit * m_ladLineEdit; -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK QLineEdit * m_stkLineEdit; #endif @@ -131,7 +131,7 @@ private: QString m_artworkDir; QString m_flDir; QString m_ladDir; -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK QString m_stkDir; #endif diff --git a/lmmsconfig.h.in b/lmmsconfig.h.in new file mode 100644 index 000000000..676d7c84b --- /dev/null +++ b/lmmsconfig.h.in @@ -0,0 +1,52 @@ +#cmakedefine LMMS_BUILD_LINUX +#cmakedefine LMMS_BUILD_WIN32 + +#cmakedefine LMMS_HAVE_ALSA +#cmakedefine LMMS_HAVE_JACK +#cmakedefine LMMS_HAVE_OGGVORBIS +#cmakedefine LMMS_HAVE_OSS +#cmakedefine LMMS_HAVE_PULSEAUDIO +#cmakedefine LMMS_HAVE_SDL +#cmakedefine LMMS_HAVE_STK +#cmakedefine LMMS_HAVE_VST + +#cmakedefine LMMS_HAVE_STDINT_H +#cmakedefine LMMS_HAVE_PTHREAD_H +#cmakedefine LMMS_HAVE_UNISTD_H +#cmakedefine LMMS_HAVE_SYS_TYPES_H +#cmakedefine LMMS_HAVE_SYS_IPC_H +#cmakedefine LMMS_HAVE_SYS_SHM_H +#cmakedefine LMMS_HAVE_SYS_TIME_H +#cmakedefine LMMS_HAVE_SYS_WAIT_H +#cmakedefine LMMS_HAVE_SYS_SELECT_H +#cmakedefine LMMS_HAVE_STDARG_H +#cmakedefine LMMS_HAVE_SIGNAL_H +#cmakedefine LMMS_HAVE_SCHED_H +#cmakedefine LMMS_HAVE_SYS_SOUNDCARD_H +#cmakedefine LMMS_HAVE_SOUNDCARD_H +#cmakedefine LMMS_HAVE_FCNTL_H +#cmakedefine LMMS_HAVE_SYS_IOCTL_H +#cmakedefine LMMS_HAVE_CTYPE_H +#cmakedefine LMMS_HAVE_STRING_H + +/* defines for libsamplerate */ + + +/* Target processor clips on negative float to int conversion. */ +#cmakedefine CPU_CLIPS_NEGATIVE 1 +#ifndef CPU_CLIPS_NEGATIVE +#define CPU_CLIPS_NEGATIVE 0 +#endif + +/* Target processor clips on positive float to int conversion. */ +#cmakedefine CPU_CLIPS_POSITIVE 1 +#ifndef CPU_CLIPS_POSITIVE +#define CPU_CLIPS_POSITIVE 0 +#endif + +/* Define if you have C99's lrint function. */ +#cmakedefine HAVE_LRINT 1 + +/* Define if you have C99's lrintf function. */ +#cmakedefine HAVE_LRINTF 1 + diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt new file mode 100644 index 000000000..04e7c5c35 --- /dev/null +++ b/plugins/CMakeLists.txt @@ -0,0 +1,24 @@ +ADD_SUBDIRECTORY(audio_file_processor) +ADD_SUBDIRECTORY(bass_booster) +ADD_SUBDIRECTORY(bit_invader) +ADD_SUBDIRECTORY(flp_import) +ADD_SUBDIRECTORY(kicker) +ADD_SUBDIRECTORY(ladspa_browser) +ADD_SUBDIRECTORY(ladspa_effect) +ADD_SUBDIRECTORY(lb302) +ADD_SUBDIRECTORY(lb303) +ADD_SUBDIRECTORY(live_tool) +ADD_SUBDIRECTORY(midi_import) +ADD_SUBDIRECTORY(organic) +ADD_SUBDIRECTORY(patman) +ADD_SUBDIRECTORY(peak_controller_effect) +ADD_SUBDIRECTORY(sf2_player) +ADD_SUBDIRECTORY(spectrum_analyzer) +ADD_SUBDIRECTORY(stereo_enhancer) +ADD_SUBDIRECTORY(stereo_matrix) +ADD_SUBDIRECTORY(stk) +ADD_SUBDIRECTORY(triple_oscillator) +ADD_SUBDIRECTORY(vestige) +ADD_SUBDIRECTORY(vst_base) +ADD_SUBDIRECTORY(vst_effect) +ADD_SUBDIRECTORY(vibed) diff --git a/plugins/Makefile.am b/plugins/Makefile.am deleted file mode 100644 index 380ee78e7..000000000 --- a/plugins/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -if VST_SUPPORT -VST_DIRS=vst_base vst_effect vestige -endif - -if STK_SUPPORT -STK_DIR=stk -endif - -if FLUIDSYNTH_SUPPORT -SF2PLAYER_DIR=sf2_player -endif - -if HAVE_LIBFFTW3 -SPECTRUMANALYZER_DIR=spectrum_analyzer -endif - -SUBDIRS = \ - audio_file_processor \ - bass_booster \ - bit_invader \ - flp_import \ - kicker \ - ladspa_browser \ - ladspa_effect \ - lb303 \ - live_tool \ - midi_import \ - organic \ - patman \ - peak_controller_effect \ - $(SF2PLAYER_DIR) \ - $(SINGERBOT_DIR) \ - $(SPECTRUMANALYZER_DIR) \ - stereo_enhancer \ - stereo_matrix \ - $(STK_DIR) \ - triple_oscillator \ - vibed \ - $(VST_DIRS) \ - $(EXTRA_PLUGINS) diff --git a/plugins/audio_file_processor/CMakeLists.txt b/plugins/audio_file_processor/CMakeLists.txt new file mode 100644 index 000000000..d7b4620b0 --- /dev/null +++ b/plugins/audio_file_processor/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(audiofileprocessor audio_file_processor.cpp audio_file_processor.h MOCFILES audio_file_processor.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/audio_file_processor/Makefile.am b/plugins/audio_file_processor/Makefile.am deleted file mode 100644 index e2d0aef28..000000000 --- a/plugins/audio_file_processor/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = audiofileprocessor - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./audio_file_processor.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) - -install-exec-hook: $(DLL) - $(STRIP) $< - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h $(DLL) - - -pkglib_LTLIBRARIES = libaudiofileprocessor.la - -libaudiofileprocessor_la_SOURCES = audio_file_processor.cpp audio_file_processor.h - -$(libaudiofileprocessor_la_SOURCES): ./embedded_resources.h diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index 0fcaef160..03bdeb6da 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -614,5 +614,5 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) } -#include "audio_file_processor.moc" +#include "moc_audio_file_processor.cxx" diff --git a/plugins/bass_booster/CMakeLists.txt b/plugins/bass_booster/CMakeLists.txt new file mode 100644 index 000000000..33baf78ba --- /dev/null +++ b/plugins/bass_booster/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(bassbooster bass_booster.cpp bassbooster_controls.cpp bassbooster_control_dialog.cpp MOCFILES bassbooster_controls.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/bass_booster/Makefile.am b/plugins/bass_booster/Makefile.am deleted file mode 100644 index ec36b173a..000000000 --- a/plugins/bass_booster/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = bassbooster - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./bassbooster_controls.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= libbassbooster.la - -libbassbooster_la_SOURCES = bass_booster.cpp \ - bass_booster.h \ - bassbooster_controls.cpp \ - bassbooster_controls.h \ - bassbooster_control_dialog.cpp \ - bassbooster_control_dialog.h - -$(libbassbooster_la_SOURCES): ./embedded_resources.h diff --git a/plugins/bass_booster/bassbooster_controls.cpp b/plugins/bass_booster/bassbooster_controls.cpp index ee3118593..1ea963844 100644 --- a/plugins/bass_booster/bassbooster_controls.cpp +++ b/plugins/bass_booster/bassbooster_controls.cpp @@ -103,5 +103,5 @@ void bassBoosterControls::saveSettings( QDomDocument & _doc, -#include "bassbooster_controls.moc" +#include "moc_bassbooster_controls.cxx" diff --git a/plugins/bit_invader/CMakeLists.txt b/plugins/bit_invader/CMakeLists.txt new file mode 100644 index 000000000..fd9ce9afe --- /dev/null +++ b/plugins/bit_invader/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(bitinvader bit_invader.cpp bit_invader.h MOCFILES bit_invader.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/bit_invader/Makefile.am b/plugins/bit_invader/Makefile.am deleted file mode 100644 index 1da6abe6f..000000000 --- a/plugins/bit_invader/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = bitinvader - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./bit_invader.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libbitinvader.la - -libbitinvader_la_SOURCES = bit_invader.cpp bit_invader.h - -$(libbitinvader_la_SOURCES): ./embedded_resources.h diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index b01f34ed6..d6067f758 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -561,4 +561,4 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) -#include "bit_invader.moc" +#include "moc_bit_invader.cxx" diff --git a/plugins/flp_import/CMakeLists.txt b/plugins/flp_import/CMakeLists.txt new file mode 100644 index 000000000..8bebdf674 --- /dev/null +++ b/plugins/flp_import/CMakeLists.txt @@ -0,0 +1,5 @@ +INCLUDE(BuildPlugin) + +INCLUDE_DIRECTORIES(unrtf) + +BUILD_PLUGIN(flpimport flp_import.cpp flp_import.h MOCFILES EMBEDDED_RESOURCES *.png) diff --git a/plugins/flp_import/Makefile.am b/plugins/flp_import/Makefile.am deleted file mode 100644 index 22f132f68..000000000 --- a/plugins/flp_import/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = flpimport - - -INCLUDES = -I$(top_srcdir)/include -I. -I./unrtf - -EXTRA_DIST = $(wildcard unrtf/*.c unrtf/*.h) - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(DLL) - -pkglib_LTLIBRARIES= libflpimport.la - -libflpimport_la_SOURCES = flp_import.cpp flp_import.h diff --git a/plugins/flp_import/unrtf/attr.c b/plugins/flp_import/unrtf/attr.c index 850f960e9..1da0a3e97 100644 --- a/plugins/flp_import/unrtf/attr.c +++ b/plugins/flp_import/unrtf/attr.c @@ -35,19 +35,19 @@ * 31 Oct 07, jasp00@users.sourceforge.net: replaced deprecated conversions *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif @@ -106,10 +106,10 @@ attr_express_begin (int attr, const char* param) { switch(attr) { case ATTR_BOLD: - outstring+=QString().sprintf(op->bold_begin); + outstring+=QString("%1").arg(op->bold_begin); break; case ATTR_ITALIC: - outstring+=QString().sprintf(op->italic_begin); + outstring+=QString("%1").arg(op->italic_begin); break; /* Various underlines, they all resolve to HTML's */ @@ -121,11 +121,11 @@ attr_express_begin (int attr, const char* param) { case ATTR_2DOT_DASH_UL: case ATTR_WORD_UL: case ATTR_UNDERLINE: - outstring+=QString().sprintf(op->underline_begin); + outstring+=QString("%1").arg(op->underline_begin); break; case ATTR_DOUBLE_UL: - outstring+=QString().sprintf(op->dbl_underline_begin); + outstring+=QString("%1").arg(op->dbl_underline_begin); break; case ATTR_FONTSIZE: @@ -133,48 +133,48 @@ attr_express_begin (int attr, const char* param) { break; case ATTR_FONTFACE: - outstring+=QString().sprintf(op->font_begin,param); + outstring+=QString("%1").arg(op->font_begin,param); break; case ATTR_FOREGROUND: - outstring+=QString().sprintf(op->foreground_begin, param); + outstring+=QString("%1").arg(op->foreground_begin, param); break; case ATTR_BACKGROUND: if (!simple_mode) - outstring+=QString().sprintf(op->foreground_begin,param); + outstring+=QString("%1").arg(op->foreground_begin,param); break; case ATTR_SUPER: - outstring+=QString().sprintf(op->superscript_begin); + outstring+=QString("%1").arg(op->superscript_begin); break; case ATTR_SUB: - outstring+=QString().sprintf(op->subscript_begin); + outstring+=QString("%1").arg(op->subscript_begin); break; case ATTR_STRIKE: - outstring+=QString().sprintf(op->strikethru_begin); + outstring+=QString("%1").arg(op->strikethru_begin); break; case ATTR_DBL_STRIKE: - outstring+=QString().sprintf(op->dbl_strikethru_begin); + outstring+=QString("%1").arg(op->dbl_strikethru_begin); break; case ATTR_EXPAND: - outstring+=QString().sprintf(op->expand_begin, param); + outstring+=QString("%1").arg(op->expand_begin, param); break; case ATTR_OUTLINE: - outstring+=QString().sprintf(op->outline_begin); + outstring+=QString("%1").arg(op->outline_begin); break; case ATTR_SHADOW: - outstring+=QString().sprintf(op->shadow_begin); + outstring+=QString("%1").arg(op->shadow_begin); break; case ATTR_EMBOSS: - outstring+=QString().sprintf(op->emboss_begin); + outstring+=QString("%1").arg(op->emboss_begin); break; case ATTR_ENGRAVE: - outstring+=QString().sprintf(op->engrave_begin); + outstring+=QString("%1").arg(op->engrave_begin); break; case ATTR_CAPS: @@ -187,7 +187,7 @@ attr_express_begin (int attr, const char* param) { simulate_smallcaps = TRUE; else { if (op->small_caps_begin) - outstring+=QString().sprintf(op->small_caps_begin); + outstring+=QString("%1").arg(op->small_caps_begin); } break; } @@ -207,10 +207,10 @@ attr_express_end (int attr, char *param) switch(attr) { case ATTR_BOLD: - outstring+=QString().sprintf(op->bold_end); + outstring+=QString("%1").arg(op->bold_end); break; case ATTR_ITALIC: - outstring+=QString().sprintf(op->italic_end); + outstring+=QString("%1").arg(op->italic_end); break; /* Various underlines, they all resolve to HTML's */ @@ -222,11 +222,11 @@ attr_express_end (int attr, char *param) case ATTR_2DOT_DASH_UL: case ATTR_WORD_UL: case ATTR_UNDERLINE: - outstring+=QString().sprintf(op->underline_end); + outstring+=QString("%1").arg(op->underline_end); break; case ATTR_DOUBLE_UL: - outstring+=QString().sprintf(op->dbl_underline_end); + outstring+=QString("%1").arg(op->dbl_underline_end); break; case ATTR_FONTSIZE: @@ -234,47 +234,47 @@ attr_express_end (int attr, char *param) break; case ATTR_FONTFACE: - outstring+=QString().sprintf(op->font_end); + outstring+=QString("%1").arg(op->font_end); break; case ATTR_FOREGROUND: - outstring+=QString().sprintf(op->foreground_end); + outstring+=QString("%1").arg(op->foreground_end); break; case ATTR_BACKGROUND: if (!simple_mode) - outstring+=QString().sprintf(op->background_end); + outstring+=QString("%1").arg(op->background_end); break; case ATTR_SUPER: - outstring+=QString().sprintf(op->superscript_end); + outstring+=QString("%1").arg(op->superscript_end); break; case ATTR_SUB: - outstring+=QString().sprintf(op->subscript_end); + outstring+=QString("%1").arg(op->subscript_end); break; case ATTR_STRIKE: - outstring+=QString().sprintf(op->strikethru_end); + outstring+=QString("%1").arg(op->strikethru_end); break; case ATTR_DBL_STRIKE: - outstring+=QString().sprintf(op->dbl_strikethru_end); + outstring+=QString("%1").arg(op->dbl_strikethru_end); break; case ATTR_OUTLINE: - outstring+=QString().sprintf(op->outline_end); + outstring+=QString("%1").arg(op->outline_end); break; case ATTR_SHADOW: - outstring+=QString().sprintf(op->shadow_end); + outstring+=QString("%1").arg(op->shadow_end); break; case ATTR_EMBOSS: - outstring+=QString().sprintf(op->emboss_end); + outstring+=QString("%1").arg(op->emboss_end); break; case ATTR_ENGRAVE: - outstring+=QString().sprintf(op->engrave_end); + outstring+=QString("%1").arg(op->engrave_end); break; case ATTR_EXPAND: - outstring+=QString().sprintf(op->expand_end); + outstring+=QString("%1").arg(op->expand_end); break; case ATTR_CAPS: @@ -287,7 +287,7 @@ attr_express_end (int attr, char *param) simulate_smallcaps = FALSE; else { if (op->small_caps_end) - outstring+=QString().sprintf(op->small_caps_end); + outstring+=QString("%1").arg(op->small_caps_end); } break; } diff --git a/plugins/flp_import/unrtf/convert.c b/plugins/flp_import/unrtf/convert.c index 690311fe7..c3538b4e0 100644 --- a/plugins/flp_import/unrtf/convert.c +++ b/plugins/flp_import/unrtf/convert.c @@ -62,23 +62,23 @@ * 31 Oct 07, jasp00@users.sourceforge.net: fixed several warnings *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif -#ifdef HAVE_CTYPE_H +#ifdef LMMS_HAVE_CTYPE_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif @@ -195,8 +195,8 @@ starting_body () { if (!have_printed_body) { if (!inline_mode) { - outstring+=QString().sprintf(op->header_end); - outstring+=QString().sprintf(op->body_begin); + outstring+=QString("%1").arg(op->header_end); + outstring+=QString("%1").arg(op->body_begin); } within_header = FALSE; have_printed_body = TRUE; @@ -365,20 +365,20 @@ process_font_table (Word *w) w=w->next; } - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("font table contains %d fonts total",total_fonts); - printf(op->comment_end); + printf("%s",op->comment_end); if (debug_mode) { int i; - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("font table dump: \n"); for (i=0; icomment_end); + printf("%s",op->comment_end); } } @@ -402,9 +402,9 @@ process_index_entry (Word *w) char *str = word_string (w2); if (debug_mode && str) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("index entry word: %s ", str); - printf(op->comment_end); + printf("%s",op->comment_end); } } w=w->next; @@ -431,11 +431,11 @@ process_toc_entry (Word *w, int include_page_num) char *str = word_string (w2); if (debug_mode && str) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("toc %s entry word: %s ", include_page_num ? "page#":"no page#", str); - printf(op->comment_end); + printf("%s",op->comment_end); } } w=w->next; @@ -471,7 +471,7 @@ process_info_group (Word *w) if (!inline_mode) { if (!strcmp("\\title", s)) { - outstring+=QString().sprintf(op->document_title_begin); + outstring+=QString("%1").arg(op->document_title_begin); w2=child->next; while (w2) { char *s2 = word_string(w2); @@ -482,7 +482,7 @@ process_info_group (Word *w) #if 1 /* daved 0.19.6 */ print_with_special_exprs (s2); #else - outstring+=QString().sprintf("%s", s2); + outstring+=QString("%1").arg("%s", s2); #endif #if 1 /* daved 0.20.0 */ } @@ -496,18 +496,18 @@ process_info_group (Word *w) s3 = op_translate_char (op, charset_type, ch, numchar_table); if (!s3 || !*s3) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("char 0x%02x",ch); - printf(op->comment_end); + printf("%s",op->comment_end); } else { if (op->word_begin) - outstring+=QString().sprintf(op->word_begin); - outstring+=QString().sprintf("%s", s3); + outstring+=QString("%1").arg(op->word_begin); + outstring+=QString("%1").arg("%s", s3); if (op->word_end) - outstring+=QString().sprintf(op->word_end); + outstring+=QString("%1").arg(op->word_end); } } } @@ -515,32 +515,32 @@ process_info_group (Word *w) #endif w2 = w2->next; } - outstring+=QString().sprintf(op->document_title_end); + outstring+=QString("%1").arg(op->document_title_end); } else if (!strcmp("\\keywords", s)) { - outstring+=QString().sprintf(op->document_keywords_begin); + outstring+=QString("%1").arg(op->document_keywords_begin); w2=child->next; while (w2) { char *s2 = word_string(w2); if (s2[0] != '\\') - outstring+=QString().sprintf("%s,", s2); + outstring+=QString("%1").arg("%s,", s2); w2 = w2->next; } - outstring+=QString().sprintf(op->document_keywords_end); + outstring+=QString("%1").arg(op->document_keywords_end); } else if (!strcmp("\\author", s)) { - outstring+=QString().sprintf(op->document_author_begin); + outstring+=QString("%1").arg(op->document_author_begin); w2=child->next; while (w2) { char *s2 = word_string(w2); if (s2[0] != '\\') - outstring+=QString().sprintf("%s", s2); + outstring+=QString("%1").arg("%s", s2); w2 = w2->next; } - outstring+=QString().sprintf(op->document_author_end); + outstring+=QString("%1").arg(op->document_author_end); } else if (!strcmp("\\comment", s)) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("comments: "); w2=child->next; while (w2) { @@ -549,46 +549,46 @@ process_info_group (Word *w) printf("%s", s2); w2 = w2->next; } - printf(op->comment_end); + printf("%s",op->comment_end); } else if (!strncmp("\\nofpages", s, 9)) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("total pages: %s",&s[9]); - printf(op->comment_end); + printf("%s",op->comment_end); } else if (!strncmp("\\nofwords", s, 9)) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("total words: %s",&s[9]); - printf(op->comment_end); + printf("%s",op->comment_end); } else if (!strncmp("\\nofchars", s, 9) && isdigit(s[9])) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("total chars: %s",&s[9]); - printf(op->comment_end); + printf("%s",op->comment_end); } else if (!strcmp("\\creatim", s)) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("creation date: "); if (child->next) word_dump_date (child->next); - printf(op->comment_end); + printf("%s",op->comment_end); } else if (!strcmp("\\printim", s)) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("last printed: "); if (child->next) word_dump_date (child->next); - printf(op->comment_end); + printf("%s",op->comment_end); } else if (!strcmp("\\buptim", s)) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("last backup: "); if (child->next) word_dump_date (child->next); - printf(op->comment_end); + printf("%s",op->comment_end); } else if (!strcmp("\\revtim", s)) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("revision date: "); if (child->next) word_dump_date (child->next); - printf(op->comment_end); + printf("%s",op->comment_end); } } @@ -598,7 +598,7 @@ process_info_group (Word *w) if (!strcmp("\\hlinkbase", s)) { char *linkstr = NULL; - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("hyperlink base: "); if (child->next) { Word *nextword = child->next; @@ -611,7 +611,7 @@ process_info_group (Word *w) printf("%s", linkstr); else printf("(none)"); - printf(op->comment_end); + printf("%s",op->comment_end); /* Store the pointer, it will remain good. */ hyperlink_base = linkstr; @@ -658,9 +658,9 @@ process_color_table (Word *w) char *s = word_string (w); #if 0 - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("found this color table word: %s", word_string(w)); - printf(op->comment_end); + printf("%s",op->comment_end); #endif if (!strncmp("\\red",s,4)) { @@ -685,10 +685,10 @@ process_color_table (Word *w) color_table[total_colors].g = g; color_table[total_colors++].b = b; if (debug_mode) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("storing color entry %d: %02x%02x%02x", total_colors-1, r,g,b); - printf(op->comment_end); + printf("%s",op->comment_end); } r=g=b=0; } @@ -697,9 +697,9 @@ process_color_table (Word *w) } if (debug_mode) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("color table had %d entries -->\n", total_colors); - printf(op->comment_end); + printf("%s",op->comment_end); } } @@ -837,7 +837,7 @@ cmd_field (Word *w, int align, char has_param, int num) { { const char * string; if ((string = op->symbol_translation_table[char_num - op->symbol_first_char]) != 0) - outstring+=QString().sprintf("%s", string); + outstring+=QString("%1").arg("%s", string); } } } @@ -857,9 +857,9 @@ cmd_field (Word *w, int align, char has_param, int num) { w4=w4->next; if (w4) { s4=word_string(w4); - outstring+=QString().sprintf(op->hyperlink_begin); - outstring+=QString().sprintf("%s", s4); - outstring+=QString().sprintf(op->hyperlink_end); + outstring+=QString("%1").arg(op->hyperlink_begin); + outstring+=QString("%1").arg("%s", s4); + outstring+=QString("%1").arg(op->hyperlink_end); return TRUE; } @@ -900,9 +900,9 @@ cmd_f (Word *w, int align, char has_param, int num) { numchar_table = FONTROMAN_TABLE; #endif if (!name) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("invalid font number %d",num); - printf(op->comment_end); + printf("%s",op->comment_end); } else { attr_push(ATTR_FONTFACE,name); #if 1 /* daved - 0.19.6 */ @@ -962,10 +962,10 @@ cmd_tab (Word *w, int align, char has_param, int param) int need= 8-(total_chars_this_line%8); total_chars_this_line += need; while(need>0) { - outstring+=QString().sprintf(op->forced_space); + outstring+=QString("%1").arg(op->forced_space); need--; } - outstring+=QString().sprintf("\n"); + outstring+=QString("%1").arg("\n"); return FALSE; } @@ -1182,7 +1182,7 @@ cmd_scaps (Word *w, int align, char has_param, int param) { static int cmd_bullet (Word *w, int align, char has_param, int param) { if (op->chars.bullet) { - outstring+=QString().sprintf(op->chars.bullet); + outstring+=QString("%1").arg(op->chars.bullet); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1197,7 +1197,7 @@ cmd_bullet (Word *w, int align, char has_param, int param) { static int cmd_ldblquote (Word *w, int align, char has_param, int param) { if (op->chars.left_dbl_quote) { - outstring+=QString().sprintf(op->chars.left_dbl_quote); + outstring+=QString("%1").arg(op->chars.left_dbl_quote); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1214,7 +1214,7 @@ cmd_ldblquote (Word *w, int align, char has_param, int param) { static int cmd_rdblquote (Word *w, int align, char has_param, int param) { if (op->chars.right_dbl_quote) { - outstring+=QString().sprintf(op->chars.right_dbl_quote); + outstring+=QString("%1").arg(op->chars.right_dbl_quote); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1230,7 +1230,7 @@ cmd_rdblquote (Word *w, int align, char has_param, int param) { static int cmd_lquote (Word *w, int align, char has_param, int param) { if (op->chars.left_quote) { - outstring+=QString().sprintf(op->chars.left_quote); + outstring+=QString("%1").arg(op->chars.left_quote); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1247,7 +1247,7 @@ cmd_lquote (Word *w, int align, char has_param, int param) { static int cmd_nonbreaking_space (Word *w, int align, char has_param, int param) { if (op->chars.nonbreaking_space) { - outstring+=QString().sprintf(op->chars.nonbreaking_space); + outstring+=QString("%1").arg(op->chars.nonbreaking_space); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1264,7 +1264,7 @@ cmd_nonbreaking_space (Word *w, int align, char has_param, int param) { static int cmd_nonbreaking_hyphen (Word *w, int align, char has_param, int param) { if (op->chars.nonbreaking_hyphen) { - outstring+=QString().sprintf(op->chars.nonbreaking_hyphen); + outstring+=QString("%1").arg(op->chars.nonbreaking_hyphen); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1281,7 +1281,7 @@ cmd_nonbreaking_hyphen (Word *w, int align, char has_param, int param) { static int cmd_optional_hyphen (Word *w, int align, char has_param, int param) { if (op->chars.optional_hyphen) { - outstring+=QString().sprintf(op->chars.optional_hyphen); + outstring+=QString("%1").arg(op->chars.optional_hyphen); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1297,7 +1297,7 @@ cmd_optional_hyphen (Word *w, int align, char has_param, int param) { static int cmd_emdash (Word *w, int align, char has_param, int param) { if (op->chars.emdash) { - outstring+=QString().sprintf(op->chars.emdash); + outstring+=QString("%1").arg(op->chars.emdash); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1314,7 +1314,7 @@ cmd_emdash (Word *w, int align, char has_param, int param) { static int cmd_endash (Word *w, int align, char has_param, int param) { if (op->chars.endash) { - outstring+=QString().sprintf(op->chars.endash); + outstring+=QString("%1").arg(op->chars.endash); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1331,7 +1331,7 @@ cmd_endash (Word *w, int align, char has_param, int param) { static int cmd_rquote (Word *w, int align, char has_param, int param) { if (op->chars.right_quote) { - outstring+=QString().sprintf(op->chars.right_quote); + outstring+=QString("%1").arg(op->chars.right_quote); ++total_chars_this_line; /* \tab */ } return FALSE; @@ -1347,7 +1347,7 @@ cmd_rquote (Word *w, int align, char has_param, int param) { static int cmd_par (Word *w, int align, char has_param, int param) { if (op->line_break) { - outstring+=QString().sprintf(op->line_break); + outstring+=QString("%1").arg(op->line_break); total_chars_this_line = 0; /* \tab */ } return FALSE; @@ -1364,7 +1364,7 @@ cmd_par (Word *w, int align, char has_param, int param) { static int cmd_line (Word *w, int align, char has_param, int param) { if (op->line_break) { - outstring+=QString().sprintf(op->line_break); + outstring+=QString("%1").arg(op->line_break); total_chars_this_line = 0; /* \tab */ } return FALSE; @@ -1380,7 +1380,7 @@ cmd_line (Word *w, int align, char has_param, int param) { static int cmd_page (Word *w, int align, char has_param, int param) { if (op->page_break) { - outstring+=QString().sprintf(op->page_break); + outstring+=QString("%1").arg(op->page_break); total_chars_this_line = 0; /* \tab */ } return FALSE; @@ -1683,9 +1683,9 @@ static int cmd_u (Word *w, int align, char has_param, int param) { { const char *string; if ((string = op->unisymbol1_translation_table[param - op->unisymbol1_first_char]) != 0) - outstring+=QString().sprintf("%s", string); + outstring+=QString("%1").arg("%s", string); else - outstring+=QString().sprintf("&#%u;", (unsigned int)param); + outstring+=QString("%1").arg("&#%u;", (unsigned int)param); done++; } if @@ -1697,9 +1697,9 @@ static int cmd_u (Word *w, int align, char has_param, int param) { { const char *string; if ((string = op->unisymbol2_translation_table[param - op->unisymbol2_first_char]) != 0) - outstring+=QString().sprintf("%s", string); + outstring+=QString("%1").arg("%s", string); else - outstring+=QString().sprintf("&#%u;", (unsigned int)param); + outstring+=QString("%1").arg("&#%u;", (unsigned int)param); done++; } if @@ -1711,9 +1711,9 @@ static int cmd_u (Word *w, int align, char has_param, int param) { { const char *string; if ((string = op->unisymbol3_translation_table[param - op->unisymbol3_first_char]) != 0) - outstring+=QString().sprintf("%s", string); + outstring+=QString("%1").arg("%s", string); else - outstring+=QString().sprintf("&#%u;", (unsigned int)param); + outstring+=QString("%1").arg("&#%u;", (unsigned int)param); done++; } #if 1 /* 0.19.5 more unicode support */ @@ -1726,9 +1726,9 @@ static int cmd_u (Word *w, int align, char has_param, int param) { { const char *string; if ((string = op->unisymbol4_translation_table[param - op->unisymbol4_first_char]) != 0) - outstring+=QString().sprintf("%s", string); + outstring+=QString("%1").arg("%s", string); else - outstring+=QString().sprintf("&#%u;", (unsigned int)param); + outstring+=QString("%1").arg("&#%u;", (unsigned int)param); done++; } #endif @@ -1869,7 +1869,7 @@ static int cmd_s (Word *w, int align, char has_param, int param) { static int cmd_sect (Word *w, int align, char has_param, int param) { /* XX kludge */ if (op->paragraph_begin) { - outstring+=QString().sprintf(op->paragraph_begin); + outstring+=QString("%1").arg(op->paragraph_begin); } return FALSE; } @@ -1883,9 +1883,9 @@ static int cmd_sect (Word *w, int align, char has_param, int param) { static int cmd_shp (Word *w, int align, char has_param, int param) { if (op->comment_begin) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("Drawn Shape (ignored--not implemented yet)"); - printf(op->comment_begin); + printf("%s",op->comment_begin); } return FALSE; @@ -1916,9 +1916,9 @@ static int cmd_outl (Word *w, int align, char has_param, int param) { static int cmd_ansi (Word *w, int align, char has_param, int param) { charset_type = CHARSET_ANSI; if (op->comment_begin) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("document uses ANSI character set"); - printf(op->comment_end); + printf("%s",op->comment_end); } return FALSE; } @@ -1933,9 +1933,9 @@ static int cmd_ansi (Word *w, int align, char has_param, int param) { static int cmd_pc (Word *w, int align, char has_param, int param) { charset_type = CHARSET_CP437 ; if (op->comment_begin) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("document uses PC codepage 437 character set"); - printf(op->comment_end); + printf("%s",op->comment_end); } return FALSE; } @@ -1950,9 +1950,9 @@ static int cmd_pc (Word *w, int align, char has_param, int param) { static int cmd_pca (Word *w, int align, char has_param, int param) { charset_type = CHARSET_CP850; if (op->comment_begin) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("document uses PC codepage 850 character set"); - printf(op->comment_end); + printf("%s",op->comment_end); } return FALSE; } @@ -1967,9 +1967,9 @@ static int cmd_pca (Word *w, int align, char has_param, int param) { static int cmd_mac (Word *w, int align, char has_param, int param) { charset_type = CHARSET_MAC; if (op->comment_begin) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("document uses Macintosh character set"); - printf(op->comment_end); + printf("%s",op->comment_end); } return FALSE; } @@ -2609,7 +2609,7 @@ enum { SMALL=0, BIG=1 }; if (simulate_smallcaps) { if (*s >= 'a' && *s <= 'z') { state=SMALL; - outstring+=QString().sprintf(op->smaller_begin); + outstring+=QString("%1").arg(op->smaller_begin); } else state=BIG; @@ -2630,7 +2630,7 @@ enum { SMALL=0, BIG=1 }; #if 1 /* daved - 0.20.1 */ if(post_trans) #endif - outstring+=QString().sprintf("%s",post_trans); + outstring+=QString("%1").arg("%s",post_trans); } s++; @@ -2639,13 +2639,13 @@ enum { SMALL=0, BIG=1 }; ch = *s; if (ch >= 'a' && ch <= 'z') { if (state==BIG) - outstring+=QString().sprintf(op->smaller_begin); + outstring+=QString("%1").arg(op->smaller_begin); state=SMALL; } else { if (state==SMALL) - outstring+=QString().sprintf(op->smaller_end); + outstring+=QString("%1").arg(op->smaller_end); state=BIG; } } @@ -2671,7 +2671,7 @@ begin_table() have_printed_cell_end = FALSE; attrstack_push(); starting_body(); - outstring+=QString().sprintf(op->table_begin); + outstring+=QString("%1").arg(op->table_begin); } @@ -2689,12 +2689,12 @@ end_table () if (within_table) { if (!have_printed_cell_end) { attr_pop_dump(); - outstring+=QString().sprintf(op->table_cell_end); + outstring+=QString("%1").arg(op->table_cell_end); } if (!have_printed_row_end) { - outstring+=QString().sprintf(op->table_row_end); + outstring+=QString("%1").arg(op->table_row_end); } - outstring+=QString().sprintf(op->table_end); + outstring+=QString("%1").arg(op->table_end); within_table=FALSE; have_printed_row_begin = FALSE; have_printed_cell_begin = FALSE; @@ -2716,13 +2716,13 @@ void starting_text() { if (within_table) { if (!have_printed_row_begin) { - outstring+=QString().sprintf(op->table_row_begin); + outstring+=QString("%1").arg(op->table_row_begin); have_printed_row_begin=TRUE; have_printed_row_end=FALSE; have_printed_cell_begin=FALSE; } if (!have_printed_cell_begin) { - outstring+=QString().sprintf(op->table_cell_begin); + outstring+=QString("%1").arg(op->table_cell_begin); attrstack_express_all(); have_printed_cell_begin=TRUE; have_printed_cell_end=FALSE; @@ -2749,15 +2749,15 @@ starting_paragraph_align (int align) switch (align) { case ALIGN_CENTER: - outstring+=QString().sprintf(op->center_begin); + outstring+=QString("%1").arg(op->center_begin); break; case ALIGN_LEFT: break; case ALIGN_RIGHT: - outstring+=QString().sprintf(op->align_right_begin); + outstring+=QString("%1").arg(op->align_right_begin); break; case ALIGN_JUSTIFY: - outstring+=QString().sprintf(op->align_right_begin); /* This is WRONG! */ + outstring+=QString("%1").arg(op->align_right_begin); /* This is WRONG! */ break; } } @@ -2776,16 +2776,16 @@ ending_paragraph_align (int align) { switch (align) { case ALIGN_CENTER: - outstring+=QString().sprintf(op->center_end); + outstring+=QString("%1").arg(op->center_end); break; case ALIGN_LEFT: /* printf(op->align_left_end); */ break; case ALIGN_RIGHT: - outstring+=QString().sprintf(op->align_right_end); + outstring+=QString("%1").arg(op->align_right_end); break; case ALIGN_JUSTIFY: - outstring+=QString().sprintf(op->justify_end); + outstring+=QString("%1").arg(op->justify_end); break; } } @@ -2861,7 +2861,7 @@ word_print_core (Word *w) if (s[0]!=' ') { char *s2; - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("picture data found, "); if (picture_wmetafile_type_str) { printf("WMF type is %s, ", @@ -2869,7 +2869,7 @@ word_print_core (Word *w) } printf("picture dimensions are %d by %d, depth %d", picture_width, picture_height, picture_bits_per_pixel); - printf(op->comment_end); + printf("%s",op->comment_end); if (picture_width && picture_height && picture_bits_per_pixel) { s2=s; while (*s2) { @@ -2894,12 +2894,12 @@ word_print_core (Word *w) total_chars_this_line += strlen(s); if (op->word_begin) - outstring+=QString().sprintf(op->word_begin); + outstring+=QString("%1").arg(op->word_begin); print_with_special_exprs (s); if (op->word_end) - outstring+=QString().sprintf(op->word_end); + outstring+=QString("%1").arg(op->word_end); } @@ -2959,24 +2959,24 @@ word_print_core (Word *w) is_cell_group=TRUE; if (!have_printed_cell_begin) { /* Need this with empty cells */ - outstring+=QString().sprintf(op->table_cell_begin); + outstring+=QString("%1").arg(op->table_cell_begin); attrstack_express_all(); } attr_pop_dump(); - outstring+=QString().sprintf(op->table_cell_end); + outstring+=QString("%1").arg(op->table_cell_end); have_printed_cell_begin = FALSE; have_printed_cell_end=TRUE; } else if (!strcmp (s, "row")) { if (within_table) { - outstring+=QString().sprintf(op->table_row_end); + outstring+=QString("%1").arg(op->table_row_end); have_printed_row_begin = FALSE; have_printed_row_end=TRUE; } else { if (debug_mode) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("end of table row"); - printf(op->comment_end); + printf("%s",op->comment_end); } } } @@ -2994,15 +2994,15 @@ word_print_core (Word *w) #endif if (!s2 || !*s2) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("char 0x%02x",ch); - printf(op->comment_end); + printf("%s",op->comment_end); } else { if (op->word_begin) - outstring+=QString().sprintf(op->word_begin); - outstring+=QString().sprintf("%s", s2); + outstring+=QString("%1").arg(op->word_begin); + outstring+=QString("%1").arg("%s", s2); if (op->word_end) - outstring+=QString().sprintf(op->word_end); + outstring+=QString("%1").arg(op->word_end); } } else @@ -3032,9 +3032,9 @@ word_print_core (Word *w) if (!hip) { if (debug_mode) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("Unfamiliar RTF command: %s (HashIndex not found)", s); - printf(op->comment_begin); + printf("%s",op->comment_begin); } } else { @@ -3068,9 +3068,9 @@ word_print_core (Word *w) debug=hip[index].debug_print; if (debug && debug_mode) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("%s", debug); - printf(op->comment_end); + printf("%s",op->comment_end); } done=TRUE; @@ -3084,9 +3084,9 @@ word_print_core (Word *w) } if (!match) { if (debug_mode) { - printf(op->comment_begin); + printf("%s",op->comment_begin); printf("Unfamiliar RTF command: %s", s); - printf(op->comment_end); + printf("%s",op->comment_end); } } } @@ -3113,9 +3113,9 @@ word_print_core (Word *w) if (within_picture) { if(pictfile) { fclose(pictfile); - outstring+=QString().sprintf(op->imagelink_begin); - outstring+=QString().sprintf("%s", picture_path); - outstring+=QString().sprintf(op->imagelink_end); + outstring+=QString("%1").arg(op->imagelink_begin); + outstring+=QString("%1").arg("%s", picture_path); + outstring+=QString("%1").arg(op->imagelink_end); } within_picture=FALSE; } @@ -3153,8 +3153,8 @@ word_print (Word *w, QString & _s) outstring = ""; if (!inline_mode) { - outstring+=QString().sprintf(op->document_begin); - outstring+=QString().sprintf(op->header_begin); + outstring+=QString("%1").arg(op->document_begin); + outstring+=QString("%1").arg(op->header_begin); } within_header=TRUE; @@ -3165,8 +3165,8 @@ word_print (Word *w, QString & _s) end_table(); if (!inline_mode) { - outstring+=QString().sprintf(op->body_end); - outstring+=QString().sprintf(op->document_end); + outstring+=QString("%1").arg(op->body_end); + outstring+=QString("%1").arg(op->document_end); } _s = outstring; } diff --git a/plugins/flp_import/unrtf/error.c b/plugins/flp_import/unrtf/error.c index cd4e650ea..1a7ca8928 100644 --- a/plugins/flp_import/unrtf/error.c +++ b/plugins/flp_import/unrtf/error.c @@ -39,15 +39,15 @@ * 31 Oct 07, jasp00@users.sourceforge.net: replaced deprecated conversions *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif diff --git a/plugins/flp_import/unrtf/hash.c b/plugins/flp_import/unrtf/hash.c index 430b9c818..18c7092e4 100644 --- a/plugins/flp_import/unrtf/hash.c +++ b/plugins/flp_import/unrtf/hash.c @@ -40,15 +40,15 @@ * 06 Jan 06, marcossamaral@terra.com.br: changes hash_stats function *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif diff --git a/plugins/flp_import/unrtf/html.c b/plugins/flp_import/unrtf/html.c index f97e683df..0a5fe30bb 100644 --- a/plugins/flp_import/unrtf/html.c +++ b/plugins/flp_import/unrtf/html.c @@ -41,15 +41,15 @@ * 31 Oct 07, jasp00@users.sourceforge.net: replaced deprecated conversions *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif diff --git a/plugins/flp_import/unrtf/malloc.c b/plugins/flp_import/unrtf/malloc.c index 0cdff5b1b..efa813aee 100644 --- a/plugins/flp_import/unrtf/malloc.c +++ b/plugins/flp_import/unrtf/malloc.c @@ -37,19 +37,19 @@ * 31 Oct 07, jasp00@users.sourceforge.net: replaced deprecated conversions *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif diff --git a/plugins/flp_import/unrtf/output.c b/plugins/flp_import/unrtf/output.c index b2efb6fda..40e10393d 100644 --- a/plugins/flp_import/unrtf/output.c +++ b/plugins/flp_import/unrtf/output.c @@ -37,19 +37,19 @@ *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif @@ -198,49 +198,49 @@ op_begin_std_fontsize (OutputPersonality *op, int size) switch (size) { case 8: if (op->fontsize8_begin) { - outstring+=QString().sprintf (op->fontsize8_begin); + outstring+=QString("%1").arg (op->fontsize8_begin); found_std_expr = TRUE; } break; case 10: if (op->fontsize10_begin) { - outstring+=QString().sprintf (op->fontsize10_begin); + outstring+=QString("%1").arg (op->fontsize10_begin); found_std_expr = TRUE; } break; case 12: if (op->fontsize12_begin) { - outstring+=QString().sprintf (op->fontsize12_begin); + outstring+=QString("%1").arg (op->fontsize12_begin); found_std_expr = TRUE; } break; case 14: if (op->fontsize14_begin) { - outstring+=QString().sprintf (op->fontsize14_begin); + outstring+=QString("%1").arg (op->fontsize14_begin); found_std_expr = TRUE; } break; case 18: if (op->fontsize18_begin) { - outstring+=QString().sprintf (op->fontsize18_begin); + outstring+=QString("%1").arg (op->fontsize18_begin); found_std_expr = TRUE; } break; case 24: if (op->fontsize24_begin) { - outstring+=QString().sprintf (op->fontsize24_begin); + outstring+=QString("%1").arg (op->fontsize24_begin); found_std_expr = TRUE; } break; case 36: if (op->fontsize36_begin) { - outstring+=QString().sprintf (op->fontsize36_begin); + outstring+=QString("%1").arg (op->fontsize36_begin); found_std_expr = TRUE; } break; case 48: if (op->fontsize48_begin) { - outstring+=QString().sprintf (op->fontsize48_begin); + outstring+=QString("%1").arg (op->fontsize48_begin); found_std_expr = TRUE; } break; @@ -253,53 +253,53 @@ op_begin_std_fontsize (OutputPersonality *op, int size) if (op->fontsize_begin) { char expr[16]; sprintf (expr, "%d", size); - outstring+=QString().sprintf (op->fontsize_begin, expr); + outstring+=QString("%1").arg (op->fontsize_begin, expr); } else { /* If we cannot write out a change for the exact * point size, we must approximate to a standard * size. */ if (size<9 && op->fontsize8_begin) { - outstring+=QString().sprintf (op->fontsize8_begin); + outstring+=QString("%1").arg (op->fontsize8_begin); } else if (size<11 && op->fontsize10_begin) { - outstring+=QString().sprintf (op->fontsize10_begin); + outstring+=QString("%1").arg (op->fontsize10_begin); } else if (size<13 && op->fontsize12_begin) { - outstring+=QString().sprintf (op->fontsize12_begin); + outstring+=QString("%1").arg (op->fontsize12_begin); } else if (size<16 && op->fontsize14_begin) { - outstring+=QString().sprintf (op->fontsize14_begin); + outstring+=QString("%1").arg (op->fontsize14_begin); } else if (size<21 && op->fontsize18_begin) { - outstring+=QString().sprintf (op->fontsize18_begin); + outstring+=QString("%1").arg (op->fontsize18_begin); } else if (size<30 && op->fontsize24_begin) { - outstring+=QString().sprintf (op->fontsize24_begin); + outstring+=QString("%1").arg (op->fontsize24_begin); } else if (size<42 && op->fontsize36_begin) { - outstring+=QString().sprintf (op->fontsize36_begin); + outstring+=QString("%1").arg (op->fontsize36_begin); } else if (size>40 && op->fontsize48_begin) { - outstring+=QString().sprintf (op->fontsize48_begin); + outstring+=QString("%1").arg (op->fontsize48_begin); } else /* If we can't even produce a good approximation, * just try to get a font size near 12 point. */ if (op->fontsize12_begin) - outstring+=QString().sprintf (op->fontsize12_begin); + outstring+=QString("%1").arg (op->fontsize12_begin); else if (op->fontsize14_begin) - outstring+=QString().sprintf (op->fontsize14_begin); + outstring+=QString("%1").arg (op->fontsize14_begin); else if (op->fontsize10_begin) - outstring+=QString().sprintf (op->fontsize10_begin); + outstring+=QString("%1").arg (op->fontsize10_begin); else if (op->fontsize18_begin) - outstring+=QString().sprintf (op->fontsize18_begin); + outstring+=QString("%1").arg (op->fontsize18_begin); else if (op->fontsize8_begin) - outstring+=QString().sprintf (op->fontsize8_begin); + outstring+=QString("%1").arg (op->fontsize8_begin); else error_handler ("output personality lacks sufficient font size change capability"); } @@ -327,49 +327,49 @@ op_end_std_fontsize (OutputPersonality *op, int size) switch (size) { case 8: if (op->fontsize8_end) { - outstring+=QString().sprintf (op->fontsize8_end); + outstring+=QString("%1").arg (op->fontsize8_end); found_std_expr = TRUE; } break; case 10: if (op->fontsize10_end) { - outstring+=QString().sprintf (op->fontsize10_end); + outstring+=QString("%1").arg (op->fontsize10_end); found_std_expr = TRUE; } break; case 12: if (op->fontsize12_end) { - outstring+=QString().sprintf (op->fontsize12_end); + outstring+=QString("%1").arg (op->fontsize12_end); found_std_expr = TRUE; } break; case 14: if (op->fontsize14_end) { - outstring+=QString().sprintf (op->fontsize14_end); + outstring+=QString("%1").arg (op->fontsize14_end); found_std_expr = TRUE; } break; case 18: if (op->fontsize18_end) { - outstring+=QString().sprintf (op->fontsize18_end); + outstring+=QString("%1").arg (op->fontsize18_end); found_std_expr = TRUE; } break; case 24: if (op->fontsize24_end) { - outstring+=QString().sprintf (op->fontsize24_end); + outstring+=QString("%1").arg (op->fontsize24_end); found_std_expr = TRUE; } break; case 36: if (op->fontsize36_end) { - outstring+=QString().sprintf (op->fontsize36_end); + outstring+=QString("%1").arg (op->fontsize36_end); found_std_expr = TRUE; } break; case 48: if (op->fontsize48_end) { - outstring+=QString().sprintf (op->fontsize48_end); + outstring+=QString("%1").arg (op->fontsize48_end); found_std_expr = TRUE; } break; @@ -382,53 +382,53 @@ op_end_std_fontsize (OutputPersonality *op, int size) if (op->fontsize_end) { char expr[16]; sprintf (expr, "%d", size); - outstring+=QString().sprintf (op->fontsize_end, expr); + outstring+=QString("%1").arg (op->fontsize_end, expr); } else { /* If we cannot write out a change for the exact * point size, we must approximate to a standard * size. */ if (size<9 && op->fontsize8_end) { - outstring+=QString().sprintf (op->fontsize8_end); + outstring+=QString("%1").arg (op->fontsize8_end); } else if (size<11 && op->fontsize10_end) { - outstring+=QString().sprintf (op->fontsize10_end); + outstring+=QString("%1").arg (op->fontsize10_end); } else if (size<13 && op->fontsize12_end) { - outstring+=QString().sprintf (op->fontsize12_end); + outstring+=QString("%1").arg (op->fontsize12_end); } else if (size<16 && op->fontsize14_end) { - outstring+=QString().sprintf (op->fontsize14_end); + outstring+=QString("%1").arg (op->fontsize14_end); } else if (size<21 && op->fontsize18_end) { - outstring+=QString().sprintf (op->fontsize18_end); + outstring+=QString("%1").arg (op->fontsize18_end); } else if (size<30 && op->fontsize24_end) { - outstring+=QString().sprintf (op->fontsize24_end); + outstring+=QString("%1").arg (op->fontsize24_end); } else if (size<42 && op->fontsize36_end) { - outstring+=QString().sprintf (op->fontsize36_end); + outstring+=QString("%1").arg (op->fontsize36_end); } else if (size>40 && op->fontsize48_end) { - outstring+=QString().sprintf (op->fontsize48_end); + outstring+=QString("%1").arg (op->fontsize48_end); } else /* If we can't even produce a good approximation, * just try to get a font size near 12 point. */ if (op->fontsize12_end) - outstring+=QString().sprintf (op->fontsize12_end); + outstring+=QString("%1").arg (op->fontsize12_end); else if (op->fontsize14_end) - outstring+=QString().sprintf (op->fontsize14_end); + outstring+=QString("%1").arg (op->fontsize14_end); else if (op->fontsize10_end) - outstring+=QString().sprintf (op->fontsize10_end); + outstring+=QString("%1").arg (op->fontsize10_end); else if (op->fontsize18_end) - outstring+=QString().sprintf (op->fontsize18_end); + outstring+=QString("%1").arg (op->fontsize18_end); else if (op->fontsize8_end) - outstring+=QString().sprintf (op->fontsize8_end); + outstring+=QString("%1").arg (op->fontsize8_end); else error_handler ("output personality lacks sufficient font size change capability"); } diff --git a/plugins/flp_import/unrtf/parse.c b/plugins/flp_import/unrtf/parse.c index 949f0c302..188e17667 100644 --- a/plugins/flp_import/unrtf/parse.c +++ b/plugins/flp_import/unrtf/parse.c @@ -38,23 +38,23 @@ * 29 Mar 05, daved@physiol.usyd.edu.au: changes requested by ZT Smith *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif -#ifdef HAVE_CTYPE_H +#ifdef LMMS_HAVE_CTYPE_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif diff --git a/plugins/flp_import/unrtf/util.c b/plugins/flp_import/unrtf/util.c index 3168ce3e9..a7e987886 100644 --- a/plugins/flp_import/unrtf/util.c +++ b/plugins/flp_import/unrtf/util.c @@ -31,15 +31,15 @@ * 29 Mar 05, daved@physiol.usyd.edu.au: changes requested by ZT Smith *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif -#ifdef HAVE_CTYPE_H +#ifdef LMMS_HAVE_CTYPE_H #include #endif diff --git a/plugins/flp_import/unrtf/word.c b/plugins/flp_import/unrtf/word.c index 3dd27d41a..e1ff4c574 100644 --- a/plugins/flp_import/unrtf/word.c +++ b/plugins/flp_import/unrtf/word.c @@ -48,23 +48,23 @@ * 11 Jan 07, jasp00@users.sourceforge.net: optimized unsafe loop *--------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H +#ifdef LMMS_HAVE_CONFIG_H #include #endif -#ifdef HAVE_STDIO_H +#ifdef LMMS_HAVE_STDIO_H #include #endif -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif -#ifdef HAVE_CTYPE_H +#ifdef LMMS_HAVE_CTYPE_H #include #endif -#ifdef HAVE_STRING_H +#ifdef LMMS_HAVE_STRING_H #include #endif diff --git a/plugins/kicker/CMakeLists.txt b/plugins/kicker/CMakeLists.txt new file mode 100644 index 000000000..c2d2d0fe2 --- /dev/null +++ b/plugins/kicker/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(kicker kicker.cpp kicker.h MOCFILES kicker.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/kicker/Makefile.am b/plugins/kicker/Makefile.am deleted file mode 100644 index de0b4c686..000000000 --- a/plugins/kicker/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = kicker - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./kicker.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libkicker.la - -libkicker_la_SOURCES = kicker.cpp kicker.h - -$(libkicker_la_SOURCES): ./embedded_resources.h diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index fed097846..dd4e4ed39 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -266,5 +266,5 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) } -#include "kicker.moc" +#include "moc_kicker.cxx" diff --git a/plugins/ladspa_browser/CMakeLists.txt b/plugins/ladspa_browser/CMakeLists.txt new file mode 100644 index 000000000..2686e3e73 --- /dev/null +++ b/plugins/ladspa_browser/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(ladspabrowser ladspa_browser.cpp ladspa_browser.h ladspa_description.cpp ladspa_description.h ladspa_port_dialog.cpp ladspa_port_dialog.h MOCFILES ladspa_browser.h ladspa_description.h ladspa_port_dialog.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/ladspa_browser/Makefile.am b/plugins/ladspa_browser/Makefile.am deleted file mode 100644 index 5e6159b9c..000000000 --- a/plugins/ladspa_browser/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = ladspabrowser - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./ladspa_browser.moc \ - ./ladspa_description.moc \ - ./ladspa_port_dialog.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libladspabrowser.la - -libladspabrowser_la_SOURCES = ladspa_browser.cpp \ - ladspa_browser.h \ - ladspa_description.cpp \ - ladspa_description.h \ - ladspa_port_dialog.cpp \ - ladspa_port_dialog.h - -$(libladspabrowser_la_SOURCES): ./embedded_resources.h diff --git a/plugins/ladspa_browser/ladspa_browser.cpp b/plugins/ladspa_browser/ladspa_browser.cpp index 4a990339d..446f87734 100644 --- a/plugins/ladspa_browser/ladspa_browser.cpp +++ b/plugins/ladspa_browser/ladspa_browser.cpp @@ -236,4 +236,4 @@ void ladspaBrowserView::showPorts( const ladspa_key_t & _key ) -#include "ladspa_browser.moc" +#include "moc_ladspa_browser.cxx" diff --git a/plugins/ladspa_browser/ladspa_description.cpp b/plugins/ladspa_browser/ladspa_description.cpp index 9e3d7490e..330e353f1 100644 --- a/plugins/ladspa_browser/ladspa_description.cpp +++ b/plugins/ladspa_browser/ladspa_description.cpp @@ -221,4 +221,4 @@ void ladspaDescription::onDoubleClicked( QListWidgetItem * _item ) -#include "ladspa_description.moc" +#include "moc_ladspa_description.cxx" diff --git a/plugins/ladspa_browser/ladspa_port_dialog.cpp b/plugins/ladspa_browser/ladspa_port_dialog.cpp index 76374f847..dcc3e6aa5 100644 --- a/plugins/ladspa_browser/ladspa_port_dialog.cpp +++ b/plugins/ladspa_browser/ladspa_port_dialog.cpp @@ -180,4 +180,5 @@ ladspaPortDialog::~ladspaPortDialog() -#include "ladspa_port_dialog.moc" +#include "moc_ladspa_port_dialog.cxx" + diff --git a/plugins/ladspa_effect/CMakeLists.txt b/plugins/ladspa_effect/CMakeLists.txt new file mode 100644 index 000000000..a5f1a7786 --- /dev/null +++ b/plugins/ladspa_effect/CMakeLists.txt @@ -0,0 +1,12 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(ladspaeffect ladspa_effect.cpp ladspa_controls.cpp ladspa_control_dialog.cpp ladspa_subplugin_features.cpp ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h ladspa_subplugin_features.h MOCFILES ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h EMBEDDED_RESOURCES *.png) + +IF(WANT_CAPS) +ADD_SUBDIRECTORY(caps) +ENDIF(WANT_CAPS) + +IF(WANT_TAP) +ADD_SUBDIRECTORY(tap) +ENDIF(WANT_TAP) + diff --git a/plugins/ladspa_effect/Makefile.am b/plugins/ladspa_effect/Makefile.am deleted file mode 100644 index f17845b3c..000000000 --- a/plugins/ladspa_effect/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -if SHIP_CAPS -SUBDIRS = caps -endif - -if SHIP_TAP -SUBDIRS = tap -endif - -PLUGIN_NAME = ladspaeffect - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./ladspa_effect.moc ./ladspa_controls.moc ./ladspa_control_dialog.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libladspaeffect.la - -libladspaeffect_la_SOURCES = ladspa_effect.cpp \ - ladspa_controls.cpp \ - ladspa_control_dialog.cpp \ - ladspa_subplugin_features.cpp \ - ladspa_effect.h \ - ladspa_controls.h \ - ladspa_control_dialog.h \ - ladspa_subplugin_features.h - -$(libladspaeffect_la_SOURCES): ./embedded_resources.h diff --git a/plugins/ladspa_effect/caps/CMakeLists.txt b/plugins/ladspa_effect/caps/CMakeLists.txt new file mode 100644 index 000000000..eecee6c0a --- /dev/null +++ b/plugins/ladspa_effect/caps/CMakeLists.txt @@ -0,0 +1,13 @@ +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") +SET(CMAKE_BUILD_TYPE release) +FILE(GLOB SOURCES *.cc) +ADD_LIBRARY(caps SHARED ${SOURCES}) +SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "") +SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O3 -Wno-write-strings") +SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") +IF(LMMS_BUILD_LINUX) +SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") +ENDIF(LMMS_BUILD_LINUX) + +INSTALL(TARGETS caps LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa) + diff --git a/plugins/ladspa_effect/caps/Makefile.am b/plugins/ladspa_effect/caps/Makefile.am deleted file mode 100644 index 0be73ca86..000000000 --- a/plugins/ladspa_effect/caps/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - - -AM_CXXFLAGS := $(AM_CXXFLAGS) -O3 -I../../../include - -DEST = $(DESTDIR)$(libdir)/$(PACKAGE)/ladspa -SOURCES = $(wildcard *.cc) -HDRS = $(wildcard *.h) $(wildcard dsp/*.h) -OBJECTS = $(SOURCES:.cc=.o) - -if BUILD_WIN32 -CAPS_SHARED=caps.dll -CAPS_LINKFLAGS= -else -CAPS_SHARED=caps.so -CAPS_LINKFLAGS=-nostartfiles -endif - -$(CAPS_SHARED): $(OBJECTS) depend - $(CXX) $(AM_CXXFLAGS) $(CAPS_LINKFLAGS) -shared -Wl,-no-undefined -o $@ $(OBJECTS) - -clean: - rm -f *.o *.so *.s *.dll depend - -install: all -# strip caps.so - install -d $(DEST) - install -m 644 $(CAPS_SHARED) $(DEST) - -uninstall: - -rm $(DEST)/caps.so - -depend: $(SOURCES) - $(CXX) -MM $(AM_CXXFLAGS) $(SOURCES) > depend - -.cc.o: - $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) -c $< - -all: $(CAPS_SHARED) - -EXTRA_DIST = $(SOURCES) $(HDRS) $(wildcard README*) diff --git a/plugins/ladspa_effect/caps/basics.h b/plugins/ladspa_effect/caps/basics.h index eb143bbb1..0a707a5e5 100644 --- a/plugins/ladspa_effect/caps/basics.h +++ b/plugins/ladspa_effect/caps/basics.h @@ -49,11 +49,7 @@ #include "lmmsconfig.h" -#ifdef LMMS_HAVE_LADSPA_H #include -#else -#include "ladspa-1.1.h" -#endif #define BOUNDED (LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE) #define INTEGER LADSPA_HINT_INTEGER diff --git a/plugins/ladspa_effect/ladspa_control_dialog.cpp b/plugins/ladspa_effect/ladspa_control_dialog.cpp index 0bac6dcb9..35c2b1dd6 100644 --- a/plugins/ladspa_effect/ladspa_control_dialog.cpp +++ b/plugins/ladspa_effect/ladspa_control_dialog.cpp @@ -146,5 +146,5 @@ void ladspaControlDialog::updateEffectView( ladspaControls * _ctl ) } -#include "ladspa_control_dialog.moc" +#include "moc_ladspa_control_dialog.cxx" diff --git a/plugins/ladspa_effect/ladspa_controls.cpp b/plugins/ladspa_effect/ladspa_controls.cpp index 0a12bc59e..b2a3e0c75 100644 --- a/plugins/ladspa_effect/ladspa_controls.cpp +++ b/plugins/ladspa_effect/ladspa_controls.cpp @@ -189,5 +189,5 @@ void ladspaControls::updateChannelLinkState( void ) } -#include "ladspa_controls.moc" +#include "moc_ladspa_controls.cxx" diff --git a/plugins/ladspa_effect/ladspa_effect.cpp b/plugins/ladspa_effect/ladspa_effect.cpp index c2eb0e8d9..4b3e04aa0 100644 --- a/plugins/ladspa_effect/ladspa_effect.cpp +++ b/plugins/ladspa_effect/ladspa_effect.cpp @@ -559,5 +559,5 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data ) } -#include "ladspa_effect.moc" +#include "moc_ladspa_effect.cxx" diff --git a/plugins/ladspa_effect/tap/CMakeLists.txt b/plugins/ladspa_effect/tap/CMakeLists.txt new file mode 100644 index 000000000..73fd3bd4d --- /dev/null +++ b/plugins/ladspa_effect/tap/CMakeLists.txt @@ -0,0 +1,16 @@ +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") +SET(CMAKE_BUILD_TYPE release) +FILE(GLOB PLUGIN_SOURCES *.c) +FOREACH(_item ${PLUGIN_SOURCES}) + GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) + ADD_LIBRARY(${_plugin} SHARED ${_item}) + SET_TARGET_PROPERTIES(${_plugin} PROPERTIES PREFIX "") + SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "-O3 -Wno-write-strings -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC") + SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") + IF(LMMS_BUILD_LINUX) + SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") + ENDIF(LMMS_BUILD_LINUX) + + INSTALL(TARGETS ${_plugin} LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa) +ENDFOREACH(_item ${PLUGIN_SOURCES}) + diff --git a/plugins/ladspa_effect/tap/Makefile.am b/plugins/ladspa_effect/tap/Makefile.am deleted file mode 100644 index b32469725..000000000 --- a/plugins/ladspa_effect/tap/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - - -AM_CFLAGS := $(AM_CFLAGS) $(CFLAGS) -I../../../include -I. -O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC - -DEST = $(DESTDIR)$(libdir)/$(PACKAGE)/ladspa - -all: $(PLUGINS) - -if BUILD_WIN32 -SHARED_EXT=dll -LINKFLAGS= -else -SHARED_EXT=so -LINKFLAGS=-nostartfiles -endif - -PLUGINS = tap_autopan.$(SHARED_EXT) \ - tap_chorusflanger.$(SHARED_EXT) \ - tap_deesser.$(SHARED_EXT) \ - tap_dynamics_m.$(SHARED_EXT) \ - tap_dynamics_st.$(SHARED_EXT) \ - tap_eq.$(SHARED_EXT) \ - tap_eqbw.$(SHARED_EXT) \ - tap_doubler.$(SHARED_EXT) \ - tap_pinknoise.$(SHARED_EXT) \ - tap_pitch.$(SHARED_EXT) \ - tap_reflector.$(SHARED_EXT) \ - tap_reverb.$(SHARED_EXT) \ - tap_rotspeak.$(SHARED_EXT) \ - tap_limiter.$(SHARED_EXT) \ - tap_sigmoid.$(SHARED_EXT) \ - tap_echo.$(SHARED_EXT) \ - tap_tremolo.$(SHARED_EXT) \ - tap_tubewarmth.$(SHARED_EXT) \ - tap_vibrato.$(SHARED_EXT) - - -LDFLAGS = $(LINKFLAGS) -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm - -%.$(SHARED_EXT): %.c - $(CC) $(AM_CFLAGS) -c $< -o $<.o - $(CC) $(LDFLAGS) $<.o -o $@ - -clean: - rm -f *.c.o *.$(SHARED_EXT) - - -install: all - install -d $(DEST) - install -m 644 $(PLUGINS) $(DEST) - -uninstall: - -rm $(DEST)/tap_*.$(SHARED_EXT) - -all: $(PLUGINS) - -EXTRA_DIST = README COPYING CREDITS $(wildcard tap_*.c) $(wildcard tap_*.h) ladspa-local.h diff --git a/plugins/ladspa_effect/tap/tap_autopan.c b/plugins/ladspa_effect/tap/tap_autopan.c index ae1647849..1eda204b0 100644 --- a/plugins/ladspa_effect/tap/tap_autopan.c +++ b/plugins/ladspa_effect/tap/tap_autopan.c @@ -27,7 +27,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin: */ diff --git a/plugins/ladspa_effect/tap/tap_chorusflanger.c b/plugins/ladspa_effect/tap/tap_chorusflanger.c index ce21733f3..24301e242 100644 --- a/plugins/ladspa_effect/tap/tap_chorusflanger.c +++ b/plugins/ladspa_effect/tap/tap_chorusflanger.c @@ -25,7 +25,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_deesser.c b/plugins/ladspa_effect/tap/tap_deesser.c index 399c9bd9b..583290e5c 100644 --- a/plugins/ladspa_effect/tap/tap_deesser.c +++ b/plugins/ladspa_effect/tap/tap_deesser.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin: */ diff --git a/plugins/ladspa_effect/tap/tap_doubler.c b/plugins/ladspa_effect/tap/tap_doubler.c index ff9248934..ae64ac8c6 100644 --- a/plugins/ladspa_effect/tap/tap_doubler.c +++ b/plugins/ladspa_effect/tap/tap_doubler.c @@ -25,7 +25,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_dynamics_m.c b/plugins/ladspa_effect/tap/tap_dynamics_m.c index 4dffee820..e5c39a7c0 100644 --- a/plugins/ladspa_effect/tap/tap_dynamics_m.c +++ b/plugins/ladspa_effect/tap/tap_dynamics_m.c @@ -25,7 +25,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_dynamics_st.c b/plugins/ladspa_effect/tap/tap_dynamics_st.c index fa2f0cd16..97c4df2e2 100644 --- a/plugins/ladspa_effect/tap/tap_dynamics_st.c +++ b/plugins/ladspa_effect/tap/tap_dynamics_st.c @@ -25,7 +25,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_echo.c b/plugins/ladspa_effect/tap/tap_echo.c index 4f9e6cdde..ee693b769 100644 --- a/plugins/ladspa_effect/tap/tap_echo.c +++ b/plugins/ladspa_effect/tap/tap_echo.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin: */ diff --git a/plugins/ladspa_effect/tap/tap_eq.c b/plugins/ladspa_effect/tap/tap_eq.c index 2ce3eb236..9d67e3a80 100644 --- a/plugins/ladspa_effect/tap/tap_eq.c +++ b/plugins/ladspa_effect/tap/tap_eq.c @@ -29,7 +29,7 @@ bugs or malfunction. */ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin */ diff --git a/plugins/ladspa_effect/tap/tap_eqbw.c b/plugins/ladspa_effect/tap/tap_eqbw.c index accfd836f..8421bf499 100644 --- a/plugins/ladspa_effect/tap/tap_eqbw.c +++ b/plugins/ladspa_effect/tap/tap_eqbw.c @@ -27,7 +27,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin */ diff --git a/plugins/ladspa_effect/tap/tap_limiter.c b/plugins/ladspa_effect/tap/tap_limiter.c index c27c39c88..346d3c6ce 100644 --- a/plugins/ladspa_effect/tap/tap_limiter.c +++ b/plugins/ladspa_effect/tap/tap_limiter.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin: */ diff --git a/plugins/ladspa_effect/tap/tap_pinknoise.c b/plugins/ladspa_effect/tap/tap_pinknoise.c index 26c59429b..4738f2867 100644 --- a/plugins/ladspa_effect/tap/tap_pinknoise.c +++ b/plugins/ladspa_effect/tap/tap_pinknoise.c @@ -25,7 +25,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin: */ diff --git a/plugins/ladspa_effect/tap/tap_pitch.c b/plugins/ladspa_effect/tap/tap_pitch.c index bb69e0cd9..d0f39d390 100644 --- a/plugins/ladspa_effect/tap/tap_pitch.c +++ b/plugins/ladspa_effect/tap/tap_pitch.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_reflector.c b/plugins/ladspa_effect/tap/tap_reflector.c index e94a322d3..9c1826f42 100644 --- a/plugins/ladspa_effect/tap/tap_reflector.c +++ b/plugins/ladspa_effect/tap/tap_reflector.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_reverb.c b/plugins/ladspa_effect/tap/tap_reverb.c index 5594d41e2..48e1cbafb 100644 --- a/plugins/ladspa_effect/tap/tap_reverb.c +++ b/plugins/ladspa_effect/tap/tap_reverb.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include /* ***** VERY IMPORTANT! ***** diff --git a/plugins/ladspa_effect/tap/tap_rotspeak.c b/plugins/ladspa_effect/tap/tap_rotspeak.c index c35d10843..aa86f1ea9 100644 --- a/plugins/ladspa_effect/tap/tap_rotspeak.c +++ b/plugins/ladspa_effect/tap/tap_rotspeak.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin: */ diff --git a/plugins/ladspa_effect/tap/tap_sigmoid.c b/plugins/ladspa_effect/tap/tap_sigmoid.c index 5a78a5148..cb28d710e 100644 --- a/plugins/ladspa_effect/tap/tap_sigmoid.c +++ b/plugins/ladspa_effect/tap/tap_sigmoid.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_tremolo.c b/plugins/ladspa_effect/tap/tap_tremolo.c index 8374b5536..820d35b91 100644 --- a/plugins/ladspa_effect/tap/tap_tremolo.c +++ b/plugins/ladspa_effect/tap/tap_tremolo.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" /* The Unique ID of the plugin: */ diff --git a/plugins/ladspa_effect/tap/tap_tubewarmth.c b/plugins/ladspa_effect/tap/tap_tubewarmth.c index 3551612f3..4c66fd17c 100644 --- a/plugins/ladspa_effect/tap/tap_tubewarmth.c +++ b/plugins/ladspa_effect/tap/tap_tubewarmth.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/ladspa_effect/tap/tap_vibrato.c b/plugins/ladspa_effect/tap/tap_vibrato.c index 577315cfa..c518116d2 100644 --- a/plugins/ladspa_effect/tap/tap_vibrato.c +++ b/plugins/ladspa_effect/tap/tap_vibrato.c @@ -24,7 +24,7 @@ #include #include -#include "ladspa-local.h" +#include #include "tap_utils.h" diff --git a/plugins/lb302/CMakeLists.txt b/plugins/lb302/CMakeLists.txt new file mode 100644 index 000000000..c75bd770a --- /dev/null +++ b/plugins/lb302/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(lb302 lb302.cpp lb302.h MOCFILES lb302.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/lb302/Makefile.am b/plugins/lb302/Makefile.am deleted file mode 100644 index 1f52ddff3..000000000 --- a/plugins/lb302/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = lb302 - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./lb302.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= liblb302.la - -liblb302_la_SOURCES = lb302.cpp lb302.h - -$(liblb302_la_SOURCES): ./embedded_resources.h diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index 97d1069ec..81eec47af 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -42,7 +42,7 @@ #undef SINGLE_SOURCE_COMPILE #include "embed.cpp" -#include "lb302.moc" +#include "moc_lb302.cxx" // Envelope Recalculation period diff --git a/plugins/lb303/CMakeLists.txt b/plugins/lb303/CMakeLists.txt new file mode 100644 index 000000000..81f71c634 --- /dev/null +++ b/plugins/lb303/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(lb303 lb303.cpp lb303.h MOCFILES lb303.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/lb303/Makefile.am b/plugins/lb303/Makefile.am deleted file mode 100644 index db1231e0c..000000000 --- a/plugins/lb303/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = lb303 - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./lb303.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= liblb303.la - -liblb303_la_SOURCES = lb303.cpp lb303.h - -$(liblb303_la_SOURCES): ./embedded_resources.h diff --git a/plugins/lb303/lb303.cpp b/plugins/lb303/lb303.cpp index d0e40bba9..68e9abd7b 100644 --- a/plugins/lb303/lb303.cpp +++ b/plugins/lb303/lb303.cpp @@ -42,7 +42,7 @@ #undef SINGLE_SOURCE_COMPILE #include "embed.cpp" -#include "lb303.moc" +#include "moc_lb303.cxx" // Envelope Recalculation period diff --git a/plugins/live_tool/CMakeLists.txt b/plugins/live_tool/CMakeLists.txt new file mode 100644 index 000000000..c853f5ed7 --- /dev/null +++ b/plugins/live_tool/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(livetool live_tool.cpp live_tool.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/live_tool/Makefile.am b/plugins/live_tool/Makefile.am deleted file mode 100644 index 4e616ec64..000000000 --- a/plugins/live_tool/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = livetool - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./live_tool.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = liblivetool.la - -liblivetool_la_SOURCES = live_tool.cpp live_tool.h - -$(liblivetool_la_SOURCES): ./embedded_resources.h diff --git a/plugins/live_tool/live_tool.cpp b/plugins/live_tool/live_tool.cpp index e46fc0801..df94eb2d9 100644 --- a/plugins/live_tool/live_tool.cpp +++ b/plugins/live_tool/live_tool.cpp @@ -200,7 +200,3 @@ void liveToolView::toggleInstrument( int _n ) } - - - -#include "live_tool.moc" diff --git a/plugins/midi_import/CMakeLists.txt b/plugins/midi_import/CMakeLists.txt new file mode 100644 index 000000000..940b6dd03 --- /dev/null +++ b/plugins/midi_import/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(midiimport midi_import.cpp midi_import.h) diff --git a/plugins/midi_import/Makefile.am b/plugins/midi_import/Makefile.am deleted file mode 100644 index 876e6f89d..000000000 --- a/plugins/midi_import/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = midiimport - - -INCLUDES = -I$(top_srcdir)/include -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(DLL) - -pkglib_LTLIBRARIES= libmidiimport.la - -libmidiimport_la_SOURCES = midi_import.cpp midi_import.h diff --git a/plugins/organic/CMakeLists.txt b/plugins/organic/CMakeLists.txt new file mode 100644 index 000000000..8274af798 --- /dev/null +++ b/plugins/organic/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(organic organic.cpp organic.h MOCFILES organic.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/organic/Makefile.am b/plugins/organic/Makefile.am deleted file mode 100644 index f089e525d..000000000 --- a/plugins/organic/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = organic - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./organic.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= liborganic.la - -liborganic_la_SOURCES = organic.cpp organic.h -$(liborganic_la_SOURCES): ./embedded_resources.h diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index 827d57c72..633a4ed0e 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -585,4 +585,4 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) -#include "organic.moc" +#include "moc_organic.cxx" diff --git a/plugins/patman/CMakeLists.txt b/plugins/patman/CMakeLists.txt new file mode 100644 index 000000000..cf8c7ffdf --- /dev/null +++ b/plugins/patman/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(patman patman.cpp patman.h MOCFILES patman.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/patman/Makefile.am b/plugins/patman/Makefile.am deleted file mode 100644 index 2ea32aa76..000000000 --- a/plugins/patman/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = patman - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./patman.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libpatman.la - -libpatman_la_SOURCES = patman.cpp patman.h - -$(libpatman_la_SOURCES): ./embedded_resources.h diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index a3c920023..a853310b1 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -675,4 +675,4 @@ const QStringList & patmanInstrument::subPluginFeatures::supported_extensions( -#include "patman.moc" +#include "moc_patman.cxx" diff --git a/plugins/peak_controller_effect/CMakeLists.txt b/plugins/peak_controller_effect/CMakeLists.txt new file mode 100644 index 000000000..654b8bb08 --- /dev/null +++ b/plugins/peak_controller_effect/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/peak_controller_effect/Makefile.am b/plugins/peak_controller_effect/Makefile.am deleted file mode 100644 index 9c71605d5..000000000 --- a/plugins/peak_controller_effect/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = peakcontroller_effect - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./peak_controller_effect_controls.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= libpeakcontroller_effect.la - -libpeakcontroller_effect_la_SOURCES = peak_controller_effect.cpp \ - peak_controller_effect.h \ - peak_controller_effect_control_dialog.cpp \ - peak_controller_effect_control_dialog.h \ - peak_controller_effect_controls.cpp \ - peak_controller_effect_controls.h - -$(libpeakcontroller_effect_la_SOURCES): ./embedded_resources.h diff --git a/plugins/peak_controller_effect/peak_controller_effect.cpp b/plugins/peak_controller_effect/peak_controller_effect.cpp index 36e6f4308..84e30cc39 100644 --- a/plugins/peak_controller_effect/peak_controller_effect.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect.cpp @@ -36,7 +36,7 @@ extern "C" { -plugin::descriptor PLUGIN_EXPORT peakcontroller_effect_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT peakcontrollereffect_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "Peak Controller", @@ -60,7 +60,7 @@ plugin::descriptor PLUGIN_EXPORT peakcontroller_effect_plugin_descriptor = peakControllerEffect::peakControllerEffect( model * _parent, const descriptor::subPluginFeatures::key * _key ) : - effect( &peakcontroller_effect_plugin_descriptor, _parent, _key ), + effect( &peakcontrollereffect_plugin_descriptor, _parent, _key ), m_effectId( ++peakController::s_lastEffectId ), m_peakControls( this ), m_autoController( NULL ) diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp index eaaeb288c..9853b7add 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp @@ -74,5 +74,5 @@ void peakControllerEffectControls::saveSettings( QDomDocument & _doc, -#include "peak_controller_effect_controls.moc" +#include "moc_peak_controller_effect_controls.cxx" diff --git a/plugins/sf2_player/CMakeLists.txt b/plugins/sf2_player/CMakeLists.txt new file mode 100644 index 000000000..5f9f1ae8a --- /dev/null +++ b/plugins/sf2_player/CMakeLists.txt @@ -0,0 +1,8 @@ +if(LMMS_HAVE_FLUIDSYNTH) + INCLUDE(BuildPlugin) + INCLUDE_DIRECTORIES(${FLUIDSYNTH_INCLUDE_DIRS}) + LINK_DIRECTORIES(${FLUIDSYNTH_LIBRARY_DIRS}) + LINK_LIBRARIES(${FLUIDSYNTH_LIBRARIES}) + BUILD_PLUGIN(sf2player sf2_player.cpp sf2_player.h patches_dialog.cpp patches_dialog.h patches_dialog.ui MOCFILES sf2_player.h patches_dialog.h UICFILES patches_dialog.ui EMBEDDED_RESOURCES *.png) +endif(LMMS_HAVE_FLUIDSYNTH) + diff --git a/plugins/sf2_player/Makefile.am b/plugins/sf2_player/Makefile.am deleted file mode 100644 index eb3397f2a..000000000 --- a/plugins/sf2_player/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = sf2player - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - -ui_%.h: ./%.ui - $(UIC) -o $@ $< - - -MOC_FILES = ./sf2_player.moc ./patches_dialog.moc - -UIC_FILES = ./ui_patches_dialog.h - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) -lfluidsynth-1 && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) $(UIC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ${UIC_FILES} ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libsf2player.la - -libsf2player_la_SOURCES = sf2_player.cpp sf2_player.h patches_dialog.cpp patches_dialog.h patches_dialog.ui -libsf2player_la_LDFLAGS = -L@fluidsynth_lib@ -lfluidsynth - -$(libsf2player_la_SOURCES): ./embedded_resources.h diff --git a/plugins/sf2_player/patches_dialog.cpp b/plugins/sf2_player/patches_dialog.cpp index e683fe810..567f96c47 100644 --- a/plugins/sf2_player/patches_dialog.cpp +++ b/plugins/sf2_player/patches_dialog.cpp @@ -361,4 +361,4 @@ void patchesDialog::progChanged (QTreeWidgetItem * _curr, QTreeWidgetItem * _pre } -#include "patches_dialog.moc" +#include "moc_patches_dialog.cxx" diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index 37befba99..dfff2560d 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -925,5 +925,5 @@ plugin * lmms_plugin_main( model *, void * _data ) } -#include "sf2_player.moc" +#include "moc_sf2_player.cxx" diff --git a/plugins/spectrum_analyzer/CMakeLists.txt b/plugins/spectrum_analyzer/CMakeLists.txt new file mode 100644 index 000000000..cf627c30d --- /dev/null +++ b/plugins/spectrum_analyzer/CMakeLists.txt @@ -0,0 +1,8 @@ +IF(LMMS_HAVE_FFTW3F) + INCLUDE(BuildPlugin) + INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS}) + LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) + LINK_LIBRARIES(${FFTW3F_LIBRARIES}) + BUILD_PLUGIN(spectrumanalyzer spectrum_analyzer.cpp spectrumanalyzer_controls.cpp spectrumanalyzer_control_dialog.cpp spectrum_analyzer.h spectrumanalyzer_controls.h spectrumanalyzer_control_dialog.h MOCFILES spectrumanalyzer_controls.h EMBEDDED_RESOURCES *.png) +ENDIF(LMMS_HAVE_FFTW3F) + diff --git a/plugins/spectrum_analyzer/Makefile.am b/plugins/spectrum_analyzer/Makefile.am deleted file mode 100644 index fa4251095..000000000 --- a/plugins/spectrum_analyzer/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = spectrumanalyzer - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./spectrumanalyzer_controls.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) -lfftw3f-3 && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libspectrumanalyzer.la - -libspectrumanalyzer_la_SOURCES = spectrum_analyzer.cpp \ - spectrum_analyzer.h \ - spectrumanalyzer_controls.cpp \ - spectrumanalyzer_controls.h \ - spectrumanalyzer_control_dialog.cpp \ - spectrumanalyzer_control_dialog.h -if BUILD_WIN32 -libspectrumanalyzer_la_LDFLAGS = -lfftw3f-3 -else -libspectrumanalyzer_la_LDFLAGS = -lfftw3f -endif - -$(libspectrumanalyzer_la_SOURCES): ./embedded_resources.h diff --git a/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp b/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp index 45077e4b9..9edf1fa51 100644 --- a/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp +++ b/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp @@ -58,5 +58,5 @@ void spectrumAnalyzerControls::saveSettings( QDomDocument & _doc, -#include "spectrumanalyzer_controls.moc" +#include "moc_spectrumanalyzer_controls.cxx" diff --git a/plugins/stereo_enhancer/CMakeLists.txt b/plugins/stereo_enhancer/CMakeLists.txt new file mode 100644 index 000000000..729b07781 --- /dev/null +++ b/plugins/stereo_enhancer/CMakeLists.txt @@ -0,0 +1,4 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(stereoenhancer stereo_enhancer.cpp stereoenhancer_controls.cpp stereoenhancer_control_dialog.cpp stereo_enhancer.h stereoenhancer_controls.h stereoenhancer_control_dialog.h MOCFILES stereoenhancer_controls.h EMBEDDED_RESOURCES *.png) + diff --git a/plugins/stereo_enhancer/Makefile.am b/plugins/stereo_enhancer/Makefile.am deleted file mode 100644 index 5f0cb8c52..000000000 --- a/plugins/stereo_enhancer/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = stereoenhancer - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./stereoenhancer_controls.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= libstereoenhancer.la - -libstereoenhancer_la_SOURCES = stereo_enhancer.cpp \ - stereo_enhancer.h \ - stereoenhancer_control_dialog.cpp \ - stereoenhancer_control_dialog.h \ - stereoenhancer_controls.cpp \ - stereoenhancer_controls.h - -$(libstereoenhancer_la_SOURCES): ./embedded_resources.h diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.cpp b/plugins/stereo_enhancer/stereoenhancer_controls.cpp index 81090e4da..48c329dd8 100644 --- a/plugins/stereo_enhancer/stereoenhancer_controls.cpp +++ b/plugins/stereo_enhancer/stereoenhancer_controls.cpp @@ -62,5 +62,5 @@ void stereoEnhancerControls::saveSettings( QDomDocument & _doc, -#include "stereoenhancer_controls.moc" +#include "moc_stereoenhancer_controls.cxx" diff --git a/plugins/stereo_matrix/CMakeLists.txt b/plugins/stereo_matrix/CMakeLists.txt new file mode 100644 index 000000000..10b2d833b --- /dev/null +++ b/plugins/stereo_matrix/CMakeLists.txt @@ -0,0 +1,4 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(stereomatrix stereo_matrix.cpp stereomatrix_controls.cpp stereomatrix_control_dialog.cpp stereo_matrix.h stereomatrix_controls.h stereomatrix_control_dialog.h MOCFILES stereomatrix_controls.h EMBEDDED_RESOURCES *.png) + diff --git a/plugins/stereo_matrix/Makefile.am b/plugins/stereo_matrix/Makefile.am deleted file mode 100644 index 0e1f2c824..000000000 --- a/plugins/stereo_matrix/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = stereomatrix - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./stereomatrix_controls.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= libstereomatrix.la - -libstereomatrix_la_SOURCES = stereo_matrix.cpp \ - stereo_matrix.h \ - stereomatrix_control_dialog.cpp \ - stereomatrix_control_dialog.h \ - stereomatrix_controls.cpp \ - stereomatrix_controls.h - -$(libstereomatrix_la_SOURCES): ./embedded_resources.h diff --git a/plugins/stereo_matrix/stereomatrix_controls.cpp b/plugins/stereo_matrix/stereomatrix_controls.cpp index ccf90f322..d089c2fd2 100644 --- a/plugins/stereo_matrix/stereomatrix_controls.cpp +++ b/plugins/stereo_matrix/stereomatrix_controls.cpp @@ -76,5 +76,5 @@ void stereoMatrixControls::saveSettings( QDomDocument & _doc, -#include "stereomatrix_controls.moc" +#include "moc_stereomatrix_controls.cxx" diff --git a/plugins/stk/CMakeLists.txt b/plugins/stk/CMakeLists.txt new file mode 100644 index 000000000..78ae7432c --- /dev/null +++ b/plugins/stk/CMakeLists.txt @@ -0,0 +1,4 @@ +IF(LMMS_HAVE_STK) +ADD_SUBDIRECTORY(mallets) +ENDIF(LMMS_HAVE_STK) + diff --git a/plugins/stk/Makefile.am b/plugins/stk/Makefile.am deleted file mode 100644 index 243a8fd79..000000000 --- a/plugins/stk/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = mallets diff --git a/plugins/stk/mallets/CMakeLists.txt b/plugins/stk/mallets/CMakeLists.txt new file mode 100644 index 000000000..0f600482d --- /dev/null +++ b/plugins/stk/mallets/CMakeLists.txt @@ -0,0 +1,4 @@ +INCLUDE(BuildPlugin) +INCLUDE_DIRECTORIES(${STK_INCLUDE_DIR}) +LINK_LIBRARIES(${STK_LIBRARY}) +BUILD_PLUGIN(malletsstk mallets.cpp mallets.h MOCFILES mallets.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/stk/mallets/Makefile.am b/plugins/stk/mallets/Makefile.am deleted file mode 100644 index 950cd3b7b..000000000 --- a/plugins/stk/mallets/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - - -INCLUDES = -I@stk_includes@ -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="malletsstk" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./mallets.moc - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES= libmalletsstk.la - -libmalletsstk_la_SOURCES = mallets.cpp mallets.h -libmalletsstk_la_LDFLAGS = -L@stk_lib@ -lstk - -$(libmalletsstk_la_SOURCES): ./embedded_resources.h diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index b4d548e8c..02570159c 100644 --- a/plugins/stk/mallets/mallets.cpp +++ b/plugins/stk/mallets/mallets.cpp @@ -665,6 +665,6 @@ plugin * lmms_plugin_main( model *, void * _data ) } -#include "mallets.moc" +#include "moc_mallets.cxx" diff --git a/plugins/triple_oscillator/CMakeLists.txt b/plugins/triple_oscillator/CMakeLists.txt new file mode 100644 index 000000000..1eafeb082 --- /dev/null +++ b/plugins/triple_oscillator/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(tripleoscillator triple_oscillator.cpp triple_oscillator.h MOCFILES triple_oscillator.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/triple_oscillator/Makefile.am b/plugins/triple_oscillator/Makefile.am deleted file mode 100644 index a0c0d703d..000000000 --- a/plugins/triple_oscillator/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = tripleoscillator - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./triple_oscillator.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h $(DLL) - - - -pkglib_LTLIBRARIES = libtripleoscillator.la - -libtripleoscillator_la_SOURCES = triple_oscillator.cpp triple_oscillator.h - -$(libtripleoscillator_la_SOURCES): ./embedded_resources.h diff --git a/plugins/triple_oscillator/triple_oscillator.cpp b/plugins/triple_oscillator/triple_oscillator.cpp index 61e33c2dd..6d1906054 100644 --- a/plugins/triple_oscillator/triple_oscillator.cpp +++ b/plugins/triple_oscillator/triple_oscillator.cpp @@ -818,5 +818,5 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) } -#include "triple_oscillator.moc" +#include "moc_triple_oscillator.cxx" diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt new file mode 100644 index 000000000..3af759e7e --- /dev/null +++ b/plugins/vestige/CMakeLists.txt @@ -0,0 +1,12 @@ +IF(LMMS_HAVE_VST) +INCLUDE(BuildPlugin) + +INCLUDE_DIRECTORIES(../vst_base) +LINK_DIRECTORIES(../vst_base) +LINK_LIBRARIES(vstbase) + +BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES *.png) +SET_TARGET_PROPERTIES(vestige PROPERTIES COMPILE_FLAGS "-D_FORTIFY_SOURCE=0") + +ENDIF(LMMS_HAVE_VST) + diff --git a/plugins/vestige/Makefile.am b/plugins/vestige/Makefile.am deleted file mode 100644 index 9e081aabf..000000000 --- a/plugins/vestige/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -I../vst_base - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vestige" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./vestige.moc - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - - -pkglib_LTLIBRARIES = libvestige.la - -libvestige_la_SOURCES = vestige.cpp vestige.h -libvestige_la_LIBADD = -L../vst_base -lvstbase - -$(libvestige_la_SOURCES): ./embedded_resources.h - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 5b288688b..af98d5769 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -548,5 +548,5 @@ plugin * lmms_plugin_main( model *, void * _data ) } -#include "vestige.moc" +#include "moc_vestige.cxx" diff --git a/plugins/vibed/CMakeLists.txt b/plugins/vibed/CMakeLists.txt new file mode 100644 index 000000000..b0e812d80 --- /dev/null +++ b/plugins/vibed/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(vibedstrings vibed.cpp nine_button_selector.cpp string_container.cpp vibrating_string.cpp vibed.h nine_button_selector.h string_container.h vibrating_string.h MOCFILES vibed.h nine_button_selector.h EMBEDDED_RESOURCES *.png) diff --git a/plugins/vibed/Makefile.am b/plugins/vibed/Makefile.am deleted file mode 100644 index d2800b6c6..000000000 --- a/plugins/vibed/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - -PLUGIN_NAME = vibedstrings - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./vibed.moc ./nine_button_selector.moc - -if BUILD_WIN32 -DLL=$(PLUGIN_NAME).dll - -$(DLL): lib$(PLUGIN_NAME).la - $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ - -install-exec-hook: $(DLL) - cp $< $(pkglibdir) - rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la -else -DLL= -endif - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h $(DLL) - - - -pkglib_LTLIBRARIES= libvibedstrings.la - -libvibedstrings_la_SOURCES = vibed.cpp \ - vibed.h \ - vibrating_string.cpp \ - vibrating_string.h \ - nine_button_selector.cpp \ - nine_button_selector.h \ - string_container.cpp \ - string_container.h - -$(libvibedstrings_la_SOURCES): ./embedded_resources.h diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp index 51995776a..ca6415d75 100644 --- a/plugins/vibed/nine_button_selector.cpp +++ b/plugins/vibed/nine_button_selector.cpp @@ -274,4 +274,4 @@ void nineButtonSelector::displayHelp( void ) -#include "nine_button_selector.moc" +#include "moc_nine_button_selector.cxx" diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index 3d57ec44c..62d874bd7 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -789,5 +789,5 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) } -#include "vibed.moc" +#include "moc_vibed.cxx" diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt new file mode 100644 index 000000000..e2e5bffa7 --- /dev/null +++ b/plugins/vst_base/CMakeLists.txt @@ -0,0 +1,23 @@ +IF(LMMS_HAVE_VST) + +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(vstbase vst_base.cpp lvsl_client.cpp lvsl_client.h communication.h MOCFILES lvsl_client.h) +SET_TARGET_PROPERTIES(vstbase PROPERTIES COMPILE_FLAGS "-D_FORTIFY_SOURCE=0") + +IF(HOST_IS_64BIT) + SET(EXTRA_FLAGS -m32 -Wb,--as-cmd='as --32',--ld-cmd='ld -melf_i386' -L/usr/lib32) +ENDIF(HOST_IS_64BIT) +ADD_CUSTOM_COMMAND( + SOURCE lvsl_server.cpp + COMMAND wineg++ + ARGS -I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_INSTALL_PREFIX}/include/wine/windows -I/usr/include/wine/windows lvsl_server.cpp -mwindows -lpthread ${EXTRA_FLAGS} -o lvsl_server.exe.so + TARGET vstbase + OUTPUTS lvsl_server.exe.so + ) + +SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES lvsl_server.exe.so) + +INSTALL(FILES lvsl_server.exe.so DESTINATION ${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}) + +ENDIF(LMMS_HAVE_VST) diff --git a/plugins/vst_base/Makefile.am b/plugins/vst_base/Makefile.am deleted file mode 100644 index e662bdfd0..000000000 --- a/plugins/vst_base/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - - -INCLUDES = -I$(top_srcdir)/include -I. - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vstbase" - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./lvsl_client.moc - -BUILT_SOURCES = $(MOC_FILES) - -pkglib_LTLIBRARIES = libvstbase.la - -libvstbase_la_SOURCES = vst_base.cpp \ - lvsl_client.cpp \ - lvsl_client.h - -pkglib_PROGRAMS = lvsl_server -lvsl_server_SOURCES = lvsl_server.cpp communication.h -lvsl_server_CPPFLAGS = $(AM_CPPFLAGS) -I${prefix}/include/wine/windows -lvsl_server_CPPFLAGS += -I/usr/include/wine/windows -lvsl_server_LINK = wineg++ -mwindows -lpthread -o $(pkglib_PROGRAMS) -nobase_pkglib_DATA = $(pkglib_PROGRAMS).exe.so - -if AMD64_BUILD -lvsl_server_CXXFLAGS = -m32 $(AM_CXXFLAGS) -lvsl_server_LINK += -m32 -Wb,--as-cmd="as --32",--ld-cmd="ld -melf_i386" \ - -L/usr/lib32 -endif - -CLEANFILES = $(MOC_FILES) $(nobase_pkglib_DATA) - -install-exec-hook: - cd $(DESTDIR)$(pkglibdir) ; \ - strip $(nobase_pkglib_DATA) - diff --git a/plugins/vst_base/lvsl_client.cpp b/plugins/vst_base/lvsl_client.cpp index ea29820a9..cab04d9f6 100644 --- a/plugins/vst_base/lvsl_client.cpp +++ b/plugins/vst_base/lvsl_client.cpp @@ -640,5 +640,5 @@ Sint16 remoteVSTPlugin::processNextMessage( void ) -#include "lvsl_client.moc" +#include "moc_lvsl_client.cxx" diff --git a/plugins/vst_effect/CMakeLists.txt b/plugins/vst_effect/CMakeLists.txt new file mode 100644 index 000000000..79cca8047 --- /dev/null +++ b/plugins/vst_effect/CMakeLists.txt @@ -0,0 +1,12 @@ +IF(LMMS_HAVE_VST) +INCLUDE(BuildPlugin) + +INCLUDE_DIRECTORIES(../vst_base) +LINK_DIRECTORIES(../vst_base) +LINK_LIBRARIES(vstbase) + +BUILD_PLUGIN(vsteffect vst_effect.cpp vst_effect_controls.cpp vst_effect_control_dialog.cpp vst_subplugin_features.cpp vst_effect.h vst_effect_controls.h vst_effect_control_dialog.h vst_subplugin_features.h MOCFILES vst_effect_controls.h EMBEDDED_RESOURCES *.png) +ENDIF(LMMS_HAVE_VST) + +SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-D_FORTIFY_SOURCE=0") + diff --git a/plugins/vst_effect/Makefile.am b/plugins/vst_effect/Makefile.am deleted file mode 100644 index aa69b3690..000000000 --- a/plugins/vst_effect/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.4 - - -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -I../vst_base/ - - -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vsteffect" - - -%.moc: ./%.h - $(MOC) -o $@ $< - - -MOC_FILES = ./vst_effect_controls.moc - - -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h -EMBEDDED_RESOURCES = $(wildcard *png) - -./embedded_resources.h: $(EMBEDDED_RESOURCES) - $(BIN2RES) $(EMBEDDED_RESOURCES) > $@ - -EXTRA_DIST = $(EMBEDDED_RESOURCES) - - -CLEANFILES = $(MOC_FILES) ./embedded_resources.h - - - -pkglib_LTLIBRARIES = libvsteffect.la - -libvsteffect_la_SOURCES = vst_effect.cpp \ - vst_effect_controls.cpp \ - vst_effect_control_dialog.cpp \ - vst_subplugin_features.cpp \ - vst_subplugin_features.h \ - vst_effect.h \ - vst_effect_controls.h \ - vst_effect_control_dialog.h -libvsteffect_la_LIBADD = -L../vst_base -lvstbase - -$(libvsteffect_la_SOURCES): ./embedded_resources.h diff --git a/plugins/vst_effect/vst_effect_controls.cpp b/plugins/vst_effect/vst_effect_controls.cpp index 7c3c8a8a9..e1cefff8b 100755 --- a/plugins/vst_effect/vst_effect_controls.cpp +++ b/plugins/vst_effect/vst_effect_controls.cpp @@ -65,5 +65,5 @@ void vstEffectControls::saveSettings( QDomDocument & _doc, QDomElement & _this ) -#include "vst_effect_controls.moc" +#include "moc_vst_effect_controls.cxx" diff --git a/src/3rdparty/samplerate/config.h b/src/3rdparty/samplerate/config.h new file mode 100644 index 000000000..134714f19 --- /dev/null +++ b/src/3rdparty/samplerate/config.h @@ -0,0 +1,12 @@ +#include "lmmsconfig.h" + +#ifdef LMMS_BUILD_WIN32 +#define WIN32 +#endif + +#ifdef LMMS_HAVE_STDINT_H +#define HAVE_STDINT_H +#endif + +#define PACKAGE "libsamplerate" +#define VERSION "0.1.4" diff --git a/src/3rdparty/samplerate/src_sinc.c b/src/3rdparty/samplerate/src_sinc.c index 44eb18f22..fadacacbe 100644 --- a/src/3rdparty/samplerate/src_sinc.c +++ b/src/3rdparty/samplerate/src_sinc.c @@ -201,8 +201,8 @@ sinc_set_converter (SRC_PRIVATE *psrc, int src_enum) ** a better way. Need to look at prepare_data () at the same time. */ - temp_filter.b_len = 1000 + 2 * lrint (0.5 + 2 * temp_filter.coeff_half_len / (temp_filter.index_inc * 1.0) * SRC_MAX_RATIO) ; - temp_filter.b_len = MIN (temp_filter.b_len, 4096) ; + temp_filter.b_len = 2 * lrint (1.0 + temp_filter.coeff_half_len / (temp_filter.index_inc * 1.0) * SRC_MAX_RATIO) ; + temp_filter.b_len = MAX (temp_filter.b_len, 4096) ; temp_filter.b_len *= temp_filter.channels ; if ((filter = calloc (1, sizeof (SINC_FILTER) + sizeof (filter->buffer [0]) * (temp_filter.b_len + temp_filter.channels))) == NULL) diff --git a/src/core/audio/audio_alsa.cpp b/src/core/audio/audio_alsa.cpp index 1f1862c8e..cfe9919c1 100644 --- a/src/core/audio/audio_alsa.cpp +++ b/src/core/audio/audio_alsa.cpp @@ -32,8 +32,7 @@ #include "audio_alsa.h" - -#ifdef ALSA_SUPPORT +#ifdef LMMS_HAVE_ALSA #include "endian_handling.h" #include "config_mgr.h" diff --git a/src/core/audio/audio_file_ogg.cpp b/src/core/audio/audio_file_ogg.cpp index 4a30ddd37..b51309fbe 100644 --- a/src/core/audio/audio_file_ogg.cpp +++ b/src/core/audio/audio_file_ogg.cpp @@ -7,7 +7,7 @@ * This file is based on encode.c from vorbis-tools-source, for more information * see below. * - * Copyright (c) 2004-2007 Tobias Doerffel + * Copyright (c) 2004-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -30,11 +30,9 @@ -#include - #include "audio_file_ogg.h" -#ifdef LMMS_HAVE_VORBIS_CODEC_H +#ifdef LMMS_HAVE_OGGVORBIS #include diff --git a/src/core/audio/audio_file_wave.cpp b/src/core/audio/audio_file_wave.cpp index d012033b7..09b5118d2 100644 --- a/src/core/audio/audio_file_wave.cpp +++ b/src/core/audio/audio_file_wave.cpp @@ -4,7 +4,7 @@ * audio_file_wave.cpp - audio-device which encodes wave-stream and writes it * into a WAVE-file. This is used for song-export. * - * Copyright (c) 2004-2007 Tobias Doerffel + * Copyright (c) 2004-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -62,7 +62,6 @@ audioFileWave::~audioFileWave() bool audioFileWave::startEncoding( void ) { -#if LMMS_HAVE_SNDFILE_H m_si.samplerate = sampleRate(); m_si.channels = channels(); m_si.frames = getMixer()->framesPerPeriod(); @@ -76,31 +75,6 @@ bool audioFileWave::startEncoding( void ) default: m_si.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16; break; } m_sf = sf_open( outputFile().toUtf8().constData(), SFM_WRITE, &m_si ); -#else - if( outputFileOpened() == FALSE ) - { - return( FALSE ); - } - - m_bytesWritten = 0; - - memcpy( m_waveFileHeader.riff_id, "RIFF", 4 ); - m_waveFileHeader.total_bytes = 0; - memcpy( m_waveFileHeader.wave_fmt_str, "WAVEfmt ", 8 ); - m_waveFileHeader.bitrate_1 = m_waveFileHeader.bitrate_2 = - BYTES_PER_INT_SAMPLE * 8; - m_waveFileHeader.uncompressed = swap16IfBE( 1 ); - m_waveFileHeader.channels = swap16IfBE( channels() ); - m_waveFileHeader.sample_rate = swap32IfBE( sampleRate() ); - m_waveFileHeader.bytes_per_second = swap32IfBE( sampleRate() * - BYTES_PER_INT_SAMPLE * channels() ); - m_waveFileHeader.block_alignment = swap16IfBE( BYTES_PER_INT_SAMPLE * - channels() ); - memcpy ( m_waveFileHeader.data_chunk_id, "data", 4 ); - m_waveFileHeader.data_bytes = 0; - - writeData( &m_waveFileHeader, sizeof( m_waveFileHeader ) ); -#endif return( TRUE ); } @@ -111,7 +85,6 @@ void audioFileWave::writeBuffer( const surroundSampleFrame * _ab, const fpp_t _frames, const float _master_gain ) { -#if LMMS_HAVE_SNDFILE_H if( depth() == 32 ) { float * buf = new float[_frames*channels()]; @@ -135,16 +108,6 @@ void audioFileWave::writeBuffer( const surroundSampleFrame * _ab, sf_writef_short( m_sf, buf, _frames ); delete[] buf; } -#else - int bytes = 0; - int_sample_t * outbuf = new int_sample_t[_frames * channels()]; - Uint32 bytes = convertToS16( _ab, _frames, _master_gain, outbuf, - !isLittleEndian() ); - writeData( outbuf, bytes ); - delete[] outbuf; - - m_bytesWritten += bytes; -#endif } @@ -152,18 +115,7 @@ void audioFileWave::writeBuffer( const surroundSampleFrame * _ab, void audioFileWave::finishEncoding( void ) { -#if LMMS_HAVE_SNDFILE_H sf_close( m_sf ); -#else - seekToBegin(); - - m_waveFileHeader.total_bytes = swap32IfBE( m_bytesWritten+36 ); - m_waveFileHeader.data_bytes = swap32IfBE( m_bytesWritten ); - - // write header again, because total-bytes-field and data-bytes-field - // have to be updated... - writeData( &m_waveFileHeader, sizeof( m_waveFileHeader ) ); -#endif } diff --git a/src/core/audio/audio_jack.cpp b/src/core/audio/audio_jack.cpp index f98016c96..d73a8d6d2 100644 --- a/src/core/audio/audio_jack.cpp +++ b/src/core/audio/audio_jack.cpp @@ -28,7 +28,7 @@ #include "audio_jack.h" -#ifdef JACK_SUPPORT +#ifdef LMMS_HAVE_JACK #include #include diff --git a/src/core/audio/audio_oss.cpp b/src/core/audio/audio_oss.cpp index 5887d7593..8fff0b0ca 100644 --- a/src/core/audio/audio_oss.cpp +++ b/src/core/audio/audio_oss.cpp @@ -28,7 +28,7 @@ #include "audio_oss.h" -#ifdef OSS_SUPPORT +#ifdef LMMS_HAVE_OSS #include #include diff --git a/src/core/audio/audio_pulseaudio.cpp b/src/core/audio/audio_pulseaudio.cpp index d1bf32727..6b119b890 100644 --- a/src/core/audio/audio_pulseaudio.cpp +++ b/src/core/audio/audio_pulseaudio.cpp @@ -32,8 +32,7 @@ #include "audio_pulseaudio.h" - -#ifdef PULSEAUDIO_SUPPORT +#ifdef LMMS_HAVE_PULSEAUDIO #include "endian_handling.h" #include "config_mgr.h" @@ -307,5 +306,5 @@ void audioPulseAudio::setupWidget::saveSettings( void ) #endif - #endif + diff --git a/src/core/audio/audio_sdl.cpp b/src/core/audio/audio_sdl.cpp index 8d14c0480..c54e2b295 100644 --- a/src/core/audio/audio_sdl.cpp +++ b/src/core/audio/audio_sdl.cpp @@ -28,7 +28,7 @@ #include "audio_sdl.h" -#ifdef SDL_AUDIO_SUPPORT +#ifdef LMMS_HAVE_SDL #include #include diff --git a/src/core/automatable_model.cpp b/src/core/automatable_model.cpp index de19c4ca6..f066a4265 100644 --- a/src/core/automatable_model.cpp +++ b/src/core/automatable_model.cpp @@ -450,5 +450,5 @@ void automatableModel::pasteValue( void ) -#include "automatable_model.moc" +#include "moc_automatable_model.cxx" diff --git a/src/core/automation_pattern.cpp b/src/core/automation_pattern.cpp index 03ea3c6c2..888dd0f7f 100644 --- a/src/core/automation_pattern.cpp +++ b/src/core/automation_pattern.cpp @@ -760,7 +760,7 @@ void automationPatternView::dropEvent( QDropEvent * _de ) -#include "automation_pattern.moc" +#include "moc_automation_pattern.cxx" #endif diff --git a/src/core/bb_track_container.cpp b/src/core/bb_track_container.cpp index 5e0b859e9..e20869424 100644 --- a/src/core/bb_track_container.cpp +++ b/src/core/bb_track_container.cpp @@ -272,5 +272,5 @@ void bbTrackContainer::createTCOsForBB( int _bb ) -#include "bb_track_container.moc" +#include "moc_bb_track_container.cxx" diff --git a/src/core/combobox_model.cpp b/src/core/combobox_model.cpp index f5f5b8eab..aeccc6159 100644 --- a/src/core/combobox_model.cpp +++ b/src/core/combobox_model.cpp @@ -67,5 +67,5 @@ int comboBoxModel::findText( const QString & _txt ) const -#include "combobox_model.moc" +#include "moc_combobox_model.cxx" diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp index 20b04c96a..06185bb45 100644 --- a/src/core/config_mgr.cpp +++ b/src/core/config_mgr.cpp @@ -57,7 +57,7 @@ configManager::configManager( void ) : m_pluginDir( qApp->applicationDirPath() + QDir::separator() + "plugins" + QDir::separator() ), #else - m_pluginDir( QString( LIBDIR ) + "/lmms/" ), + m_pluginDir( QString( PLUGIN_DIR ) ), #endif m_vstDir( QDir::home().absolutePath() ), m_flDir( QDir::home().absolutePath() ) @@ -117,7 +117,7 @@ void configManager::setLADSPADir( const QString & _fd ) void configManager::setSTKDir( const QString & _fd ) { -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK m_stkDir = _fd; #endif } @@ -258,7 +258,7 @@ bool configManager::loadConfigFile( void ) m_vstDir = value( "paths", "vstdir" ); m_flDir = value( "paths", "fldir" ); m_ladDir = value( "paths", "laddir" ); -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK m_stkDir = value( "paths", "stkdir" ); #endif @@ -277,11 +277,11 @@ bool configManager::loadConfigFile( void ) #ifdef LMMS_BUILD_WIN32 m_ladDir = m_pluginDir + "ladspa" + QDir::separator(); #else - m_ladDir = QString(LIBDIR) + "/ladspa/"; + m_ladDir = QString(LIB_DIR) + "/ladspa/"; #endif } -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK if( m_stkDir == "" ) { m_stkDir = "/usr/share/stk/rawwaves/"; @@ -323,7 +323,7 @@ void configManager::saveConfigFile( void ) setValue( "paths", "vstdir", m_vstDir ); setValue( "paths", "fldir", m_flDir ); setValue( "paths", "laddir", m_ladDir ); -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK setValue( "paths", "stkdir", m_stkDir ); #endif diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 21c0c160a..2ad01ddc8 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -225,7 +225,7 @@ controllerDialog * controller::createDialog( QWidget * _parent ) } -#include "controller.moc" +#include "moc_controller.cxx" #endif diff --git a/src/core/controller_connection.cpp b/src/core/controller_connection.cpp index f8bac3bb7..4a1c5e4a7 100644 --- a/src/core/controller_connection.cpp +++ b/src/core/controller_connection.cpp @@ -211,7 +211,7 @@ controllerDialog * controller::createDialog( QWidget * _parent ) } */ -#include "controller_connection.moc" +#include "moc_controller_connection.cxx" #endif diff --git a/src/core/envelope_and_lfo_parameters.cpp b/src/core/envelope_and_lfo_parameters.cpp index 54a076363..658ed9095 100644 --- a/src/core/envelope_and_lfo_parameters.cpp +++ b/src/core/envelope_and_lfo_parameters.cpp @@ -489,7 +489,7 @@ void envelopeAndLFOParameters::updateSampleVars( void ) -#include "envelope_and_lfo_parameters.moc" +#include "moc_envelope_and_lfo_parameters.cxx" #endif diff --git a/src/core/instrument_functions.cpp b/src/core/instrument_functions.cpp index ff2e0940f..8ffe89781 100644 --- a/src/core/instrument_functions.cpp +++ b/src/core/instrument_functions.cpp @@ -510,6 +510,6 @@ void arpeggiator::loadSettings( const QDomElement & _this ) } -#include "instrument_functions.moc" +#include "moc_instrument_functions.cxx" #endif diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp index fbf179a77..4072123b3 100644 --- a/src/core/instrument_sound_shaping.cpp +++ b/src/core/instrument_sound_shaping.cpp @@ -399,6 +399,6 @@ void instrumentSoundShaping::loadSettings( const QDomElement & _this ) -#include "instrument_sound_shaping.moc" +#include "moc_instrument_sound_shaping.cxx" #endif diff --git a/src/core/ladspa_control.cpp b/src/core/ladspa_control.cpp index 74a985cfc..8d3f82972 100644 --- a/src/core/ladspa_control.cpp +++ b/src/core/ladspa_control.cpp @@ -306,4 +306,4 @@ void ladspaControl::setLink( bool _state ) -#include "ladspa_control.moc" +#include "moc_ladspa_control.cxx" diff --git a/src/core/ladspa_manager.cpp b/src/core/ladspa_manager.cpp index fadc255da..136580e44 100644 --- a/src/core/ladspa_manager.cpp +++ b/src/core/ladspa_manager.cpp @@ -43,7 +43,7 @@ ladspaManager::ladspaManager( void ) ladspaDirectories.push_back( configManager::inst()->pluginDir() + "ladspa" ); #ifndef LMMS_BUILD_WIN32 - ladspaDirectories.push_back( QString( LIBDIR ) + "/ladspa" ); + ladspaDirectories.push_back( QString( LIB_DIR ) + "ladspa" ); ladspaDirectories.push_back( "/usr/lib/lmms/ladspa" ); ladspaDirectories.push_back( "/usr/local/lib/lmms/ladspa" ); ladspaDirectories.push_back( "/usr/lib/ladspa" ); diff --git a/src/core/lfo_controller.cpp b/src/core/lfo_controller.cpp index 4a381673e..1ba074d06 100644 --- a/src/core/lfo_controller.cpp +++ b/src/core/lfo_controller.cpp @@ -245,7 +245,7 @@ controllerDialog * lfoController::createDialog( QWidget * _parent ) } -#include "lfo_controller.moc" +#include "moc_lfo_controller.cxx" #endif diff --git a/src/core/main.cpp b/src/core/main.cpp index 309c7d253..1fc24107d 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -117,7 +117,7 @@ int main( int argc, char * * argv ) "modify it under the terms of the GNU General Public\n" "License as published by the Free Software Foundation; either\n" "version 2 of the License, or (at your option) any later version.\n\n" - "Try \"%s --help\" for more information.\n\n", LMMS_PACKAGE_VERSION, + "Try \"%s --help\" for more information.\n\n", LMMS_VERSION, argv[0] ); return( EXIT_SUCCESS ); } @@ -151,7 +151,7 @@ int main( int argc, char * * argv ) "-u,--upgrade upgrade file and save as \n" "-v, --version show version information and exit.\n" "-h, --help show this usage message and exit.\n\n", - LMMS_PACKAGE_VERSION ); + LMMS_VERSION ); return( EXIT_SUCCESS ); } else if( argc > i+1 && ( QString( argv[i] ) == "--upgrade" || @@ -183,10 +183,12 @@ int main( int argc, char * * argv ) { eff = projectRenderer::WaveFile; } +#ifdef LMMS_HAVE_OGGVORBIS else if( ext == "ogg" ) { eff = projectRenderer::OggFile; } +#endif else { printf( "\nInvalid output format %s.\n\n" @@ -298,9 +300,11 @@ int main( int argc, char * * argv ) QString pos = QLocale::system().name().left( 2 ); +#ifdef QT_TRANSLATIONS_DIR // load translation for Qt-widgets/-dialogs loadTranslation( QString( "qt_" ) + pos, - QString( LMMS_QT_TRANSLATIONS_DIR ) ); + QString( QT_TRANSLATIONS_DIR ) ); +#endif // load actual translation for LMMS loadTranslation( pos ); diff --git a/src/core/meter_model.cpp b/src/core/meter_model.cpp index ca29611e1..f1e9565ba 100644 --- a/src/core/meter_model.cpp +++ b/src/core/meter_model.cpp @@ -75,5 +75,5 @@ void meterModel::loadSettings( const QDomElement & _this, -#include "meter_model.moc" +#include "moc_meter_model.cxx" diff --git a/src/core/midi/midi_alsa_raw.cpp b/src/core/midi/midi_alsa_raw.cpp index 80c1ea9af..cc00fe968 100644 --- a/src/core/midi/midi_alsa_raw.cpp +++ b/src/core/midi/midi_alsa_raw.cpp @@ -3,7 +3,7 @@ /* * midi_alsa_raw.cpp - midi-client for RawMIDI via ALSA * - * Copyright (c) 2005-2007 Tobias Doerffel + * Copyright (c) 2005-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -34,7 +34,7 @@ #include "gui_templates.h" -#ifdef ALSA_SUPPORT +#ifdef LMMS_HAVE_ALSA midiALSARaw::midiALSARaw( void ) : @@ -207,8 +207,7 @@ void midiALSARaw::setupWidget::saveSettings( void ) } +#endif #endif - -#endif diff --git a/src/core/midi/midi_alsa_seq.cpp b/src/core/midi/midi_alsa_seq.cpp index bf2f92473..c54181f3c 100644 --- a/src/core/midi/midi_alsa_seq.cpp +++ b/src/core/midi/midi_alsa_seq.cpp @@ -38,7 +38,7 @@ #include "note.h" -#ifdef ALSA_SUPPORT +#ifdef LMMS_HAVE_ALSA midiALSASeq::midiALSASeq( void ) : @@ -651,10 +651,9 @@ void midiALSASeq::setupWidget::saveSettings( void ) } -#include "midi_alsa_seq.moc" +#include "moc_midi_alsa_seq.cxx" #endif - #endif diff --git a/src/core/midi/midi_controller.cpp b/src/core/midi/midi_controller.cpp index 4403bac9b..02c54d6f2 100644 --- a/src/core/midi/midi_controller.cpp +++ b/src/core/midi/midi_controller.cpp @@ -156,7 +156,7 @@ controllerDialog * midiController::createDialog( QWidget * _parent ) } -#include "midi_controller.moc" +#include "moc_midi_controller.cxx" #endif diff --git a/src/core/midi/midi_mapper.cpp b/src/core/midi/midi_mapper.cpp index 849dea558..1f6fff3a7 100644 --- a/src/core/midi/midi_mapper.cpp +++ b/src/core/midi/midi_mapper.cpp @@ -1,3 +1,4 @@ +#if 0 #ifndef SINGLE_SOURCE_COMPILE /* @@ -214,4 +215,5 @@ void midiMapper::readChannelMap( QFile & _f ) +#endif #endif diff --git a/src/core/midi/midi_oss.cpp b/src/core/midi/midi_oss.cpp index 6b4253e3e..6535b228f 100644 --- a/src/core/midi/midi_oss.cpp +++ b/src/core/midi/midi_oss.cpp @@ -3,7 +3,7 @@ /* * midi_oss.cpp - OSS-raw-midi-client * - * Copyright (c) 2005-2007 Tobias Doerffel + * Copyright (c) 2005-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -27,14 +27,14 @@ #include "midi_oss.h" -#ifdef OSS_SUPPORT +#ifdef LMMS_HAVE_OSS #include #include -#ifdef HAVE_STDLIB_H +#ifdef LMMS_HAVE_STDLIB_H #include #endif diff --git a/src/core/midi/midi_port.cpp b/src/core/midi/midi_port.cpp index 094040151..ec7f9ce68 100644 --- a/src/core/midi/midi_port.cpp +++ b/src/core/midi/midi_port.cpp @@ -391,7 +391,7 @@ void midiPort::subscribeWriteablePort( const QString & _port, bool _subscribe ) -#include "midi_port.moc" +#include "moc_midi_port.cxx" #endif diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp index 3bbb549cc..d0effada4 100644 --- a/src/core/mixer.cpp +++ b/src/core/mixer.cpp @@ -914,7 +914,7 @@ audioDevice * mixer::tryAudioDevices( void ) dev_name = ""; } -#ifdef ALSA_SUPPORT +#ifdef LMMS_HAVE_ALSA if( dev_name == audioALSA::name() || dev_name == "" ) { dev = new audioALSA( success_ful, this ); @@ -928,7 +928,7 @@ audioDevice * mixer::tryAudioDevices( void ) #endif -#ifdef PULSEAUDIO_SUPPORT +#ifdef LMMS_HAVE_PULSEAUDIO if( dev_name == audioPulseAudio::name() || dev_name == "" ) { dev = new audioPulseAudio( success_ful, this ); @@ -942,7 +942,7 @@ audioDevice * mixer::tryAudioDevices( void ) #endif -#ifdef OSS_SUPPORT +#ifdef LMMS_HAVE_OSS if( dev_name == audioOSS::name() || dev_name == "" ) { dev = new audioOSS( success_ful, this ); @@ -956,7 +956,7 @@ audioDevice * mixer::tryAudioDevices( void ) #endif -#ifdef JACK_SUPPORT +#ifdef LMMS_HAVE_JACK if( dev_name == audioJACK::name() || dev_name == "" ) { dev = new audioJACK( success_ful, this ); @@ -970,7 +970,7 @@ audioDevice * mixer::tryAudioDevices( void ) #endif -#ifdef SDL_AUDIO_SUPPORT +#ifdef LMMS_HAVE_SDL if( dev_name == audioSDL::name() || dev_name == "" ) { dev = new audioSDL( success_ful, this ); @@ -1008,7 +1008,7 @@ midiClient * mixer::tryMIDIClients( void ) QString client_name = configManager::inst()->value( "mixer", "mididev" ); -#ifdef ALSA_SUPPORT +#ifdef LMMS_HAVE_ALSA if( client_name == midiALSASeq::name() || client_name == "" ) { midiALSASeq * malsas = new midiALSASeq; @@ -1032,7 +1032,7 @@ midiClient * mixer::tryMIDIClients( void ) } #endif -#ifdef OSS_SUPPORT +#ifdef LMMS_HAVE_OSS if( client_name == midiOSS::name() || client_name == "" ) { midiOSS * moss = new midiOSS; @@ -1096,7 +1096,7 @@ void mixer::fifoWriter::run( void ) -#include "mixer.moc" +#include "moc_mixer.cxx" #endif diff --git a/src/core/mv_base.cpp b/src/core/mv_base.cpp index bf90d6fbe..6ee6137bb 100644 --- a/src/core/mv_base.cpp +++ b/src/core/mv_base.cpp @@ -112,5 +112,5 @@ void modelView::doConnections( void ) } -#include "mv_base.moc" +#include "moc_mv_base.cxx" diff --git a/src/core/peak_controller.cpp b/src/core/peak_controller.cpp index 8f18d07b2..311a2dd38 100644 --- a/src/core/peak_controller.cpp +++ b/src/core/peak_controller.cpp @@ -112,7 +112,7 @@ controllerDialog * peakController::createDialog( QWidget * _parent ) } -#include "peak_controller.moc" +#include "moc_peak_controller.cxx" #endif diff --git a/src/core/piano.cpp b/src/core/piano.cpp index 7a9f530d8..78d69da6d 100644 --- a/src/core/piano.cpp +++ b/src/core/piano.cpp @@ -869,7 +869,7 @@ void pianoView::paintEvent( QPaintEvent * ) -#include "piano.moc" +#include "moc_piano.cxx" #endif diff --git a/src/core/project_renderer.cpp b/src/core/project_renderer.cpp index 60c9621db..1bd702395 100644 --- a/src/core/project_renderer.cpp +++ b/src/core/project_renderer.cpp @@ -205,5 +205,5 @@ void projectRenderer::updateConsoleProgress( void ) -#include "project_renderer.moc" +#include "moc_project_renderer.cxx" diff --git a/src/core/sample_buffer.cpp b/src/core/sample_buffer.cpp index e0c62279c..b6e113262 100644 --- a/src/core/sample_buffer.cpp +++ b/src/core/sample_buffer.cpp @@ -38,11 +38,9 @@ #include -#ifdef LMMS_HAVE_SNDFILE_H #include -#endif -#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H +#ifdef LMMS_HAVE_OGGVORBIS #include #endif @@ -189,14 +187,12 @@ void sampleBuffer::update( bool _keep_settings ) m_frames = 0; -#ifdef LMMS_HAVE_SNDFILE_H if( m_frames == 0 ) { m_frames = decodeSampleSF( f, buf, channels, samplerate ); } -#endif -#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H +#ifdef LMMS_HAVE_OGGVORBIS if( m_frames == 0 ) { m_frames = decodeSampleOGGVorbis( f, buf, channels, @@ -314,7 +310,6 @@ void sampleBuffer::normalizeSampleRate( const sample_rate_t _src_sr, -#ifdef LMMS_HAVE_SNDFILE_H f_cnt_t sampleBuffer::decodeSampleSF( const char * _f, int_sample_t * & _buf, ch_cnt_t & _channels, @@ -323,15 +318,9 @@ f_cnt_t sampleBuffer::decodeSampleSF( const char * _f, SNDFILE * snd_file; SF_INFO sf_info; f_cnt_t frames = 0; -#ifdef OLD_SNDFILE - if( ( snd_file = sf_open_read( _f, &sf_info ) ) != NULL ) - { - frames = sf_info.samples; -#else if( ( snd_file = sf_open( _f, SFM_READ, &sf_info ) ) != NULL ) { frames = sf_info.frames; -#endif _buf = new int_sample_t[sf_info.channels * frames]; if( sf_read_short( snd_file, _buf, sf_info.channels * frames ) < sf_info.channels * frames ) @@ -355,12 +344,11 @@ f_cnt_t sampleBuffer::decodeSampleSF( const char * _f, } return( frames ); } -#endif -#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H +#ifdef LMMS_HAVE_OGGVORBIS // callback-functions for reading ogg-file @@ -1213,7 +1201,7 @@ sampleBuffer::handleState::~handleState() -#include "sample_buffer.moc" +#include "moc_sample_buffer.cxx" #endif diff --git a/src/core/song.cpp b/src/core/song.cpp index 9139cbc83..7610d9fe5 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -1167,7 +1167,7 @@ void song::removeController( controller * _controller ) } -#include "song.moc" +#include "moc_song.cxx" #endif diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp index 97fb9e7dc..22958faf4 100644 --- a/src/core/surround_area.cpp +++ b/src/core/surround_area.cpp @@ -282,7 +282,7 @@ automationPattern * surroundAreaModel::automationPatternY( void ) */ -#include "surround_area.moc" +#include "moc_surround_area.cxx" #endif diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp index ac3e7d496..3fd622389 100644 --- a/src/core/timeline.cpp +++ b/src/core/timeline.cpp @@ -372,7 +372,7 @@ void timeLine::mouseReleaseEvent( QMouseEvent * _me ) -#include "timeline.moc" +#include "moc_timeline.cxx" #endif diff --git a/src/core/track.cpp b/src/core/track.cpp index 14b6ba8c2..de3759729 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -2427,7 +2427,7 @@ void trackView::createTCOView( trackContentObject * _tco ) -#include "track.moc" +#include "moc_track.cxx" #endif diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp index 1fb748828..33e013dc0 100644 --- a/src/core/track_container.cpp +++ b/src/core/track_container.cpp @@ -213,5 +213,5 @@ dummyTrackContainer::dummyTrackContainer( void ) : -#include "track_container.moc" +#include "moc_track_container.cxx" diff --git a/src/gui/about_dialog.cpp b/src/gui/about_dialog.cpp index 4cb8e49da..c19a40dc8 100644 --- a/src/gui/about_dialog.cpp +++ b/src/gui/about_dialog.cpp @@ -129,7 +129,7 @@ void aboutDialog::resizeEvent( QResizeEvent * _re ) -#include "about_dialog.moc" +#include "moc_about_dialog.cxx" #endif diff --git a/src/gui/automatable_model_view.cpp b/src/gui/automatable_model_view.cpp index 3a7bba319..4ab3dbc12 100644 --- a/src/gui/automatable_model_view.cpp +++ b/src/gui/automatable_model_view.cpp @@ -239,4 +239,4 @@ void automatableModelViewSlots::editSongGlobalAutomation( void ) -#include "automatable_model_view.moc" +#include "moc_automatable_model_view.cxx" diff --git a/src/gui/automation_editor.cpp b/src/gui/automation_editor.cpp index b9a078605..84251edbc 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/automation_editor.cpp @@ -2160,7 +2160,7 @@ void automationEditor::update( void ) -#include "automation_editor.moc" +#include "moc_automation_editor.cxx" #endif diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index 4bb2828cd..c63113856 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -246,5 +246,5 @@ void bbEditor::keyPressEvent( QKeyEvent * _ke ) -#include "bb_editor.moc" +#include "moc_bb_editor.cxx" diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp index eabce6264..1b8f16b95 100644 --- a/src/gui/controller_connection_dialog.cpp +++ b/src/gui/controller_connection_dialog.cpp @@ -409,6 +409,6 @@ void controllerConnectionDialog::midiValueChanged( void ) -#include "controller_connection_dialog.moc" +#include "moc_controller_connection_dialog.cxx" #endif diff --git a/src/gui/controller_dialog.cpp b/src/gui/controller_dialog.cpp index afe2ff78c..dcf53e0a4 100644 --- a/src/gui/controller_dialog.cpp +++ b/src/gui/controller_dialog.cpp @@ -53,6 +53,6 @@ void controllerDialog::closeEvent( QCloseEvent * _ce ) } -#include "controller_dialog.moc" +#include "moc_controller_dialog.cxx" #endif diff --git a/src/gui/effect_control_dialog.cpp b/src/gui/effect_control_dialog.cpp index ccbc4d536..48184514d 100644 --- a/src/gui/effect_control_dialog.cpp +++ b/src/gui/effect_control_dialog.cpp @@ -62,7 +62,7 @@ void effectControlDialog::closeEvent( QCloseEvent * _ce ) -#include "effect_control_dialog.moc" +#include "moc_effect_control_dialog.cxx" #endif diff --git a/src/gui/effect_select_dialog.cpp b/src/gui/effect_select_dialog.cpp index 24e9c0896..1ac1f101d 100644 --- a/src/gui/effect_select_dialog.cpp +++ b/src/gui/effect_select_dialog.cpp @@ -314,6 +314,6 @@ void effectListWidget::updateSelection( void ) } -#include "effect_select_dialog.moc" +#include "moc_effect_select_dialog.cxx" #endif diff --git a/src/gui/export_project_dialog.cpp b/src/gui/export_project_dialog.cpp index aad90f69a..2882789e4 100644 --- a/src/gui/export_project_dialog.cpp +++ b/src/gui/export_project_dialog.cpp @@ -167,7 +167,7 @@ void exportProjectDialog::updateTitleBar( int _prog ) -#include "export_project_dialog.moc" +#include "moc_export_project_dialog.cxx" #endif diff --git a/src/gui/file_browser.cpp b/src/gui/file_browser.cpp index 2ce84ed65..70d250322 100644 --- a/src/gui/file_browser.cpp +++ b/src/gui/file_browser.cpp @@ -893,5 +893,5 @@ QString fileItem::extension( const QString & _file ) -#include "file_browser.moc" +#include "moc_file_browser.cxx" diff --git a/src/gui/fx_mixer_view.cpp b/src/gui/fx_mixer_view.cpp index 2ed38dbfc..7216d695f 100644 --- a/src/gui/fx_mixer_view.cpp +++ b/src/gui/fx_mixer_view.cpp @@ -324,6 +324,6 @@ void fxMixerView::updateFaders( void ) -#include "fx_mixer_view.moc" +#include "moc_fx_mixer_view.cxx" #endif diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp index 490caccb0..374622097 100644 --- a/src/gui/main_window.cpp +++ b/src/gui/main_window.cpp @@ -964,7 +964,7 @@ void mainWindow::browseHelp( void ) -#include "main_window.moc" +#include "moc_main_window.cxx" #endif diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index b19a5976e..3291629fb 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -2760,7 +2760,7 @@ bool pianoRoll::x11Event( XEvent * _xe ) -#include "piano_roll.moc" +#include "moc_piano_roll.cxx" #endif diff --git a/src/gui/plugin_browser.cpp b/src/gui/plugin_browser.cpp index b8c4e88c2..402c47967 100644 --- a/src/gui/plugin_browser.cpp +++ b/src/gui/plugin_browser.cpp @@ -223,7 +223,7 @@ void pluginDescWidget::updateHeight( void ) -#include "plugin_browser.moc" +#include "moc_plugin_browser.cxx" #endif diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp index ccc868b43..847906961 100644 --- a/src/gui/setup_dialog.cpp +++ b/src/gui/setup_dialog.cpp @@ -101,7 +101,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : m_artworkDir( configManager::inst()->artworkDir() ), m_flDir( configManager::inst()->flDir() ), m_ladDir( configManager::inst()->ladspaDir() ), -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK m_stkDir( configManager::inst()->stkDir() ), #endif m_disableChActInd( configManager::inst()->value( "ui", @@ -128,7 +128,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : m_tabBar->setFixedWidth( 72 ); QWidget * ws = new QWidget( settings ); -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK ws->setFixedSize( 360, 422 ); #else ws->setFixedSize( 360, 366 ); @@ -227,7 +227,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : QWidget * directories = new QWidget( ws ); -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK directories->setFixedSize( 360, 372 ); #else directories->setFixedSize( 360, 326 ); @@ -331,7 +331,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( laddir_select_btn, SIGNAL( clicked() ), this, SLOT( openLADSPADir() ) ); -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK // STK-dir tabWidget * stk_tw = new tabWidget( tr( "STK rawwave directory" ).toUpper(), @@ -361,7 +361,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : dir_layout->addWidget( fl_tw ); dir_layout->addSpacing( 10 ); dir_layout->addWidget( lad_tw ); -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK dir_layout->addSpacing( 10 ); dir_layout->addWidget( stk_tw ); #endif @@ -439,27 +439,27 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : asw_layout->setMargin( 0 ); //asw_layout->setAutoAdd( TRUE ); -#ifdef JACK_SUPPORT +#ifdef LMMS_HAVE_JACK m_audioIfaceSetupWidgets[audioJACK::name()] = new audioJACK::setupWidget( asw ); #endif -#ifdef ALSA_SUPPORT +#ifdef LMMS_HAVE_ALSA m_audioIfaceSetupWidgets[audioALSA::name()] = new audioALSA::setupWidget( asw ); #endif -#ifdef PULSEAUDIO_SUPPORT +#ifdef LMMS_HAVE_PULSEAUDIO m_audioIfaceSetupWidgets[audioPulseAudio::name()] = new audioPulseAudio::setupWidget( asw ); #endif -#ifdef SDL_AUDIO_SUPPORT +#ifdef LMMS_HAVE_SDL m_audioIfaceSetupWidgets[audioSDL::name()] = new audioSDL::setupWidget( asw ); #endif -#ifdef OSS_SUPPORT +#ifdef LMMS_HAVE_OSS m_audioIfaceSetupWidgets[audioOSS::name()] = new audioOSS::setupWidget( asw ); #endif @@ -526,14 +526,14 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : msw_layout->setMargin( 0 ); //msw_layout->setAutoAdd( TRUE ); -#ifdef ALSA_SUPPORT +#ifdef LMMS_HAVE_ALSA m_midiIfaceSetupWidgets[midiALSASeq::name()] = new midiALSASeq::setupWidget( msw ); m_midiIfaceSetupWidgets[midiALSARaw::name()] = new midiALSARaw::setupWidget( msw ); #endif -#ifdef OSS_SUPPORT +#ifdef LMMS_HAVE_OSS m_midiIfaceSetupWidgets[midiOSS::name()] = new midiOSS::setupWidget( msw ); #endif @@ -663,7 +663,7 @@ void setupDialog::accept( void ) configManager::inst()->setArtworkDir( m_artworkDir ); configManager::inst()->setFLDir( m_flDir ); configManager::inst()->setLADSPADir( m_ladDir ); -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK configManager::inst()->setSTKDir( m_stkDir ); #endif @@ -913,7 +913,7 @@ void setupDialog::openLADSPADir( void ) void setupDialog::openSTKDir( void ) { -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK QString new_dir = QFileDialog::getExistingDirectory( this, tr( "Choose STK rawwave directory" ), m_ladDir ); @@ -945,7 +945,7 @@ void setupDialog::setLADSPADir( const QString & _fd ) void setupDialog::setSTKDir( const QString & _fd ) { -#ifdef LMMS_HAVE_STK_H +#ifdef LMMS_HAVE_STK m_stkDir = _fd; #endif } @@ -1013,7 +1013,7 @@ void setupDialog::displayMIDIHelp( void ) -#include "setup_dialog.moc" +#include "moc_setup_dialog.cxx" #endif diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index ed184ffc5..34fdd4a01 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -640,7 +640,7 @@ bool songEditor::allowRubberband( void ) const -#include "song_editor.moc" +#include "moc_song_editor.cxx" #endif diff --git a/src/gui/track_container_view.cpp b/src/gui/track_container_view.cpp index 1e4d6cfe7..c72d917d6 100644 --- a/src/gui/track_container_view.cpp +++ b/src/gui/track_container_view.cpp @@ -483,5 +483,5 @@ void trackContainerView::scrollArea::wheelEvent( QWheelEvent * _we ) -#include "track_container_view.moc" +#include "moc_track_container_view.cxx" diff --git a/src/gui/widgets/automatable_button.cpp b/src/gui/widgets/automatable_button.cpp index f6c223c7b..cbed8467b 100644 --- a/src/gui/widgets/automatable_button.cpp +++ b/src/gui/widgets/automatable_button.cpp @@ -261,6 +261,6 @@ void automatableButtonGroup::updateButtons( void ) } -#include "automatable_button.moc" +#include "moc_automatable_button.cxx" #endif diff --git a/src/gui/widgets/automatable_slider.cpp b/src/gui/widgets/automatable_slider.cpp index 216b2b8a3..6ce0d1d23 100644 --- a/src/gui/widgets/automatable_slider.cpp +++ b/src/gui/widgets/automatable_slider.cpp @@ -146,6 +146,6 @@ void automatableSlider::updateSlider( void ) -#include "automatable_slider.moc" +#include "moc_automatable_slider.cxx" #endif diff --git a/src/gui/widgets/caption_menu.cpp b/src/gui/widgets/caption_menu.cpp index 41a9b0e4d..7cd245bf9 100644 --- a/src/gui/widgets/caption_menu.cpp +++ b/src/gui/widgets/caption_menu.cpp @@ -47,7 +47,7 @@ captionMenu::~captionMenu() -#include "caption_menu.moc" +#include "moc_caption_menu.cxx" #endif diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp index c243cd2b7..efae33c4c 100644 --- a/src/gui/widgets/combobox.cpp +++ b/src/gui/widgets/combobox.cpp @@ -245,7 +245,7 @@ void comboBox::setItem( QAction * _item ) -#include "combobox.moc" +#include "moc_combobox.cxx" #endif diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp index 232bdb6fe..ec557b036 100644 --- a/src/gui/widgets/controller_rack_view.cpp +++ b/src/gui/widgets/controller_rack_view.cpp @@ -280,6 +280,6 @@ void effectRackView::modelChanged( void ) */ -#include "controller_rack_view.moc" +#include "moc_controller_rack_view.cxx" #endif diff --git a/src/gui/widgets/controller_view.cpp b/src/gui/widgets/controller_view.cpp index 7709089f9..49657bd52 100644 --- a/src/gui/widgets/controller_view.cpp +++ b/src/gui/widgets/controller_view.cpp @@ -178,6 +178,6 @@ void controllerView::modelChanged( void ) } -#include "controller_view.moc" +#include "moc_controller_view.cxx" #endif diff --git a/src/gui/widgets/cpuload_widget.cpp b/src/gui/widgets/cpuload_widget.cpp index 1e8ca3a40..f0f67e727 100644 --- a/src/gui/widgets/cpuload_widget.cpp +++ b/src/gui/widgets/cpuload_widget.cpp @@ -102,7 +102,7 @@ void cpuloadWidget::updateCpuLoad() -#include "cpuload_widget.moc" +#include "moc_cpuload_widget.cxx" #endif diff --git a/src/gui/widgets/effect_rack_view.cpp b/src/gui/widgets/effect_rack_view.cpp index 5850f85f3..b521241f8 100644 --- a/src/gui/widgets/effect_rack_view.cpp +++ b/src/gui/widgets/effect_rack_view.cpp @@ -251,6 +251,6 @@ void effectRackView::modelChanged( void ) -#include "effect_rack_view.moc" +#include "moc_effect_rack_view.cxx" #endif diff --git a/src/gui/widgets/effect_view.cpp b/src/gui/widgets/effect_view.cpp index 635674ae6..ecb65f888 100644 --- a/src/gui/widgets/effect_view.cpp +++ b/src/gui/widgets/effect_view.cpp @@ -268,6 +268,6 @@ void effectView::modelChanged( void ) } -#include "effect_view.moc" +#include "moc_effect_view.cxx" #endif diff --git a/src/gui/widgets/envelope_and_lfo_view.cpp b/src/gui/widgets/envelope_and_lfo_view.cpp index 5815fcad6..84b6f3de8 100644 --- a/src/gui/widgets/envelope_and_lfo_view.cpp +++ b/src/gui/widgets/envelope_and_lfo_view.cpp @@ -584,7 +584,7 @@ void envelopeAndLFOView::lfoUserWaveChanged( void ) -#include "envelope_and_lfo_view.moc" +#include "moc_envelope_and_lfo_view.cxx" #endif diff --git a/src/gui/widgets/fade_button.cpp b/src/gui/widgets/fade_button.cpp index 6a9cb44ff..019b92f8d 100644 --- a/src/gui/widgets/fade_button.cpp +++ b/src/gui/widgets/fade_button.cpp @@ -125,7 +125,7 @@ void fadeButton::signalUpdate( void ) -#include "fade_button.moc" +#include "moc_fade_button.cxx" #endif diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp index 2ae24ec1f..eb398c500 100644 --- a/src/gui/widgets/fader.cpp +++ b/src/gui/widgets/fader.cpp @@ -247,5 +247,5 @@ void fader::setMinPeak( float fMin ) -#include "fader.moc" +#include "moc_fader.cxx" diff --git a/src/gui/widgets/graph.cpp b/src/gui/widgets/graph.cpp index a24ffe29b..4d800324d 100644 --- a/src/gui/widgets/graph.cpp +++ b/src/gui/widgets/graph.cpp @@ -522,4 +522,4 @@ void graphModel::normalize( void ) -#include "graph.moc" +#include "moc_graph.cxx" diff --git a/src/gui/widgets/group_box.cpp b/src/gui/widgets/group_box.cpp index a98dbeada..ec429ca44 100644 --- a/src/gui/widgets/group_box.cpp +++ b/src/gui/widgets/group_box.cpp @@ -152,7 +152,7 @@ void groupBox::updatePixmap( void ) -#include "group_box.moc" +#include "moc_group_box.cxx" #endif diff --git a/src/gui/widgets/instrument_function_views.cpp b/src/gui/widgets/instrument_function_views.cpp index 61acc1a0b..b88c9c206 100644 --- a/src/gui/widgets/instrument_function_views.cpp +++ b/src/gui/widgets/instrument_function_views.cpp @@ -204,6 +204,6 @@ void arpeggiatorView::modelChanged( void ) -#include "instrument_function_views.moc" +#include "moc_instrument_function_views.cxx" #endif diff --git a/src/gui/widgets/instrument_sound_shaping_view.cpp b/src/gui/widgets/instrument_sound_shaping_view.cpp index b08aed95f..519cf9616 100644 --- a/src/gui/widgets/instrument_sound_shaping_view.cpp +++ b/src/gui/widgets/instrument_sound_shaping_view.cpp @@ -146,5 +146,5 @@ void instrumentSoundShapingView::modelChanged( void ) -#include "instrument_sound_shaping_view.moc" +#include "moc_instrument_sound_shaping_view.cxx" diff --git a/src/gui/widgets/kmultitabbar.cpp b/src/gui/widgets/kmultitabbar.cpp index 1a404cbb8..9bbd4b0e2 100644 --- a/src/gui/widgets/kmultitabbar.cpp +++ b/src/gui/widgets/kmultitabbar.cpp @@ -912,7 +912,7 @@ QList* KMultiTabBar::tabs() {return m_internal->tabs();} QList* KMultiTabBar::buttons() {return &m_buttons;} -#include "kmultitabbar.moc" +#include "moc_kmultitabbar.cxx" diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp index bec086a90..da9307838 100644 --- a/src/gui/widgets/knob.cpp +++ b/src/gui/widgets/knob.cpp @@ -652,7 +652,7 @@ void knob::displayHelp( void ) -#include "knob.moc" +#include "moc_knob.cxx" #endif diff --git a/src/gui/widgets/ladspa_control_view.cpp b/src/gui/widgets/ladspa_control_view.cpp index c6ffb8b9f..137b254e4 100644 --- a/src/gui/widgets/ladspa_control_view.cpp +++ b/src/gui/widgets/ladspa_control_view.cpp @@ -128,5 +128,5 @@ ladspaControlView::~ladspaControlView() -#include "ladspa_control_view.moc" +#include "moc_ladspa_control_view.cxx" diff --git a/src/gui/widgets/lcd_spinbox.cpp b/src/gui/widgets/lcd_spinbox.cpp index d1f78c854..1f5e79ffd 100644 --- a/src/gui/widgets/lcd_spinbox.cpp +++ b/src/gui/widgets/lcd_spinbox.cpp @@ -338,7 +338,7 @@ void lcdSpinBox::wheelEvent( QWheelEvent * _we ) -#include "lcd_spinbox.moc" +#include "moc_lcd_spinbox.cxx" #endif diff --git a/src/gui/widgets/led_checkbox.cpp b/src/gui/widgets/led_checkbox.cpp index ad482ce2d..c6ec082ac 100644 --- a/src/gui/widgets/led_checkbox.cpp +++ b/src/gui/widgets/led_checkbox.cpp @@ -95,6 +95,6 @@ void ledCheckBox::paintEvent( QPaintEvent * ) -#include "led_checkbox.moc" +#include "moc_led_checkbox.cxx" #endif diff --git a/src/gui/widgets/midi_port_menu.cpp b/src/gui/widgets/midi_port_menu.cpp index deedbf95b..4c164c6cd 100644 --- a/src/gui/widgets/midi_port_menu.cpp +++ b/src/gui/widgets/midi_port_menu.cpp @@ -101,5 +101,5 @@ void midiPortMenu::updatePorts( void ) -#include "midi_port_menu.moc" +#include "moc_midi_port_menu.cxx" diff --git a/src/gui/widgets/nstate_button.cpp b/src/gui/widgets/nstate_button.cpp index 2a4092522..de78fbc62 100644 --- a/src/gui/widgets/nstate_button.cpp +++ b/src/gui/widgets/nstate_button.cpp @@ -102,7 +102,7 @@ void nStateButton::mousePressEvent( QMouseEvent * _me ) -#include "nstate_button.moc" +#include "moc_nstate_button.cxx" #endif diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp index 739888979..e2f80c09a 100644 --- a/src/gui/widgets/pixmap_button.cpp +++ b/src/gui/widgets/pixmap_button.cpp @@ -135,7 +135,7 @@ void pixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update ) -#include "pixmap_button.moc" +#include "moc_pixmap_button.cxx" #endif diff --git a/src/gui/widgets/project_notes.cpp b/src/gui/widgets/project_notes.cpp index 73e0c2aa8..c9705702c 100644 --- a/src/gui/widgets/project_notes.cpp +++ b/src/gui/widgets/project_notes.cpp @@ -403,7 +403,7 @@ void projectNotes::loadSettings( const QDomElement & _this ) } -#include "project_notes.moc" +#include "moc_project_notes.cxx" #endif diff --git a/src/gui/widgets/rename_dialog.cpp b/src/gui/widgets/rename_dialog.cpp index 840bb606d..2f45a407e 100644 --- a/src/gui/widgets/rename_dialog.cpp +++ b/src/gui/widgets/rename_dialog.cpp @@ -77,7 +77,7 @@ void renameDialog::textChanged( const QString & _new_string ) -#include "rename_dialog.moc" +#include "moc_rename_dialog.cxx" #endif diff --git a/src/gui/widgets/rubberband.cpp b/src/gui/widgets/rubberband.cpp index f96e72649..991a0ec14 100644 --- a/src/gui/widgets/rubberband.cpp +++ b/src/gui/widgets/rubberband.cpp @@ -104,7 +104,7 @@ QVector rubberBand::selectableObjects( void ) const -#include "rubberband.moc" +#include "moc_rubberband.cxx" #endif diff --git a/src/gui/widgets/side_bar_widget.cpp b/src/gui/widgets/side_bar_widget.cpp index 326fab8bd..4d2a8bec1 100644 --- a/src/gui/widgets/side_bar_widget.cpp +++ b/src/gui/widgets/side_bar_widget.cpp @@ -89,8 +89,8 @@ void sideBarWidget::resizeEvent( QResizeEvent * ) -#include "side_bar.moc" -#include "side_bar_widget.moc" +#include "moc_side_bar.cxx" +#include "moc_side_bar_widget.cxx" #endif diff --git a/src/gui/widgets/tab_bar.cpp b/src/gui/widgets/tab_bar.cpp index e1aeec6a7..f9c656c34 100644 --- a/src/gui/widgets/tab_bar.cpp +++ b/src/gui/widgets/tab_bar.cpp @@ -244,8 +244,8 @@ bool tabBar::allHidden( void ) -#include "tab_bar.moc" -#include "tab_button.moc" +#include "moc_tab_bar.cxx" +#include "moc_tab_button.cxx" #endif diff --git a/src/gui/widgets/tab_widget.cpp b/src/gui/widgets/tab_widget.cpp index 042abde7d..fa6985c74 100644 --- a/src/gui/widgets/tab_widget.cpp +++ b/src/gui/widgets/tab_widget.cpp @@ -228,7 +228,7 @@ void tabWidget::wheelEvent( QWheelEvent * _we ) -#include "tab_widget.moc" +#include "moc_tab_widget.cxx" #endif diff --git a/src/gui/widgets/tempo_sync_knob.cpp b/src/gui/widgets/tempo_sync_knob.cpp index 7dedbd7fe..deca81384 100644 --- a/src/gui/widgets/tempo_sync_knob.cpp +++ b/src/gui/widgets/tempo_sync_knob.cpp @@ -485,7 +485,7 @@ void tempoSyncKnob::showCustom( void ) -#include "tempo_sync_knob.moc" +#include "moc_tempo_sync_knob.cxx" #endif diff --git a/src/gui/widgets/tool_button.cpp b/src/gui/widgets/tool_button.cpp index 1a0957353..3cf1cf87a 100644 --- a/src/gui/widgets/tool_button.cpp +++ b/src/gui/widgets/tool_button.cpp @@ -104,7 +104,7 @@ void toolButton::toggledBool( bool _on ) -#include "tool_button.moc" +#include "moc_tool_button.cxx" #endif diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/track_label_button.cpp index 465f4b695..5ee38f7f9 100644 --- a/src/gui/widgets/track_label_button.cpp +++ b/src/gui/widgets/track_label_button.cpp @@ -234,7 +234,7 @@ void trackLabelButton::dropEvent( QDropEvent * _de ) -#include "track_label_button.moc" +#include "moc_track_label_button.cxx" #endif diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp index e31d426bb..2cd58c27c 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/visualization_widget.cpp @@ -193,7 +193,7 @@ void visualizationWidget::mousePressEvent( QMouseEvent * _me ) -#include "visualization_widget.moc" +#include "moc_visualization_widget.cxx" #endif diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index b6d899b8d..d619bed18 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -573,7 +573,7 @@ void bbTrackView::clickedTrackLabel( void ) -#include "bb_track.moc" +#include "moc_bb_track.cxx" #endif diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 7985e2d58..26f31f4fd 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -1409,7 +1409,7 @@ void instrumentTrackWindow::loadSettings( const QDomElement & _this ) -#include "instrument_track.moc" +#include "moc_instrument_track.cxx" #endif diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp index c3df6a48c..de65c4874 100644 --- a/src/tracks/pattern.cpp +++ b/src/tracks/pattern.cpp @@ -1302,7 +1302,7 @@ void patternView::paintEvent( QPaintEvent * ) -#include "pattern.moc" +#include "moc_pattern.cxx" #endif diff --git a/src/tracks/sample_track.cpp b/src/tracks/sample_track.cpp index 644f00bf3..23795af4e 100644 --- a/src/tracks/sample_track.cpp +++ b/src/tracks/sample_track.cpp @@ -479,7 +479,7 @@ void sampleTrackView::showEffects( void ) -#include "sample_track.moc" +#include "moc_sample_track.cxx" #endif