partially-done (but compile-friendly) move of instrument info into a new backend object

git-svn-id: svn://localhost/ardour2/branches/3.0@12652 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 14 insertions, 60 deletions

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 490dbf90a2..ca9cd4af71 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -115,10 +115,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
 	_note_group->raise_to_top();
 	PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
 
-	/* Look up MIDNAM details from our MidiTimeAxisView */
-	MidiTimeAxisView& mtv = dynamic_cast<MidiTimeAxisView&> (tv);
-	midi_patch_settings_changed (mtv.midi_patch_model (), mtv.midi_patch_custom_device_mode ());
-
 	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
 	connect_to_diskstream ();
 
@@ -156,10 +152,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
 	_note_group->raise_to_top();
 	PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
 
-	/* Look up MIDNAM details from our MidiTimeAxisView */
-	MidiTimeAxisView& mtv = dynamic_cast<MidiTimeAxisView&> (tv);
-	midi_patch_settings_changed (mtv.midi_patch_model (), mtv.midi_patch_custom_device_mode ());
-	
 	connect_to_diskstream ();
 
 	SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
@@ -291,8 +283,11 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
 	midi_view()->signal_channel_mode_changed().connect(
 		sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
 
-	midi_view()->signal_midi_patch_settings_changed().connect(
-		sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+	RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
+	if (route_ui) {
+		route_ui->route()->instrument_info().Changed.connect (_instrument_changed_connection, invalidator (*this),
+								      boost::bind (&MidiRegionView::instrument_settings_changed, this), gui_context());
+	}
 
 	trackview.editor().SnapChanged.connect(snap_changed_connection, invalidator(*this),
 	                                       boost::bind (&MidiRegionView::snap_changed, this),
@@ -1209,10 +1204,10 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel, bool active_c
 			continue;
 		}
 
-		MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
-		string patch_name = mtv->get_patch_name ((*i)->bank(), (*i)->program(), channel);
+		// MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+		//string patch_name = mtv->get_patch_name ((*i)->bank(), (*i)->program(), channel);
 
-		add_canvas_patch_change (*i, patch_name, active_channel);
+		// add_canvas_patch_change (*i, patch_name, active_channel);
 	}
 }
 
@@ -3207,10 +3202,8 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
 }
 
 void
-MidiRegionView::midi_patch_settings_changed(std::string model, std::string custom_device_mode)
+MidiRegionView::instrument_settings_changed ()
 {
-	_model_name         = model;
-	_custom_device_mode = custom_device_mode;
 	redisplay_model();
 }
 
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 07c51800d5..93cc1ee128 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -356,7 +356,8 @@ private:
 	bool note_canvas_event(GdkEvent* ev);
 
 	void midi_channel_mode_changed(ARDOUR::ChannelMode mode, uint16_t mask);
-	void midi_patch_settings_changed(std::string model, std::string custom_device_mode);
+	void instrument_settings_changed ();
+	PBD::ScopedConnection _instrument_changed_connection;
 
 	void change_note_channel (ArdourCanvas::CanvasNoteEvent *, int8_t, bool relative=false);
 	void change_note_velocity(ArdourCanvas::CanvasNoteEvent* ev, int8_t vel, bool relative=false);
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index e8a2b1faff..4678ea7c7b 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -317,15 +317,14 @@ MidiTimeAxisView::model_changed()
 	}
 
 	_custom_device_mode_selector.set_active(0);
-
-	set_gui_property (X_("midnam-model-name"), midi_patch_model ());
+	
+	_route->instrument_info().set_external_instrument (_model_selector.get_active_text(), _custom_device_mode_selector.get_active_text());
 }
 
 void
 MidiTimeAxisView::custom_device_mode_changed()
 {
-	_midi_patch_settings_changed.emit (midi_patch_model (), midi_patch_custom_device_mode ());
-	set_gui_property (X_("midnam-custom-device-mode"), midi_patch_custom_device_mode ());
+	_route->instrument_info().set_external_instrument (_model_selector.get_active_text(), _custom_device_mode_selector.get_active_text());
 }
 
 MidiStreamView*
@@ -1207,33 +1206,3 @@ MidiTimeAxisView::note_range_changed ()
 	set_gui_property ("note-range-max", (int) midi_view()->highest_note ());
 }
 
-string
-MidiTimeAxisView::midi_patch_model () const
-{
-	return _model_selector.get_active_text ();
-}
-
-string
-MidiTimeAxisView::midi_patch_custom_device_mode () const
-{
-	return _custom_device_mode_selector.get_active_text ();
-}
-
-string
-MidiTimeAxisView::get_patch_name (uint16_t bank, uint8_t program, uint8_t channel) const
-{
-	MIDI::Name::PatchPrimaryKey patch_key (bank, program);
-	
-	boost::shared_ptr<MIDI::Name::Patch> patch =
-		MIDI::Name::MidiPatchManager::instance().find_patch (midi_patch_model(), midi_patch_custom_device_mode(), channel, patch_key);
-
-	if (patch) {
-		return patch->name();
-	} else {
-		/* program and bank numbers are zero-based: convert to one-based: MIDI_BP_ZERO */
-
-#define MIDI_BP_ZERO ((Config->get_first_midi_bank_is_zero())?0:1)
-
-		return string_compose ("%1 %2",program + MIDI_BP_ZERO , bank + MIDI_BP_ZERO);
-	}
-}	
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 68819b11b3..529c4e089a 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -86,11 +86,6 @@ class MidiTimeAxisView : public RouteTimeAxisView
 		return _channel_selector.mode_changed;
 	}
 
-	sigc::signal<void, std::string, std::string>& signal_midi_patch_settings_changed() {
-		return _midi_patch_settings_changed;
-	}
-
-
 	const MidiMultipleChannelSelector& channel_selector() { return _channel_selector; }
 
 	Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
@@ -102,10 +97,6 @@ class MidiTimeAxisView : public RouteTimeAxisView
 
 	uint8_t get_channel_for_add () const;
 
-	std::string midi_patch_model () const;
-	std::string midi_patch_custom_device_mode () const;
-        std::string get_patch_name (uint16_t bank, uint8_t program, uint8_t channel) const;
-
   protected:
 	void start_step_editing ();
 	void stop_step_editing ();