GObject canvas changes

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 3958bea4b5d8820070e3fb451c581f9f5892805f..1c25863e23203ed5cdba33249076bd8e2d0aebb3 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -100,7 +100,7 @@ static const gchar * small_x_xpm[] = {
 "           ",
 "           "};
 
-AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt, CanvasAA& canvas)
+AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt, Canvas& canvas)
        : AxisView(sess),
          RouteUI(rt, sess, _("m"), _("s"), _("r")), // mute, solo, and record
          TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas),
@@ -169,7 +169,6 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt
        hide_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::hide_click));
 
        name_entry.signal_activate().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_activated));
-       name_entry.signal_focus_out_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_focus_out_handler));
        name_entry.signal_button_press_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_press_handler));
        name_entry.signal_button_release_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_release_handler));
        name_entry.signal_key_release_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_key_release_handler));
@@ -1038,7 +1037,7 @@ AudioTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, do
        }
        
        jack_nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
-       jack_nframes_t end_adjusted = session_frame_to_track_frame(start, speed);
+       jack_nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
 
        if (view && touched (top, bot)) {
                view->get_selectables (start_adjusted, end_adjusted, results);
@@ -1108,13 +1107,6 @@ AudioTimeAxisView::name_entry_button_release_handler (GdkEventButton *ev)
        return FALSE;
 }
 
-gint
-AudioTimeAxisView::name_entry_focus_out_handler (GdkEventFocus* ev)
-{
-       name_entry_changed ();
-       return TRUE;
-}
-
 gint
 AudioTimeAxisView::name_entry_key_release_handler (GdkEventKey* ev)
 {
@@ -1144,8 +1136,6 @@ AudioTimeAxisView::name_entry_changed ()
 {
        string x;
 
-       ARDOUR_UI::generic_focus_out_event (0);
-
        x = name_entry.get_text ();
        
        if (x == _route.name()) {
@@ -1202,20 +1192,15 @@ AudioTimeAxisView::add_gain_automation_child ()
                                                     _route,
                                                     editor,
                                                     *this,
-                                                    *(parent_canvas.root()),
+                                                    parent_canvas,
                                                     _("gain"),
                                                     _route.gain_automation_curve());
        
-
-#if 0
        line = new AutomationGainLine ("automation gain",
                                       _session,
                                       *gain_track,
                                       *gain_track->canvas_display,
-                                      _route.gain_automation_curve(),
-                                      mem_fun (editor, &PublicEditor::canvas_control_point_event),
-                                      mem_fun (editor, &PublicEditor::canvas_line_event));
-#endif
+                                      _route.gain_automation_curve());
 
        line->set_line_color (color_map[cAutomationLine]);
        
@@ -1248,7 +1233,7 @@ AudioTimeAxisView::add_pan_automation_child ()
 {
        XMLProperty* prop;
 
-       pan_track = new PanAutomationTimeAxisView (_session, _route, editor, *this, *(parent_canvas.root()), _("pan"));
+       pan_track = new PanAutomationTimeAxisView (_session, _route, editor, *this, parent_canvas, _("pan"));
 
        update_pans ();
        
@@ -1294,9 +1279,7 @@ AudioTimeAxisView::update_pans ()
 
                line = new AutomationPanLine ("automation pan", _session, *pan_track,
                                              *pan_track->canvas_display, 
-                                             (*p)->automation(),
-                                             mem_fun (editor, &PublicEditor::canvas_control_point_event),
-                                             mem_fun (editor, &PublicEditor::canvas_line_event));
+                                             (*p)->automation());
 
                if (p == _route.panner().begin()) {
                        /* first line is a nice orange */
@@ -1472,13 +1455,11 @@ AudioTimeAxisView::add_redirect_automation_curve (Redirect *redirect, uint32_t w
        char state_name[256];
        snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (redirect->name()).c_str(), what);
 
-       ran->view = new RedirectAutomationTimeAxisView (_session, _route, editor, *this, (*parent_canvas.root()), name, what, *redirect, state_name);
+       ran->view = new RedirectAutomationTimeAxisView (_session, _route, editor, *this, parent_canvas, name, what, *redirect, state_name);
 
        ral = new RedirectAutomationLine (name, 
                                          *redirect, what, _session, *ran->view,
-                                         *ran->view->canvas_display, redirect->automation_list (what), 
-                                         mem_fun (editor, &PublicEditor::canvas_control_point_event),
-                                         mem_fun (editor, &PublicEditor::canvas_line_event));
+                                         *ran->view->canvas_display, redirect->automation_list (what));
        
        ral->set_line_color (color_map[cRedirectAutomationLine]);
        ral->queue_reset ();