Skip to content

Commit

Permalink
v1.31: LV2 plug-in (GNU/Linux)
Browse files Browse the repository at this point in the history 
* experimental 64-bit versions for Windows

* code cleanup and a few small bug fixes

* updated framework to JUCE v2.40

* validation: full re-calibration and new audio file
  • Loading branch information
@mzuther
mzuther committed May 29, 2013
1 parent 2262f28 commit 3d05bd6
Show file tree
Hide file tree
Showing 16 changed files with 1,230 additions and 44 deletions.
4 changes: 2 additions & 2 deletions Builds/linux/lv2_stereo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ endif

ifeq ($(config),debug64)
OBJDIR = ../../../bin/intermediate_linux/lv2_stereo_debug/x64
TARGETDIR = ../../../bin/kmeter_lv2
TARGETDIR = ../../../bin/kmeter_lv2_x64
TARGET = $(TARGETDIR)/kmeter_stereo_lv2_debug_x64.so
DEFINES += -D_DEBUG=1 -DDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=1 -DKMETER_LV2_PLUGIN=1 -DKMETER_STEREO=1 -DJUCE_USE_VSTSDK_2_4=0 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I/usr/include -I/usr/include/freetype2
Expand All @@ -87,7 +87,7 @@ endif

ifeq ($(config),release64)
OBJDIR = ../../../bin/intermediate_linux/lv2_stereo_release/x64
TARGETDIR = ../../../bin/kmeter_lv2
TARGETDIR = ../../../bin/kmeter_lv2_x64
TARGET = $(TARGETDIR)/kmeter_stereo_lv2_x64.so
DEFINES += -DNDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=0 -DKMETER_LV2_PLUGIN=1 -DKMETER_STEREO=1 -DJUCE_USE_VSTSDK_2_4=0 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I/usr/include -I/usr/include/freetype2
Expand Down
4 changes: 2 additions & 2 deletions Builds/linux/lv2_surround/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ endif

ifeq ($(config),debug64)
OBJDIR = ../../../bin/intermediate_linux/lv2_surround_debug/x64
TARGETDIR = ../../../bin/kmeter_lv2
TARGETDIR = ../../../bin/kmeter_lv2_x64
TARGET = $(TARGETDIR)/kmeter_surround_lv2_debug_x64.so
DEFINES += -D_DEBUG=1 -DDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=1 -DKMETER_LV2_PLUGIN=1 -DKMETER_SURROUND=1 -DJUCE_USE_VSTSDK_2_4=0 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I/usr/include -I/usr/include/freetype2
Expand All @@ -87,7 +87,7 @@ endif

