More renaming

.gitignore

@@ -56,7 +56,8 @@ carla-bridge-lv2-gtk3
 carla-bridge-lv2-qt4
 carla-bridge-lv2-qt5
 carla-bridge-lv2-x11
-carla-bridge-vst-mac
+carla-bridge-vst-carbon
+carla-bridge-vst-cocoa
 carla-bridge-vst-x11
 
 carla-discovery-qtcreator
@@ -91,41 +92,41 @@ src/dist/
 *build-*Debug/
 *build-*Release/
 
-# ZynAddSubFX
-source/modules/native-plugins/ZynAddSubFX/Output/
-source/modules/native-plugins/ZynAddSubFX/Tests/
-source/modules/native-plugins/ZynAddSubFX/UI/ADnoteUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/ADnoteUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/BankUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/BankUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/ConfigUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/ConfigUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/EffUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/EffUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/EnvelopeUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/EnvelopeUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/FilterUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/FilterUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/LFOUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/LFOUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/MasterUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/MasterUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/MicrotonalUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/MicrotonalUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/OscilGenUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/OscilGenUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/PADnoteUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/PADnoteUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/PartUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/PartUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/PresetsUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/PresetsUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/ResonanceUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/ResonanceUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/SUBnoteUI.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/SUBnoteUI.h
-source/modules/native-plugins/ZynAddSubFX/UI/VirKeyboard.cpp
-source/modules/native-plugins/ZynAddSubFX/UI/VirKeyboard.h
+# zynaddsubfx
+source/modules/native-plugins/zynaddsubfx/Output/
+source/modules/native-plugins/zynaddsubfx/Tests/
+source/modules/native-plugins/zynaddsubfx/UI/ADnoteUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/ADnoteUI.h
+source/modules/native-plugins/zynaddsubfx/UI/BankUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/BankUI.h
+source/modules/native-plugins/zynaddsubfx/UI/ConfigUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/ConfigUI.h
+source/modules/native-plugins/zynaddsubfx/UI/EffUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/EffUI.h
+source/modules/native-plugins/zynaddsubfx/UI/EnvelopeUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/EnvelopeUI.h
+source/modules/native-plugins/zynaddsubfx/UI/FilterUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/FilterUI.h
+source/modules/native-plugins/zynaddsubfx/UI/LFOUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/LFOUI.h
+source/modules/native-plugins/zynaddsubfx/UI/MasterUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/MasterUI.h
+source/modules/native-plugins/zynaddsubfx/UI/MicrotonalUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/MicrotonalUI.h
+source/modules/native-plugins/zynaddsubfx/UI/OscilGenUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/OscilGenUI.h
+source/modules/native-plugins/zynaddsubfx/UI/PADnoteUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/PADnoteUI.h
+source/modules/native-plugins/zynaddsubfx/UI/PartUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/PartUI.h
+source/modules/native-plugins/zynaddsubfx/UI/PresetsUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/PresetsUI.h
+source/modules/native-plugins/zynaddsubfx/UI/ResonanceUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/ResonanceUI.h
+source/modules/native-plugins/zynaddsubfx/UI/SUBnoteUI.cpp
+source/modules/native-plugins/zynaddsubfx/UI/SUBnoteUI.h
+source/modules/native-plugins/zynaddsubfx/UI/VirKeyboard.cpp
+source/modules/native-plugins/zynaddsubfx/UI/VirKeyboard.h
 
 # Other
 source/includes/asio/

source/Makefile.mk

@@ -256,6 +256,15 @@ endif
 # --------------------------------------------------------------
 # Set libs stuff (part 2)
 
+ifeq ($(HAVE_AF_DEPS),true)
+AUDIO_DECODER_FLAGS  = $(shell pkg-config --cflags sndfile)
+AUDIO_DECODER_LIBS   = $(shell pkg-config --libs sndfile)
+ifeq ($(HAVE_FFMPEG),true)
+AUDIO_DECODER_FLAGS += $(shell pkg-config --cflags libavcodec libavformat libavutil)
+AUDIO_DECODER_LIBS  += $(shell pkg-config --libs libavcodec libavformat libavutil)
+endif
+endif
+
 RTAUDIO_FLAGS  = -DHAVE_GETTIMEOFDAY -D__UNIX_JACK__
 
 ifeq ($(DEBUG),true)
@@ -320,6 +329,23 @@ RTAUDIO_LIBS           += -ldsound -lpthread
 RTMIDI_FLAGS           += -D__WINDOWS_MM__
 endif
 
+# --------------------------------------------------------------
+# Set libs stuff (part 3)
+
+NATIVE_PLUGINS_LIBS  = $(AUDIO_DECODER_LIBS)
+NATIVE_PLUGINS_LIBS += $(DGL_LIBS)
+
+ifeq ($(HAVE_MF_DEPS),true)
+NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs smf)
+endif
+
+ifeq ($(HAVE_ZYN_DEPS),true)
+NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs fftw3 mxml zlib)
+ifeq ($(HAVE_ZYN_UI_DEPS),true)
+NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs ntk_images ntk)
+endif
+endif
+
 # --------------------------------------------------------------
 # Set Qt tools
 

source/modules/audio_decoder/Makefile

@@ -0,0 +1,104 @@
+#!/usr/bin/make -f
+# Makefile for audio_decoder #
+# -------------------------- #
+# Created by falkTX
+#
+
+include ../../Makefile.mk
+
+# --------------------------------------------------------------
+
+BUILD_C_FLAGS += $(AUDIO_DECODER_FLAGS)
+LINK_FLAGS    += $(AUDIO_DECODER_LIBS)
+
+# --------------------------------------------------------------
+
+all: ../audio_decoder.a
+
+posix32: ../audio_decoder.posix32.a
+posix64: ../audio_decoder.posix64.a
+win32:   ../audio_decoder.win32.a
+win64:   ../audio_decoder.win64.a
+
+# --------------------------------------------------------------
+
+../audio_decoder.a: $(OBJS)
+	$(RM) $@
+	$(AR) crs $@ $^
+
+../audio_decoder.posix32.a: $(OBJS_posix32)
+	$(RM) $@
+	$(AR) crs $@ $^
+
+../audio_decoder.posix64.a: $(OBJS_posix64)
+	$(RM) $@
+	$(AR) crs $@ $^
+
+../audio_decoder.win32.a: $(OBJS_win32)
+	$(RM) $@
+	$(AR) crs $@ $^
+
+../audio_decoder.win64.a: $(OBJS_win64)
+	$(RM) $@
+	$(AR) crs $@ $^
+
+../libaudio_decoder.dll: $(OBJS)
+	$(CC) $^ -shared $(LINK_FLAGS) -o $@
+
+../libaudio_decoder.dylib: $(OBJS)
+	$(CC) $^ -dynamiclib $(LINK_FLAGS) -o $@
+
+../libaudio_decoder.so: $(OBJS)
+	$(CC) $^ -shared $(LINK_FLAGS) -o $@
+
+# --------------------------------------------------------------
+
+serd.c.o: serd.c
+	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@
+
+sord.c.o: sord.c
+	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@
+
+sratom.c.o: sratom.c
+	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@
+
+audio_decoder.c.o: audio_decoder.c
+	$(CC) $< $(BUILD_C_FLAGS) -Iaudio_decoder-$(LILV_VERSION) -Iaudio_decoder-$(LILV_VERSION)/src -c -o $@
+
+# --------------------------------------------------------------
+
+serd.c.%32.o: serd.c
+	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@
+
+sord.c.%32.o: sord.c
+	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@
+
+sratom.c.%32.o: sratom.c
+	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@
+
+audio_decoder.c.%32.o: audio_decoder.c
+	$(CC) $< $(BUILD_C_FLAGS) -Iaudio_decoder-$(LILV_VERSION) -Iaudio_decoder-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@
+
+# --------------------------------------------------------------
+
+serd.c.%64.o: serd.c
+	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@
+
+sord.c.%64.o: sord.c
+	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@
+
+sratom.c.%64.o: sratom.c
+	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@
+
+audio_decoder.c.%64.o: audio_decoder.c
+	$(CC) $< $(BUILD_C_FLAGS) -Iaudio_decoder-$(LILV_VERSION) -Iaudio_decoder-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@
+
+# --------------------------------------------------------------
+
+clean:
+	$(RM) *.o ../audio_decoder*.a ../libaudio_decoder.*
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/distrho/DistrhoPluginMain.cpp

@@ -1,6 +1,6 @@
 /*
  * DISTRHO Plugin Toolkit (DPT)
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any purpose with
  * or without fee is hereby granted, provided that the above copyright notice and this
@@ -16,7 +16,9 @@
 
 #include "src/DistrhoPlugin.cpp"
 
-#if (defined(DISTRHO_PLUGIN_TARGET_LADSPA) || defined(DISTRHO_PLUGIN_TARGET_DSSI))
+#if defined(DISTRHO_PLUGIN_TARGET_CARLA)
+# include "src/DistrhoPluginCarla.cpp"
+#elif (defined(DISTRHO_PLUGIN_TARGET_LADSPA) || defined(DISTRHO_PLUGIN_TARGET_DSSI))
 # include "src/DistrhoPluginLADSPA+DSSI.cpp"
 #elif defined(DISTRHO_PLUGIN_TARGET_LV2)
 # include "src/DistrhoPluginLV2.cpp"

source/modules/distrho/DistrhoUIMain.cpp

@@ -1,6 +1,6 @@
 /*
  * DISTRHO Plugin Toolkit (DPT)
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any purpose with
  * or without fee is hereby granted, provided that the above copyright notice and this
@@ -16,7 +16,9 @@
 
 #include "src/DistrhoUI.cpp"
 
-#if defined(DISTRHO_PLUGIN_TARGET_DSSI)
+#if defined(DISTRHO_PLUGIN_TARGET_CARLA)
+// nothing
+#elif defined(DISTRHO_PLUGIN_TARGET_DSSI)
 # include "src/DistrhoUIDSSI.cpp"
 #elif defined(DISTRHO_PLUGIN_TARGET_LV2)
 # include "src/DistrhoUILV2.cpp"

source/modules/native-plugins/distrho/DistrhoPluginCarla.cpp → source/modules/distrho/src/DistrhoPluginCarla.cpp

@@ -14,15 +14,14 @@
  * For a full copy of the license see the LGPL.txt file
  */
 
-#include "CarlaNative.hpp"
-#include "CarlaString.hpp"
-
-#include "DistrhoPluginMain.cpp"
+#include "DistrhoPluginInternal.hpp"
 
 #if DISTRHO_PLUGIN_HAS_UI
-# include "DistrhoUIMain.cpp"
+# include "DistrhoUIInternal.hpp"
 #endif
 
+#include "CarlaNative.hpp"
+
 // -----------------------------------------------------------------------
 
 START_NAMESPACE_DISTRHO

source/modules/native-plugins/Makefile

@@ -12,21 +12,7 @@ BUILD_C_FLAGS   += -I. -I../../includes -isystem ..
 BUILD_CXX_FLAGS += -I. -I../../includes -I../../utils -I../distrho -isystem ..
 
 # --------------------------------------------------------------
-
-LINK_FLAGS      += -L..
-ifeq ($(HAVE_DGL),true)
-LINK_FLAGS      += -ldgl $(DGL_LIBS)
-endif
-ifeq ($(HAVE_JUCE),true)
-LINK_FLAGS      += -ljuce_audio_basics $(JUCE_AUDIO_BASICS_LIBS)
-LINK_FLAGS      += -ljuce_core $(JUCE_CORE_LIBS)
-LINK_FLAGS      += -ljuce_data_structures $(JUCE_DATA_STRUCTURES_LIBS)
-LINK_FLAGS      += -ljuce_events $(JUCE_EVENTS_LIBS)
-LINK_FLAGS      += -ljuce_graphics $(JUCE_GRAPHICS_LIBS)
-LINK_FLAGS      += -ljuce_gui_basics $(JUCE_GUI_BASICS_LIBS)
-endif
-
-# --------------------------------------------------------------
+# Flags for _all.c
 
 ALL_C_FLAGS  = $(BUILD_C_FLAGS)
 
@@ -46,47 +32,33 @@ ALL_C_FLAGS += -DWANT_ZYNADDSUBFX
 endif
 
 # --------------------------------------------------------------
+# Flags for MidiFile
 
-# AudioFile
-ifeq ($(HAVE_AF_DEPS),true)
-AF_C_FLAGS     = $(BUILD_C_FLAGS)
-AF_C_FLAGS    += $(shell pkg-config --cflags sndfile)
-LINK_FLAGS    += $(shell pkg-config --libs sndfile)
-ifeq ($(HAVE_FFMPEG),true)
-AF_C_FLAGS    += $(shell pkg-config --cflags libavcodec libavformat libavutil)
-LINK_FLAGS    += $(shell pkg-config --libs libavcodec libavformat libavutil)
-endif
-endif
-
-# MidiFile
 ifeq ($(HAVE_MF_DEPS),true)
-MF_CXX_FLAGS   = $(BUILD_CXX_FLAGS)
-MF_CXX_FLAGS  += $(shell pkg-config --cflags smf)
-LINK_FLAGS    += $(shell pkg-config --libs smf)
+MF_CXX_FLAGS  = $(BUILD_CXX_FLAGS)
+MF_CXX_FLAGS += $(shell pkg-config --cflags smf)
 endif
 
-# ZynAddSubFX
+# --------------------------------------------------------------
+# Flags for ZynAddSubFX
+
 ifeq ($(HAVE_ZYN_DEPS),true)
 ZYN_CXX_FLAGS  = $(BUILD_CXX_FLAGS)
 ZYN_CXX_FLAGS += $(shell pkg-config --cflags fftw3 mxml zlib)
-LINK_FLAGS    += $(shell pkg-config --libs fftw3 mxml zlib)
 ifeq ($(HAVE_ZYN_UI_DEPS),true)
 ZYN_CXX_FLAGS += -DNTK_GUI -DWANT_ZYNADDSUBFX_UI
 ZYN_CXX_FLAGS += $(shell pkg-config --cflags ntk_images ntk)
-LINK_FLAGS    += $(shell pkg-config --libs ntk_images ntk)
 endif
 endif
 
 # --------------------------------------------------------------
+# Set objects
 
