summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-04-03 15:44:46 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-04-03 15:44:46 +0000
commit6532413fa6e8b2343569c0f8e0dc79569345ce28 (patch)
tree8a527ec6d7571ef9c48ea7cfbe6b3465bf40ab18 /libs
parent4b35fc4c68fbd4845f7f8f3d2307e97412d7a4d8 (diff)
fix botched apply of torben's zero line patch, remove sampo's debug output re: ladspa plugin port setting
git-svn-id: svn://localhost/ardour2/trunk@1662 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/insert.cc4
-rw-r--r--libs/ardour/ladspa_plugin.cc1
-rw-r--r--libs/ardour/route.cc7
-rw-r--r--libs/ardour/vst_plugin.cc5
4 files changed, 10 insertions, 7 deletions
diff --git a/libs/ardour/insert.cc b/libs/ardour/insert.cc
index 1e67f28030..11d41cfab4 100644
--- a/libs/ardour/insert.cc
+++ b/libs/ardour/insert.cc
@@ -484,9 +484,11 @@ PluginInsert::protect_automation ()
switch (al.automation_state()) {
case Write:
- case Touch:
al.set_automation_state (Off);
break;
+ case Touch:
+ al.set_automation_state (Play);
+ break;
default:
break;
}
diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index 98f098ef11..6d55423e37 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -116,7 +116,6 @@ LadspaPlugin::init (void *mod, uint32_t index, nframes_t rate)
for (i = 0; i < port_cnt; ++i) {
if (LADSPA_IS_PORT_CONTROL(port_descriptor (i))) {
- cerr << "plugin, port nr " << i << ", data = " << control_data[i] << endl;
connect_port (i, &control_data[i]);
if (LADSPA_IS_PORT_OUTPUT(port_descriptor (i)) &&
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index a71781bfab..edb7adfee0 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -2308,8 +2308,9 @@ Route::protect_automation ()
{
switch (gain_automation_state()) {
case Write:
- case Touch:
set_gain_automation_state (Off);
+ case Touch:
+ set_gain_automation_state (Play);
break;
default:
break;
@@ -2317,9 +2318,11 @@ Route::protect_automation ()
switch (panner().automation_state ()) {
case Write:
- case Touch:
panner().set_automation_state (Off);
break;
+ case Touch:
+ panner().set_automation_state (Play);
+ break;
default:
break;
}
diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index ed78b0942d..afba6b5cfb 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -172,9 +172,8 @@ VSTPlugin::get_state()
} else {
- error << string_compose (_("cannot check VST chunk directory: %1"),
- strerror (errno))
- << endmsg;
+ warning << string_compose (_("cannot check VST chunk directory: %1"), strerror (errno))
+ << endmsg;
return *root;
}