ifeq ($(config),release64)
OBJDIR = ../../../bin/intermediate_linux/lv2_surround_release/x64
TARGETDIR = ../../../bin/kmeter_lv2
TARGETDIR = ../../../bin/kmeter_lv2_x64
TARGET = $(TARGETDIR)/kmeter_surround_lv2_x64.so
DEFINES += -DNDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=0 -DKMETER_LV2_PLUGIN=1 -DKMETER_SURROUND=1 -DJUCE_USE_VSTSDK_2_4=0 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I/usr/include -I/usr/include/freetype2
Expand Down
8 changes: 4 additions & 4 deletions Builds/linux/vst_stereo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif
ifeq ($(config),debug32)
OBJDIR = ../../../bin/intermediate_linux/vst_stereo_debug/x32
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_stereo_debug.so
TARGET = $(TARGETDIR)/kmeter_stereo_vst_debug.so
DEFINES += -D_DEBUG=1 -DDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=1 -DKMETER_VST_PLUGIN=1 -DKMETER_STEREO=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand All @@ -44,7 +44,7 @@ endif
ifeq ($(config),release32)
OBJDIR = ../../../bin/intermediate_linux/vst_stereo_release/x32
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_stereo.so
TARGET = $(TARGETDIR)/kmeter_stereo_vst.so
DEFINES += -DNDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=0 -DKMETER_VST_PLUGIN=1 -DKMETER_STEREO=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand All @@ -66,7 +66,7 @@ endif
ifeq ($(config),debug64)
OBJDIR = ../../../bin/intermediate_linux/vst_stereo_debug/x64
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_stereo_debug_x64.so
TARGET = $(TARGETDIR)/kmeter_stereo_vst_debug_x64.so
DEFINES += -D_DEBUG=1 -DDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=1 -DKMETER_VST_PLUGIN=1 -DKMETER_STEREO=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand All @@ -88,7 +88,7 @@ endif
ifeq ($(config),release64)
OBJDIR = ../../../bin/intermediate_linux/vst_stereo_release/x64
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_stereo_x64.so
TARGET = $(TARGETDIR)/kmeter_stereo_vst_x64.so
DEFINES += -DNDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=0 -DKMETER_VST_PLUGIN=1 -DKMETER_STEREO=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand Down
8 changes: 4 additions & 4 deletions Builds/linux/vst_surround/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif
ifeq ($(config),debug32)
OBJDIR = ../../../bin/intermediate_linux/vst_surround_debug/x32
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_surround_debug.so
TARGET = $(TARGETDIR)/kmeter_surround_vst_debug.so
DEFINES += -D_DEBUG=1 -DDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=1 -DKMETER_VST_PLUGIN=1 -DKMETER_SURROUND=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand All @@ -44,7 +44,7 @@ endif
ifeq ($(config),release32)
OBJDIR = ../../../bin/intermediate_linux/vst_surround_release/x32
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_surround.so
TARGET = $(TARGETDIR)/kmeter_surround_vst.so
DEFINES += -DNDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=0 -DKMETER_VST_PLUGIN=1 -DKMETER_SURROUND=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand All @@ -66,7 +66,7 @@ endif
ifeq ($(config),debug64)
OBJDIR = ../../../bin/intermediate_linux/vst_surround_debug/x64
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_surround_debug_x64.so
TARGET = $(TARGETDIR)/kmeter_surround_vst_debug_x64.so
DEFINES += -D_DEBUG=1 -DDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=1 -DKMETER_VST_PLUGIN=1 -DKMETER_SURROUND=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand All @@ -88,7 +88,7 @@ endif
ifeq ($(config),release64)
OBJDIR = ../../../bin/intermediate_linux/vst_surround_release/x64
TARGETDIR = ../../../bin
TARGET = $(TARGETDIR)/kmeter_surround_x64.so
TARGET = $(TARGETDIR)/kmeter_surround_vst_x64.so
DEFINES += -DNDEBUG=1 -DJUCE_CHECK_MEMORY_LEAKS=0 -DKMETER_VST_PLUGIN=1 -DKMETER_SURROUND=1 -DJUCE_USE_VSTSDK_2_4=1 -DLINUX=1 -DJUCE_USE_XSHM=1 -DJUCE_ALSA=0 -DJUCE_JACK=0 -DJUCE_ASIO=0 -DJUCE_DIRECTSOUND=0
INCLUDES += -I../../../JuceLibraryCode -I../../../libraries -I../../../libraries/vstsdk2.4 -I/usr/include -I/usr/include/freetype2
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
Expand Down
18 changes: 14 additions & 4 deletions Builds/premake4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ solution "kmeter"
project (os.get() .. "_lv2_stereo")
kind "SharedLib"
location (os.get() .. "/lv2_stereo")
targetdir "../bin/kmeter_lv2/"
targetname "kmeter_stereo_lv2"
targetprefix ""

Expand Down Expand Up @@ -241,6 +240,12 @@ solution "kmeter"
"Xext"
}

configuration { "x32" }
targetdir "../bin/kmeter_lv2/"

configuration { "x64" }
targetdir "../bin/kmeter_lv2_x64/"

configuration "Debug"
objdir ("../bin/intermediate_" .. os.get() .. "/lv2_stereo_debug")

Expand All @@ -252,7 +257,6 @@ solution "kmeter"
project (os.get() .. "_lv2_surround")
kind "SharedLib"
location (os.get() .. "/lv2_surround")
targetdir "../bin/kmeter_lv2/"
targetname "kmeter_surround_lv2"
targetprefix ""

Expand Down Expand Up @@ -295,6 +299,12 @@ solution "kmeter"
"Xext"
}

configuration { "x32" }
targetdir "../bin/kmeter_lv2/"

configuration { "x64" }
targetdir "../bin/kmeter_lv2_x64/"

configuration "Debug"
objdir ("../bin/intermediate_" .. os.get() .. "/lv2_surround_debug")

Expand All @@ -306,7 +316,7 @@ solution "kmeter"
project (os.get() .. "_vst_stereo")
kind "SharedLib"
location (os.get() .. "/vst_stereo")
targetname "kmeter_stereo"
targetname "kmeter_stereo_vst"
targetprefix ""

