ardour/livetrax
13
0
Fork 0
Code

Fix crash when twiddling MIDI controllers (#6050).

Browse Source
This commit is contained in:
David Robillard 2014-12-04 22:23:16 -05:00
parent 59af923b77
commit 124e54f01b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/ardour/ardour/automation_control.h
View File

@ -40,7 +40,10 @@ class Automatable;
/** A PBD::Controllable with associated automation data (AutomationList) /** A PBD::Controllable with associated automation data (AutomationList)
*/ */
class LIBARDOUR_API AutomationControl : public PBD::Controllable, public Evoral::Control, public boost::enable_shared_from_this<AutomationControl> class LIBARDOUR_API AutomationControl
: public PBD::Controllable
, public Evoral::Control
, public boost::enable_shared_from_this<AutomationControl>
{ {
public: public:
AutomationControl(ARDOUR::Session&, AutomationControl(ARDOUR::Session&,
@ -58,25 +61,25 @@ public:
void set_list (boost::shared_ptr<Evoral::ControlList>); void set_list (boost::shared_ptr<Evoral::ControlList>);
inline bool automation_playback() const { inline bool automation_playback() const {
return alist()->automation_playback(); return alist() ? alist()->automation_playback() : false;
} }
inline bool automation_write() const { inline bool automation_write() const {
return alist()->automation_write(); return alist() ? alist()->automation_write() : false;
} }
inline AutoState automation_state() const { inline AutoState automation_state() const {
return alist()->automation_state(); return alist() ? alist()->automation_state() : Off;
} }
inline AutoStyle automation_style() const { inline AutoStyle automation_style() const {
return alist()->automation_style(); return alist() ? alist()->automation_style() : Absolute;
} }
void set_automation_state(AutoState as); void set_automation_state(AutoState as);
void set_automation_style(AutoStyle as); void set_automation_style(AutoStyle as);
void start_touch (double when); void start_touch(double when);
void stop_touch (bool mark, double when); void stop_touch(bool mark, double when);
void set_value (double); void set_value (double);
double get_value () const; double get_value () const;

1
libs/ardour/automation_control.cc
View File

@ -106,6 +106,7 @@ AutomationControl::set_automation_state (AutoState as)
void void
AutomationControl::set_automation_style (AutoStyle as) AutomationControl::set_automation_style (AutoStyle as)
{ {
if (!_list) return;
alist()->set_automation_style (as); alist()->set_automation_style (as);
} }