- refactored

.gitignore

@@ -0,0 +1,2 @@
+build
+

Makefile

@@ -3,12 +3,13 @@ include make/defaults.mk
 CONFIG ?= release
 TARGET ?= JaySynth.so
 
-APP_VERSION := 1.0.1a
+APP_VERSION := 1.0.1b
 APP_VERSION_HEX := 0x010001
 LIBSRC_PATH ?= $(realpath ./submodule)
 JUCE_PATH :=  $(realpath ./sdk/juce/JUCE-3.1.1)
 VST2_SDK_PATH ?= $(realpath ./sdk/vst/vstsdk2.4)
 JUCE_LIBCODE_PATH ?= $(realpath ./JuceLibraryCode)
+SRC_PATH := $(realpath ./src)
 
 NAME =: JaySynth
 
@@ -30,9 +31,9 @@ DEFINES += -DJucePlugin_Version=$(APP_VERSION)
 DEFINES += -DJucePlugin_VersionCode=$(APP_VERSION_HEX)
 DEFINES += -DJucePlugin_VersionString=\"$(APP_VERSION)\"
 
-INCLUDES += -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I $(LIBSRC_PATH) -I $(JUCE_LIBCODE_PATH)
+INCLUDES += -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I $(LIBSRC_PATH) -I $(JUCE_LIBCODE_PATH) -I $(SRC_PATH)
 
-PACKAGES := JuceLibraryCode Source Synth Fir
+PACKAGES := JuceLibraryCode plug synth fir
 
 export 
 
@@ -44,16 +45,16 @@ app: objects link
 
 objects: ${PACKAGES}
 
-Synth:
+synth:
-	@$(MAKE) -C Source/synth
+	@$(MAKE) -C $(SRC_PATH)/synth
 
-Source:
+plug:
-	@$(MAKE) -C $@
+	@$(MAKE) -C $(SRC_PATH)/plug
 
 JuceLibraryCode:
 	@$(MAKE) -C $@
 
-Fir:
+fir:
 	@$(MAKE) -C $(LIBSRC_PATH)/fir
 
 include $(MAKE_HOME)/link.mk

Source/Makefile

@@ -1,11 +0,0 @@
-include $(MAKE_HOME)/defaults.mk
-
-LIBSRC_PATH ?= $(realpath ../../../libsrc)
-JUCE_PATH ?=  $(realpath ../sdk/juce/JUCE-3.1.1)
-VST2_SDK_PATH ?= $(realpath ../sdk/vst/vstsdk2.4)
-
-include config.mk
-
-INCLUDES += -I $(LIBSRC_PATH) -I $(JUCE_PATH) -I $(VST2_SDK_PATH)
-
-include $(MAKE_HOME)/compile.mk

Source/synth/Makefile

@@ -1,10 +0,0 @@
-include $(MAKE_HOME)/defaults.mk
-
-LIBSRC_PATH ?= $(realpath ../../../../libsrc)
-VST2_SDK_PATH ?= $(realpath ../../sdk/vst/vstsdk2.4)
-
-include config.mk
-
-INCLUDES ?= -I $(LIBSRC_PATH) -I $(VST2_SDK_PATH)
-
-include $(MAKE_HOME)/compile.mk

make/defaults.mk

@@ -0,0 +1,7 @@
+include $(MAKE_HOME)/defaults.mk
+
+# Environment
+CC=clang
+CCC=clang++
+CXX=clang++
+

sdk/juce/.gitignore

@@ -0,0 +1,3 @@
+build
+JUCE-3.1.1
+

sdk/vst/.gitignore

@@ -0,0 +1,2 @@
+vstsdk2.4
+

src/plug/ButtonLED.h

@@ -23,7 +23,7 @@
 #define __JUCER_HEADER_BUTTONLED_BUTTONLED_B8510B75__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 //[/Headers]
 
 

src/plug/JK_MidiClock.h

@@ -14,7 +14,7 @@
 #ifndef __JK_MIDICLOCK
 #define __JK_MIDICLOCK
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
 //#include "Includes.h"
 

src/plug/JaySynth.cpp

