[SCM] calf/master: + Fix error reporting with JACK connections + Fix LADSPA plugin number for vintage delay + some search replace problems + Add scrolling to JACK host window (cannot set the default size properly yet)

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:36:47 UTC 2013


The following commit has been merged in the master branch:
commit e4b445c7a5d0999740d5680f88643ff4942ea283
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Sat Dec 22 12:23:11 2007 +0000

    + Fix error reporting with JACK connections
    + Fix LADSPA plugin number for vintage delay + some search replace problems
    + Add scrolling to JACK host window (cannot set the default size properly yet)
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@34 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/src/calf/giface.h b/src/calf/giface.h
index aa8b423..f47e43e 100644
--- a/src/calf/giface.h
+++ b/src/calf/giface.h
@@ -390,7 +390,7 @@ struct audio_exception: public std::exception
 public:
     audio_exception(const char *_text) : text(_text) {}
     audio_exception(const std::string &t) : text(container.c_str()), container(t) {}
-    virtual const char *what() { return text; }
+    virtual const char *what() const throw () { return text; }
     virtual ~audio_exception() throw () {}
 };
 
diff --git a/src/gui.cpp b/src/gui.cpp
index 4067047..354dce3 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -380,11 +380,15 @@ void plugin_gui_window::create(plugin_ctl_iface *_jh, const char *title, const c
     gtk_ui_manager_add_ui_from_string(ui_mgr, ui_xml, -1, &error);    
     fill_gui_presets();
     
-    gtk_container_add(GTK_CONTAINER(vbox), gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar"));
+    gtk_box_pack_start(GTK_BOX(vbox), gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar"), false, false, 0);
     
     GtkWidget *table = gui->create(_jh, effect);
-
-    gtk_container_add(GTK_CONTAINER(vbox), table);
+    GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE);
+    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), table);
+    
+    gtk_box_pack_start(GTK_BOX(vbox), sw, true, true, 0);
 
     gtk_widget_show_all(GTK_WIDGET(toplevel));
     
diff --git a/src/modules.cpp b/src/modules.cpp
index 8921173..447feed 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -129,7 +129,7 @@ parameter_properties vintage_delay_audio_module::param_props[] = {
     { 1,         0,  2, 1.01, PF_ENUM | PF_CTL_COMBO, vintage_delay_fbmodes, "medium", "Medium" },
 };
 
-static synth::ladspa_info vintage_delay_info = { 0x847f, "vintage_delay", "Calf vintage Delay", "Krzysztof Foltman", copyright, "DelayPlugin" };
+static synth::ladspa_info vintage_delay_info = { 0x8482, "VintageDelay", "Calf Vintage Delay", "Krzysztof Foltman", copyright, "DelayPlugin" };
 
 #if USE_LADSPA
 static synth::ladspa_wrapper<vintage_delay_audio_module> vintage_delay(vintage_delay_info);

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list