diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-29 16:33:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-29 16:33:38 +0000 |
| commit | b1ed7820456ce76d23d73a2fa592efb9bf0517bf (patch) | |
| tree | 4f298b4c160375b050277fecabf81ff921dc79c7 /libs | |
| parent | 1a096d5472ba3f6786e43481d701a4a32dc35e21 (diff) | |
change is the only constant
git-svn-id: svn://localhost/ardour2/branches/3.0@13362 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/automation_list.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index e7377d6b02..71eddda6dd 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -96,7 +96,7 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL void start_touch (double when); void stop_touch (bool mark, double when); - bool touching() const { return g_atomic_int_get (&_touching); } + bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_touching)); } bool writing() const { return _state == Write; } bool touch_enabled() const { return _state == Touch; } diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index f359411846..507f25b118 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1075,7 +1075,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi PostTransportClearSubstate); gint _post_transport_work; /* accessed only atomic ops */ - PostTransportWork post_transport_work() const { return (PostTransportWork) g_atomic_int_get (&_post_transport_work); } + PostTransportWork post_transport_work() const { return (PostTransportWork) g_atomic_int_get (const_cast<gint*>(&_post_transport_work)); } void set_post_transport_work (PostTransportWork ptw) { g_atomic_int_set (&_post_transport_work, (gint) ptw); } void add_post_transport_work (PostTransportWork ptw); |