commit 72b40e1e647e4842aff2fa3f72b1eb5778242f25 parent 0e92655f0124a8dda83c8f11f7c406356f1c6925 Author: Harald Hvaal <harald.hvaal@gmail.com> Date: Wed, 24 Jun 2009 23:13:15 +0900 Rename C files to cpp and make it work with cmake and old makefile build Diffstat:
77 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -85,6 +85,11 @@ if(FltkGui) # Check for FLTK message(STATUS "Will build fltk gui") + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/UI + ${CMAKE_CURRENT_BINARY_DIR}/UI + ) + add_subdirectory(UI) endif() @@ -107,11 +112,10 @@ add_subdirectory(Seq) add_subdirectory(Effects) add_subdirectory(Params) add_subdirectory(DSP) -add_subdirectory(UI) add_subdirectory(Samples) set(zynaddsubfx_SRCS - main.C + main.cpp ) add_executable(zynaddsubfx diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt @@ -1,6 +1,6 @@ set(zynaddsubfx_controls_SRCS - Control.C - DelayCtl.C + Control.cpp + DelayCtl.cpp ) add_library(zynaddsubfx_controls STATIC diff --git a/src/Controls/Control.C b/src/Controls/Control.cpp diff --git a/src/Controls/DelayCtl.C b/src/Controls/DelayCtl.cpp diff --git a/src/DSP/AnalogFilter.C b/src/DSP/AnalogFilter.cpp diff --git a/src/DSP/CMakeLists.txt b/src/DSP/CMakeLists.txt @@ -1,9 +1,9 @@ set(zynaddsubfx_dsp_SRCS - AnalogFilter.C - FFTwrapper.C - Filter.C - FormantFilter.C - SVFilter.C + AnalogFilter.cpp + FFTwrapper.cpp + Filter.cpp + FormantFilter.cpp + SVFilter.cpp ) add_library(zynaddsubfx_dsp STATIC diff --git a/src/DSP/FFTwrapper.C b/src/DSP/FFTwrapper.cpp diff --git a/src/DSP/Filter.C b/src/DSP/Filter.cpp diff --git a/src/DSP/FormantFilter.C b/src/DSP/FormantFilter.cpp diff --git a/src/DSP/SVFilter.C b/src/DSP/SVFilter.cpp diff --git a/src/Effects/Alienwah.C b/src/Effects/Alienwah.cpp diff --git a/src/Effects/CMakeLists.txt b/src/Effects/CMakeLists.txt @@ -1,15 +1,15 @@ set(zynaddsubfx_effect_SRCS - Alienwah.C - Chorus.C - Distorsion.C - DynamicFilter.C - Echo.C - Effect.C - EffectLFO.C - EffectMgr.C - EQ.C - Phaser.C - Reverb.C + Alienwah.cpp + Chorus.cpp + Distorsion.cpp + DynamicFilter.cpp + Echo.cpp + Effect.cpp + EffectLFO.cpp + EffectMgr.cpp + EQ.cpp + Phaser.cpp + Reverb.cpp ) add_library(zynaddsubfx_effect STATIC diff --git a/src/Effects/Chorus.C b/src/Effects/Chorus.cpp diff --git a/src/Effects/Distorsion.C b/src/Effects/Distorsion.cpp diff --git a/src/Effects/DynamicFilter.C b/src/Effects/DynamicFilter.cpp diff --git a/src/Effects/EQ.C b/src/Effects/EQ.cpp diff --git a/src/Effects/Echo.C b/src/Effects/Echo.cpp diff --git a/src/Effects/Effect.C b/src/Effects/Effect.cpp diff --git a/src/Effects/EffectLFO.C b/src/Effects/EffectLFO.cpp diff --git a/src/Effects/EffectMgr.C b/src/Effects/EffectMgr.cpp diff --git a/src/Effects/Phaser.C b/src/Effects/Phaser.cpp diff --git a/src/Effects/Reverb.C b/src/Effects/Reverb.cpp diff --git a/src/Input/ALSAMidiIn.C b/src/Input/ALSAMidiIn.cpp diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt @@ -1,16 +1,16 @@ SET (AlsaMidiInput On CACHE BOOL "Include ALSA Midi input") set(zynaddsubfx_input_SRCS - MidiIn.C - NULLMidiIn.C - #OSSMidiIn.C - #WINMidiIn.C + MidiIn.cpp + NULLMidiIn.cpp + #OSSMidiIn.cpp + #WINMidiIn.cpp ) FIND_PACKAGE(Alsa) if(AlsaMidiInput) set(zynaddsubfx_input_SRCS ${zynaddsubfx_input_SRCS} - ALSAMidiIn.C + ALSAMidiIn.cpp ) message("Alsa midi input enabled") endif(AlsaMidiInput) diff --git a/src/Input/MidiIn.C b/src/Input/MidiIn.cpp diff --git a/src/Input/NULLMidiIn.C b/src/Input/NULLMidiIn.cpp diff --git a/src/Input/OSSMidiIn.C b/src/Input/OSSMidiIn.cpp diff --git a/src/Input/WINMidiIn.C b/src/Input/WINMidiIn.cpp diff --git a/src/Makefile b/src/Makefile @@ -11,7 +11,7 @@ CXXFLAGS += -DOS_$(OS_PORT) -D$(MIDIIN)MIDIIN -DFFTW_VERSION_$(FFTW_VERSION) -DA ifeq ($(DISABLE_GUI),YES) CXXFLAGS += -DDISABLE_GUI else - CXXFLAGS += `fltk-config --cflags` + CXXFLAGS += -DFLTK_GUI `fltk-config --cflags` endif ifeq ($(AUDIOOUT),OSS_AND_JACK) @@ -86,7 +86,7 @@ all: $(MAKE) -C UI $@ # @sh -c "cd UI ; $(CXX) -MM -MG -w *.cc >> ../Make.deps ; cd .." - @for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.C >> ../Make.deps ; cd .."; done + @for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.cpp >> ../Make.deps ; cd .."; done $(MAKE) subdirs $(MAKE) objs rm -f zynaddsubfx zynaddsubfx.exe diff --git a/src/Misc/Bank.C b/src/Misc/Bank.cpp diff --git a/src/Misc/CMakeLists.txt b/src/Misc/CMakeLists.txt @@ -4,14 +4,14 @@ find_package(fftw3) include_directories(${MXML_INCLUDE_DIR}) set(zynaddsubfx_misc_SRCS - Bank.C - Config.C - Dump.C - Master.C - Microtonal.C - Part.C - Util.C - XMLwrapper.C + Bank.cpp + Config.cpp + Dump.cpp + Master.cpp + Microtonal.cpp + Part.cpp + Util.cpp + XMLwrapper.cpp ) add_library(zynaddsubfx_misc STATIC diff --git a/src/Misc/Config.C b/src/Misc/Config.cpp diff --git a/src/Misc/Dump.C b/src/Misc/Dump.cpp diff --git a/src/Misc/LASHClient.C b/src/Misc/LASHClient.cpp diff --git a/src/Misc/Master.C b/src/Misc/Master.cpp diff --git a/src/Misc/Microtonal.C b/src/Misc/Microtonal.cpp diff --git a/src/Misc/Part.C b/src/Misc/Part.cpp diff --git a/src/Misc/Stereo.C b/src/Misc/Stereo.cpp diff --git a/src/Misc/Stereo.h b/src/Misc/Stereo.h @@ -62,6 +62,6 @@ private: T rightChannel; }; -#include "Stereo.C" +#include "Stereo.cpp" #endif diff --git a/src/Misc/Util.C b/src/Misc/Util.cpp diff --git a/src/Misc/XMLwrapper.C b/src/Misc/XMLwrapper.cpp diff --git a/src/Output/CMakeLists.txt b/src/Output/CMakeLists.txt @@ -1,12 +1,12 @@ set(zynaddsubfx_output_SRCS - Recorder.C - WAVaudiooutput.C + Recorder.cpp + WAVaudiooutput.cpp ) if(AlsaMidiOutput) set(zynaddsubfx_output_SRCS ${zynaddsubfx_output_SRCS} - OSSaudiooutput.C) + OSSaudiooutput.cpp) set(zynaddsubfx_output_lib ${ASOUND_LIBRARY}) endif(AlsaMidiOutput) @@ -14,7 +14,7 @@ if(JackOutput) include_directories(${JACK_INCLUDE_DIR}) set(zynaddsubfx_output_SRCS ${zynaddsubfx_output_SRCS} - JACKaudiooutput.C) + JACKaudiooutput.cpp) set(zynaddsubfx_output_lib ${JACK_LIBRARIES}) endif(JackOutput) @@ -22,7 +22,7 @@ if(PortAudioOutput) include_directories(${PORTAUDIO_INCLUDE_DIR}) set(zynaddsubfx_output_SRCS ${zynaddsubfx_output_SRCS} - PAaudiooutput.C) + PAaudiooutput.cpp) set(zynaddsubfx_output_lib ${PORTAUDIO_LIBRARIES}) endif(PortAudioOutput) diff --git a/src/Output/DSSIaudiooutput.C b/src/Output/DSSIaudiooutput.cpp diff --git a/src/Output/JACK_RTaudiooutput.C b/src/Output/JACK_RTaudiooutput.cpp diff --git a/src/Output/JACKaudiooutput.C b/src/Output/JACKaudiooutput.cpp diff --git a/src/Output/OSSaudiooutput.C b/src/Output/OSSaudiooutput.cpp diff --git a/src/Output/PAaudiooutput.C b/src/Output/PAaudiooutput.cpp diff --git a/src/Output/Recorder.C b/src/Output/Recorder.cpp diff --git a/src/Output/VSTaudiooutput.C b/src/Output/VSTaudiooutput.cpp diff --git a/src/Output/WAVaudiooutput.C b/src/Output/WAVaudiooutput.cpp diff --git a/src/Params/ADnoteParameters.C b/src/Params/ADnoteParameters.cpp diff --git a/src/Params/CMakeLists.txt b/src/Params/CMakeLists.txt @@ -1,13 +1,13 @@ set(zynaddsubfx_params_SRCS - ADnoteParameters.C - Controller.C - EnvelopeParams.C - FilterParams.C - LFOParams.C - PADnoteParameters.C - Presets.C - PresetsStore.C - SUBnoteParameters.C + ADnoteParameters.cpp + Controller.cpp + EnvelopeParams.cpp + FilterParams.cpp + LFOParams.cpp + PADnoteParameters.cpp + Presets.cpp + PresetsStore.cpp + SUBnoteParameters.cpp ) diff --git a/src/Params/Controller.C b/src/Params/Controller.cpp diff --git a/src/Params/EnvelopeParams.C b/src/Params/EnvelopeParams.cpp diff --git a/src/Params/FilterParams.C b/src/Params/FilterParams.cpp diff --git a/src/Params/LFOParams.C b/src/Params/LFOParams.cpp diff --git a/src/Params/PADnoteParameters.C b/src/Params/PADnoteParameters.cpp diff --git a/src/Params/Presets.C b/src/Params/Presets.cpp diff --git a/src/Params/PresetsStore.C b/src/Params/PresetsStore.cpp diff --git a/src/Params/SUBnoteParameters.C b/src/Params/SUBnoteParameters.cpp diff --git a/src/Samples/AuSample.C b/src/Samples/AuSample.cpp diff --git a/src/Samples/CMakeLists.txt b/src/Samples/CMakeLists.txt @@ -1,8 +1,8 @@ set(zynaddsubfx_samples_SRCS - AuSample.C - FqSample.C - Sample.C - #StereoSample.C + AuSample.cpp + FqSample.cpp + Sample.cpp + #StereoSample.cpp ) add_library(zynaddsubfx_samples STATIC diff --git a/src/Samples/FqSample.C b/src/Samples/FqSample.cpp diff --git a/src/Samples/Sample.C b/src/Samples/Sample.cpp diff --git a/src/Seq/CMakeLists.txt b/src/Seq/CMakeLists.txt @@ -1,7 +1,7 @@ set(zynaddsubfx_seq_SRCS - MIDIEvents.C - MIDIFile.C - Sequencer.C + MIDIEvents.cpp + MIDIFile.cpp + Sequencer.cpp ) add_library(zynaddsubfx_seq STATIC diff --git a/src/Seq/MIDIEvents.C b/src/Seq/MIDIEvents.cpp diff --git a/src/Seq/MIDIFile.C b/src/Seq/MIDIFile.cpp diff --git a/src/Seq/Sequencer.C b/src/Seq/Sequencer.cpp diff --git a/src/Synth/ADnote.C b/src/Synth/ADnote.cpp diff --git a/src/Synth/CMakeLists.txt b/src/Synth/CMakeLists.txt @@ -1,11 +1,11 @@ set(zynaddsubfx_synth_SRCS - ADnote.C - Envelope.C - LFO.C - OscilGen.C - PADnote.C - Resonance.C - SUBnote.C + ADnote.cpp + Envelope.cpp + LFO.cpp + OscilGen.cpp + PADnote.cpp + Resonance.cpp + SUBnote.cpp ) add_library(zynaddsubfx_synth STATIC diff --git a/src/Synth/Envelope.C b/src/Synth/Envelope.cpp diff --git a/src/Synth/LFO.C b/src/Synth/LFO.cpp diff --git a/src/Synth/OscilGen.C b/src/Synth/OscilGen.cpp diff --git a/src/Synth/PADnote.C b/src/Synth/PADnote.cpp diff --git a/src/Synth/Resonance.C b/src/Synth/Resonance.cpp diff --git a/src/Synth/SUBnote.C b/src/Synth/SUBnote.cpp diff --git a/src/main.C b/src/main.cpp