[SCM] calf/master: + GUI: fix compilation w/o JACK
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:39:20 UTC 2013
The following commit has been merged in the master branch:
commit a675debbc583a5b88145c2ab4ff572094b8d0c12
Author: Krzysztof Foltman <wdev at foltman.com>
Date: Sat Feb 7 11:14:01 2009 +0000
+ GUI: fix compilation w/o JACK
diff --git a/src/calf/jackhost.h b/src/calf/jackhost.h
index 0138217..deeb182 100644
--- a/src/calf/jackhost.h
+++ b/src/calf/jackhost.h
@@ -359,8 +359,8 @@ public:
extern jack_host_base *create_jack_host(const char *name, const std::string &instance_name, calf_plugins::progress_report_iface *priface);
-#endif
-
};
#endif
+
+#endif
diff --git a/src/calf/main_win.h b/src/calf/main_win.h
index 21ea9c7..1ddc0ba 100644
--- a/src/calf/main_win.h
+++ b/src/calf/main_win.h
@@ -57,7 +57,11 @@ namespace calf_plugins {
GtkWidget *strips_table;
GtkUIManager *ui_mgr;
GtkActionGroup *std_actions, *plugin_actions;
+#if USE_JACK
jack_client *client;
+#else
+ void *client_dummy;
+#endif
std::map<plugin_ctl_iface *, plugin_strip *> plugins;
std::set<std::string> conditions;
std::vector<plugin_ctl_iface *> plugin_queue;
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list