summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_region_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-08-20 20:02:04 +0000
committerCarl Hetherington <carl@carlh.net>2011-08-20 20:02:04 +0000
commitad444c095530b09c8d6ad42c30d9637e42d36b3b (patch)
tree280655d1b3881228fff0cd6d52efcf24fe776e84 /gtk2_ardour/midi_region_view.h
parentc8e6db4e9207d68d2d676fd35a4c82a0adc140cd (diff)
Another go at fixing up MIDI note additions with snap
(#4189). git-svn-id: svn://localhost/ardour2/branches/3.0@10017 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_region_view.h')
-rw-r--r--gtk2_ardour/midi_region_view.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 29a5d648da..ffce48dea0 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -169,8 +169,6 @@ public:
void end_write();
void extend_active_notes();
- void create_note_at(double x, double y, double length, bool);
-
void display_model(boost::shared_ptr<ARDOUR::MidiModel> model);
void start_note_diff_command (std::string name = "midi edit");
@@ -253,7 +251,7 @@ public:
*/
framepos_t snap_pixel_to_frame(double x);
- ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t);
+ ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t) const;
/** Convert a timestamp in beats into frames (both relative to region start) */
framepos_t region_beats_to_region_frames(double beats) const;
@@ -317,6 +315,8 @@ private:
friend class EditNoteDialog;
+ void create_note_at(double x, double y, double length, bool, bool);
+
/** Play the NoteOn event of the given note immediately
* and schedule the playback of the corresponding NoteOff event.
*/
@@ -460,6 +460,8 @@ private:
double _last_event_x;
double _last_event_y;
+ framepos_t snap_frame_to_grid_underneath (framepos_t p, framecnt_t &) const;
+
PBD::ScopedConnection _mouse_mode_connection;
Gdk::Cursor* _pre_enter_cursor;