[SCM] calf/master: + JACK host: make --preset parameter work

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a12f81d19916ef7a6277abdead3eb38aa5427889
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Sat Jun 28 21:49:27 2008 +0000

    + JACK host: make --preset parameter work
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@217 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/src/jackhost.cpp b/src/jackhost.cpp
index 6f58f81..0f4515c 100644
--- a/src/jackhost.cpp
+++ b/src/jackhost.cpp
@@ -84,7 +84,7 @@ static struct option long_options[] = {
     {"version", 0, 0, 'v'},
     {"client", 1, 0, 'c'},
     {"effect", 0, 0, 'e'},
-    {"preset", 0, 0, 'p'},
+    {"preset", 1, 0, 'p'},
     {"input", 1, 0, 'i'},
     {"output", 1, 0, 'o'},
     {"connect-midi", 1, 0, 'M'},
@@ -258,15 +258,16 @@ void host_session::remove_plugin(plugin_ctl_iface *plugin)
     }
 }
 
-bool host_session::activate_preset(int i, const std::string &preset, bool builtin)
+bool host_session::activate_preset(int plugin_no, const std::string &preset, bool builtin)
 {
-    string cur_plugin = plugins[i]->get_id();
+    string cur_plugin = plugins[plugin_no]->get_id();
     preset_vector &pvec = (builtin ? builtin_presets : user_presets).presets;
     for (unsigned int i = 0; i < pvec.size(); i++) {
         if (pvec[i].name == preset && pvec[i].plugin == cur_plugin)
         {
-            pvec[i].activate(plugins[i]);
-            gui_win->gui->refresh();
+            pvec[i].activate(plugins[plugin_no]);
+            if (gui_win && gui_win->gui)
+                gui_win->gui->refresh();
             return true;
         }
     }

-- 
calf audio plugins packaging