projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Somewhat uncertain fix to playhead misbehaviour in rewind.
[ardour.git]
/
libs
/
ardour
/
automation_control.cc
diff --git
a/libs/ardour/automation_control.cc
b/libs/ardour/automation_control.cc
index cad3ef57e88ae0a936e33ccc277cb201a4c1f933..a1611337fd78f07262a7f272080c8b10289845de 100644
(file)
--- a/
libs/ardour/automation_control.cc
+++ b/
libs/ardour/automation_control.cc
@@
-34,28
+34,34
@@
AutomationControl::AutomationControl(
const Evoral::Parameter& parameter,
boost::shared_ptr<ARDOUR::AutomationList> list,
const string& name)
const Evoral::Parameter& parameter,
boost::shared_ptr<ARDOUR::AutomationList> list,
const string& name)
- : Controllable
((name != "") ? name : EventTypeMap::instance().to_symbol(parameter), string("") /* XXX missing URI */
)
+ : Controllable
(name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name
)
, Evoral::Control(parameter, list)
, _session(session)
{
}
, Evoral::Control(parameter, list)
, _session(session)
{
}
-
-float
+double
AutomationControl::get_value() const
{
bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
AutomationControl::get_value() const
{
bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
- return Control::get_
float
(from_list, _session.transport_frame());
+ return Control::get_
double
(from_list, _session.transport_frame());
}
}
-
void
void
-AutomationControl::set_value(
float
value)
+AutomationControl::set_value(
double
value)
{
bool to_list = _list && _session.transport_stopped()
&& ((AutomationList*)_list.get())->automation_write();
{
bool to_list = _list && _session.transport_stopped()
&& ((AutomationList*)_list.get())->automation_write();
+
+ if (to_list && parameter().toggled()) {
+
+ // store the previous value just before this so any
+ // interpolation works right
+
+ _list->add (get_double(), _session.transport_frame()-1);
+ }
- Control::set_
float
(value, to_list, _session.transport_frame());
+ Control::set_
double
(value, to_list, _session.transport_frame());
Changed(); /* EMIT SIGNAL */
}
Changed(); /* EMIT SIGNAL */
}