remove button 4/5 handling (now scroll_up/down); prevent dbl-click on xfade from...

git-svn-id: svn://localhost/ardour2/trunk@1634 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index eec94b525f4dd7e82d02be1262848b165048d99e..910e15ffea6d1873953963a1d3b6e72aefadcb73 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -629,14 +629,9 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev)
                return true;
 
        case 3:
+       default:
                return true;
-               
-       case 4:
-               shuttle_fract += 0.005;
-               break;
-       case 5:
-               shuttle_fract -= 0.005;
-               break;
+
        }
 
        use_shuttle_fract (true);

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 1334bfdc4b498d449ccad14f6587d8ea5785bff3..28505ab46d6f06baa9770c43f37c12b7644a6549 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -1073,39 +1073,6 @@ AudioClock::field_button_press_event (GdkEventButton *ev, Field field)
                return FALSE;
                break;
 
-       case 4:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
-                       frames = get_frames (field);
-                       if (frames != 0) {
-                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
-                                       frames *= 10;
-                               }
-                               set (current_time() + frames, true);
-                                ValueChanged (); /* EMIT_SIGNAL */
-                       }
-               }
-               break;
-
-       case 5:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
-                       frames = get_frames (field);
-                       if (frames != 0) {
-                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
-                                       frames *= 10;
-                               }
-
-                               if ((double)current_time() - (double)frames < 0.0) {
-                                       set (0, true);
-                               }
-                               else {
-                                       set (current_time() - frames, true);
-                               }
-                               
-                                ValueChanged (); /* EMIT_SIGNAL */
-                       }
-               }
-               break;
-
        default:
                return FALSE;
                break;

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index dd190c7132b291caf68fce4715ed162c4cdab190..4b46ba72905d617345b8663d001a76eea81de035 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -148,11 +148,8 @@ Editor::track_canvas_event (GdkEvent *event, ArdourCanvas::Item* item)
                break;
 
        case GDK_BUTTON_RELEASE:
-               switch (event->button.button) {
-               case 4:
-               case 5:
-                       button_release_handler (item, event, NoItem);
-                       break;
+               if (drag_info.item) {
+                       end_grab (drag_info.item, event);
                }
                break;
 
@@ -165,7 +162,7 @@ Editor::track_canvas_event (GdkEvent *event, ArdourCanvas::Item* item)
                break;
        }
 
-       return FALSE;
+       return false;
 }
 
 bool
@@ -220,6 +217,7 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
                return false;
        }
 
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
@@ -519,6 +517,11 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
                
        }
 
+       /* XXX do not forward double clicks */
+
+       if (event->type == GDK_2BUTTON_PRESS) {
+               return false;
+       }
        
        /* proxy for the upper most regionview */
 
@@ -544,10 +547,10 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 
                                        RegionView* rv = atv->view()->find_view (rl->front());
 
-                                       /* proxy */
-
                                        delete rl;
 
+                                       /* proxy */
+                                       
                                        return canvas_region_view_event (event, rv->get_canvas_group(), rv);
                                } 
                        }

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index f8c9b0124aec4c4a6769a930fbfdc608926cc77c..e9b71e4e859e604b2925028e46b3d7d59f5c4b03 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -387,8 +387,6 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 bool
 Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
 {
-       nframes_t where = event_frame (event, 0, 0);
-
        track_canvas.grab_focus();
 
        if (session && session->actively_recording()) {
@@ -746,79 +744,6 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
        case 3:
                break;
 
-       case 4:
-               switch (mouse_mode) {
-               case MouseZoom:
-                       //temporal_zoom_to_frame (true, where);
-                       if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-                               temporal_zoom_to_frame (true, where);
-                       }
-                       else {
-                               temporal_zoom_step (true);
-                       }
-                       break;
-               default:
-                       
-                       if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Alt))) {
-                               scroll_backward (0.6f);
-                               return true;
-                       }
-                       else if (Keyboard::no_modifier_keys_pressed (&event->button)) {
-                               scroll_tracks_up_line ();
-                       } else {
-                               if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Shift)) {
-                                       if (clicked_trackview) {
-                                               if (!current_stepping_trackview) {
-                                                 step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-                                                       current_stepping_trackview = clicked_trackview;
-                                               }
-                                               gettimeofday (&last_track_height_step_timestamp, 0);
-                                               current_stepping_trackview->step_height (true);
-                                       }
-                               }
-                               else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-                                       temporal_zoom_to_frame (true, where);
-                               }
-                       }
-               }
-               break;
-
-       case 5:
-               switch (mouse_mode) {
-               case MouseZoom:
-                       // temporal_zoom_to_frame (false, where);
-                       if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-                               temporal_zoom_to_frame (false, where);
-                       }
-                       else {
-                               temporal_zoom_step (false);
-                       }
-                       break;
-               default:
-
-                       if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Alt))) {
-                               scroll_forward (0.6f);
-                               return true;
-                       }
-                       else if (Keyboard::no_modifier_keys_pressed (&event->button)) {
-                               scroll_tracks_down_line ();
-                       } else {
-                               if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Shift)) {
-                                       if (clicked_trackview) {
-                                               if (!current_stepping_trackview) {
-                                                 step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-                                                       current_stepping_trackview = clicked_trackview;
-                                               }
-                                               gettimeofday (&last_track_height_step_timestamp, 0);
-                                               current_stepping_trackview->step_height (false);
-                                       }
-                               } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-                                       temporal_zoom_to_frame (false, where);
-                               }
-                       }
-               }
-               break;
-
        default:
                break;
 
@@ -4559,7 +4484,6 @@ Editor::end_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event)
                        switch (mouse_mode) {
                        case MouseObject:
                                /* find the two markers on either side and then make the selection from it */
-                               cerr << "select between " << start << " .. " << end << endl;
                                select_all_within (start, end, 0.0f, FLT_MAX, Selection::Set);
                                break;