@@ -9,22 +9,22 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "synth/synth_defs.h"
+#include <synth/synth_defs.h>
+#include <synth/voice.h>
+#include <synth/vco.h>
+#include <synth/noise.h>
+#include <synth/smooth.h>
+#include <synth/vcf.h>
+#include <synth/lfo.h>
+#include <synth/env.h>
+#include <synth/param_scale.h>
+
 #include "JaySynthSound.h"
 #include "JaySynthVoice.h"
 #include "JaySynthMonophonicMGR.h"
 #include "JaySynthMidiCC.h"
 #include "JaySynth.h"
 
-#include "synth/voice.h"
-#include "synth/vco.h"
-#include "synth/noise.h"
-#include "synth/smooth.h"
-#include "synth/vcf.h"
-#include "synth/lfo.h"
-#include "synth/env.h"
-#include "synth/param_scale.h"
-
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))
 #endif

src/plug/JaySynth.h

@@ -9,9 +9,10 @@
 #ifndef _JAYSYNTH_H_
 #define _JAYSYNTH_H_
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <synth/synth_defs.h>
-#include "synth/synth_defs.h"
+#include <synth/param_scale.h>
-#include "synth/param_scale.h"
+
+#include <JuceHeader.h>
 #include "JaySynthVoice.h"
 #include "JaySynthMonophonicMGR.h"
 

src/plug/JaySynthAudioProcessorEditor.h

@@ -21,7 +21,7 @@
 #define __JUCE_HEADER_AD3FF14AD0EF4DBE__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "PluginProcessor.h"
 #include "ButtonLED.h"
 #include "MidiCC_PopUp.h"

src/plug/JaySynthMidiCC.cpp

@@ -7,8 +7,9 @@
 
   ==============================================================================
 */
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <synth/synth_defs.h>
-#include "synth/synth_defs.h"
+
+#include <JuceHeader.h>
 #include "JaySynthMidiCC.h"
 
 //==============================================================================

src/plug/JaySynthMidiCC.h

@@ -11,17 +11,17 @@
 #ifndef _JAYSYNTH_MIDICC_
 #define _JAYSYNTH_MIDICC_
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
-#include "synth/synth_defs.h"
 
-#include "synth/voice.h"
+#include <synth/synth_defs.h>
-#include "synth/vco.h"
+#include <synth/voice.h>
-#include "synth/noise.h"
+#include <synth/vco.h>
-#include "synth/smooth.h"
+#include <synth/noise.h>
-#include "synth/vcf.h"
+#include <synth/smooth.h>
-#include "synth/lfo.h"
+#include <synth/vcf.h>
-#include "synth/env.h"
+#include <synth/lfo.h>
-#include "synth/param_scale.h"
+#include <synth/env.h>
+#include <synth/param_scale.h>
 
 //==============================================================================
 #define	MIDICONTROLLER_TYPE_VELKEY		0x00000080

src/plug/JaySynthMonophonicMGR.cpp

@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "synth/synth_defs.h"
+#include <synth/synth_defs.h>
 #include "JaySynthMonophonicMGR.h"
 
 /** A JaySynth voice that just plays incredible sounds.. */

src/plug/JaySynthMonophonicMGR.h

@@ -9,9 +9,6 @@
 #ifndef _JAYSYNTHMONOPHONICMGR_H_
 #define _JAYSYNTHMONOPHONICMGR_H_
 
