projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the horrible mess that was anything related to sources and paths.
[ardour.git]
/
libs
/
ardour
/
ardour
/
automation_control.h
diff --git
a/libs/ardour/ardour/automation_control.h
b/libs/ardour/ardour/automation_control.h
index c414f7bc40a741ec099322a428e9dd6c00959ecf..3f22e6d57fd295460de12aeadd92636cbc7e60a0 100644
(file)
--- a/
libs/ardour/ardour/automation_control.h
+++ b/
libs/ardour/ardour/automation_control.h
@@
-23,27
+23,26
@@
#include <boost/shared_ptr.hpp>
#include <pbd/controllable.h>
#include <boost/shared_ptr.hpp>
#include <pbd/controllable.h>
-#include <ardour/parameter.h>
#include <evoral/Control.hpp>
#include <evoral/Control.hpp>
-#include <ardour/automation_
even
t.h>
+#include <ardour/automation_
lis
t.h>
namespace ARDOUR {
namespace ARDOUR {
-class AutomationList;
class Session;
class Automatable;
class Session;
class Automatable;
-/** A PBD:Controllable with associated automation data (AutomationList)
+/** A PBD:
:
Controllable with associated automation data (AutomationList)
*/
class AutomationControl : public PBD::Controllable, public Evoral::Control
{
public:
AutomationControl(ARDOUR::Session&,
*/
class AutomationControl : public PBD::Controllable, public Evoral::Control
{
public:
AutomationControl(ARDOUR::Session&,
- boost::shared_ptr<ARDOUR::AutomationList>,
- std::string name="unnamed controllable");
+ const Evoral::Parameter& parameter,
+ boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(),
+ const string& name="");
- boost::shared_ptr<AutomationList> alist() { return boost::dynamic_pointer_cast<AutomationList>(_list); }
+ boost::shared_ptr<AutomationList> alist()
const
{ return boost::dynamic_pointer_cast<AutomationList>(_list); }
void set_list(boost::shared_ptr<Evoral::ControlList>);
void set_list(boost::shared_ptr<Evoral::ControlList>);
@@
-55,10
+54,14
@@
public:
return ((ARDOUR::AutomationList*)_list.get())->automation_write();
}
return ((ARDOUR::AutomationList*)_list.get())->automation_write();
}
- inline AutoState automation_state() {
+ inline AutoState automation_state()
const
{
return ((ARDOUR::AutomationList*)_list.get())->automation_state();
}
return ((ARDOUR::AutomationList*)_list.get())->automation_state();
}
+ inline void set_automation_state(AutoState as) {
+ return ((ARDOUR::AutomationList*)_list.get())->set_automation_state(as);
+ }
+
inline void start_touch() {
return ((ARDOUR::AutomationList*)_list.get())->start_touch();
}
inline void start_touch() {
return ((ARDOUR::AutomationList*)_list.get())->start_touch();
}
@@
-67,7
+70,13
@@
public:
return ((ARDOUR::AutomationList*)_list.get())->stop_touch();
}
return ((ARDOUR::AutomationList*)_list.get())->stop_touch();
}
+ /** Set the value and do the right thing based on automation state
+ * (e.g. record if necessary, etc.)
+ */
void set_value(float val);
void set_value(float val);
+
+ /** Get the current effective value based on automation state.
+ */
float get_value() const;
protected:
float get_value() const;
protected: