Merge branch 'master' of https://github.com/DISTRHO/DPF-Max-Gen

Makefile

@@ -18,6 +18,7 @@ plugins:
 	$(MAKE) all -C plugins/shiroverb
 	$(MAKE) all -C plugins/pitchotto
 	$(MAKE) all -C plugins/modulay
+	$(MAKE) all -C plugins/larynx
 
 gen: plugins dpf/utils/lv2_ttl_generator
 	@$(CURDIR)/dpf/utils/generate-ttl.sh
@@ -39,6 +40,7 @@ clean:
 	$(MAKE) clean -C plugins/shiroverb
 	$(MAKE) clean -C plugins/pitchotto
 	$(MAKE) clean -C plugins/modulay
+	$(MAKE) clean -C plugins/larynx
 
 # --------------------------------------------------------------
 

modguis/Modulay.modgui/manifest.ttl

@@ -1,46 +0,0 @@
-@prefix modgui: <http://moddevices.com/ns/modgui#> .
-@prefix lv2:    <http://lv2plug.in/ns/lv2core#> .
-
-<http://distrho.sf.net/plugins/Modulay>
-    modgui:gui [
-        modgui:resourcesDirectory <modgui> ;
-        modgui:iconTemplate <modgui/icon-modulay.html> ;
-        modgui:stylesheet <modgui/stylesheet-modulay.css> ;
-        modgui:screenshot <modgui/screenshot-modulay.png> ;
-        modgui:thumbnail <modgui/thumbnail-modulay.png> ;
-        modgui:brand "Shiro" ;
-        modgui:label "Modulay" ;
-        modgui:model "boxy" ;
-        modgui:panel "7-knobs" ;
-        modgui:color "racing" ;
-        modgui:knob "black" ;
-        modgui:port [
-            lv2:index 0 ;
-            lv2:symbol "time" ;
-            lv2:name "time" ;
-        ] , [
-            lv2:index 1 ;
-            lv2:symbol "repeats" ;
-            lv2:name "repeats" ;
-        ] , [
-            lv2:index 2 ;
-            lv2:symbol "cutoff" ;
-            lv2:name "cutoff" ;
-        ] , [
-            lv2:index 3 ;
-            lv2:symbol "mix" ;
-            lv2:name "mix" ;
-        ] , [
-            lv2:index 4 ;
-            lv2:symbol "depth" ;
-            lv2:name "depth" ;
-        ] , [
-            lv2:index 5 ;
-            lv2:symbol "rate" ;
-            lv2:name "rate" ;
-        ] , [
-            lv2:index 6 ;
-            lv2:symbol "delay" ;
-            lv2:name "delay" ;
-        ] ;
-    ] .

modguis/Modulay.modgui/modgui/icon-modulay.html

