[Summary] Changing implementation of export/import usecases

export/Tracks Live.format

@@ -11,7 +11,7 @@
     <Option name="broadcast-info" value="false"/>
   </EncodingOptions>
   <Processing>
-    <Normalize enabled="true" target="-0"/>
+    <Normalize enabled="false" target="-0"/>
     <Silence>
       <Start>
         <Trim enabled="false"/>

gtk2_ardour/editor_export_audio.cc

@@ -63,9 +63,17 @@ using namespace Gtk;
 void
 Editor::export_audio ()
 {
-	WavesExportDialog dialog (*this, _("Export"), ExportProfileManager::RegularExport);
-	dialog.set_session (_session);
-	dialog.run();
+	if (Config->get_output_auto_connect() & AutoConnectPhysical) {
+        WavesMessageDialog read_only_session_dialog ("",
+                                                     "Not available in Multi Out mode.\nPlease switch to Stereo Out mode.",
+                                                     WavesMessageDialog::BUTTON_OK);
+        read_only_session_dialog.set_position (Gtk::WIN_POS_CENTER);
+        read_only_session_dialog.run ();
+	} else {
+		WavesExportDialog dialog (*this, _("Export"), ExportProfileManager::RegularExport);
+		dialog.set_session (_session);
+		dialog.run();
+	}
 }
 
 void

gtk2_ardour/ui/waves_import_dialog.xml

@@ -73,8 +73,8 @@
               <Label style="generic_dropdown_menu"/>
             </HBox>
             <DropdownMenu style="generic_dropdown_menu">
-              <DropdownItem style="generic_dropdown_menu" title="file timestamp" data="0"/>
               <DropdownItem style="generic_dropdown_menu" title="playhead" data="2"/>
+              <DropdownItem style="generic_dropdown_menu" title="file timestamp" data="0"/>
               <DropdownItem style="generic_dropdown_menu" title="session start" data="3"/>
             </DropdownMenu>
           </Dropdown>

gtk2_ardour/ui/waves_port_export_channel_selector.xml

@@ -24,8 +24,12 @@
          bgnormal="#6C6C6C"/>
   <style name="generic_dropdown_menu"
          style="generic_dropdown"/>
-  <VBox spacing="5">
-    <HBox spacing="5">
+  <VBox spacing="5"
+        _visible="false"
+        _noshowall="true">
+    <HBox spacing="5" 
+        visible="false"
+        noshowall="true">
       <Label style="generic_control"
              text="Channels:"/>
       <HBox box.fill="true" box.expand="true">
@@ -55,20 +59,22 @@
     </HBox>
     <Hbox>
       <IconButton id="split_button"
-              width="20"
-              height="20"
-              normalicon="waves_darker_check_box"
-              activeicon="waves_darker_check_box_active"
-              toggleable="true"/>
+                  width="20"
+                  height="20"
+                  normalicon="waves_darker_check_box"
+                  activeicon="waves_darker_check_box_active"
+                  toggleable="true"/>
       <Label style="generic_control"
              text="Split mono files"/>
     </Hbox>
   </VBox>
   <VBox box.fill="true"
-        box.expand="true">
-  <ScrolledWindow id="channel_scroller"
-                  box.fill="true"
-                  box.expand="true"/>
+        box.expand="true"
+        visible="false"
+        noshowall="true">
+    <ScrolledWindow id="channel_scroller"
+                    box.fill="true"
+                    box.expand="true"/>
   <VBox height="10"/>
   </VBox>
 </HBox>

gtk2_ardour/waves_export_channel_selector.cc

@@ -41,7 +41,7 @@ using namespace Glib;
 using namespace ARDOUR;
 using namespace PBD;
 
-uint32_t WavesPortExportChannelSelector::__max_channels = 20;
+uint32_t WavesPortExportChannelSelector::__max_channels = 2;
 
 WavesPortExportChannelSelector::WavesPortExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager)
   : WavesExportChannelSelector (session, manager)
@@ -187,18 +187,11 @@ WavesPortExportChannelSelector::ChannelTreeView::ChannelTreeView (uint32_t max_c
 
 	/* Add column with toggle and text */
 
-	append_column_editable (_("Bus or Track"), route_cols.selected);
-
-	Gtk::CellRendererText* text_renderer = Gtk::manage (new Gtk::CellRendererText);
-	text_renderer->property_editable() = false;
-
-	Gtk::TreeView::Column* column = get_column (0);
-	column->pack_start (*text_renderer);
-	column->add_attribute (text_renderer->property_text(), route_cols.name);
-
+	append_column_editable (_(""), route_cols.selected);
 	Gtk::CellRendererToggle *toggle = dynamic_cast<Gtk::CellRendererToggle *>(get_column_cell_renderer (0));
 	toggle->signal_toggled().connect (sigc::mem_fun (*this, &WavesPortExportChannelSelector::ChannelTreeView::update_toggle_selection));
 
+	append_column (_("Bus or Track"), route_cols.name);
 	static_columns = get_columns().size();
 }
 
@@ -323,9 +316,9 @@ WavesPortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t cha
 
 		Gtk::CellRendererCombo* combo_renderer = Gtk::manage (new Gtk::CellRendererCombo);
 		combo_renderer->property_text_column() = 2;
-		column->pack_start (*combo_renderer);
+		column->pack_start (*combo_renderer, false);
 
-		append_column (*column);
+		// append_column (*column);
 
 		column->add_attribute (combo_renderer->property_text(), route_cols.get_channel(n_channels).label);
 		column->add_attribute (combo_renderer->property_model(), route_cols.port_list_col);
@@ -343,11 +336,11 @@ WavesPortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t cha
 
 		/* set column width */
 
-		get_column (static_columns + n_channels - 1)->set_min_width (80);
+		// get_column (static_columns + n_channels - 1)->set_min_width (80);
 
 		--offset;
 	}
-
+	/*
 	while (offset < 0) {
 		--n_channels;
 
@@ -355,7 +348,7 @@ WavesPortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t cha
 
 		++offset;
 	}
-
+	*/
 	update_config ();
 }
 

gtk2_ardour/waves_export_channel_selector.h

@@ -184,9 +184,9 @@ class WavesPortExportChannelSelector : public WavesExportChannelSelector, public
 	WavesButton& _channels_inc_button;
 	WavesButton& _channels_dec_button;
 	WavesButton& _split_button;
-	Gtk::ScrolledWindow          &_channel_scroller;
-	ChannelTreeView              _channel_view;
-	static uint32_t                     __max_channels;
+	Gtk::ScrolledWindow &_channel_scroller;
+	ChannelTreeView _channel_view;
+	static uint32_t __max_channels;
 };
 
 class WavesRegionExportChannelSelector : public WavesExportChannelSelector, public WavesUI