-//#include "../JuceLibraryCode/JuceHeader.h"
-#include "synth/synth_defs.h"
-
 class JaySynthMonophonicMGR
 {
 public:

src/plug/JaySynthSound.cpp

@@ -8,7 +8,7 @@
 
 #include <math.h>
 
-#include "synth/synth_defs.h"
+#include <synth/synth_defs.h>
 #include "JaySynthSound.h"
 
 JaySynthSound::JaySynthSound()

src/plug/JaySynthSound.h

@@ -9,8 +9,17 @@
 #ifndef _JAYSYNTHSOUND_H_
 #define _JAYSYNTHSOUND_H_
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
-#include "synth/synth_defs.h"
+#include <synth/synth_defs.h>
+#include <synth/voice.h>
+#include <synth/vco.h>
+#include <synth/noise.h>
+#include <synth/smooth.h>
+#include <synth/vcf.h>
+#include <synth/lfo.h>
+#include <synth/env.h>
+#include <synth/param_scale.h>
+
 #include "JaySynthMidiCC.h"
 
 //==============================================================================

src/plug/JaySynthVoice.cpp

@@ -8,7 +8,6 @@
 
 #include <math.h>
 
-#include "synth/synth_defs.h"
 #include "JaySynthSound.h"
 #include "JaySynthVoice.h"
 

src/plug/JaySynthVoice.h

@@ -9,8 +9,8 @@
 #ifndef _JAYSYNTHVOICE_H_
 #define _JAYSYNTHVOICE_H_
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
-#include "synth/synth_defs.h"
+#include <synth/synth_defs.h>
 
 class JaySynthVoice
 {

src/plug/Makefile

@@ -0,0 +1,2 @@
+include ./config.mk
+include $(MAKE_HOME)/compile.mk

src/plug/MidiCC_PopUp.cpp

@@ -20,7 +20,7 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "synth/param_scale.h"
+#include <synth/param_scale.h>
 //[/Headers]
 
 #include "MidiCC_PopUp.h"

src/plug/MidiCC_PopUp.h

@@ -23,7 +23,7 @@
 #define __JUCER_HEADER_MIDICCPOPUP_MIDICCPOPUP_EA70576__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "PluginProcessor.h"
 //#include "juce.h"
 

src/plug/PluginProcessor.cpp

@@ -11,7 +11,7 @@
 
 #include "PluginProcessor.h"
 #include "JaySynthAudioProcessorEditor.h"
-#include "synth/vector_utils.h"
+#include <synth/vector_utils.h>
 
 using namespace juce;
 

src/plug/PluginProcessor.h

@@ -11,8 +11,8 @@
 #ifndef __PLUGINPROCESSOR_H_20F201CA__
 #define __PLUGINPROCESSOR_H_20F201CA__
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
-#include "synth/synth_defs.h"
+#include <synth/synth_defs.h>
 #include "JaySynthSound.h"
 #include "JaySynth.h"
 #include "JK_MidiClock.h"

src/plug/VelKey_PopUp.h

@@ -23,8 +23,8 @@
 #define __JUCER_HEADER_VELKEYPOPUP_VELKEYPOPUP_9719552A__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
-#include "synth/synth_defs.h"
+#include <synth/synth_defs.h>
 #include "PluginProcessor.h"
 class VelKey_PopUp_Listener
 {

src/plug/config.mk

@@ -1,4 +1,4 @@
-NAME := JaySynthModules
+NAME := plug
 
 CXX_SRCS := ButtonLED.cpp
 CXX_SRCS += graph_window.cpp

src/plug/graph_window.h

@@ -23,16 +23,16 @@
 #define __JUCER_HEADER_GRAPHWINDOW_GRAPHWINDOW_E0AFC61E__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
-#include "synth/voice.h"
+#include <synth/voice.h>
-#include "synth/vco.h"
+#include <synth/vco.h>
-#include "synth/noise.h"
+#include <synth/noise.h>
-#include "synth/smooth.h"
+#include <synth/smooth.h>
-#include "synth/vcf.h"
+#include <synth/vcf.h>
-#include "synth/lfo.h"
+#include <synth/lfo.h>
-#include "synth/env.h"
+#include <synth/env.h>
-#include "synth/param_scale.h"
+#include <synth/param_scale.h>
 
 //[/Headers]
 

src/synth/Makefile

@@ -0,0 +1,2 @@
+include ./config.mk
+include $(MAKE_HOME)/compile.mk

src/synth/config.mk

@@ -1,4 +1,4 @@
-NAME := Synth
+NAME := synth
 
 GCC_SRCS := blit.c
 GCC_SRCS += env.c

src/synth/wavetable.c

@@ -268,7 +268,7 @@ void WT_Reset(wt_t *pObj, synth_float_t phase)
 
 void WT_Prepare(wt_t *pObj)
 {
-	WT_Reset(pObj, (synth_float_t)rand()/RAND_MAX);
+	WT_Reset(pObj, (synth_float_t)rand()/(synth_float_t)RAND_MAX);
 }
 
 void WT_Param2Set(wt_t *pObj, UINT32 type, synth_float_t value)