-# Implement carla_register_native_plugin
-LINK_FLAGS += -I.. _link.c
+OBJS = _all.c.o
 
 # --------------------------------------------------------------
+# Simple plugins
 
-OBJS = _all.c.o
-
-# Simple plugins (C)
 OBJS += \
 	bypass.c.o \
 	lfo.c.o \
@@ -96,49 +68,53 @@ OBJS += \
 	midi-transpose.c.o \
 	nekofilter.c.o
 
+ifeq ($(_ignore_WIN32__),true)
 # --------------------------------------------------------------
+# External-UI plugins
 
-ifeq ($(HAVE_JUCE),true)
 OBJS += \
-	juce-patchbay.cpp.o \
-	vex-fx.cpp.o \
-	vex-synth.cpp.o \
-	vex-src.cpp.o
+	ext-bigmeter.cpp.o \
+	ext-notes.cpp.o
 endif
 
 # --------------------------------------------------------------
+# DISTRHO plugins
 
-ifeq ($(HAVE_DGL),true)
 OBJS += \
 	distrho-3bandeq.cpp.o \
 	distrho-3bandsplitter.cpp.o \
-	distrho-pingpongpan.cpp.o
-# 	distrho-nekobi.cpp.o \
-# 	distrho-stereoenhancer.cpp.o
-endif
+	distrho-pingpongpan.cpp.o \
+	distrho-nekobi.cpp.o
+#	distrho-stereoenhancer.cpp.o
 
+ifeq ($(HAVE_JUCE),true)
 # --------------------------------------------------------------
+# JUCE based plugins
 
-# AudioFile
-ifeq ($(HAVE_AF_DEPS),true)
 OBJS += \
-	audio-file.cpp.o \
-	audio_decoder/ad_ffmpeg.c.o \
-	audio_decoder/ad_plugin.c.o \
-	audio_decoder/ad_soundfile.c.o
+	juce-patchbay.cpp.o \
+	vex-fx.cpp.o \
+	vex-synth.cpp.o \
+	vex-src.cpp.o
 endif
 
 # --------------------------------------------------------------
+# AudioFile
+
+ifeq ($(HAVE_AF_DEPS),true)
+OBJS += audio-file.cpp.o
+endif
 
+# --------------------------------------------------------------
 # MidiFile
+
 ifeq ($(HAVE_MF_DEPS),true)
-OBJS += \
-	midi-file.cpp.o
+OBJS += midi-file.cpp.o
 endif
 
 # --------------------------------------------------------------
-
 # ZynAddSubFX
+
 ifeq ($(HAVE_ZYN_DEPS),true)
 OBJS += \
 	zynaddsubfx-fx.cpp.o \
@@ -215,9 +191,6 @@ _all.c.o: _all.c $(CDEPS)
 bypass.c.o: bypass.c $(CDEPS)
 	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-audio_decoder/%.c.o: audio_decoder/%.c
-	$(CC) $< $(AF_C_FLAGS) -w -c -o $@
-
 lfo.c.o: lfo.c $(CDEPS)
 	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
