Fix up confusion with relayering after movement drags in

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index c382e97d1aba8c17f2217f92d210a1be4d5100ce..f4bdd9291d52c578fa51c0dfcdb0aaa7e3660822 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -178,12 +178,12 @@ Editor::ruler_scroll (GdkEventScroll* event)
 
        switch (direction) {
        case GDK_SCROLL_UP:
-               temporal_zoom_step (true);
+               temporal_zoom_step (false);
                handled = true;
                break;
 
        case GDK_SCROLL_DOWN:
-               temporal_zoom_step (false);
+               temporal_zoom_step (true);
                handled = true;
                break;
 
@@ -216,15 +216,13 @@ Editor::ruler_scroll (GdkEventScroll* event)
 }
 
 
-gint
+bool
 Editor::ruler_button_press (GdkEventButton* ev)
 {
        if (_session == 0) {
-               return FALSE;
+               return false;
        }
 
-       // jlc: grab ev->window ?
-       //Gtk::Main::grab_add (*minsec_ruler);
        Widget * grab_widget = 0;
 
        if (timecode_ruler->is_realized() && ev->window == timecode_ruler->get_window()->gobj()) {
@@ -254,14 +252,14 @@ Editor::ruler_button_press (GdkEventButton* ev)
                _dragging_playhead = true;
        }
 
-       return TRUE;
+       return true;
 }
 
-gint
+bool
 Editor::ruler_button_release (GdkEventButton* ev)
 {
        if (_session == 0) {
-               return FALSE;
+               return false;
        }
 
        gint x,y;
@@ -288,35 +286,35 @@ Editor::ruler_button_release (GdkEventButton* ev)
                ruler_grabbed_widget = 0;
        }
 
-       return TRUE;
+       return true;
 }
 
-gint
+bool
 Editor::ruler_label_button_release (GdkEventButton* ev)
 {
        if (ev->button == 3) {
-               Gtk::Menu* m= dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (X_("/RulerMenuPopup")));
+               Gtk::Menu* m = dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (X_("/RulerMenuPopup")));
                if (m) {
                        m->popup (1, ev->time);
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 
-gint
+bool
 Editor::ruler_mouse_motion (GdkEventMotion* ev)
 {
        if (_session == 0) {
-               return FALSE;
+               return false;
        }
 
        if (_drags->active ()) {
                _drags->motion_handler (reinterpret_cast<GdkEvent*> (ev), false);
        }
 
-       return TRUE;
+       return true;
 }
 
 
@@ -1262,7 +1260,7 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
                bbt_ruler_scale =  bbt_show_ticks_detail;
        }
 
-       if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Timecode::BBT_Time::ticks_per_beat / 4)) {
+       if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Timecode::BBT_Time::ticks_per_bar_division / 4)) {
                bbt_ruler_scale =  bbt_show_ticks_super_detail;
        }
 }
@@ -1380,7 +1378,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
                        next_beat.bars = (*i).bar;
                        next_beat.ticks = 0;
 
-                       if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
+                       if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
                                  next_beat.beats += 1;
                        } else {
                                  next_beat.bars += 1;
@@ -1391,14 +1389,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
                        frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
                        frame_skip_error -= frame_skip;
-                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
+                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_bar_division / bbt_beat_subdivision);
 
                        pos = (*i).frame + frame_skip;
                        accumulated_error = frame_skip_error;
 
                        tick = skip;
 
-                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
+                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_bar_division) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
 
                                if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
                                        i_am_accented = true;
@@ -1472,7 +1470,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
                        next_beat.beats = (*i).beat;
                        next_beat.bars = (*i).bar;
 
-                       if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
+                       if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
                                  next_beat.beats += 1;
                        } else {
                                  next_beat.bars += 1;
@@ -1483,14 +1481,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
                        frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
                        frame_skip_error -= frame_skip;
-                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
+                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_bar_division / bbt_beat_subdivision);
 
                        pos = (*i).frame + frame_skip;
                        accumulated_error = frame_skip_error;
 
                        tick = skip;
 
-                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
+                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_bar_division) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
 
                                if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
                                        i_am_accented = true;
@@ -1569,7 +1567,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
                        next_beat.beats = (*i).beat;
                        next_beat.bars = (*i).bar;
 
-                       if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
+                       if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
                                  next_beat.beats += 1;
                        } else {
                                  next_beat.bars += 1;
@@ -1580,14 +1578,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
                        frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
                        frame_skip_error -= frame_skip;
-                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
+                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_bar_division / bbt_beat_subdivision);
 
                        pos = (*i).frame + frame_skip;
                        accumulated_error = frame_skip_error;
 
                        tick = skip;
 
-                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
+                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_bar_division) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
 
                                  if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
                                          i_am_accented = true;
@@ -1746,7 +1744,7 @@ Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper)
 }
 
 gint
-Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/)
+Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
 {
        framepos_t pos;
        framepos_t const ilower = (framepos_t) floor (lower);