debian/0000755000000000000000000000000012227535420007170 5ustar debian/compat0000644000000000000000000000000212227533527010374 0ustar 9 debian/patches/0000755000000000000000000000000012227533055010621 5ustar debian/patches/1001-errs_and_warns.patch0000644000000000000000000000710612227533243015233 0ustar Description: Fix some compilation errors and warnings. From: http://git.savannah.gnu.org/gitweb/?p=ll-plugins/azr3-jack.git;a=commit;h=2453bdc15286 Author: Lars Luthman Origin: upstream, commit:2453bdc15286 --- azr3/azr3gui.cpp | 10 +++++----- azr3/azr3gui.hpp | 6 +++--- azr3/main.cpp | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) --- azr3-jack.orig/azr3/azr3gui.cpp +++ azr3-jack/azr3/azr3gui.cpp @@ -332,7 +332,7 @@ void AZR3GUI::set_back_pixmap(Widget* wd } -Knob* AZR3GUI::add_knob(Fixed& fbox, RefPtr& pm, int port, +Knob* AZR3GUI::add_knob(Fixed& fbox, RefPtr& pm, size_t port, float min, float max, float value, int xoffset, int yoffset, float dmin, float dmax, bool decimal) { @@ -350,7 +350,7 @@ Knob* AZR3GUI::add_knob(Fixed& fbox, Ref s->set_bg_pixmap(STATE_SELECTED, npm); s->set_bg_pixmap(STATE_INSENSITIVE, npm); knob->set_style(s); - if (port >= 0 && port < m_adj.size()) { + if (port < m_adj.size()) { knob->get_adjustment().signal_value_changed(). connect(compose(bind<0>(mem_fun(*this, &AZR3GUI::control_changed), port), mem_fun(knob->get_adjustment(), @@ -362,7 +362,7 @@ Knob* AZR3GUI::add_knob(Fixed& fbox, Ref } -Drawbar* AZR3GUI::add_drawbar(Fixed& fbox, RefPtr& pm, int port, +Drawbar* AZR3GUI::add_drawbar(Fixed& fbox, RefPtr& pm, size_t port, float min, float max, float value, int xoffset, int yoffset, Drawbar::Type type) { @@ -380,7 +380,7 @@ Drawbar* AZR3GUI::add_drawbar(Fixed& fbo s->set_bg_pixmap(STATE_SELECTED, npm); s->set_bg_pixmap(STATE_INSENSITIVE, npm); db->set_style(s); - if (port >= 0 && port < m_adj.size()) { + if (port < m_adj.size()) { db->get_adjustment().signal_value_changed(). connect(compose(bind<0>(mem_fun(*this, &AZR3GUI::control_changed), port), mem_fun(db->get_adjustment(), &Adjustment::get_value))); @@ -391,7 +391,7 @@ Drawbar* AZR3GUI::add_drawbar(Fixed& fbo } -Switch* AZR3GUI::add_switch(Fixed& fbox, int port, +Switch* AZR3GUI::add_switch(Fixed& fbox, size_t port, int xoffset, int yoffset, Switch::Type type) { Switch* sw = manage(new Switch(type)); fbox.put(*sw, xoffset, yoffset); --- azr3-jack.orig/azr3/azr3gui.hpp +++ azr3-jack/azr3/azr3gui.hpp @@ -62,15 +62,15 @@ protected: void splitbox_clicked(); void set_back_pixmap(Widget* wdg, Glib::RefPtr pm); - Knob* add_knob(Gtk::Fixed& fbox, Glib::RefPtr& pm, int port, + Knob* add_knob(Gtk::Fixed& fbox, Glib::RefPtr& pm, size_t port, float min, float max, float value, int xoffset, int yoffset, float dmin, float dmax, bool decimal); Drawbar* add_drawbar(Gtk::Fixed& fbox, Glib::RefPtr& pm, - int port, float min, float max, float value, + size_t port, float min, float max, float value, int xoffset, int yoffset, Drawbar::Type type); - Switch* add_switch(Gtk::Fixed& fbox, int port, + Switch* add_switch(Gtk::Fixed& fbox, size_t port, int xoffset, int yoffset, Switch::Type type); Gtk::EventBox* add_clickbox(Gtk::Fixed& fbox, int xoffset, int yoffset, int width, int height); --- azr3-jack.orig/azr3/main.cpp +++ azr3-jack/azr3/main.cpp @@ -338,9 +338,7 @@ int Main::static_process(jack_nframes_t void Main::auto_connect() { - const char* env; const char** port_list; - const char* name = jack_get_client_name(m_jack_client); // MIDI input if (m_auto_midi != "") { debian/patches/0003-manpage.patch0000644000000000000000000000255712227532771013647 0ustar Description: Escape hyphen '-' as it is used as minus sign. Author: Alessio Treglia Forwarded: no --- azr3.1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- azr3-jack.orig/azr3.1 +++ azr3-jack/azr3.1 @@ -37,33 +37,33 @@ MIDI and audio software using JACK. .br .TP -\fB -a, --audio-output\fP=\fIPORT|CLIENT\fP +\fB \-a, \-\-audio-output\fP=\fIPORT|CLIENT\fP When used, azr3 will try to connect its audio output ports to PORT (if it's a JACK port name) or the first two audio input ports in CLIENT (if it's a JACK client name). .TP -\fB -h, --help\fP +\fB \-h, \-\-help\fP Display a help text and exit. .TP -\fB -j, --jack-name\fP=\fINAME\fP +\fB \-j, \-\-jack-name\fP=\fINAME\fP Set the name of the JACK client. The default is \fBAZR-3\fP. Note that JACK may change this name by e.g. adding a number at the end if needed. .TP -\fB -m, --midi-input\fP=\fIPORT|CLIENT\fP +\fB \-m, \-\-midi-input\fP=\fIPORT|CLIENT\fP When used, azr3 will try to connect its MIDI input port to PORT (if it's a JACK port name) or the first MIDI output port in CLIENT (if it's a JACK client name). .TP -\fB -p, --preset\fP=\fINUMBER\fP +\fB \-p, \-\-preset\fP=\fINUMBER\fP Load the preset with the given number instead of the first available one. .TP -.B -v, --version +.B \-v, \-\-version Display version information and exit. .P debian/patches/series0000644000000000000000000000014312227533047012035 0ustar 0001-linking_order.patch 0002-drop_lash_support.patch 0003-manpage.patch 1001-errs_and_warns.patch debian/patches/0001-linking_order.patch0000644000000000000000000000532312227532771015055 0ustar Description: Fix linking order to properly pass LDFLAGS values to the linker. Author: Alessio Treglia Forwarded: no --- Makefile.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- azr3-jack-1.2.3.orig/Makefile.template +++ azr3-jack-1.2.3/Makefile.template @@ -118,7 +118,7 @@ $$($(2)_CXXOBJECTS): Makefile.config $$( $(CXX) -c -o $$@ $(SHARED_LIBRARY_CFLAGS) $(CFLAGS) $(CXXFLAGS) $$($(2)_CFLAGS) $$(patsubst $$($(2)_BLDPRF)%,$$($(2)_SRCPRF)%,$$(subst .o,.cpp,$$@)) $$($(2)_BLDPRF)/$(1): $$($(2)_OBJECTS) $$($(2)_ARCHIVES) $$($(2)_LIBRARIES) $$(filter-out $$(wildcard $$($(2)_BUILDDIR)), $$($(2)_BUILDDIR)) - $(CXX) $(SHARED_LIBRARY_LDFLAGS) $$($(2)_OBJECTS) -Wl,--whole-archive $$($(2)_ARCHIVES) -Wl,--no-whole-archive $$($(2)_LOCALLDFLAGS) $$($(2)_LOCALLIBRARIES) $(LDFLAGS) $$($(2)_LDFLAGS) -o $$@ -Wl,-soname=$(1).0 + $(CXX) $(LDFLAGS) $(SHARED_LIBRARY_LDFLAGS) $$($(2)_OBJECTS) -Wl,--whole-archive $$($(2)_ARCHIVES) -Wl,--no-whole-archive $$($(2)_LOCALLDFLAGS) $$($(2)_LOCALLIBRARIES) $$($(2)_LDFLAGS) -o $$@ -Wl,-soname=$(1).0 /sbin/ldconfig -n $$($(2)_BLDPRF) install-$(2)-headers: $$(patsubst %,$$($(2)_SRCPRF)/%,$$($(2)_HEADERS)) @@ -211,7 +211,7 @@ $$($(1)_CXXOBJECTS): Makefile.config $$( $(CXX) -c -o $$@ $(CFLAGS) $(CXXFLAGS) $$($(1)_CFLAGS) $$($$(patsubst %.o,%_cpp_CFLAGS,$$(notdir $$@))) $$($(1)_CFLAGS) $$(patsubst $$($(1)_BLDPRF)%,$$($(1)_SRCPRF)%,$$(subst .o,.cpp,$$@)) $$($(1)_BLDPRF)/$(1): $$($(1)_OBJECTS) $$($(1)_LIBRARIES) $$($(1)_ARCHIVES) $$(filter-out $$(wildcard $$($(1)_BUILDDIR)), $$($(1)_BUILDDIR)) - $(CXX) $$($(1)_OBJECTS) $$($(1)_ARCHIVES) $$($(1)_LOCALLDFLAGS) $$($(1)_LOCALLIBRARIES) $$($(1)_LDFLAGS) $(LDFLAGS) -o $$@ + $(CXX) $(LDFLAGS) $$($(1)_OBJECTS) $$($(1)_ARCHIVES) $$($(1)_LOCALLDFLAGS) $$($(1)_LOCALLIBRARIES) $$($(1)_LDFLAGS) -o $$@ install-$(1)-headers: $$(patsubst %,$$($(1)_SRCPRF)/%,$$($(1)_HEADERS)) mkdir -p $(DESTDIR)/$(pkgincludedir) @@ -264,7 +264,7 @@ $$($(2)_CXXOBJECTS): Makefile.config $$( $(CXX) -c -o $$@ $(MODULE_CFLAGS) $(CFLAGS) $(CXXFLAGS) $$($(2)_CFLAGS) $$($$(patsubst %.o,%_cpp_CFLAGS,$$(notdir $$@))) $$($(2)_CFLAGS) $$(patsubst $$($(2)_BLDPRF)%,$$($(2)_SRCPRF)%,$$(subst .o,.cpp,$$@)) $$($(2)_BLDPRF)/$(1): $$($(2)_OBJECTS) $$($(2)_LIBRARIES) $$($(2)_ARCHIVES) $$(filter-out $$(wildcard $$($(2)_BUILDDIR)), $$($(2)_BUILDDIR)) - $(CXX) $(MODULE_LDFLAGS) $$($(2)_OBJECTS) $$($(2)_LOCALLDFLAGS) $$($(2)_LOCALLIBRARIES) $$($(2)_ARCHIVES) $(LDFLAGS) $$($(2)_LDFLAGS) -o $$@ + $(CXX) $(LDFLAGS) $(MODULE_LDFLAGS) $$($(2)_OBJECTS) $$($(2)_LOCALLDFLAGS) $$($(2)_LOCALLIBRARIES) $$($(2)_ARCHIVES) $$($(2)_LDFLAGS) -o $$@ install-$(2)-headers: $$(patsubst %,$$($(2)_SRCPRF)/%,$$($(2)_HEADERS)) mkdir -p $(DESTDIR)/$(pkgincludedir) debian/patches/0002-drop_lash_support.patch0000644000000000000000000001320412227532771015774 0ustar Description: Disable LASH support. Author: Alessio Treglia Forwarded: no --- Makefile | 6 +-- azr3/main.cpp | 91 ---------------------------------------------------------- azr3/main.hpp | 7 ---- 3 files changed, 4 insertions(+), 100 deletions(-) --- azr3-jack.orig/Makefile +++ azr3-jack/Makefile @@ -10,7 +10,7 @@ PACKAGE_WEBPAGE = "http://ll-plugins.non PACKAGE_BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=ll-plugins" PACKAGE_VC = "http://git.savannah.gnu.org/cgit/ll-plugins/azr3-jack.git/" -PKG_DEPS = gtkmm-2.4>=2.8.8 jack>=0.103.0 lash-1.0>=0.5.3 +PKG_DEPS = gtkmm-2.4>=2.8.8 jack>=0.103.0 PROGRAMS = azr3 @@ -32,8 +32,8 @@ azr3_SOURCES = \ drawbar.hpp drawbar.cpp \ textbox.hpp textbox.cpp azr3_SOURCEDIR = azr3 -azr3_CFLAGS = `pkg-config --cflags gtkmm-2.4 jack lash-1.0` -DDATADIR=\"$(pkgdatadir)\" -azr3_LDFLAGS = `pkg-config --libs gtkmm-2.4 jack lash-1.0` +azr3_CFLAGS = `pkg-config --cflags gtkmm-2.4 jack` -DDATADIR=\"$(pkgdatadir)\" +azr3_LDFLAGS = `pkg-config --libs gtkmm-2.4 jack` azr3_cpp_CFLAGS = $(shell if pkg-config --atleast-version=0.107 jack ; then echo -include azr3/newjack.hpp; fi) main_cpp_CFLAGS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" --- azr3-jack.orig/azr3/main.hpp +++ azr3-jack/azr3/main.hpp @@ -25,7 +25,6 @@ #include #include #include -#include #include "azr3.hpp" #include "azr3gui.hpp" @@ -65,10 +64,6 @@ protected: int process(jack_nframes_t nframes); - bool check_lash_events(); - - bool init_lash(lash_args_t* lash_args, const std::string& jack_name); - void auto_connect(); static int static_process(jack_nframes_t frames, void* arg); @@ -89,10 +84,8 @@ protected: sem_t m_gui_changed; float m_gui_controls[63]; Preset m_presets[128]; - lash_client_t* m_lash_client; bool m_ok; - bool m_started_by_lashd; std::string m_auto_midi; std::string m_auto_audio; --- azr3-jack.orig/azr3/main.cpp +++ azr3-jack/azr3/main.cpp @@ -32,13 +32,6 @@ using namespace std; Main::Main(int& argc, char**& argv) : m_ok(false) { - - /* this is a bit dumb, but the only way I know of to check whether we were - started by lashd is to see if lash_extract_args() removes any arguments */ - int old_argc = argc; - lash_args_t* lash_args = lash_extract_args(&argc, &argv); - m_started_by_lashd = (argc != old_argc); - // parse all non-LASH arguments OptionParser op; bool help(false); @@ -165,10 +158,6 @@ Main::Main(int& argc, char**& argv) : m_ } } } - - // initialise LASH - if (!init_lash(lash_args, jack_get_client_name(m_jack_client))) - return; m_win->set_title("AZR-3"); m_win->set_resizable(false); @@ -184,14 +173,11 @@ void Main::run() { jack_activate(m_jack_client); // auto-connect JACK ports if desired - if (!m_started_by_lashd) - auto_connect(); + auto_connect(); Glib::signal_timeout(). connect(sigc::bind_return(sigc::mem_fun(*this, &Main::check_changes), true), 10); - Glib::signal_timeout(). - connect(sigc::mem_fun(*this, &Main::check_lash_events), 500); m_kit->run(*m_win); jack_deactivate(m_jack_client); m_engine->deactivate(); @@ -345,81 +331,6 @@ int Main::process(jack_nframes_t nframes } -bool Main::check_lash_events() { - lash_event_t* event; - bool go_on = true; - while ((event = lash_get_event(m_lash_client))) { - - // save - if (lash_event_get_type(event) == LASH_Save_File) { - cerr<<"Received LASH Save command"<clear_programs(); - for (unsigned char i = 0; i < 128; ++i) { - if (!m_presets[i].empty) - m_gui->add_program(i, m_presets[i].name.c_str()); - } - ifstream fin((dir + "/state").c_str()); - int prog; - fin>>prog; - m_gui->set_program(prog); - for (uint32_t p = 0; p < 63; ++p) { - float tmp; - fin>>tmp; - m_gui->set_control(p, tmp); - } - lash_send_event(m_lash_client, - lash_event_new_with_type(LASH_Restore_File)); - } - - // quit - else if (lash_event_get_type(event) == LASH_Quit) { - cerr<<"Received LASH Quit command"<quit(); - go_on = false; - } - - lash_event_destroy(event); - } - return go_on; -} - - -bool Main::init_lash(lash_args_t* lash_args, const std::string& jack_name) { - - m_lash_client = lash_init(lash_args, "AZR-3", - LASH_Config_File, LASH_PROTOCOL(2, 0)); - if (m_lash_client) { - lash_event_t* event = lash_event_new_with_type(LASH_Client_Name); - lash_event_set_string(event, "AZR-3"); - lash_send_event(m_lash_client, event); - lash_jack_client_name(m_lash_client, jack_name.c_str()); - Glib::signal_timeout(). - connect(sigc::mem_fun(*this, &Main::check_lash_events), 500); - } - else - cerr<<"Could not initialise LASH!"<(arg)->process(frames); } debian/rules0000755000000000000000000000076312227535134010260 0ustar #!/usr/bin/make -f CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) export CXXFLAGS+=$(CPPFLAGS) export LDFLAGS+=-Wl,--as-needed %: dh $@ --parallel override_dh_auto_configure: ./configure --prefix=/usr \ --CFLAGS="$(CXXFLAGS)" \ --LDFLAGS="$(LDFLAGS)" override_dh_auto_clean: $(MAKE) clean override_dh_auto_install: dh_auto_install rm -rf debian/azr3-jack/usr/share/doc/azr3-jack/* debian/docs0000644000000000000000000000001012227532771010040 0ustar AUTHORS debian/control0000644000000000000000000000304312227533537010602 0ustar Source: azr3-jack Section: sound Priority: optional Maintainer: Debian Multimedia Maintainers Uploaders: Alessio Treglia Build-Depends: debhelper (>= 9~), libgtkmm-2.4-dev, libjack-dev, lv2-c++-tools Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/azr3-jack.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/azr3-jack.git Homepage: http://ll-plugins.nongnu.org/azr3/ Package: azr3-jack Architecture: any Depends: jackd, ${misc:Depends}, ${shlibs:Depends} Description: drawbar organ simulator This JACK program is a port of the free VST plugin AZR-3. It is a tonewheel organ with drawbars, distortion and rotating speakers. The original was written by Rumpelrausch Täips. . The organ has three sections, two polyphonic with 9 drawbars each and one monophonic bass section with 5 drawbars. The two polyphonic sections respond to events on MIDI channel 1 and 2, and an optional keyboard split function makes the bass section listen to the lower keys on channel 1. . The three sections have separate sustain and percussion switches as well as separate volume controls, and the two polyphonic sections have separate vibrato settings. All three sections are mixed and sent through the distortion effect and the rotating speakers simulator, where the modulation wheel can be used to switch between fast and slow rotation, and the fast and slow rotation speeds themselves can be changed separately for the lower and upper frequencies. debian/changelog0000644000000000000000000000103712227534106011043 0ustar azr3-jack (1.2.3-2) unstable; urgency=low * Hardening: - Bump DH compatibility for automatic hardening. - Pass CFLAGS and LDFLAGS to configure. * Cherry-pick patch from upstream to fix some compilation errors and warnings. * Fix VCS urls according to the canonical form. * Bump Standards. -- Alessio Treglia Wed, 16 Oct 2013 17:00:17 +0100 azr3-jack (1.2.3-1) unstable; urgency=low * Initial release. (Closes: #628101) -- Alessio Treglia Fri, 27 May 2011 18:04:49 +0200 debian/gbp.conf0000644000000000000000000000010312227532771010607 0ustar [DEFAULT] pristine-tar = True sign-tags = True compression = bzip2 debian/copyright0000644000000000000000000000217112227533343011126 0ustar Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 Upstream-Name: AZR3 Upstream-Contact: Lars Luthman Source: http://download.savannah.gnu.org/releases/ll-plugins/ Files: * Copyright: 2006-2010 Lars Luthman 2006 Philipp Mott License: GPL-2 Files: debian/* Copyright: 2011 Alessio Treglia License: GPL-2 License: GPL-2 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; version 2 of the License. . 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. Comment: You should have received a copy of the GNU General Public License along with LADI Session Handler. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". debian/source/0000755000000000000000000000000012227532771010476 5ustar debian/source/format0000644000000000000000000000001412227532771011704 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000013012227532771010221 0ustar version=3 http://download.savannah.gnu.org/releases/ll-plugins/azr3-jack-(.*)\.tar\.bz2 debian/clean0000644000000000000000000000001612227532771010200 0ustar Makefile.deps