@@ -234,30 +207,21 @@ CXXDEPS = ../CarlaNative.h ../CarlaNative.hpp
 audio-file.cpp.o: audio-file.cpp audio-base.hpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-distrho-3bandeq.cpp.o: distrho-3bandeq.cpp 3bandeq/*.cpp 3bandeq/*.h 3bandeq/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
+distrho-3bandeq.cpp.o: distrho-3bandeq.cpp 3bandeq/*.cpp 3bandeq/*.h 3bandeq/*.hpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -I3bandeq -DDISTRHO_NAMESPACE=DISTRHO_3BandEQ -c -o $@
 
-distrho-3bandsplitter.cpp.o: distrho-3bandsplitter.cpp 3bandsplitter/*.cpp 3bandsplitter/*.h 3bandsplitter/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
+distrho-3bandsplitter.cpp.o: distrho-3bandsplitter.cpp 3bandsplitter/*.cpp 3bandsplitter/*.h 3bandsplitter/*.hpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -I3bandsplitter -DDISTRHO_NAMESPACE=DISTRHO_3BandSplitter -c -o $@
 
-distrho-nekobi.cpp.o: distrho-nekobi.cpp nekobi/*.cpp nekobi/*.h nekobi/*.hpp nekobi/nekobee-src/*.c nekobi/nekobee-src/*.h distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
+distrho-nekobi.cpp.o: distrho-nekobi.cpp nekobi/*.cpp nekobi/*.h nekobi/*.hpp nekobi/nekobee-src/*.c nekobi/nekobee-src/*.h $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Inekobi -DDISTRHO_NAMESPACE=DISTRHO_Nekobi -c -o $@
 
-distrho-pingpongpan.cpp.o: distrho-pingpongpan.cpp pingpongpan/*.cpp pingpongpan/*.h pingpongpan/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
+distrho-pingpongpan.cpp.o: distrho-pingpongpan.cpp pingpongpan/*.cpp pingpongpan/*.h pingpongpan/*.hpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Ipingpongpan -DDISTRHO_NAMESPACE=DISTRHO_PingPongPan -c -o $@
 
-distrho-stereoenhancer.cpp.o: distrho-stereoenhancer.cpp stereoenhancer/*.cpp stereoenhancer/*.h stereoenhancer/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
+distrho-stereoenhancer.cpp.o: distrho-stereoenhancer.cpp stereoenhancer/*.cpp stereoenhancer/*.h stereoenhancer/*.hpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Istereoenhancer -DDISTRHO_NAMESPACE=DISTRHO_StereoEnhancer -c -o $@
 
-distrho-bigmeter.cpp.o: distrho-bigmeter.cpp bigmeter/*.cpp bigmeter/*.h bigmeter/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Ibigmeter -DDISTRHO_NAMESPACE=DISTRHO_BigMeter -c -o $@
-
-distrho-bigmeterM.cpp.o: distrho-bigmeterM.cpp bigmeterM/*.cpp bigmeterM/*.h bigmeterM/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -IbigmeterM -DDISTRHO_NAMESPACE=DISTRHO_BigMeterM -c -o $@
-
-distrho-notes.cpp.o: distrho-notes.cpp notes/*.cpp notes/*.h notes/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Inotes -DDISTRHO_NAMESPACE=DISTRHO_Notes -c -o $@
-
 juce-patchbay.cpp.o: juce-patchbay.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 

source/modules/native-plugins/_all.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,50 +20,47 @@
 // Simple plugins
 extern void carla_register_native_plugin_bypass();
 extern void carla_register_native_plugin_lfo();
-
-// Simple plugins
-extern void carla_register_native_plugin_midiGain();
-extern void carla_register_native_plugin_midiSplit();
-extern void carla_register_native_plugin_midiThrough();
-extern void carla_register_native_plugin_midiTranspose();
+extern void carla_register_native_plugin_midigain();
+extern void carla_register_native_plugin_midisplit();
+extern void carla_register_native_plugin_midithrough();
+extern void carla_register_native_plugin_miditranspose();
 extern void carla_register_native_plugin_nekofilter();
 
-// Simple plugins (C++)
-extern void carla_register_native_plugin_sunvoxfile();
-
 #ifndef CARLA_OS_WIN
+// Carla
 extern void carla_register_native_plugin_carla();
+
+// External-UI plugins
+extern void carla_register_native_plugin_bigmeter();
+extern void carla_register_native_plugin_notes();
 #endif
 
+// DISTRHO plugins
+extern void carla_register_native_plugin_3bandeq();
+extern void carla_register_native_plugin_3bandsplitter();
+extern void carla_register_native_plugin_nekobi();
+extern void carla_register_native_plugin_pingpongpan();
+extern void carla_register_native_plugin_stereoenhancer();
+
 #ifdef HAVE_JUCE
-extern void carla_register_native_plugin_jucePatchbay();
+// JUCE based plugins
+extern void carla_register_native_plugin_jucepatchbay();
 extern void carla_register_native_plugin_vex_fx();
 extern void carla_register_native_plugin_vex_synth();
 #endif
 
 #ifdef WANT_AUDIOFILE
-// AudioFile
+// Audio File
 extern void carla_register_native_plugin_audiofile();
 #endif
 
 #ifdef WANT_MIDIFILE
-// MidiFile
+// MIDI File
 extern void carla_register_native_plugin_midifile();
 #endif
 
-#ifdef HAVE_DGL
-// DISTRHO plugins (OpenGL)
-extern void carla_register_native_plugin_3BandEQ();
-extern void carla_register_native_plugin_3BandSplitter();
-extern void carla_register_native_plugin_Nekobi();
-extern void carla_register_native_plugin_PingPongPan();
-extern void carla_register_native_plugin_StereoEnhancer();
-#endif
-
-// DISTRHO plugins (PyQt)
-// extern void carla_register_native_plugin_BigMeter();
-// extern void carla_register_native_plugin_BigMeterM();
-// extern void carla_register_native_plugin_Notes();
+// SunVox File
+extern void carla_register_native_plugin_sunvoxfile();
 
 #ifdef WANT_ZYNADDSUBFX
 // ZynAddSubFX
@@ -76,50 +73,47 @@ void carla_register_all_plugins()
     // Simple plugins
     carla_register_native_plugin_bypass();
     carla_register_native_plugin_lfo();
-
-    // Simple plugins
-    carla_register_native_plugin_midiGain();
-    carla_register_native_plugin_midiSplit();
-    carla_register_native_plugin_midiThrough();
-    carla_register_native_plugin_midiTranspose();
+    carla_register_native_plugin_midigain();
+    carla_register_native_plugin_midisplit();
+    carla_register_native_plugin_midithrough();
+    carla_register_native_plugin_miditranspose();
     carla_register_native_plugin_nekofilter();
 
-    // Simple plugins (C++)
-    //carla_register_native_plugin_sunvoxfile(); // unfinished
-
 #ifndef CARLA_OS_WIN
+    // Carla
     carla_register_native_plugin_carla();
+
+    // External-UI plugins
+    carla_register_native_plugin_bigmeter();
+    carla_register_native_plugin_notes();
 #endif
 
+    // DISTRHO plugins
+    carla_register_native_plugin_3bandeq();
+    carla_register_native_plugin_3bandsplitter();
+    carla_register_native_plugin_nekobi();
+    carla_register_native_plugin_pingpongpan();
+    carla_register_native_plugin_stereoenhancer();
+
 #ifdef HAVE_JUCE
-    carla_register_native_plugin_jucePatchbay();
+    // JUCE based plugins
+    carla_register_native_plugin_jucepatchbay();
     carla_register_native_plugin_vex_fx();
     carla_register_native_plugin_vex_synth();
 #endif
 
 #ifdef WANT_AUDIOFILE
-    // AudioFile
+    // Audio File
     carla_register_native_plugin_audiofile();
 #endif
 
 #ifdef WANT_MIDIFILE
-    // MidiFile
+    // MIDI File
     carla_register_native_plugin_midifile();
 #endif
 
-#ifdef HAVE_DGL
-    // DISTRHO plugins (OpenGL)
-    carla_register_native_plugin_3BandEQ();
-    carla_register_native_plugin_3BandSplitter();
-    //carla_register_native_plugin_Nekobi();
-    carla_register_native_plugin_PingPongPan();
-    //carla_register_native_plugin_StereoEnhancer(); // unfinished
-#endif
-
-    // DISTRHO plugins (PyQt)
-//     carla_register_native_plugin_BigMeter();
-//     carla_register_native_plugin_BigMeterM();
-//     carla_register_native_plugin_Notes();
+    // SunVox File
+    carla_register_native_plugin_sunvoxfile();
 
 #ifdef WANT_ZYNADDSUBFX
     // ZynAddSubFX

source/modules/native-plugins/_link.c

@@ -1,22 +0,0 @@
-/*
- * Carla Native Plugins
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#include "CarlaNative.h"
-
-// Dummy function for linking test
-void carla_register_native_plugin(const PluginDescriptor* desc)
-{ (void)desc; }

source/modules/native-plugins/audio-file.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/native-plugins/bypass.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -53,7 +53,7 @@ static const NativePluginDescriptor bypassDesc = {
     .midiOuts  = 0,
     .paramIns  = 0,
     .paramOuts = 0,
-    .name      = "ByPass",
+    .name      = "Bypass",
     .label     = "bypass",
     .maker     = "falkTX",
     .copyright = "GNU GPL v2+",

source/modules/native-plugins/distrho-3bandeq.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,22 +15,21 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
 // Plugin Code
 #include "3bandeq/DistrhoArtwork3BandEQ.cpp"
 #include "3bandeq/DistrhoPlugin3BandEQ.cpp"
 #include "3bandeq/DistrhoUI3BandEQ.cpp"
 
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
+// DISTRHO Code
+#define DISTRHO_PLUGIN_TARGET_CARLA
+#include "DistrhoPluginMain.cpp"
+#include "DistrhoUIMain.cpp"
 
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor tBandEqDesc = {
+static const NativePluginDescriptor _3bandeqDesc = {
     /* category  */ PLUGIN_CATEGORY_EQ,
     /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_RTSAFE|PLUGIN_HAS_UI),
     /* supports  */ static_cast<NativePluginSupports>(0x0),
@@ -41,7 +40,7 @@ static const NativePluginDescriptor tBandEqDesc = {
     /* paramIns  */ DistrhoPlugin3BandEQ::paramCount,
     /* paramOuts */ 0,
     /* name      */ DISTRHO_PLUGIN_NAME,
-    /* label     */ "3BandEQ",
+    /* label     */ "3bandeq",
     /* maker     */ "falkTX",
     /* copyright */ "LGPL",
     PluginDescriptorFILL(PluginCarla)
@@ -52,10 +51,10 @@ END_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 CARLA_EXPORT
-void carla_register_native_plugin_3BandEQ()
+void carla_register_native_plugin_3bandeq()
 {
     USE_NAMESPACE_DISTRHO
-    carla_register_native_plugin(&tBandEqDesc);
+    carla_register_native_plugin(&_3bandeqDesc);
 }
 
 // -----------------------------------------------------------------------

source/modules/native-plugins/distrho-3bandsplitter.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,22 +15,21 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
 // Plugin Code
 #include "3bandsplitter/DistrhoArtwork3BandSplitter.cpp"
 #include "3bandsplitter/DistrhoPlugin3BandSplitter.cpp"
 #include "3bandsplitter/DistrhoUI3BandSplitter.cpp"
 
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
+// DISTRHO Code
+#define DISTRHO_PLUGIN_TARGET_CARLA
+#include "DistrhoPluginMain.cpp"
+#include "DistrhoUIMain.cpp"
 
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor tBandSplitterDesc = {
+static const NativePluginDescriptor _3bandsplitterDesc = {
     /* category  */ PLUGIN_CATEGORY_EQ,
     /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_RTSAFE|PLUGIN_HAS_UI),
     /* supports  */ static_cast<NativePluginSupports>(0x0),
@@ -52,10 +51,10 @@ END_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 CARLA_EXPORT
-void carla_register_native_plugin_3BandSplitter()
+void carla_register_native_plugin_3bandsplitter()
 {
     USE_NAMESPACE_DISTRHO
-    carla_register_native_plugin(&tBandSplitterDesc);
+    carla_register_native_plugin(&_3bandsplitterDesc);
 }
 
 // -----------------------------------------------------------------------

source/modules/native-plugins/distrho-bigmeter.cpp

@@ -1,60 +0,0 @@
-/*
- * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
-// Plugin Code
-#include "bigmeter/DistrhoPluginBigMeter.cpp"
-#include "bigmeter/DistrhoUIBigMeter.cpp"
-
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
-
-START_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-static const NativePluginDescriptor bigMeterDesc = {
-    /* category  */ PLUGIN_CATEGORY_UTILITY,
-    /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_RTSAFE|PLUGIN_HAS_UI),
-    /* supports  */ static_cast<NativePluginSupports>(0x0),
-    /* audioIns  */ DISTRHO_PLUGIN_NUM_INPUTS,
-    /* audioOuts */ DISTRHO_PLUGIN_NUM_OUTPUTS,
-    /* midiIns   */ 0,
-    /* midiOuts  */ 0,
-    /* paramIns  */ 1,
-    /* paramOuts */ 2,
-    /* name      */ DISTRHO_PLUGIN_NAME,
-    /* label     */ "BigMeter",
-    /* maker     */ "falkTX",
-    /* copyright */ "GPL v2+",
-    PluginDescriptorFILL(PluginCarla)
-};
-
-END_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-CARLA_EXPORT
-void carla_register_native_plugin_BigMeter()
-{
-    USE_NAMESPACE_DISTRHO
-    carla_register_native_plugin(&bigMeterDesc);
-}
-
-// -----------------------------------------------------------------------

source/modules/native-plugins/distrho-bigmeterM.cpp

@@ -1,60 +0,0 @@
-/*
- * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
-// Plugin Code
-#include "bigmeterM/DistrhoPluginBigMeter.cpp"
-#include "bigmeterM/DistrhoUIBigMeter.cpp"
-
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
-
-START_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-static const NativePluginDescriptor bigMeterMDesc = {
-    /* category  */ PLUGIN_CATEGORY_UTILITY,
-    /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_RTSAFE|PLUGIN_HAS_UI),
-    /* supports  */ static_cast<NativePluginSupports>(0x0),
-    /* audioIns  */ DISTRHO_PLUGIN_NUM_INPUTS,
-    /* audioOuts */ DISTRHO_PLUGIN_NUM_OUTPUTS,
-    /* midiIns   */ 0,
-    /* midiOuts  */ 0,
-    /* paramIns  */ 1,
-    /* paramOuts */ DISTRHO_PLUGIN_NUM_INPUTS,
-    /* name      */ DISTRHO_PLUGIN_NAME,
-    /* label     */ "BigMeter (many)",
-    /* maker     */ "falkTX",
-    /* copyright */ "GPL v2+",
-    PluginDescriptorFILL(PluginCarla)
-};
-
-END_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-CARLA_EXPORT
-void carla_register_native_plugin_BigMeterM()
-{
-    USE_NAMESPACE_DISTRHO
-    carla_register_native_plugin(&bigMeterMDesc);
-}
-
-// -----------------------------------------------------------------------

source/modules/native-plugins/distrho-nekobi.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,16 +15,15 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
 // Plugin Code
 #include "nekobi/DistrhoArtworkNekobi.cpp"
 #include "nekobi/DistrhoPluginNekobi.cpp"
 #include "nekobi/DistrhoUINekobi.cpp"
 
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
+// DISTRHO Code
+#define DISTRHO_PLUGIN_TARGET_CARLA
+#include "DistrhoPluginMain.cpp"
+#include "DistrhoUIMain.cpp"
 
 START_NAMESPACE_DISTRHO
 
@@ -41,7 +40,7 @@ static const NativePluginDescriptor nekobiDesc = {
     /* paramIns  */ DistrhoPluginNekobi::paramCount,
     /* paramOuts */ 0,
     /* name      */ DISTRHO_PLUGIN_NAME,
-    /* label     */ "Nekobi",
+    /* label     */ "nekobi",
     /* maker     */ "falkTX",
     /* copyright */ "GPL v2+",
     PluginDescriptorFILL(PluginCarla)
@@ -52,7 +51,7 @@ END_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 CARLA_EXPORT
-void carla_register_native_plugin_Nekobi()
+void carla_register_native_plugin_nekobi()
 {
     USE_NAMESPACE_DISTRHO
     carla_register_native_plugin(&nekobiDesc);

source/modules/native-plugins/distrho-notes.cpp

@@ -1,60 +0,0 @@
-/*
- * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
-// Plugin Code
-#include "notes/DistrhoPluginNotes.cpp"
-#include "notes/DistrhoUINotes.cpp"
-
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
-
-START_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-static const NativePluginDescriptor notesDesc = {
-    /* category  */ PLUGIN_CATEGORY_UTILITY,
-    /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_RTSAFE|PLUGIN_HAS_UI),
-    /* supports  */ static_cast<NativePluginSupports>(0x0),
-    /* audioIns  */ DISTRHO_PLUGIN_NUM_INPUTS,
-    /* audioOuts */ DISTRHO_PLUGIN_NUM_OUTPUTS,
-    /* midiIns   */ 0,
-    /* midiOuts  */ 0,
-    /* paramIns  */ 1,
-    /* paramOuts */ 0,
-    /* name      */ DISTRHO_PLUGIN_NAME,
-    /* label     */ "Notes",
-    /* maker     */ "falkTX",
-    /* copyright */ "GPL v2+",
-    PluginDescriptorFILL(PluginCarla)
-};
-
-END_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-CARLA_EXPORT
-void carla_register_native_plugin_Notes()
-{
-    USE_NAMESPACE_DISTRHO
-    carla_register_native_plugin(&notesDesc);
-}
-
-// -----------------------------------------------------------------------