@@ -1,49 +0,0 @@
-<div class="mod-pedal mod-pedal-boxy{{{cns}}} mod-seven-knobs mod-boxy75 mod-{{color}} {{color}}">
-    <div mod-role="drag-handle" class="mod-drag-handle"></div>
-    <div class="mod-plugin-brand"><h1>{{brand}}</h1></div>
-    <div class="mod-plugin-name"><h1>{{label}}</h1></div>
-    <div class="mod-light on" mod-role="bypass-light"></div>
-    <div class="mod-control-group mod-{{knob}} clearfix">
-        {{#controls}}
-        <div class="mod-knob">
-            <div class="mod-knob-image" mod-role="input-control-port" mod-port-symbol="{{symbol}}"></div>
-            <span class="mod-knob-title">{{name}}</span>
-        </div>
-        {{/controls}}
-    </div>
-    <div class="mod-footswitch" mod-role="bypass"></div>
-    <div class="mod-pedal-input">
-        {{#effect.ports.audio.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-audio-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.audio.input}}
-        {{#effect.ports.midi.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-midi-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.midi.input}}
-        {{#effect.ports.cv.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-cv-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.cv.input}}
-    </div>
-    <div class="mod-pedal-output">
-        {{#effect.ports.audio.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-audio-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.audio.output}}
-        {{#effect.ports.midi.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-midi-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.midi.output}}
-        {{#effect.ports.cv.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-cv-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.cv.output}}
-    </div>
-</div>

modguis/Pitchotto.modgui/manifest.ttl

@@ -1,42 +0,0 @@
-@prefix modgui: <http://moddevices.com/ns/modgui#> .
-@prefix lv2:    <http://lv2plug.in/ns/lv2core#> .
-
-<http://distrho.sf.net/plugins/Pitchotto>
-    modgui:gui [
-        modgui:resourcesDirectory <modgui> ;
-        modgui:iconTemplate <modgui/icon-pitchotto.html> ;
-        modgui:stylesheet <modgui/stylesheet-pitchotto.css> ;
-        modgui:screenshot <modgui/screenshot-pitchotto.png> ;
-        modgui:thumbnail <modgui/thumbnail-pitchotto.png> ;
-        modgui:brand "Shiro" ;
-        modgui:label "Pitchotto" ;
-        modgui:model "boxy" ;
-        modgui:panel "6-knobs" ;
-        modgui:color "red" ;
-        modgui:knob "black" ;
-        modgui:port [
-            lv2:index 0 ;
-            lv2:symbol "ratio1" ;
-            lv2:name "ratio1" ;
-        ] , [
-            lv2:index 1 ;
-            lv2:symbol "ratio2" ;
-            lv2:name "ratio2" ;
-        ] , [
-            lv2:index 2 ;
-            lv2:symbol "mix" ;
-            lv2:name "mix" ;
-        ] , [
-            lv2:index 3 ;
-            lv2:symbol "delay1" ;
-            lv2:name "delay1" ;
-        ] , [
-            lv2:index 4 ;
-            lv2:symbol "delay2" ;
-            lv2:name "delay2" ;
-        ] , [
-            lv2:index 5 ;
-            lv2:symbol "cutoff" ;
-            lv2:name "cutoff" ;
-        ] ;
-    ] .

modguis/Pitchotto.modgui/modgui/icon-pitchotto.html

@@ -1,49 +0,0 @@
-<div class="mod-pedal mod-pedal-boxy{{{cns}}} mod-six-knobs mod-{{color}} {{color}}">
-    <div mod-role="drag-handle" class="mod-drag-handle"></div>
-    <div class="mod-plugin-brand"><h1>{{brand}}</h1></div>
-    <div class="mod-plugin-name"><h1>{{label}}</h1></div>
-    <div class="mod-light on" mod-role="bypass-light"></div>
-    <div class="mod-control-group mod-{{knob}} clearfix">
-        {{#controls}}
-        <div class="mod-knob">
-            <div class="mod-knob-image" mod-role="input-control-port" mod-port-symbol="{{symbol}}"></div>
-            <span class="mod-knob-title">{{name}}</span>
-        </div>
-        {{/controls}}
-    </div>
-    <div class="mod-footswitch" mod-role="bypass"></div>
-    <div class="mod-pedal-input">
-        {{#effect.ports.audio.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-audio-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.audio.input}}
-        {{#effect.ports.midi.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-midi-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.midi.input}}
-        {{#effect.ports.cv.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-cv-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.cv.input}}
-    </div>
-    <div class="mod-pedal-output">
-        {{#effect.ports.audio.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-audio-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.audio.output}}
-        {{#effect.ports.midi.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-midi-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.midi.output}}
-        {{#effect.ports.cv.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-cv-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.cv.output}}
-    </div>
-</div>

modguis/Shiroverb.modgui/manifest.ttl

@@ -1,50 +0,0 @@
-@prefix modgui: <http://moddevices.com/ns/modgui#> .
-@prefix lv2:    <http://lv2plug.in/ns/lv2core#> .
-
-<http://distrho.sf.net/plugins/Shiroverb>
-    modgui:gui [
-        modgui:resourcesDirectory <modgui> ;
-        modgui:iconTemplate <modgui/icon-shiroverb.html> ;
-        modgui:stylesheet <modgui/stylesheet-shiroverb.css> ;
-        modgui:screenshot <modgui/screenshot-shiroverb.png> ;
-        modgui:thumbnail <modgui/thumbnail-shiroverb.png> ;
-        modgui:brand "Shiro" ;
-        modgui:label "Shiroverb" ;
-        modgui:model "boxy" ;
-        modgui:panel "8-knobs" ;
-        modgui:color "petrol" ;
-        modgui:knob "black" ;
-        modgui:port [
-            lv2:index 0 ;
-            lv2:symbol "decay" ;
-            lv2:name "decay" ;
-        ] , [
-            lv2:index 1 ;
-            lv2:symbol "tail" ;
-            lv2:name "tail" ;
-        ] , [
-            lv2:index 2 ;
-            lv2:symbol "damping" ;
-            lv2:name "damping" ;
-        ] , [
-            lv2:index 3 ;
-            lv2:symbol "mix" ;
-            lv2:name "mix" ;
-        ] , [
-            lv2:index 4 ;
-            lv2:symbol "roomsize" ;
-            lv2:name "roomsize" ;
-        ] , [
-            lv2:index 5 ;
-            lv2:symbol "ratio" ;
-            lv2:name "ratio" ;
-        ] , [
-            lv2:index 6 ;
-            lv2:symbol "cutoff" ;
-            lv2:name "cutoff" ;
-        ] , [
-            lv2:index 7 ;
-            lv2:symbol "shimmer" ;
-            lv2:name "shimmer" ;
-        ] ;
-    ] .

modguis/Shiroverb.modgui/modgui/icon-shiroverb.html

@@ -1,49 +0,0 @@
-<div class="mod-pedal mod-pedal-boxy{{{cns}}} mod-eight-knobs mod-boxy75 mod-{{color}} {{color}}">
-    <div mod-role="drag-handle" class="mod-drag-handle"></div>
-    <div class="mod-plugin-brand"><h1>{{brand}}</h1></div>
-    <div class="mod-plugin-name"><h1>{{label}}</h1></div>
-    <div class="mod-light on" mod-role="bypass-light"></div>
-    <div class="mod-control-group mod-{{knob}} clearfix">
-        {{#controls}}
-        <div class="mod-knob">
-            <div class="mod-knob-image" mod-role="input-control-port" mod-port-symbol="{{symbol}}"></div>
-            <span class="mod-knob-title">{{name}}</span>
-        </div>
-        {{/controls}}
-    </div>
-    <div class="mod-footswitch" mod-role="bypass"></div>
-    <div class="mod-pedal-input">
-        {{#effect.ports.audio.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-audio-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.audio.input}}
-        {{#effect.ports.midi.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-midi-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.midi.input}}
-        {{#effect.ports.cv.input}}
-        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-cv-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-input-image"></div>
-        </div>
-        {{/effect.ports.cv.input}}
-    </div>
-    <div class="mod-pedal-output">
-        {{#effect.ports.audio.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-audio-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.audio.output}}
-        {{#effect.ports.midi.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-midi-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.midi.output}}
-        {{#effect.ports.cv.output}}
-        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-cv-port" mod-port-symbol="{{symbol}}">
-            <div class="mod-pedal-output-image"></div>
-        </div>
-        {{/effect.ports.cv.output}}
-    </div>
-</div>

plugins/larynx/DistrhoPluginInfo.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 Nino de Wit <ninodig@hotmail.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
+ * permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+ * TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
+#define DISTRHO_PLUGIN_INFO_H_INCLUDED
+
+#define DISTRHO_PLUGIN_BRAND "SHIRO"
+#define DISTRHO_PLUGIN_NAME  "Larynx"
+#define DISTRHO_PLUGIN_URI   "http://distrho.sf.net/plugins/Larynx"
+
+#define DISTRHO_PLUGIN_HAS_UI        0
+#define DISTRHO_PLUGIN_IS_RT_SAFE    0
+#define DISTRHO_PLUGIN_NUM_INPUTS    1
+#define DISTRHO_PLUGIN_NUM_OUTPUTS   1
+#define DISTRHO_PLUGIN_USES_MODGUI   1
+
+#define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:ModulatorPlugin"
+
+#define DISTRHO_PLUGIN_DESCRIPTION "Vibrato with tone control"
+#define DISTRHO_PLUGIN_VERSION d_cconst('D', 'V', 'b', 'r')
+
+#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED

plugins/larynx/DistrhoPluginMaxGen.cpp

@@ -0,0 +1 @@
+../common/DistrhoPluginMaxGen.cpp

plugins/larynx/Makefile

@@ -0,0 +1,40 @@
+#!/usr/bin/make -f
+# Makefile for DISTRHO Plugins #
+# ---------------------------- #
+# Created by falkTX
+#
+
+# --------------------------------------------------------------
+# Project name, used for binaries
+
+NAME = Larynx
+
+# --------------------------------------------------------------
+# Files to build
+
+OBJS_DSP = \
+	DistrhoPluginMaxGen.cpp.o \
+	gen_exported.cpp.o
+
+# --------------------------------------------------------------
+# Do some magic
+
+include ../Makefile.mk
+
+# --------------------------------------------------------------
+# Enable all possible plugin types
+
+ifeq ($(HAVE_JACK),true)
+TARGETS += jack
+endif
+
+ifeq ($(LINUX),true)
+TARGETS += ladspa
+endif
+
+TARGETS += lv2_dsp
+TARGETS += vst
+
+all: $(TARGETS)
+
+# --------------------------------------------------------------

plugins/shiroverb/DistrhoPluginInfo.h

@@ -28,7 +28,7 @@
 
 #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:ReverbPlugin"
 
-#define DISTRHO_PLUGIN_DESCRIPTION "Shiroverb is a shimmer-reverb based on the \"Gigaverb\"-genpatch, ported from the implementation by Juhana Sadeharju, and the \"Pitch-Shift\"-genpatch, both in Max."
+#define DISTRHO_PLUGIN_DESCRIPTION "Shiroverb is a shimmer-reverb based on the \"Gigaverb\"-genpatch, ported from the implementation by Juhana Sadeharju, and the \"Pitch-Shift\"-genpatch, both in Max MSP."
 #define DISTRHO_PLUGIN_VERSION d_cconst('D', 'M', 's', 'v')
 
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED