diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 428160c0f5..c257a54f7d 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -22,6 +22,7 @@ + diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 37552dee7a..387896432f 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -161,6 +161,9 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (main_actions, X_("ExportAudio"), _("Export To Audio File(s)..."), sigc::mem_fun (*editor, &PublicEditor::export_audio)); ActionManager::session_sensitive_actions.push_back (act); + + act = ActionManager::register_action (main_actions, X_("StemExport"), _("Stem export..."), sigc::mem_fun (*editor, &PublicEditor::stem_export)); + ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (main_actions, X_("Export"), _("Export")); ActionManager::session_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index c4d3edeef7..8cbccefabd 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -291,6 +291,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* export */ void export_audio (); + void stem_export (); void export_selection (); void export_range (); void export_region (); diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 928a9809bc..7b77f19099 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -59,7 +59,15 @@ using namespace Gtk; void Editor::export_audio () { - ExportDialog dialog (*this, _("Export")); + ExportDialog dialog (*this, _("Export"), X_("ExportProfile")); + dialog.set_session (_session); + dialog.run(); +} + +void +Editor::stem_export () +{ + StemExportDialog dialog (*this); dialog.set_session (_session); dialog.run(); } diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index 8df698e853..6881b032a4 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -502,3 +502,96 @@ RegionExportChannelSelector::handle_selection () CriticalSelectionChanged (); } + +TrackExportChannelSelector::TrackExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager) + : ExportChannelSelector(session, manager) +{ + track_scroller.add (track_view); + track_scroller.set_size_request (-1, 130); + track_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + pack_start(track_scroller); + + // Track list + track_list = Gtk::ListStore::create (track_cols); + track_view.set_model (track_list); + track_view.set_headers_visible (true); + + track_view.append_column_editable (_("Track"), track_cols.selected); + Gtk::CellRendererToggle *toggle = dynamic_cast(track_view.get_column_cell_renderer (0)); + toggle->signal_toggled().connect (sigc::hide (sigc::mem_fun (*this, &TrackExportChannelSelector::update_config))); + + Gtk::CellRendererText* text_renderer = Gtk::manage (new Gtk::CellRendererText); + text_renderer->property_editable() = false; + + Gtk::TreeView::Column* column = track_view.get_column (0); + column->pack_start (*text_renderer); + column->add_attribute (text_renderer->property_text(), track_cols.label); + + fill_list(); + + show_all_children (); +} + +void +TrackExportChannelSelector::sync_with_manager () +{ + // TODO implement properly + update_config(); +} + +void +TrackExportChannelSelector::fill_list() +{ + track_list->clear(); + RouteList routes = *_session->get_routes(); + + for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { + Route * route = it->get(); + if(dynamic_cast(route)) { + add_track(route->output().get()); + } + } +} + +void +TrackExportChannelSelector::add_track(IO * io) +{ + Gtk::TreeModel::iterator iter = track_list->append(); + Gtk::TreeModel::Row row = *iter; + + row[track_cols.selected] = true; + row[track_cols.label] = io->name(); + row[track_cols.track] = io; +} + +void +TrackExportChannelSelector::update_config() +{ + manager->clear_channel_configs(); + + for (Gtk::ListStore::Children::iterator it = track_list->children().begin(); it != track_list->children().end(); ++it) { + Gtk::TreeModel::Row row = *it; + + if (!row[track_cols.selected]) { + continue; + } + + ExportProfileManager::ChannelConfigStatePtr state = manager->add_channel_config(); + + IO * track = row[track_cols.track]; + uint32_t outs = track->n_ports().n_audio(); + for (uint32_t i = 0; i < outs; ++i) { + AudioPort * port = track->audio (i); + if(port) { + ExportChannelPtr channel (new PortExportChannel ()); + PortExportChannel * pec = static_cast (channel.get()); + pec->add_port(port); + state->config->register_channel(channel); + } + } + + state->config->set_name(track->name()); + } + + CriticalSelectionChanged (); +} diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index cfb71b34f5..63af76e77d 100644 --- a/gtk2_ardour/export_channel_selector.h +++ b/gtk2_ardour/export_channel_selector.h @@ -47,6 +47,7 @@ class ExportChannelSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr { protected: typedef boost::shared_ptr ChannelConfigPtr; + typedef std::list ChannelConfigList; typedef boost::shared_ptr ProfileManagerPtr; ProfileManagerPtr manager; @@ -225,4 +226,37 @@ class RegionExportChannelSelector : public ExportChannelSelector Gtk::RadioButton processed_button; }; +class TrackExportChannelSelector : public ExportChannelSelector +{ + public: + TrackExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager); + + virtual void sync_with_manager (); + + private: + + void fill_list(); + void add_track(ARDOUR::IO * io); + void update_config(); + + ChannelConfigList configs; + + struct TrackCols : public Gtk::TreeModelColumnRecord + { + public: + Gtk::TreeModelColumn track; + Gtk::TreeModelColumn label; + Gtk::TreeModelColumn selected; + + TrackCols () { add (track); add(label); add(selected); } + }; + TrackCols track_cols; + + Glib::RefPtr track_list; + Gtk::TreeView track_view; + + Gtk::ScrolledWindow track_scroller; + +}; + #endif /* __export_channel_selector_h__ */ diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index fac810c92f..77e75ab0a5 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -36,13 +36,14 @@ using namespace ARDOUR; using namespace PBD; using std::string; -ExportDialog::ExportDialog (PublicEditor & editor, std::string title) : - ArdourDialog (title), - editor (editor), +ExportDialog::ExportDialog (PublicEditor & editor, std::string title, std::string xml_node_name) + : ArdourDialog (title) + , xml_node_name (xml_node_name) + , editor (editor) - warn_label ("", Gtk::ALIGN_LEFT), - list_files_label (_("Some already existing files will be overwritten."), Gtk::ALIGN_RIGHT), - list_files_button (_("List files")) + , warn_label ("", Gtk::ALIGN_LEFT) + , list_files_label (_("Some already existing files will be overwritten."), Gtk::ALIGN_RIGHT) + , list_files_button (_("List files")) { } ExportDialog::~ExportDialog () @@ -61,7 +62,7 @@ ExportDialog::set_session (ARDOUR::Session* s) handler = _session->get_export_handler (); status = _session->get_export_status (); - profile_manager.reset (new ExportProfileManager (*_session)); + profile_manager.reset (new ExportProfileManager (*_session, xml_node_name)); /* Possibly init stuff in derived classes */ @@ -381,7 +382,7 @@ ExportDialog::add_warning (string const & text) /*** Dialog specializations ***/ ExportRangeDialog::ExportRangeDialog (PublicEditor & editor, string range_id) : - ExportDialog (editor, _("Export Range")), + ExportDialog (editor, _("Export Range"), X_("RangeExportProfile")), range_id (range_id) {} @@ -395,7 +396,7 @@ ExportRangeDialog::init_components () } ExportSelectionDialog::ExportSelectionDialog (PublicEditor & editor) : - ExportDialog (editor, _("Export Selection")) + ExportDialog (editor, _("Export Selection"), X_("SelectionExportProfile")) {} void @@ -408,7 +409,7 @@ ExportSelectionDialog::init_components () } ExportRegionDialog::ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track) : - ExportDialog (editor, _("Export Region")), + ExportDialog (editor, _("Export Region"), X_("RegionExportProfile")), region (region), track (track) {} @@ -431,3 +432,19 @@ ExportRegionDialog::init_components () channel_selector.reset (new RegionExportChannelSelector (_session, profile_manager, region, track)); file_notebook.reset (new ExportFileNotebook ()); } + +StemExportDialog::StemExportDialog (PublicEditor & editor) + : ExportDialog(editor, _("Stem Export"), X_("StemExportProfile")) +{ + +} + +void +StemExportDialog::init_components () +{ + preset_selector.reset (new ExportPresetSelector ()); + timespan_selector.reset (new ExportTimespanSelectorMultiple (_session, profile_manager)); + channel_selector.reset (new TrackExportChannelSelector (_session, profile_manager)); + file_notebook.reset (new ExportFileNotebook ()); +} + diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index b635d4c472..5c9e346f50 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -47,7 +47,7 @@ class ExportDialog : public ArdourDialog { public: - explicit ExportDialog (PublicEditor & editor, std::string title); + ExportDialog (PublicEditor & editor, std::string title, std::string xml_node_name); ~ExportDialog (); void set_session (ARDOUR::Session* s); @@ -65,6 +65,7 @@ class ExportDialog : public ArdourDialog { typedef boost::shared_ptr HandlerPtr; typedef boost::shared_ptr ManagerPtr; + std::string xml_node_name; HandlerPtr handler; ManagerPtr profile_manager; @@ -160,7 +161,7 @@ class ExportSelectionDialog : public ExportDialog class ExportRegionDialog : public ExportDialog { - public: + public: ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track); private: @@ -171,4 +172,13 @@ class ExportRegionDialog : public ExportDialog ARDOUR::AudioTrack & track; }; +class StemExportDialog : public ExportDialog +{ + public: + StemExportDialog (PublicEditor & editor); + + private: + void init_components (); +}; + #endif /* __ardour_export_dialog_h__ */ diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 2667d031b6..5d054fe174 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -210,6 +210,9 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { /** Open main export dialog */ virtual void export_audio () = 0; + + /** Open stem export dialog */ + virtual void stem_export () = 0; /** Open export dialog with current selection pre-selected */ virtual void export_selection () = 0; diff --git a/libs/ardour/ardour/export_channel_configuration.h b/libs/ardour/ardour/export_channel_configuration.h index 932a74328c..d50ec0365d 100644 --- a/libs/ardour/ardour/export_channel_configuration.h +++ b/libs/ardour/ardour/export_channel_configuration.h @@ -62,7 +62,7 @@ class ExportChannelConfiguration : public boost::enable_shared_from_this FilePair; typedef std::map FileMap; + std::string const xml_node_name; HandlerPtr handler; Session & session; @@ -174,6 +175,8 @@ class ExportProfileManager typedef std::list ChannelConfigStateList; ChannelConfigStateList const & get_channel_configs () { return check_list (channel_configs); } + void clear_channel_configs () { channel_configs.clear(); } + ChannelConfigStatePtr add_channel_config (); private: diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index c7a1efebd1..51b4c7042c 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -187,6 +187,7 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptrget_n_chans(); int format = get_real_format (config); + config.filename->set_channel_config(config.channel_config); string filename = config.filename->get_path (config.format); writer.reset (new AudioGrapher::SndfileWriter (filename, format, channels, config.format->sample_rate(), config.broadcast_info)); diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index 24ccd102a0..65b74103ae 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -49,15 +49,16 @@ using namespace PBD; namespace ARDOUR { -ExportProfileManager::ExportProfileManager (Session & s) : - handler (s.get_export_handler()), - session (s), +ExportProfileManager::ExportProfileManager (Session & s, std::string xml_node_name) + : xml_node_name (xml_node_name) + , handler (s.get_export_handler()) + , session (s) - session_range (new Location (s)), - ranges (new LocationList ()), - single_range_mode (false), + , session_range (new Location (s)) + , ranges (new LocationList ()) + , single_range_mode (false) - format_list (new FormatList ()) + , format_list (new FormatList ()) { /* Initialize path variables */ @@ -68,13 +69,13 @@ ExportProfileManager::ExportProfileManager (Session & s) : search_path += ardour_search_path().add_subdirectory_to_paths("export"); - sys::path sys_export = ardour_module_directory(); - sys_export /= "export"; - + sys::path sys_export = ardour_module_directory(); + sys_export /= "export"; + search_path += sys_export; - info << string_compose (_("Searching for export formats in %1"), search_path.to_string()) << endmsg; - cerr << string_compose (_("Searching for export formats in %1"), search_path.to_string()) << endl; + info << string_compose (_("Searching for export formats in %1"), search_path.to_string()) << endmsg; + cerr << string_compose (_("Searching for export formats in %1"), search_path.to_string()) << endl; /* create export config directory if necessary */ @@ -98,7 +99,7 @@ ExportProfileManager::~ExportProfileManager () { if (single_range_mode) { return; } - XMLNode * instant_xml (new XMLNode ("ExportProfile")); + XMLNode * instant_xml (new XMLNode (xml_node_name)); serialize_profile (*instant_xml); session.add_instant_xml (*instant_xml, false); } @@ -106,11 +107,11 @@ ExportProfileManager::~ExportProfileManager () void ExportProfileManager::load_profile () { - XMLNode * instant_node = session.instant_xml ("ExportProfile"); + XMLNode * instant_node = session.instant_xml (xml_node_name); if (instant_node) { set_state (*instant_node); } else { - XMLNode empty_node ("ExportProfile"); + XMLNode empty_node (xml_node_name); set_state (empty_node); } } @@ -118,17 +119,19 @@ ExportProfileManager::load_profile () void ExportProfileManager::prepare_for_export () { - ChannelConfigPtr channel_config = channel_configs.front()->config; TimespanListPtr ts_list = timespans.front()->timespans; FormatStateList::const_iterator format_it; FilenameStateList::const_iterator filename_it; + // For each timespan for (TimespanList::iterator ts_it = ts_list->begin(); ts_it != ts_list->end(); ++ts_it) { + // ..., each format-filename pair for (format_it = formats.begin(), filename_it = filenames.begin(); format_it != formats.end() && filename_it != filenames.end(); ++format_it, ++filename_it) { + FilenamePtr filename = (*filename_it)->filename; // filename->include_timespan = (ts_list->size() > 1); Disabled for now... boost::shared_ptr b; @@ -136,8 +139,12 @@ ExportProfileManager::prepare_for_export () b.reset (new BroadcastInfo); b->set_from_session (session, (*ts_it)->get_start()); } - - handler->add_export_config (*ts_it, channel_config, (*format_it)->format, (*filename_it)->filename, b); + + // ...and each channel config + filename->include_channel_config = (channel_configs.size() > 1); + for(ChannelConfigStateList::iterator cc_it = channel_configs.begin(); cc_it != channel_configs.end(); ++cc_it) { + handler->add_export_config (*ts_it, (*cc_it)->config, (*format_it)->format, filename, b); + } } } } @@ -440,6 +447,14 @@ ExportProfileManager::update_ranges () { } } +ExportProfileManager::ChannelConfigStatePtr +ExportProfileManager::add_channel_config () +{ + ChannelConfigStatePtr ptr(new ChannelConfigState(handler->add_channel_config())); + channel_configs.push_back(ptr); + return ptr; +} + bool ExportProfileManager::init_channel_configs (XMLNodeList nodes) {