Some work towards MIDI plugins (LV2 plugins with (MIDI supporting) event ports shown in plugin selector).

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

3 files changed, 26 insertions, 14 deletions

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index a8692af77a..df72841aff 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -362,7 +362,7 @@ MidiRegionView::create_note_at(double x, double y, double dur)
 	//double dur = m.frames_per_bar(t, trackview.session().frame_rate()) / m.beats_per_bar();
 
 	// Add a 1 beat long note (for now)
-	const boost::shared_ptr<Note> new_note(new Note(stamp, dur, (uint8_t)note, 0x40));
+	const boost::shared_ptr<Note> new_note(new Note(0, stamp, dur, (uint8_t)note, 0x40));
 	
 	view->update_bounds(new_note->note());
 
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index d893bc5695..c76c5dcf78 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -71,8 +71,10 @@ PluginSelector::PluginSelector (PluginManager *mgr)
 	plugin_display.append_column (_("Type"), plugin_columns.type_name);
 	plugin_display.append_column (_("Category"), plugin_columns.category);
 	plugin_display.append_column (_("Creator"), plugin_columns.creator);
-	plugin_display.append_column (_("# Inputs"),plugin_columns.ins);
-	plugin_display.append_column (_("# Outputs"), plugin_columns.outs);
+	plugin_display.append_column (_("# Audio In"),plugin_columns.audio_ins);
+	plugin_display.append_column (_("# Audio Out"), plugin_columns.audio_outs);
+	plugin_display.append_column (_("# MIDI In"),plugin_columns.midi_ins);
+	plugin_display.append_column (_("# MIDI Out"), plugin_columns.midi_outs);
 	plugin_display.set_headers_visible (true);
 	plugin_display.set_headers_clickable (true);
 	plugin_display.set_reorderable (false);
@@ -86,7 +88,7 @@ PluginSelector::PluginSelector (PluginManager *mgr)
 	added_list.set_headers_visible (true);
 	added_list.set_reorderable (false);
 
-	for (int i = 0; i <=3; i++) {
+	for (int i = 0; i <=7; i++) {
 		Gtk::TreeView::Column* column = plugin_display.get_column(i);
 		column->set_sort_column(i);
 	}
@@ -258,16 +260,22 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filte
 			newrow[plugin_columns.creator] = creator;
 
 			if ((*i)->n_inputs.n_total() < 0) {
-				newrow[plugin_columns.ins] = "various";
+				newrow[plugin_columns.audio_ins] = "various";
+				newrow[plugin_columns.midi_ins] = "various";
 			} else {
-				snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_total());
-				newrow[plugin_columns.ins] = buf;
+				snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_audio());
+				newrow[plugin_columns.audio_ins] = buf;
+				snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_midi());
+				newrow[plugin_columns.midi_ins] = buf;
 			}
 			if ((*i)->n_outputs.n_total() < 0) {
-				newrow[plugin_columns.outs] = "various";
+				newrow[plugin_columns.audio_outs] = "various";
+				newrow[plugin_columns.midi_outs] = "various";
 			} else {
-				snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_total());		
-				newrow[plugin_columns.outs] = buf;
+				snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_audio());		
+				newrow[plugin_columns.audio_outs] = buf;
+				snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_midi());		
+				newrow[plugin_columns.midi_outs] = buf;
 			}
 
 			newrow[plugin_columns.plugin] = *i;
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index ea258d3be0..e8e8927829 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -61,16 +61,20 @@ class PluginSelector : public ArdourDialog
 			add (type_name);
 			add (category);
 			add (creator);
-			add (ins);
-			add (outs);
+			add (audio_ins);
+			add (audio_outs);
+			add (midi_ins);
+			add (midi_outs);
 			add (plugin);
 		}
 		Gtk::TreeModelColumn<std::string> name;
 		Gtk::TreeModelColumn<std::string> type_name;
 		Gtk::TreeModelColumn<std::string> category;
 		Gtk::TreeModelColumn<std::string> creator;
-		Gtk::TreeModelColumn<std::string> ins;
-		Gtk::TreeModelColumn<std::string> outs;
+		Gtk::TreeModelColumn<std::string> audio_ins;
+		Gtk::TreeModelColumn<std::string> audio_outs;
+		Gtk::TreeModelColumn<std::string> midi_ins;
+		Gtk::TreeModelColumn<std::string> midi_outs;
 		Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> plugin;
 	};
 	PluginColumns plugin_columns;