- reverted removing JK Midi Clock
git-svn-id: http://moon:8086/svn/software/trunk/projects/JaySynth@735 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
@@ -528,6 +528,8 @@ void JaySynthAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer
|
|||||||
AudioPlayHead::CurrentPositionInfo pos;
|
AudioPlayHead::CurrentPositionInfo pos;
|
||||||
getPlayHead()->getCurrentPosition(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
|
// 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
|
// add messages to the buffer if the user is clicking on the on-screen keys
|
||||||
keyboardState.processNextMidiBuffer (midiMessages, 0, numSamples, true);
|
keyboardState.processNextMidiBuffer (midiMessages, 0, numSamples, true);
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
#include "synth/synth_defs.h"
|
#include "synth/synth_defs.h"
|
||||||
#include "JaySynthSound.h"
|
#include "JaySynthSound.h"
|
||||||
#include "JaySynth.h"
|
#include "JaySynth.h"
|
||||||
|
#include "JK_MidiClock.h"
|
||||||
|
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
/**
|
/**
|
||||||
@@ -353,6 +354,7 @@ private:
|
|||||||
JaySynthMidiCC midCC_editBuffer;
|
JaySynthMidiCC midCC_editBuffer;
|
||||||
int m_limiter_active;
|
int m_limiter_active;
|
||||||
synth_float_t m_limiter_env;
|
synth_float_t m_limiter_env;
|
||||||
|
JK_MidiClock m_JK_MidiClock;
|
||||||
|
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JaySynthAudioProcessor);
|
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JaySynthAudioProcessor);
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ OBJECTFILES= \
|
|||||||
${OBJECTDIR}/_ext/7a97f8cd/juce_gui_basics.o \
|
${OBJECTDIR}/_ext/7a97f8cd/juce_gui_basics.o \
|
||||||
${OBJECTDIR}/_ext/e78e30df/fir2.o \
|
${OBJECTDIR}/_ext/e78e30df/fir2.o \
|
||||||
${OBJECTDIR}/Source/ButtonLED.o \
|
${OBJECTDIR}/Source/ButtonLED.o \
|
||||||
|
${OBJECTDIR}/Source/JK_MidiClock.o \
|
||||||
${OBJECTDIR}/Source/JaySynth.o \
|
${OBJECTDIR}/Source/JaySynth.o \
|
||||||
${OBJECTDIR}/Source/JaySynthAudioProcessorEditor.o \
|
${OBJECTDIR}/Source/JaySynthAudioProcessorEditor.o \
|
||||||
${OBJECTDIR}/Source/JaySynthMidiCC.o \
|
${OBJECTDIR}/Source/JaySynthMidiCC.o \
|
||||||
@@ -150,6 +151,11 @@ ${OBJECTDIR}/Source/ButtonLED.o: Source/ButtonLED.cpp
|
|||||||
${RM} "$@.d"
|
${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
|
$(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
|
${OBJECTDIR}/Source/JaySynth.o: Source/JaySynth.cpp
|
||||||
${MKDIR} -p ${OBJECTDIR}/Source
|
${MKDIR} -p ${OBJECTDIR}/Source
|
||||||
${RM} "$@.d"
|
${RM} "$@.d"
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ OBJECTFILES= \
|
|||||||
${OBJECTDIR}/_ext/7a97f8cd/juce_gui_basics.o \
|
${OBJECTDIR}/_ext/7a97f8cd/juce_gui_basics.o \
|
||||||
${OBJECTDIR}/_ext/e78e30df/fir2.o \
|
${OBJECTDIR}/_ext/e78e30df/fir2.o \
|
||||||
${OBJECTDIR}/Source/ButtonLED.o \
|
${OBJECTDIR}/Source/ButtonLED.o \
|
||||||
|
${OBJECTDIR}/Source/JK_MidiClock.o \
|
||||||
${OBJECTDIR}/Source/JaySynth.o \
|
${OBJECTDIR}/Source/JaySynth.o \
|
||||||
${OBJECTDIR}/Source/JaySynthAudioProcessorEditor.o \
|
${OBJECTDIR}/Source/JaySynthAudioProcessorEditor.o \
|
||||||
${OBJECTDIR}/Source/JaySynthMidiCC.o \
|
${OBJECTDIR}/Source/JaySynthMidiCC.o \
|
||||||
@@ -150,6 +151,11 @@ ${OBJECTDIR}/Source/ButtonLED.o: Source/ButtonLED.cpp
|
|||||||
${RM} "$@.d"
|
${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
|
$(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
|
${OBJECTDIR}/Source/JaySynth.o: Source/JaySynth.cpp
|
||||||
${MKDIR} -p ${OBJECTDIR}/Source
|
${MKDIR} -p ${OBJECTDIR}/Source
|
||||||
${RM} "$@.d"
|
${RM} "$@.d"
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
projectFiles="true">
|
projectFiles="true">
|
||||||
<itemPath>JuceLibraryCode/AppConfig.h</itemPath>
|
<itemPath>JuceLibraryCode/AppConfig.h</itemPath>
|
||||||
<itemPath>Source/ButtonLED.h</itemPath>
|
<itemPath>Source/ButtonLED.h</itemPath>
|
||||||
|
<itemPath>Source/JK_MidiClock.h</itemPath>
|
||||||
<itemPath>Source/JaySynth.h</itemPath>
|
<itemPath>Source/JaySynth.h</itemPath>
|
||||||
<itemPath>Source/JaySynthAudioProcessorEditor.h</itemPath>
|
<itemPath>Source/JaySynthAudioProcessorEditor.h</itemPath>
|
||||||
<itemPath>Source/JaySynthMidiCC.h</itemPath>
|
<itemPath>Source/JaySynthMidiCC.h</itemPath>
|
||||||
@@ -70,6 +71,7 @@
|
|||||||
<itemPath>Source/synth/wavetable.h</itemPath>
|
<itemPath>Source/synth/wavetable.h</itemPath>
|
||||||
</logicalFolder>
|
</logicalFolder>
|
||||||
<itemPath>Source/ButtonLED.cpp</itemPath>
|
<itemPath>Source/ButtonLED.cpp</itemPath>
|
||||||
|
<itemPath>Source/JK_MidiClock.cpp</itemPath>
|
||||||
<itemPath>Source/JaySynth.cpp</itemPath>
|
<itemPath>Source/JaySynth.cpp</itemPath>
|
||||||
<itemPath>Source/JaySynthAudioProcessorEditor.cpp</itemPath>
|
<itemPath>Source/JaySynthAudioProcessorEditor.cpp</itemPath>
|
||||||
<itemPath>Source/JaySynthMidiCC.cpp</itemPath>
|
<itemPath>Source/JaySynthMidiCC.cpp</itemPath>
|
||||||
@@ -204,6 +206,10 @@
|
|||||||
</item>
|
</item>
|
||||||
<item path="Source/ButtonLED.h" ex="false" tool="3" flavor2="0">
|
<item path="Source/ButtonLED.h" ex="false" tool="3" flavor2="0">
|
||||||
</item>
|
</item>
|
||||||
|
<item path="Source/JK_MidiClock.cpp" ex="false" tool="1" flavor2="0">
|
||||||
|
</item>
|
||||||
|
<item path="Source/JK_MidiClock.h" ex="false" tool="3" flavor2="0">
|
||||||
|
</item>
|
||||||
<item path="Source/JaySynth.cpp" ex="false" tool="1" flavor2="0">
|
<item path="Source/JaySynth.cpp" ex="false" tool="1" flavor2="0">
|
||||||
</item>
|
</item>
|
||||||
<item path="Source/JaySynth.h" ex="false" tool="3" flavor2="0">
|
<item path="Source/JaySynth.h" ex="false" tool="3" flavor2="0">
|
||||||
@@ -417,6 +423,10 @@
|
|||||||
</item>
|
</item>
|
||||||
<item path="Source/ButtonLED.h" ex="false" tool="3" flavor2="0">
|
<item path="Source/ButtonLED.h" ex="false" tool="3" flavor2="0">
|
||||||
</item>
|
</item>
|
||||||
|
<item path="Source/JK_MidiClock.cpp" ex="false" tool="1" flavor2="0">
|
||||||
|
</item>
|
||||||
|
<item path="Source/JK_MidiClock.h" ex="false" tool="3" flavor2="0">
|
||||||
|
</item>
|
||||||
<item path="Source/JaySynth.cpp" ex="false" tool="1" flavor2="0">
|
<item path="Source/JaySynth.cpp" ex="false" tool="1" flavor2="0">
|
||||||
</item>
|
</item>
|
||||||
<item path="Source/JaySynth.h" ex="false" tool="3" flavor2="0">
|
<item path="Source/JaySynth.h" ex="false" tool="3" flavor2="0">
|
||||||
|
|||||||
Reference in New Issue
Block a user