Make range selection context menu work again.

[ardour.git] / gtk2_ardour / region_view.cc

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index fc0253a27239fec64d48eef342461e192841b402..54e0a9ef5e86389530df45b13650eeea91b085de 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -227,15 +227,6 @@ RegionView::region_changed (Change what_changed)
        if (what_changed & Region::SyncOffsetChanged) {
                region_sync_changed ();
        }
-       /* 
-          this should not be needed now that only playlist can change layering
-       */
-       /*
-       if (what_changed & Region::LayerChanged) {
-               // this is handled by the playlist i believe
-               //region_layered ();
-       }
-       */
        if (what_changed & Region::LockChanged) {
                region_locked ();
        }
@@ -276,21 +267,8 @@ RegionView::reset_width_dependent_items (double pixel_width)
 {
        TimeAxisViewItem::reset_width_dependent_items (pixel_width);
        _pixel_width = pixel_width;
-
-       /*for (AutomationChildren::iterator i = _automation_children.begin();
-                       i != _automation_children.end(); ++i) {
-               i->second->reset_width_dependent_items(pixel_width);
-       }*/
 }
 
-void
-RegionView::region_layered ()
-{
-       RouteTimeAxisView *rtv = dynamic_cast<RouteTimeAxisView*>(&get_time_axis_view());
-       assert(rtv);
-       //rtv->view()->region_layered (this);
-}
-       
 void
 RegionView::region_muted ()
 {
@@ -334,11 +312,6 @@ RegionView::set_position (nframes_t pos, void* src, double* ignored)
                for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                        (*i)->group->move (delta, 0.0);
                }
-       
-               for (AutomationChildren::iterator i = _automation_children.begin();
-                               i != _automation_children.end(); ++i) {
-                       i->second->get_canvas_group()->move(delta, 0.0);
-               }
        }
 
        return ret;
@@ -545,11 +518,6 @@ RegionView::move (double x_delta, double y_delta)
        for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                (*i)->group->move (x_delta, 0.0);
        }
-               
-       for (AutomationChildren::iterator i = _automation_children.begin();
-                       i != _automation_children.end(); ++i) {
-               i->second->get_canvas_group()->move(x_delta, 0.0);
-       }
 }
 
 void
@@ -643,14 +611,14 @@ RegionView::update_coverage_frames (LayerDisplay d)
 
                /* finish off any old rect, if required */
                if (cr && me != new_me) {
-                       cr->property_x2() = trackview.editor.frame_to_pixel (t - position);
+                       cr->property_x2() = trackview.editor().frame_to_pixel (t - position);
                }
 
                /* start off any new rect, if required */
                if (cr == 0 || me != new_me) {
                        cr = new ArdourCanvas::SimpleRect (*group);
                        _coverage_frames.push_back (cr);
-                       cr->property_x1() = trackview.editor.frame_to_pixel (t - position);
+                       cr->property_x1() = trackview.editor().frame_to_pixel (t - position);
                        cr->property_y1() = 1;
                        cr->property_y2() = _height + 1;
                        cr->property_outline_pixels() = 0;
@@ -668,6 +636,6 @@ RegionView::update_coverage_frames (LayerDisplay d)
 
        if (cr) {
                /* finish off the last rectangle */
-               cr->property_x2() = trackview.editor.frame_to_pixel (end - position);
+               cr->property_x2() = trackview.editor().frame_to_pixel (end - position);
        }
 }