diff options
| -rw-r--r-- | gtk2_ardour/midi_region_view.h | 6 | ||||
| -rw-r--r-- | libs/evoral/evoral/ControlList.hpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 7c60c2a037..f8cb9c058c 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -381,7 +381,7 @@ private: bool note_canvas_event(GdkEvent* ev); void midi_channel_mode_changed (); - PBD::ScopedConnection _channel_mode_changed_connection; + PBD::ScopedConnection _channel_mode_changed_connection; void instrument_settings_changed (); PBD::ScopedConnection _instrument_changed_connection; @@ -524,8 +524,8 @@ private: boost::shared_ptr<CursorContext> _press_cursor_ctx; - ARDOUR::ChannelMode get_channel_mode() const; - uint16_t get_selected_channels () const; + ARDOUR::ChannelMode get_channel_mode() const; + uint16_t get_selected_channels () const; inline double contents_height() const { return (_height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); } inline double contents_note_range () const { return (double)(_current_range_max - _current_range_min + 1); } diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index 7d6b294a98..8e72c21c48 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.hpp @@ -90,11 +90,11 @@ public: virtual boost::shared_ptr<ControlList> create(const Parameter& id, const ParameterDescriptor& desc); - void dump (std::ostream&); + void dump (std::ostream&); ControlList& operator= (const ControlList&); bool operator== (const ControlList&); - void copy_events (const ControlList&); + void copy_events (const ControlList&); virtual void freeze(); virtual void thaw (); @@ -107,7 +107,7 @@ public: void set_descriptor(const ParameterDescriptor& d) { _desc = d; } EventList::size_type size() const { return _events.size(); } - double length() const { + double length() const { Glib::Threads::RWLock::ReaderLock lm (_lock); return _events.empty() ? 0.0 : _events.back()->when; } @@ -314,7 +314,7 @@ public: bool operator!= (ControlList const &) const; - void invalidate_insert_iterator (); + void invalidate_insert_iterator (); protected: |