diff options
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 29 | ||||
-rw-r--r-- | gtk2_ardour/region_view.cc | 32 | ||||
-rw-r--r-- | gtk2_ardour/region_view.h | 4 |
3 files changed, 0 insertions, 65 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index f8ea8a3e2e..af3203ec9b 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -575,35 +575,6 @@ MidiRegionView::redisplay_model() display_program_change_flags(); - // Is this necessary? - /*for (Automatable::Controls::const_iterator i = _model->controls().begin(); - i != _model->controls().end(); ++i) { - - assert(i->second); - - boost::shared_ptr<AutomationTimeAxisView> at - = midi_view()->automation_child(i->second->parameter()); - if (!at) - continue; - - Gdk::Color col = midi_stream_view()->get_region_color(); - - boost::shared_ptr<AutomationRegionView> arv; - - { - Glib::Mutex::Lock list_lock (i->second->list()->lock()); - - arv = boost::shared_ptr<AutomationRegionView>( - new AutomationRegionView(at->canvas_display, - *at.get(), _region, i->second->list(), - midi_stream_view()->get_samples_per_unit(), col)); - } - - arv->set_duration(_region->length(), this); - arv->init(col, true); - - _automation_children.insert(std::make_pair(i->second->parameter(), arv)); - }*/ _model->read_unlock(); } else { diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 8ceef8138e..54e0a9ef5e 100644 --- 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,22 +267,9 @@ 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 () { set_frame_color (); @@ -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 diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index 11c6c7e556..de9d95ccf3 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -108,7 +108,6 @@ class RegionView : public TimeAxisViewItem virtual void region_muted (); void region_locked (); void region_opacity (); - void region_layered (); virtual void region_renamed (); void region_sync_changed (); @@ -150,9 +149,6 @@ class RegionView : public TimeAxisViewItem that will be played at any given time. */ std::list<ArdourCanvas::SimpleRect*> _coverage_frames; - - typedef std::map<const Evoral::Parameter, boost::shared_ptr<AutomationRegionView> > AutomationChildren; - AutomationChildren _automation_children; }; #endif /* __gtk_ardour_region_view_h__ */ |