From c5ba984db2286695051d02a66f0c15e33158c42a Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 17 Aug 2020 17:44:52 +0000 Subject: [PATCH] - reverted removing JK Midi Clock git-svn-id: http://moon:8086/svn/software/trunk/projects/JaySynth@735 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- Source/PluginProcessor.cpp | 2 ++ Source/PluginProcessor.h | 2 ++ nbproject/Makefile-Debug.mk | 6 ++++++ nbproject/Makefile-Release.mk | 6 ++++++ nbproject/configurations.xml | 10 ++++++++++ 5 files changed, 26 insertions(+) diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp index ad05f76..10232e7 100644 --- a/Source/PluginProcessor.cpp +++ b/Source/PluginProcessor.cpp @@ -528,6 +528,8 @@ void JaySynthAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer AudioPlayHead::CurrentPositionInfo pos; getPlayHead()->getCurrentPosition(pos); + m_JK_MidiClock.generateMidiclock(pos, &midiMessages, numSamples, getSampleRate()); + // Now pass any incoming midi messages to our keyboard state object, and let it // add messages to the buffer if the user is clicking on the on-screen keys keyboardState.processNextMidiBuffer (midiMessages, 0, numSamples, true); diff --git a/Source/PluginProcessor.h b/Source/PluginProcessor.h index 2d8e9c8..df6480a 100644 --- a/Source/PluginProcessor.h +++ b/Source/PluginProcessor.h @@ -15,6 +15,7 @@ #include "synth/synth_defs.h" #include "JaySynthSound.h" #include "JaySynth.h" +#include "JK_MidiClock.h" //============================================================================== /** @@ -353,6 +354,7 @@ private: JaySynthMidiCC midCC_editBuffer; int m_limiter_active; synth_float_t m_limiter_env; + JK_MidiClock m_JK_MidiClock; //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JaySynthAudioProcessor); diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk index 818fd66..5aeac47 100644 --- a/nbproject/Makefile-Debug.mk +++ b/nbproject/Makefile-Debug.mk @@ -46,6 +46,7 @@ OBJECTFILES= \ ${OBJECTDIR}/_ext/7a97f8cd/juce_gui_basics.o \ ${OBJECTDIR}/_ext/e78e30df/fir2.o \ ${OBJECTDIR}/Source/ButtonLED.o \ + ${OBJECTDIR}/Source/JK_MidiClock.o \ ${OBJECTDIR}/Source/JaySynth.o \ ${OBJECTDIR}/Source/JaySynthAudioProcessorEditor.o \ ${OBJECTDIR}/Source/JaySynthMidiCC.o \ @@ -150,6 +151,11 @@ ${OBJECTDIR}/Source/ButtonLED.o: Source/ButtonLED.cpp ${RM} "$@.d" $(COMPILE.cc) -g -DDEBUG -DSYNTH_DEBUG -DWIN32 -D_DEBUG -D_WINDOWS -Dfir_float_t=double -I../../libsrc -I../../../extLib/JUCE -IJuceLibraryCode -I../../../extLib/vst2/vstsdk2.4 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Source/ButtonLED.o Source/ButtonLED.cpp +${OBJECTDIR}/Source/JK_MidiClock.o: Source/JK_MidiClock.cpp + ${MKDIR} -p ${OBJECTDIR}/Source + ${RM} "$@.d" + $(COMPILE.cc) -g -DDEBUG -DSYNTH_DEBUG -DWIN32 -D_DEBUG -D_WINDOWS -Dfir_float_t=double -I../../libsrc -I../../../extLib/JUCE -IJuceLibraryCode -I../../../extLib/vst2/vstsdk2.4 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Source/JK_MidiClock.o Source/JK_MidiClock.cpp + ${OBJECTDIR}/Source/JaySynth.o: Source/JaySynth.cpp ${MKDIR} -p ${OBJECTDIR}/Source ${RM} "$@.d" diff --git a/nbproject/Makefile-Release.mk b/nbproject/Makefile-Release.mk index d669e27..6b429fe 100644 --- a/nbproject/Makefile-Release.mk +++ b/nbproject/Makefile-Release.mk @@ -46,6 +46,7 @@ OBJECTFILES= \ ${OBJECTDIR}/_ext/7a97f8cd/juce_gui_basics.o \ ${OBJECTDIR}/_ext/e78e30df/fir2.o \ ${OBJECTDIR}/Source/ButtonLED.o \ + ${OBJECTDIR}/Source/JK_MidiClock.o \ ${OBJECTDIR}/Source/JaySynth.o \ ${OBJECTDIR}/Source/JaySynthAudioProcessorEditor.o \ ${OBJECTDIR}/Source/JaySynthMidiCC.o \ @@ -150,6 +151,11 @@ ${OBJECTDIR}/Source/ButtonLED.o: Source/ButtonLED.cpp ${RM} "$@.d" $(COMPILE.cc) -O3 -s -DWIN32 -D_WINDOWS -Dfir_float_t=double -I../../libsrc -I../../../extLib/JUCE -IJuceLibraryCode -I../../../extLib/vst2/vstsdk2.4 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Source/ButtonLED.o Source/ButtonLED.cpp +${OBJECTDIR}/Source/JK_MidiClock.o: Source/JK_MidiClock.cpp + ${MKDIR} -p ${OBJECTDIR}/Source + ${RM} "$@.d" + $(COMPILE.cc) -O3 -s -DWIN32 -D_WINDOWS -Dfir_float_t=double -I../../libsrc -I../../../extLib/JUCE -IJuceLibraryCode -I../../../extLib/vst2/vstsdk2.4 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Source/JK_MidiClock.o Source/JK_MidiClock.cpp + ${OBJECTDIR}/Source/JaySynth.o: Source/JaySynth.cpp ${MKDIR} -p ${OBJECTDIR}/Source ${RM} "$@.d" diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 6ff38c3..c3d47d8 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -6,6 +6,7 @@ projectFiles="true"> JuceLibraryCode/AppConfig.h Source/ButtonLED.h + Source/JK_MidiClock.h Source/JaySynth.h Source/JaySynthAudioProcessorEditor.h Source/JaySynthMidiCC.h @@ -70,6 +71,7 @@ Source/synth/wavetable.h Source/ButtonLED.cpp + Source/JK_MidiClock.cpp Source/JaySynth.cpp Source/JaySynthAudioProcessorEditor.cpp Source/JaySynthMidiCC.cpp @@ -204,6 +206,10 @@ + + + + @@ -417,6 +423,10 @@ + + + +