ardour/livetrax
13
0
Fork 0
Code

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

Browse Source
This commit is contained in:
nick_m 2016-11-17 03:13:16 +11:00
parent 5ab33bdb63
commit 05355d0306
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.cc
View File

@ -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)) {

2
gtk2_ardour/editor.h
View File

@ -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);

2
gtk2_ardour/public_editor.h
View File

@ -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;