diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-11-17 03:13:16 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-17 03:13:16 +1100 |
| commit | 05355d0306c858c56957f2b7c97ed954ef6a2690 (patch) | |
| tree | 209036a973432a8bbf0334016eaa6a40aa9565ba /gtk2_ardour | |
| parent | 5ab33bdb63fa284e6148abbc66c935f97a37f035 (diff) | |
fix incorrect return type for Editor::get_grid_music_divisions().
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/public_editor.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 446965588d..806ec3cd1c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4055,7 +4055,7 @@ Editor::get_grid_beat_divisions(framepos_t position) if the grid is snapped to bars, returns -1. @param event_state the current keyboard modifier mask. */ -unsigned +int32_t Editor::get_grid_music_divisions (uint32_t event_state) { if (snap_mode() == Editing::SnapOff && !ArdourKeyboard::indicates_snap (event_state)) { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index ccebaa853e..a6c6bdd2c9 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -332,7 +332,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD unsigned get_grid_beat_divisions(framepos_t position); Evoral::Beats get_grid_type_as_beats (bool& success, framepos_t position); - unsigned get_grid_music_divisions (uint32_t event_state); + int32_t get_grid_music_divisions (uint32_t event_state); void nudge_forward (bool next, bool force_playhead); void nudge_backward (bool next, bool force_playhead); diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index d7413feab7..576fd17096 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -298,7 +298,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable { virtual framecnt_t get_paste_offset (framepos_t pos, unsigned paste_count, framecnt_t duration) = 0; virtual unsigned get_grid_beat_divisions(framepos_t position) = 0; virtual Evoral::Beats get_grid_type_as_beats (bool& success, framepos_t position) = 0; - virtual unsigned get_grid_music_divisions (uint32_t event_state) = 0; + virtual int32_t get_grid_music_divisions (uint32_t event_state) = 0; virtual void edit_notes (MidiRegionView*) = 0; virtual void queue_visual_videotimeline_update () = 0; |