projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mute of MIDI tracks with channel forcing.
[ardour.git]
/
libs
/
ardour
/
processor.cc
diff --git
a/libs/ardour/processor.cc
b/libs/ardour/processor.cc
index d571f55688f5e0e283c64ab597704dc87efb9485..caa240ce228ecc0125e786b2146b4e3e3773a442 100644
(file)
--- a/
libs/ardour/processor.cc
+++ b/
libs/ardour/processor.cc
@@
-63,6
+63,7
@@
Processor::Processor(Session& session, const string& name)
, _display_to_user (true)
, _pre_fader (false)
, _ui_pointer (0)
, _display_to_user (true)
, _pre_fader (false)
, _ui_pointer (0)
+ , _window_proxy (0)
, _owner (0)
{
}
, _owner (0)
{
}
@@
-79,6
+80,8
@@
Processor::Processor (const Processor& other)
, _display_to_user (true)
, _pre_fader (false)
, _ui_pointer (0)
, _display_to_user (true)
, _pre_fader (false)
, _ui_pointer (0)
+ , _window_proxy (0)
+ , _owner (0)
{
}
{
}
@@
-147,7
+150,9
@@
Processor::set_state_2X (const XMLNode & node, int /*version*/)
set_id (**i);
set_id (**i);
- if ((prop = (*i)->property ("active")) != 0) {
+ //note: in A2, active state was stored in the Redirect node, not the child IO node
+ /*
+ * if ((prop = (*i)->property ("active")) != 0) {
bool const a = string_is_affirmative (prop->value ());
if (_active != a) {
if (a) {
bool const a = string_is_affirmative (prop->value ());
if (_active != a) {
if (a) {
@@
-156,7
+161,8
@@
Processor::set_state_2X (const XMLNode & node, int /*version*/)
deactivate ();
}
}
deactivate ();
}
}
- }
+ }*/
+
}
}
}
}
@@
-219,7
+225,7
@@
Processor::set_state (const XMLNode& node, int version)
}
}
}
}
- bool const a = string_is_affirmative (prop->value ());
+ bool const a = string_is_affirmative (prop->value ())
&& !_session.get_disable_all_loaded_plugins()
;
if (_active != a) {
if (a) {
activate ();
if (_active != a) {
if (a) {
activate ();
@@
-271,6
+277,12
@@
Processor::set_ui (void* p)
_ui_pointer = p;
}
_ui_pointer = p;
}
+void
+Processor::set_window_proxy (ProcessorWindowProxy* wp)
+{
+ _window_proxy = wp;
+}
+
void
Processor::set_owner (SessionObject* o)
{
void
Processor::set_owner (SessionObject* o)
{