From 2d082739873b49f291a288c3217a4f06ef6fde01 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 5 Oct 2010 14:55:08 +0000 Subject: Remove some unused code. git-svn-id: svn://localhost/ardour2/branches/3.0@7876 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/midi_region_view.cc | 8 -------- gtk2_ardour/midi_region_view.h | 1 - libs/ardour/ardour/midi_region.h | 1 - libs/ardour/ardour/source.h | 1 - libs/ardour/midi_region.cc | 25 ------------------------- 5 files changed, 36 deletions(-) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 136515c08e..400b245782 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -2692,14 +2692,6 @@ MidiRegionView::note_mouse_position (float x_fraction, float y_fraction, bool ca } } -void -MidiRegionView::switch_source(boost::shared_ptr src) -{ - boost::shared_ptr msrc = boost::dynamic_pointer_cast(src); - if (msrc) - display_model(msrc->model()); -} - void MidiRegionView::set_frame_color() { diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 29ad2f7821..d89f477145 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -317,7 +317,6 @@ class MidiRegionView : public RegionView bool play_midi_note_off(boost::shared_ptr note); void clear_events(); - void switch_source(boost::shared_ptr src); bool canvas_event(GdkEvent* ev); bool note_canvas_event(GdkEvent* ev); diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index a7a5fb3a82..dbbf6d80d1 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -128,7 +128,6 @@ class MidiRegion : public Region void set_position_internal (framepos_t pos, bool allow_bbt_recompute); - void switch_source(boost::shared_ptr source); void model_changed (); void model_automation_state_changed (Evoral::Parameter const &); void model_contents_changed (); diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index b8b3c9c229..64dd88d094 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -84,7 +84,6 @@ class Source : public SessionObject virtual bool length_mutable() const { return false; } static PBD::Signal1 SourceCreated; - PBD::Signal1 > Switched; bool has_been_analysed() const; virtual bool can_be_analysed() const { return false; } diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index ffb5217137..e8d6229e91 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -72,7 +72,6 @@ MidiRegion::MidiRegion (const SourceList& srcs) { register_properties (); - // midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1)); midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this)); model_changed (); assert(_name.val().find("/") == string::npos); @@ -86,7 +85,6 @@ MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t register_properties (); assert(_name.val().find("/") == string::npos); - // midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1)); midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this)); model_changed (); } @@ -257,29 +255,6 @@ MidiRegion::midi_source (uint32_t n) const return boost::dynamic_pointer_cast(source(n)); } - -void -MidiRegion::switch_source(boost::shared_ptr src) -{ - _source_connection.disconnect (); - - boost::shared_ptr msrc = boost::dynamic_pointer_cast(src); - if (!msrc) { - return; - } - - // MIDI regions have only one source - SourceList srcs; - srcs.push_back (msrc); - - drop_sources (); - use_sources (srcs); - - set_name (msrc->name()); - - msrc->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this)); -} - void MidiRegion::model_changed () { -- cgit v1.2.3