fix incorrect return type for Editor::get_grid_music_divisions().

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 446965588d25a9e566b028f1ca279c0fe555117d..806ec3cd1c1d41508affce5ca62f1a88e555ad02 100644 (file)
--- 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 ccebaa853ef6d60f2a1417b2e231afc1ab3ad366..a6c6bdd2c9d7de924962875ea27c317854a5fe06 100644 (file)
--- 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 d7413feab7ee5dec48d79a0894949443a887e4c9..576fd170966bad36f2f38304689d8f4e5542c85b 100644 (file)
--- 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;