defines {
Expand Down Expand Up @@ -363,7 +373,7 @@ solution "kmeter"
project (os.get() .. "_vst_surround")
kind "SharedLib"
location (os.get() .. "/vst_surround")
targetname "kmeter_surround"
targetname "kmeter_surround_vst"
targetprefix ""

defines {
Expand Down
6 changes: 3 additions & 3 deletions JuceLibraryCode/AppConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,13 @@
#define JucePlugin_EditorRequiresKeyboardFocus 0
#endif
#ifndef JucePlugin_Version
#define JucePlugin_Version 1.30.2
#define JucePlugin_Version 1.31.0
#endif
#ifndef JucePlugin_VersionCode
#define JucePlugin_VersionCode 0x11e02
#define JucePlugin_VersionCode 0x11f00
#endif
#ifndef JucePlugin_VersionString
#define JucePlugin_VersionString "1.30.2"
#define JucePlugin_VersionString "1.31.0"
#endif
#ifndef JucePlugin_VSTUniqueID
#define JucePlugin_VSTUniqueID JucePlugin_PluginCode
Expand Down
4 changes: 2 additions & 2 deletions JuceLibraryCode/JuceHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
namespace ProjectInfo
{
const char* const projectName = "K-Meter";
const char* const versionString = "1.30.2";
const int versionNumber = 0x11e02;
const char* const versionString = "1.31.0";
const int versionNumber = 0x11f00;
}

#endif // __APPHEADERFILE_LEMWQ6__
2 changes: 1 addition & 1 deletion K-Meter.jucer
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="LEmwq6" name="K-Meter" projectType="audioplug" version="1.30.2"
<JUCERPROJECT id="LEmwq6" name="K-Meter" projectType="audioplug" version="1.31.0"
bundleIdentifier="de.mzuther.KMeter" buildVST="1" buildRTAS="0"
buildAU="0" pluginName="K-Meter" pluginDesc="Implementation of a K-System meter according to Bob Katz' specifications"
pluginManufacturer="mzuther" pluginManufacturerCode="mz" pluginCode="kmet"
Expand Down
24 changes: 12 additions & 12 deletions bin/kmeter_lv2/manifest.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,75 @@

<http://code.mzuther.de/kmeter/stereo>
a lv2:Plugin ;
lv2:binary <kmeter_stereo_lv2_x64.so> ;
lv2:binary <kmeter_stereo_lv2.so> ;
rdfs:seeAlso <kmeter_stereo.ttl> .

<http://code.mzuther.de/kmeter/stereo#ExternalUI>
a <http://kxstudio.sf.net/ns/lv2ext/external-ui#Widget> ;
ui:binary <kmeter_stereo_lv2_x64.so> ;
ui:binary <kmeter_stereo_lv2.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .

<http://code.mzuther.de/kmeter/stereo#ParentUI>
a ui:X11UI ;
ui:binary <kmeter_stereo_lv2_x64.so> ;
ui:binary <kmeter_stereo_lv2.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .


<http://code.mzuther.de/kmeter/stereo/debug>
a lv2:Plugin ;
lv2:binary <kmeter_stereo_lv2_debug_x64.so> ;
lv2:binary <kmeter_stereo_lv2_debug.so> ;
rdfs:seeAlso <kmeter_stereo_debug.ttl> .

<http://code.mzuther.de/kmeter/stereo/debug#ExternalUI>
a <http://kxstudio.sf.net/ns/lv2ext/external-ui#Widget> ;
ui:binary <kmeter_stereo_lv2_debug_x64.so> ;
ui:binary <kmeter_stereo_lv2_debug.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .

<http://code.mzuther.de/kmeter/stereo/debug#ParentUI>
a ui:X11UI ;
ui:binary <kmeter_stereo_lv2_debug_x64.so> ;
ui:binary <kmeter_stereo_lv2_debug.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .


<http://code.mzuther.de/kmeter/surround>
a lv2:Plugin ;
lv2:binary <kmeter_surround_lv2_x64.so> ;
lv2:binary <kmeter_surround_lv2.so> ;
rdfs:seeAlso <kmeter_surround.ttl> .

<http://code.mzuther.de/kmeter/surround#ExternalUI>
a <http://kxstudio.sf.net/ns/lv2ext/external-ui#Widget> ;
ui:binary <kmeter_surround_lv2_x64.so> ;
ui:binary <kmeter_surround_lv2.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .

<http://code.mzuther.de/kmeter/surround#ParentUI>
a ui:X11UI ;
ui:binary <kmeter_surround_lv2_x64.so> ;
ui:binary <kmeter_surround_lv2.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .


<http://code.mzuther.de/kmeter/surround/debug>
a lv2:Plugin ;
lv2:binary <kmeter_surround_lv2_debug_x64.so> ;
lv2:binary <kmeter_surround_lv2_debug.so> ;
rdfs:seeAlso <kmeter_surround_debug.ttl> .

<http://code.mzuther.de/kmeter/surround/debug#ExternalUI>
a <http://kxstudio.sf.net/ns/lv2ext/external-ui#Widget> ;
ui:binary <kmeter_surround_lv2_debug_x64.so> ;
ui:binary <kmeter_surround_lv2_debug.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .

<http://code.mzuther.de/kmeter/surround/debug#ParentUI>
a ui:X11UI ;
ui:binary <kmeter_surround_lv2_debug_x64.so> ;
ui:binary <kmeter_surround_lv2_debug.so> ;
lv2:requiredFeature <http://lv2plug.in/ns/ext/instance-access> ;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData <http://kxstudio.sf.net/ns/lv2ext/programs#UIInterface> .
Expand Down
Loading

0 comments on commit 3d05bd6

Please sign in to comment.