X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_channel_selector.h;h=aa9999a9b61099aadfd9141e9fcaff1bf372b281;hb=8505c16057a074531a99728e730408151d7aafa4;hp=e7b2dc11ee0a0785667187e41dd3163b6d3a8caf;hpb=a406d9183adc67075a4e802fd8254c2560df9964;p=ardour.git

diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index e7b2dc11ee..aa9999a9b6 100644
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -24,7 +24,10 @@
 #include <list>
 
 #include "ardour/export_profile_manager.h"
-#include "ardour/export_channel.h"
+
+#ifdef interface
+#undef interface
+#endif
 
 #include <gtkmm.h>
 #include <sigc++/signal.h>
@@ -123,14 +126,14 @@ class PortExportChannelSelector : public ExportChannelSelector
 		typedef Gtk::TreeModelColumn<Glib::RefPtr<Gtk::ListStore> > ComboCol;
 		ComboCol                             port_list_col;
 
-		/* Channel struct, that represents the selected port and it's name */
+		/* Channel struct, that represents the selected port and its name */
 
 		struct Channel {
 		  public:
 			Channel (RouteCols & cols) { cols.add (port); cols.add (label); }
 
-			Gtk::TreeModelColumn<ARDOUR::AudioPort *>  port;
-			Gtk::TreeModelColumn<std::string>        label;
+			Gtk::TreeModelColumn<boost::weak_ptr<ARDOUR::AudioPort> > port;
+			Gtk::TreeModelColumn<std::string> label;
 		};
 		std::list<Channel> channels;
 
@@ -144,11 +147,11 @@ class PortExportChannelSelector : public ExportChannelSelector
 		class PortCols : public Gtk::TreeModel::ColumnRecord
 		{
 		  public:
-			PortCols () { add (selected); add(port); add(label); }
+			PortCols () { add(selected); add(port); add(label); }
 
-			Gtk::TreeModelColumn<bool>                  selected;  // not used ATM
-			Gtk::TreeModelColumn<ARDOUR::AudioPort *>   port;
-			Gtk::TreeModelColumn<std::string>         label;
+			Gtk::TreeModelColumn<bool> selected;  // not used ATM
+			Gtk::TreeModelColumn<boost::weak_ptr<ARDOUR::AudioPort> > port;
+			Gtk::TreeModelColumn<std::string> label;
 		};
 		PortCols port_cols;
 	};
@@ -236,19 +239,21 @@ class TrackExportChannelSelector : public ExportChannelSelector
   private:
 
 	void fill_list();
-	void add_track(ARDOUR::Route * route);
+	void add_track (boost::shared_ptr<ARDOUR::Route> route);
 	void update_config();
-
 	ChannelConfigList configs;
 
+	Gtk::VBox main_layout;
+
 	struct TrackCols : public Gtk::TreeModelColumnRecord
 	{
 	  public:
-		Gtk::TreeModelColumn<ARDOUR::Route *> track;
+		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
 		Gtk::TreeModelColumn<std::string>     label;
 		Gtk::TreeModelColumn<bool>            selected;
+		Gtk::TreeModelColumn<uint32_t>        order_key;
 
-		TrackCols () { add (track); add(label); add(selected); }
+		TrackCols () { add (route); add(label); add(selected); add(order_key); }
 	};
 	TrackCols                    track_cols;
 
@@ -256,7 +261,17 @@ class TrackExportChannelSelector : public ExportChannelSelector
 	Gtk::TreeView                track_view;
 
 	Gtk::ScrolledWindow          track_scroller;
-	
+
+	Gtk::HBox                    options_box;
+	Gtk::RadioButton::Group      source_group;
+	Gtk::RadioButton             region_contents_button;
+	Gtk::RadioButton             track_output_button;
+	Gtk::Button                  select_tracks_button;
+	Gtk::Button                  select_busses_button;
+	Gtk::Button                  select_none_button;
+	void select_tracks ();
+	void select_busses ();
+	void select_none ();
 };
 
 #endif /* __export_channel_selector_h__ */