source/modules/native-plugins/distrho-pingpongpan.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,22 +15,21 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
 // Plugin Code
 #include "pingpongpan/DistrhoArtworkPingPongPan.cpp"
 #include "pingpongpan/DistrhoPluginPingPongPan.cpp"
 #include "pingpongpan/DistrhoUIPingPongPan.cpp"
 
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
+// DISTRHO Code
+#define DISTRHO_PLUGIN_TARGET_CARLA
+#include "DistrhoPluginMain.cpp"
+#include "DistrhoUIMain.cpp"
 
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor pppDesc = {
+static const NativePluginDescriptor pingpongpanDesc = {
     /* category  */ PLUGIN_CATEGORY_UTILITY,
     /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_RTSAFE|PLUGIN_HAS_UI),
     /* supports  */ static_cast<NativePluginSupports>(0x0),
@@ -41,7 +40,7 @@ static const NativePluginDescriptor pppDesc = {
     /* paramIns  */ DistrhoPluginPingPongPan::paramCount,
     /* paramOuts */ 0,
     /* name      */ DISTRHO_PLUGIN_NAME,
-    /* label     */ "PingPongPan",
+    /* label     */ "pingpongpan",
     /* maker     */ "falkTX",
     /* copyright */ "LGPL",
     PluginDescriptorFILL(PluginCarla)
@@ -52,10 +51,10 @@ END_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 CARLA_EXPORT
-void carla_register_native_plugin_PingPongPan()
+void carla_register_native_plugin_pingpongpan()
 {
     USE_NAMESPACE_DISTRHO
-    carla_register_native_plugin(&pppDesc);
+    carla_register_native_plugin(&pingpongpanDesc);
 }
 
 // -----------------------------------------------------------------------

source/modules/native-plugins/distrho-stereoenhancer.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,23 +15,22 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#include "CarlaNative.hpp"
-#include "CarlaMathUtils.hpp"
-
 // Plugin Code
 #include "stereoenhancer/DistrhoArtworkStereoEnhancer.cpp"
 #include "stereoenhancer/DistrhoPluginStereoEnhancer.cpp"
 #include "stereoenhancer/DistrhoUIStereoEnhancer.cpp"
 
-// Carla DISTRHO Plugin
-#include "distrho/DistrhoPluginCarla.cpp"
+// DISTRHO Code
+#define DISTRHO_PLUGIN_TARGET_CARLA
+#include "DistrhoPluginMain.cpp"
+#include "DistrhoUIMain.cpp"
 
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
 
 static const NativePluginDescriptor stereoenhancerDesc = {
-    /* category  */ PLUGIN_CATEGORY_EQ,
+    /* category  */ PLUGIN_CATEGORY_UTILITY,
     /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_RTSAFE|PLUGIN_HAS_UI),
     /* supports  */ static_cast<NativePluginSupports>(0x0),
     /* audioIns  */ DISTRHO_PLUGIN_NUM_INPUTS,
@@ -41,7 +40,7 @@ static const NativePluginDescriptor stereoenhancerDesc = {
     /* paramIns  */ DistrhoPluginStereoEnhancer::paramCount,
     /* paramOuts */ 0,
     /* name      */ DISTRHO_PLUGIN_NAME,
-    /* label     */ "StereoEnhancer",
+    /* label     */ "stereoenhancer",
     /* maker     */ "falkTX",
     /* copyright */ "LGPL",
     PluginDescriptorFILL(PluginCarla)
@@ -52,7 +51,7 @@ END_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 CARLA_EXPORT
-void carla_register_native_plugin_StereoEnhancer()
+void carla_register_native_plugin_stereoenhancer()
 {
     USE_NAMESPACE_DISTRHO
     carla_register_native_plugin(&stereoenhancerDesc);

source/modules/native-plugins/juce-patchbay.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -24,10 +24,10 @@ using namespace juce;
 
 // -----------------------------------------------------------------------
 
-#include "juce-host/FilterGraph.h"
-#include "juce-host/InternalFilters.h"
-#include "juce-host/GraphEditorPanel.h"
-#include "juce-host/MainHostWindow.h"
+#include "jucepluginhost/FilterGraph.h"
+#include "jucepluginhost/InternalFilters.h"
+#include "jucepluginhost/GraphEditorPanel.h"
+#include "jucepluginhost/MainHostWindow.h"
 
 // -----------------------------------------------------------------------
 
@@ -233,9 +233,9 @@ private:
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor jucePatchbayDesc = {
+static const NativePluginDescriptor jucepatchbayDesc = {
     /* category  */ PLUGIN_CATEGORY_UTILITY,
-    /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_SYNTH|PLUGIN_HAS_UI|PLUGIN_NEEDS_FIXED_BUFFERS|PLUGIN_NEEDS_UI_JUCE|PLUGIN_USES_STATE|PLUGIN_USES_TIME),
+    /* hints     */ static_cast<NativePluginHints>(PLUGIN_IS_SYNTH|PLUGIN_HAS_UI|PLUGIN_NEEDS_FIXED_BUFFERS|PLUGIN_NEEDS_UI_JUCE|PLUGIN_USES_STATE/*|PLUGIN_USES_TIME*/),
     /* supports  */ static_cast<NativePluginSupports>(0x0),
     /* audioIns  */ 2,
     /* audioOuts */ 2,
@@ -253,19 +253,19 @@ static const NativePluginDescriptor jucePatchbayDesc = {
 // -----------------------------------------------------------------------
 
 CARLA_EXPORT
-void carla_register_native_plugin_jucePatchbay()
+void carla_register_native_plugin_jucepatchbay()
 {
-    carla_register_native_plugin(&jucePatchbayDesc);
+    carla_register_native_plugin(&jucepatchbayDesc);
 }
 
 // -----------------------------------------------------------------------
 
-#include "juce-host/juce_MidiKeyboardComponent.h"
-#include "juce-host/juce_MidiKeyboardComponent.cpp"
+#include "jucepluginhost/juce_MidiKeyboardComponent.h"
+#include "jucepluginhost/juce_MidiKeyboardComponent.cpp"
 
-#include "juce-host/FilterGraph.cpp"
-#include "juce-host/InternalFilters.cpp"
-#include "juce-host/GraphEditorPanel.cpp"
-#include "juce-host/MainHostWindow.cpp"
+#include "jucepluginhost/FilterGraph.cpp"
+#include "jucepluginhost/InternalFilters.cpp"
+#include "jucepluginhost/GraphEditorPanel.cpp"
+#include "jucepluginhost/MainHostWindow.cpp"
 
 // -----------------------------------------------------------------------

source/modules/native-plugins/lfo.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,8 +21,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-typedef unsigned int uint;
-
 // -----------------------------------------------------------------------
 
 typedef enum {

source/modules/native-plugins/midi-file.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/native-plugins/midi-gain.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -41,7 +41,7 @@ typedef struct {
 
 // -----------------------------------------------------------------------
 
-static NativePluginHandle midiGain_instantiate(const NativeHostDescriptor* host)
+static NativePluginHandle midigain_instantiate(const NativeHostDescriptor* host)
 {
     MidiGainHandle* const handle = (MidiGainHandle*)malloc(sizeof(MidiGainHandle));
 
@@ -58,12 +58,12 @@ static NativePluginHandle midiGain_instantiate(const NativeHostDescriptor* host)
 
 #define handlePtr ((MidiGainHandle*)handle)
 
-static void midiGain_cleanup(NativePluginHandle handle)
+static void midigain_cleanup(NativePluginHandle handle)
 {
     free(handlePtr);
 }
 
-static uint32_t midiGain_get_parameter_count(NativePluginHandle handle)
+static uint32_t midigain_get_parameter_count(NativePluginHandle handle)
 {
     return PARAM_COUNT;
 
@@ -71,7 +71,7 @@ static uint32_t midiGain_get_parameter_count(NativePluginHandle handle)
     (void)handle;
 }
 
-const NativeParameter* midiGain_get_parameter_info(NativePluginHandle handle, uint32_t index)
+const NativeParameter* midigain_get_parameter_info(NativePluginHandle handle, uint32_t index)
 {
     if (index > PARAM_COUNT)
         return NULL;
@@ -132,7 +132,7 @@ const NativeParameter* midiGain_get_parameter_info(NativePluginHandle handle, ui
     (void)handle;
 }
 
-static float midiGain_get_parameter_value(NativePluginHandle handle, uint32_t index)
+static float midigain_get_parameter_value(NativePluginHandle handle, uint32_t index)
 {
     switch (index)
     {
@@ -149,7 +149,7 @@ static float midiGain_get_parameter_value(NativePluginHandle handle, uint32_t in
     }
 }
 
-static void midiGain_set_parameter_value(NativePluginHandle handle, uint32_t index, float value)
+static void midigain_set_parameter_value(NativePluginHandle handle, uint32_t index, float value)
 {
     switch (index)
     {
@@ -168,7 +168,7 @@ static void midiGain_set_parameter_value(NativePluginHandle handle, uint32_t ind
     }
 }
 
-static void midiGain_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midigain_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     const float gain           = handlePtr->gain;
@@ -193,7 +193,7 @@ static void midiGain_process(NativePluginHandle handle, float** inBuffer, float*
 
             if (value <= 0.0f)
                 tmpEvent.data[2] = 0;
-            else if (value >= 1.27f)
+            else if (value >= 127.0f)
                 tmpEvent.data[2] = 127;
             else
                 tmpEvent.data[2] = (uint8_t)value;
@@ -214,7 +214,7 @@ static void midiGain_process(NativePluginHandle handle, float** inBuffer, float*
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor midiGainDesc = {
+static const NativePluginDescriptor midigainDesc = {
     .category  = PLUGIN_CATEGORY_UTILITY,
     .hints     = PLUGIN_IS_RTSAFE,
     .supports  = PLUGIN_SUPPORTS_EVERYTHING,
@@ -225,22 +225,22 @@ static const NativePluginDescriptor midiGainDesc = {
     .paramIns  = 0,
     .paramOuts = 0,
     .name      = "MIDI Gain",
-    .label     = "midiGain",
+    .label     = "midigain",
     .maker     = "falkTX",
     .copyright = "GNU GPL v2+",
 
-    .instantiate = midiGain_instantiate,
-    .cleanup     = midiGain_cleanup,
+    .instantiate = midigain_instantiate,
+    .cleanup     = midigain_cleanup,
 
-    .get_parameter_count = midiGain_get_parameter_count,
-    .get_parameter_info  = midiGain_get_parameter_info,
-    .get_parameter_value = midiGain_get_parameter_value,
+    .get_parameter_count = midigain_get_parameter_count,
+    .get_parameter_info  = midigain_get_parameter_info,
+    .get_parameter_value = midigain_get_parameter_value,
     .get_parameter_text  = NULL,
 
     .get_midi_program_count = NULL,
     .get_midi_program_info  = NULL,
 
-    .set_parameter_value = midiGain_set_parameter_value,
+    .set_parameter_value = midigain_set_parameter_value,
     .set_midi_program    = NULL,
     .set_custom_data     = NULL,
 
@@ -253,7 +253,7 @@ static const NativePluginDescriptor midiGainDesc = {
 
     .activate   = NULL,
     .deactivate = NULL,
-    .process    = midiGain_process,
+    .process    = midigain_process,
 
     .get_state = NULL,
     .set_state = NULL,
@@ -263,9 +263,9 @@ static const NativePluginDescriptor midiGainDesc = {
 
 // -----------------------------------------------------------------------
 
-void carla_register_native_plugin_midiGain()
+void carla_register_native_plugin_midigain()
 {
-    carla_register_native_plugin(&midiGainDesc);
+    carla_register_native_plugin(&midigainDesc);
 }
 
 // -----------------------------------------------------------------------

source/modules/native-plugins/midi-sequencer.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/native-plugins/midi-split.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -28,7 +28,7 @@ typedef struct {
 
 // -----------------------------------------------------------------------
 
-static NativePluginHandle midiSplit_instantiate(const NativeHostDescriptor* host)
+static NativePluginHandle midisplit_instantiate(const NativeHostDescriptor* host)
 {
     MidiSplitHandle* const handle = (MidiSplitHandle*)malloc(sizeof(MidiSplitHandle));
 
@@ -41,12 +41,12 @@ static NativePluginHandle midiSplit_instantiate(const NativeHostDescriptor* host
 
 #define handlePtr ((MidiSplitHandle*)handle)
 
-static void midiSplit_cleanup(NativePluginHandle handle)
+static void midisplit_cleanup(NativePluginHandle handle)
 {
     free(handlePtr);
 }
 
-static void midiSplit_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midisplit_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     NativeMidiEvent tmpEvent;
@@ -84,7 +84,7 @@ static void midiSplit_process(NativePluginHandle handle, float** inBuffer, float
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor midiSplitDesc = {
+static const NativePluginDescriptor midisplitDesc = {
     .category  = PLUGIN_CATEGORY_UTILITY,
     .hints     = PLUGIN_IS_RTSAFE,
     .supports  = PLUGIN_SUPPORTS_EVERYTHING,
@@ -95,12 +95,12 @@ static const NativePluginDescriptor midiSplitDesc = {
     .paramIns  = 0,
     .paramOuts = 0,
     .name      = "MIDI Split",
-    .label     = "midiSplit",
+    .label     = "midisplit",
     .maker     = "falkTX",
     .copyright = "GNU GPL v2+",
 
-    .instantiate = midiSplit_instantiate,
-    .cleanup     = midiSplit_cleanup,
+    .instantiate = midisplit_instantiate,
+    .cleanup     = midisplit_cleanup,
 
     .get_parameter_count = NULL,
     .get_parameter_info  = NULL,
@@ -123,7 +123,7 @@ static const NativePluginDescriptor midiSplitDesc = {
 
     .activate   = NULL,
     .deactivate = NULL,
-    .process    = midiSplit_process,
+    .process    = midisplit_process,
 
     .get_state = NULL,
     .set_state = NULL,
@@ -133,9 +133,9 @@ static const NativePluginDescriptor midiSplitDesc = {
 
 // -----------------------------------------------------------------------
 
-void carla_register_native_plugin_midiSplit()
+void carla_register_native_plugin_midisplit()
 {
-    carla_register_native_plugin(&midiSplitDesc);
+    carla_register_native_plugin(&midisplitDesc);
 }
 
 // -----------------------------------------------------------------------

source/modules/native-plugins/midi-through.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -28,7 +28,7 @@ typedef struct {
 
 // -----------------------------------------------------------------------
 
-static NativePluginHandle midiThrough_instantiate(const NativeHostDescriptor* host)
+static NativePluginHandle midithrough_instantiate(const NativeHostDescriptor* host)
 {
     MidiThroughHandle* const handle = (MidiThroughHandle*)malloc(sizeof(MidiThroughHandle));
 
@@ -41,12 +41,12 @@ static NativePluginHandle midiThrough_instantiate(const NativeHostDescriptor* ho
 
 #define handlePtr ((MidiThroughHandle*)handle)
 
-static void midiThrough_cleanup(NativePluginHandle handle)
+static void midithrough_cleanup(NativePluginHandle handle)
 {
     free(handlePtr);
 }
 
-static void midiThrough_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midithrough_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
 
@@ -65,7 +65,7 @@ static void midiThrough_process(NativePluginHandle handle, float** inBuffer, flo
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor midiThroughDesc = {
+static const NativePluginDescriptor midithroughDesc = {
     .category  = PLUGIN_CATEGORY_UTILITY,
     .hints     = PLUGIN_IS_RTSAFE,
     .supports  = PLUGIN_SUPPORTS_EVERYTHING,
@@ -76,12 +76,12 @@ static const NativePluginDescriptor midiThroughDesc = {
     .paramIns  = 0,
     .paramOuts = 0,
     .name      = "MIDI Through",
-    .label     = "midiThrough",
+    .label     = "midithrough",
     .maker     = "falkTX",
     .copyright = "GNU GPL v2+",
 
-    .instantiate = midiThrough_instantiate,
-    .cleanup     = midiThrough_cleanup,
+    .instantiate = midithrough_instantiate,
+    .cleanup     = midithrough_cleanup,
 
     .get_parameter_count = NULL,
     .get_parameter_info  = NULL,
@@ -104,7 +104,7 @@ static const NativePluginDescriptor midiThroughDesc = {
 
     .activate   = NULL,
     .deactivate = NULL,
-    .process    = midiThrough_process,
+    .process    = midithrough_process,
 
     .get_state = NULL,
     .set_state = NULL,
@@ -114,9 +114,9 @@ static const NativePluginDescriptor midiThroughDesc = {
 
 // -----------------------------------------------------------------------
 
-void carla_register_native_plugin_midiThrough()
+void carla_register_native_plugin_midithrough()
 {
-    carla_register_native_plugin(&midiThroughDesc);
+    carla_register_native_plugin(&midithroughDesc);
 }
 
 // -----------------------------------------------------------------------

source/modules/native-plugins/midi-transpose.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -29,7 +29,7 @@ typedef struct {
 
 // -----------------------------------------------------------------------
 
-static NativePluginHandle midiTranspose_instantiate(const NativeHostDescriptor* host)
+static NativePluginHandle miditranspose_instantiate(const NativeHostDescriptor* host)
 {
     MidiTransposeHandle* const handle = (MidiTransposeHandle*)malloc(sizeof(MidiTransposeHandle));
 
@@ -43,12 +43,12 @@ static NativePluginHandle midiTranspose_instantiate(const NativeHostDescriptor*
 
 #define handlePtr ((MidiTransposeHandle*)handle)
 
-static void midiTranspose_cleanup(NativePluginHandle handle)
+static void miditranspose_cleanup(NativePluginHandle handle)
 {
     free(handlePtr);
 }
 
-static uint32_t midiTranspose_get_parameter_count(NativePluginHandle handle)
+static uint32_t miditranspose_get_parameter_count(NativePluginHandle handle)
 {
     return 1;
 
@@ -56,7 +56,7 @@ static uint32_t midiTranspose_get_parameter_count(NativePluginHandle handle)
     (void)handle;
 }
 
-const NativeParameter* midiTranspose_get_parameter_info(NativePluginHandle handle, uint32_t index)
+const NativeParameter* miditranspose_get_parameter_info(NativePluginHandle handle, uint32_t index)
 {
     if (index != 0)
         return NULL;
@@ -81,7 +81,7 @@ const NativeParameter* midiTranspose_get_parameter_info(NativePluginHandle handl
     (void)handle;
 }
 
-static float midiTranspose_get_parameter_value(NativePluginHandle handle, uint32_t index)
+static float miditranspose_get_parameter_value(NativePluginHandle handle, uint32_t index)
 {
     if (index != 0)
         return 0.0f;
@@ -89,7 +89,7 @@ static float midiTranspose_get_parameter_value(NativePluginHandle handle, uint32
     return (float)handlePtr->octaves;
 }
 
-static void midiTranspose_set_parameter_value(NativePluginHandle handle, uint32_t index, float value)
+static void miditranspose_set_parameter_value(NativePluginHandle handle, uint32_t index, float value)
 {
     if (index != 0)
         return;
@@ -97,7 +97,7 @@ static void midiTranspose_set_parameter_value(NativePluginHandle handle, uint32_
     handlePtr->octaves = (int)value;
 }
 
-static void midiTranspose_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void miditranspose_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     const int octaves = handlePtr->octaves;
@@ -143,7 +143,7 @@ static void midiTranspose_process(NativePluginHandle handle, float** inBuffer, f
 
 // -----------------------------------------------------------------------
 
-static const NativePluginDescriptor midiTransposeDesc = {
+static const NativePluginDescriptor miditransposeDesc = {
     .category  = PLUGIN_CATEGORY_UTILITY,
     .hints     = PLUGIN_IS_RTSAFE,
     .supports  = PLUGIN_SUPPORTS_EVERYTHING,
@@ -154,22 +154,22 @@ static const NativePluginDescriptor midiTransposeDesc = {
     .paramIns  = 1,
     .paramOuts = 0,
     .name      = "MIDI Transpose",
-    .label     = "midiTranspose",
+    .label     = "miditranspose",
     .maker     = "falkTX",
     .copyright = "GNU GPL v2+",
 
-    .instantiate = midiTranspose_instantiate,
-    .cleanup     = midiTranspose_cleanup,
+    .instantiate = miditranspose_instantiate,
+    .cleanup     = miditranspose_cleanup,
 
-    .get_parameter_count = midiTranspose_get_parameter_count,
-    .get_parameter_info  = midiTranspose_get_parameter_info,
-    .get_parameter_value = midiTranspose_get_parameter_value,
+    .get_parameter_count = miditranspose_get_parameter_count,
+    .get_parameter_info  = miditranspose_get_parameter_info,
+    .get_parameter_value = miditranspose_get_parameter_value,
     .get_parameter_text  = NULL,
 
     .get_midi_program_count = NULL,
     .get_midi_program_info  = NULL,
 
-    .set_parameter_value = midiTranspose_set_parameter_value,
+    .set_parameter_value = miditranspose_set_parameter_value,
     .set_midi_program    = NULL,
     .set_custom_data     = NULL,
 
@@ -182,7 +182,7 @@ static const NativePluginDescriptor midiTransposeDesc = {
 
     .activate   = NULL,
     .deactivate = NULL,
-    .process    = midiTranspose_process,
+    .process    = miditranspose_process,
 
     .get_state = NULL,
     .set_state = NULL,
@@ -192,9 +192,9 @@ static const NativePluginDescriptor midiTransposeDesc = {
 
 // -----------------------------------------------------------------------
 
-void carla_register_native_plugin_midiTranspose()
+void carla_register_native_plugin_miditranspose()
 {
-    carla_register_native_plugin(&midiTransposeDesc);
+    carla_register_native_plugin(&miditransposeDesc);
 }
 
 // -----------------------------------------------------------------------