Merge branch 'cairocanvas' into windows+cc
[ardour.git] / libs / ardour / export_profile_manager.cc
index 529a4e3d9ff62b2b2f2d4aa04a43ad563b016da6..7ff4282c74bcdea5ee64ff28ce57313689cda6bc 100644 (file)
 
 */
 
-#include "ardour/export_profile_manager.h"
-
 #include <cassert>
 #include <stdexcept>
+#include <cerrno>
+
+#include <glib.h>
+#include <glib/gstdio.h>
 
 #include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
 #include "pbd/convert.h"
 
-#include "ardour/export_failed.h"
-#include "ardour/export_file_io.h"
+#include "ardour/export_profile_manager.h"
 #include "ardour/export_format_specification.h"
+#include "ardour/export_formats_search_path.h"
 #include "ardour/export_timespan.h"
 #include "ardour/export_channel_configuration.h"
 #include "ardour/export_filename.h"
 #include "ardour/export_preset.h"
 #include "ardour/export_handler.h"
+#include "ardour/export_failed.h"
+#include "ardour/directory_names.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
+#include "ardour/broadcast_info.h"
 
 #include "i18n.h"
 
@@ -49,37 +56,55 @@ using namespace PBD;
 namespace ARDOUR
 {
 
-ExportProfileManager::ExportProfileManager (Session & s) :
-  handler (s.get_export_handler()),
-  session (s),
+ExportProfileManager::ExportProfileManager (Session & s, ExportType type)
+  : type(type)
+  , handler (s.get_export_handler())
+  , session (s)
 
-  session_range (new Location ()),
-  ranges (new LocationList ()),
-  single_range_mode (false),
+  , ranges (new LocationList ())
+  , single_range_mode (false)
 
-  format_list (new FormatList ())
+  format_list (new FormatList ())
 {
+       switch(type) {
+       case RegularExport:
+               xml_node_name = X_("ExportProfile");
+               break;
+       case RangeExport:
+               xml_node_name = X_("RangeExportProfile");
+               break;
+       case SelectionExport:
+               xml_node_name = X_("SelectionExportProfile");
+               break;
+       case RegionExport:
+               xml_node_name = X_("RegionExportProfile");
+               break;
+       case StemExport:
+               xml_node_name = X_("StemExportProfile");
+               break;
+       }
 
        /* Initialize path variables */
 
-       export_config_dir = user_config_directory();
-       export_config_dir /= "export";
-       search_path += export_config_dir;
-       
-       search_path += ardour_search_path().add_subdirectory_to_paths("export");
-       search_path += system_config_search_path().add_subdirectory_to_paths("export");;
-       
+       export_config_dir = Glib::build_filename (user_config_directory(), export_dir_name);
+
+       search_path += export_formats_search_path();
+
+       info << string_compose (_("Searching for export formats in %1"), search_path.to_string()) << endmsg;
+
        /* create export config directory if necessary */
 
-       if (!sys::exists (export_config_dir)) {
-               sys::create_directory (export_config_dir);
+       if (!Glib::file_test (export_config_dir, Glib::FILE_TEST_EXISTS)) {
+               if (g_mkdir_with_parents (export_config_dir.c_str(), 0755) != 0) {
+                       error << string_compose (_("Unable to create export format directory %1: %2"), export_config_dir, g_strerror(errno)) << endmsg;
+               }
        }
-       
+
        load_presets ();
        load_formats ();
-       
+
        /* Initialize all lists with an empty config */
-       
+
        XMLNodeList dummy;
        init_timespans (dummy);
        init_channel_configs (dummy);
@@ -89,9 +114,7 @@ ExportProfileManager::ExportProfileManager (Session & s) :
 
 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);
 }
@@ -99,11 +122,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);
        }
 }
@@ -111,25 +134,39 @@ 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) {
-               
+
+                       ExportFilenamePtr filename = (*filename_it)->filename;
 //                     filename->include_timespan = (ts_list->size() > 1); Disabled for now...
-                       handler->add_export_config (*ts_it, channel_config, (*format_it)->format, (*filename_it)->filename);
+
+                       boost::shared_ptr<BroadcastInfo> b;
+                       if ((*format_it)->format->has_broadcast_info()) {
+                               b.reset (new BroadcastInfo);
+                               b->set_from_session (session, (*ts_it)->get_start());
+                       }
+
+                       // ...and each channel config
+                       filename->include_channel_config = (type == StemExport) ||
+                                                          (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);
+                       }
                }
        }
 }
 
 bool
-ExportProfileManager::load_preset (PresetPtr preset)
+ExportProfileManager::load_preset (ExportPresetPtr preset)
 {
        bool ok = true;
 
@@ -140,36 +177,53 @@ ExportProfileManager::load_preset (PresetPtr preset)
        if ((state = preset->get_local_state())) {
                set_local_state (*state);
        } else { ok = false; }
-       
+
        if ((state = preset->get_global_state())) {
                if (!set_global_state (*state)) {
                        ok = false;
                }
        } else { ok = false; }
-       
+
        return ok;
 }
 
 void
 ExportProfileManager::load_presets ()
 {
-       vector<sys::path> found = find_file (string_compose (X_("*%1"),export_preset_suffix));
+       vector<std::string> found = find_file (string_compose (X_("*%1"),export_preset_suffix));
 
-       for (vector<sys::path>::iterator it = found.begin(); it != found.end(); ++it) {
+       for (vector<std::string>::iterator it = found.begin(); it != found.end(); ++it) {
                load_preset_from_disk (*it);
        }
 }
 
-ExportProfileManager::PresetPtr
+std::string
+ExportProfileManager::preset_filename (std::string const & preset_name)
+{
+       string safe_name = legalize_for_path (preset_name);
+       return Glib::build_filename (export_config_dir, safe_name + export_preset_suffix);
+}
+
+ExportPresetPtr
+ExportProfileManager::new_preset (string const & name)
+{
+       // Generate new ID and do regular save
+       string filename = preset_filename (name);
+       current_preset.reset (new ExportPreset (filename, session));
+       preset_list.push_back (current_preset);
+       return save_preset (name);
+}
+
+ExportPresetPtr
 ExportProfileManager::save_preset (string const & name)
 {
-       string filename = export_config_dir.to_string() + "/" + name + export_preset_suffix;
+       string filename = preset_filename (name);
 
        if (!current_preset) {
                current_preset.reset (new ExportPreset (filename, session));
                preset_list.push_back (current_preset);
        }
-       
+
        XMLNode * global_preset = new XMLNode ("ExportPreset");
        XMLNode * local_preset = new XMLNode ("ExportPreset");
 
@@ -179,9 +233,9 @@ ExportProfileManager::save_preset (string const & name)
        current_preset->set_name (name);
        current_preset->set_global_state (*global_preset);
        current_preset->set_local_state (*local_preset);
-       
+
        current_preset->save (filename);
-       
+
        return current_preset;
 }
 
@@ -199,21 +253,23 @@ ExportProfileManager::remove_preset ()
 
        FileMap::iterator it = preset_file_map.find (current_preset->id());
        if (it != preset_file_map.end()) {
-               sys::remove (it->second);
+               if (g_remove (it->second.c_str()) != 0) {
+                       error << string_compose (_("Unable to remove export preset %1: %2"), it->second, g_strerror(errno)) << endmsg;
+               }
                preset_file_map.erase (it);
        }
-       
+
        current_preset->remove_local();
        current_preset.reset();
 }
 
 void
-ExportProfileManager::load_preset_from_disk (PBD::sys::path const & path)
+ExportProfileManager::load_preset_from_disk (std::string const & path)
 {
-       PresetPtr preset (new ExportPreset (path.to_string(), session));
-       
+       ExportPresetPtr preset (new ExportPreset (path, session));
+
        /* Handle id to filename mapping and don't add duplicates to list */
-       
+
        FilePair pair (preset->id(), path);
        if (preset_file_map.insert (pair).second) {
                preset_list.push_back (preset);
@@ -223,20 +279,20 @@ ExportProfileManager::load_preset_from_disk (PBD::sys::path const & path)
 bool
 ExportProfileManager::set_state (XMLNode const & root)
 {
-       return set_global_state (root) && set_local_state (root);
+       return set_global_state (root) & set_local_state (root);
 }
 
 bool
 ExportProfileManager::set_global_state (XMLNode const & root)
 {
-       return init_filenames (root.children ("ExportFilename")) &&
+       return init_filenames (root.children ("ExportFilename")) &
               init_formats (root.children ("ExportFormat"));
 }
 
 bool
 ExportProfileManager::set_local_state (XMLNode const & root)
 {
-       return init_timespans (root.children ("ExportTimespan")) &&
+       return init_timespans (root.children ("ExportTimespan")) &
               init_channel_configs (root.children ("ExportChannelConfiguration"));
 }
 
@@ -265,16 +321,16 @@ ExportProfileManager::serialize_local_profile (XMLNode & root)
        for (TimespanStateList::iterator it = timespans.begin(); it != timespans.end(); ++it) {
                root.add_child_nocopy (serialize_timespan (*it));
        }
-       
+
        for (ChannelConfigStateList::iterator it = channel_configs.begin(); it != channel_configs.end(); ++it) {
                root.add_child_nocopy ((*it)->config->get_state());
        }
 }
 
-std::vector<sys::path>
+std::vector<std::string>
 ExportProfileManager::find_file (std::string const & pattern)
 {
-       vector<sys::path> found;
+       vector<std::string> found;
 
        Glib::PatternSpec pattern_spec (pattern);
        find_matching_files_in_search_path (search_path, pattern_spec, found);
@@ -283,33 +339,33 @@ ExportProfileManager::find_file (std::string const & pattern)
 }
 
 void
-ExportProfileManager::set_selection_range (nframes_t start, nframes_t end)
+ExportProfileManager::set_selection_range (framepos_t start, framepos_t end)
 {
 
        if (start || end) {
-               selection_range.reset (new Location());
+               selection_range.reset (new Location (session));
                selection_range->set_name (_("Selection"));
                selection_range->set (start, end);
        } else {
                selection_range.reset();
        }
-       
+
        for (TimespanStateList::iterator it = timespans.begin(); it != timespans.end(); ++it) {
                (*it)->selection_range = selection_range;
        }
 }
 
 std::string
-ExportProfileManager::set_single_range (nframes_t start, nframes_t end, Glib::ustring name)
+ExportProfileManager::set_single_range (framepos_t start, framepos_t end, string name)
 {
        single_range_mode = true;
-       
-       single_range.reset (new Location());
+
+       single_range.reset (new Location (session));
        single_range->set_name (name);
        single_range->set (start, end);
-       
+
        update_ranges ();
-       
+
        return single_range->id().to_s();
 }
 
@@ -318,7 +374,7 @@ ExportProfileManager::init_timespans (XMLNodeList nodes)
 {
        timespans.clear ();
        update_ranges ();
-       
+
        bool ok = true;
        for (XMLNodeList::const_iterator it = nodes.begin(); it != nodes.end(); ++it) {
                TimespanStatePtr span = deserialize_timespan (**it);
@@ -326,46 +382,65 @@ ExportProfileManager::init_timespans (XMLNodeList nodes)
                        timespans.push_back (span);
                } else { ok = false; }
        }
-       
+
        if (timespans.empty()) {
-               TimespanStatePtr timespan (new TimespanState (session_range, selection_range, ranges));
-               timespans.push_back (timespan);
+               TimespanStatePtr state (new TimespanState (selection_range, ranges));
+               timespans.push_back (state);
+
+               // Add session as default selection
+               Location * session_range = session.locations()->session_range_location();
+               if (!session_range) { return false; }
+
+               ExportTimespanPtr timespan = handler->add_timespan();
+               timespan->set_name (session_range->name());
+               timespan->set_range_id (session_range->id().to_s());
+               timespan->set_range (session_range->start(), session_range->end());
+               state->timespans->push_back (timespan);
                return false;
        }
-       
+
        return ok;
 }
 
 ExportProfileManager::TimespanStatePtr
 ExportProfileManager::deserialize_timespan (XMLNode & root)
 {
-       TimespanStatePtr state (new TimespanState (session_range, selection_range, ranges));
+       TimespanStatePtr state (new TimespanState (selection_range, ranges));
        XMLProperty const * prop;
-       
+
        XMLNodeList spans = root.children ("Range");
        for (XMLNodeList::iterator node_it = spans.begin(); node_it != spans.end(); ++node_it) {
-               
+
                prop = (*node_it)->property ("id");
                if (!prop) { continue; }
-               ustring id = prop->value();
-       
+               string id = prop->value();
+
+               Location * location = 0;
                for (LocationList::iterator it = ranges->begin(); it != ranges->end(); ++it) {
-                       if ((!id.compare ("session") && *it == session_range.get()) ||
-                           (!id.compare ("selection") && *it == selection_range.get()) ||
-                           (!id.compare ((*it)->id().to_s()))) {
-                               TimespanPtr timespan = handler->add_timespan();
-                               timespan->set_name ((*it)->name());
-                               timespan->set_range_id (id);
-                               timespan->set_range ((*it)->start(), (*it)->end());
-                               state->timespans->push_back (timespan);
+                       if ((id == "selection" && *it == selection_range.get()) ||
+                           (id == (*it)->id().to_s())) {
+                               location = *it;
+                               break;
                        }
                }
+
+               if (!location) { continue; }
+
+               ExportTimespanPtr timespan = handler->add_timespan();
+               timespan->set_name (location->name());
+               timespan->set_range_id (location->id().to_s());
+               timespan->set_range (location->start(), location->end());
+               state->timespans->push_back (timespan);
        }
-       
+
        if ((prop = root.property ("format"))) {
                state->time_format = (TimeFormat) string_2_enum (prop->value(), TimeFormat);
        }
-       
+
+       if (state->timespans->empty()) {
+               return TimespanStatePtr();
+       }
+
        return state;
 }
 
@@ -374,24 +449,23 @@ ExportProfileManager::serialize_timespan (TimespanStatePtr state)
 {
        XMLNode & root = *(new XMLNode ("ExportTimespan"));
        XMLNode * span;
-       
+
        update_ranges ();
-       
        for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) {
                if ((span = root.add_child ("Range"))) {
                        span->add_property ("id", (*it)->range_id());
                }
        }
-       
+
        root.add_property ("format", enum_2_string (state->time_format));
-       
+
        return root;
 }
 
 void
 ExportProfileManager::update_ranges () {
        ranges->clear();
-       
+
        if (single_range_mode) {
                ranges->push_back (single_range.get());
                return;
@@ -399,18 +473,19 @@ ExportProfileManager::update_ranges () {
 
        /* Session */
 
-       session_range->set_name (_("Session"));
-       session_range->set (session.current_start_frame(), session.current_end_frame());
-       ranges->push_back (session_range.get());
-       
+       Location * session_range = session.locations()->session_range_location();
+       if (session_range) {
+               ranges->push_back (session_range);
+       }
+
        /* Selection */
-       
+
        if (selection_range) {
                ranges->push_back (selection_range.get());
        }
-       
+
        /* ranges */
-       
+
        LocationList const & list (session.locations()->list());
        for (LocationList::const_iterator it = list.begin(); it != list.end(); ++it) {
                if ((*it)->is_range_marker()) {
@@ -419,23 +494,45 @@ 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)
 {
        channel_configs.clear();
 
-       if (nodes.empty()) {    
+       if (nodes.empty()) {
                ChannelConfigStatePtr config (new ChannelConfigState (handler->add_channel_config()));
                channel_configs.push_back (config);
+
+               // Add master outs as default
+               if (!session.master_out()) { return false; }
+
+               IO* master_out = session.master_out()->output().get();
+               if (!master_out) { return false; }
+
+               for (uint32_t n = 0; n < master_out->n_ports().n_audio(); ++n) {
+                       PortExportChannel * channel = new PortExportChannel ();
+                       channel->add_port (master_out->audio (n));
+
+                       ExportChannelPtr chan_ptr (channel);
+                       config->config->register_channel (chan_ptr);
+               }
                return false;
        }
-       
+
        for (XMLNodeList::const_iterator it = nodes.begin(); it != nodes.end(); ++it) {
                ChannelConfigStatePtr config (new ChannelConfigState (handler->add_channel_config()));
                config->config->set_state (**it);
                channel_configs.push_back (config);
        }
-       
+
        return true;
 }
 
@@ -461,61 +558,66 @@ ExportProfileManager::remove_format_state (FormatStatePtr state)
        }
 }
 
-sys::path
-ExportProfileManager::save_format_to_disk (FormatPtr format)
+std::string
+ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format)
 {
        // TODO filename character stripping
 
        /* Get filename for file */
 
-       Glib::ustring new_name = format->name();
+       string new_name = format->name();
        new_name += export_format_suffix;
-       
-       sys::path new_path (export_config_dir);
-       new_path /= new_name;
+
+        /* make sure its legal for the filesystem */
+
+        new_name = legalize_for_path (new_name);
+
+       std::string new_path = Glib::build_filename (export_config_dir, new_name);
 
        /* Check if format is on disk already */
        FileMap::iterator it;
        if ((it = format_file_map.find (format->id())) != format_file_map.end()) {
-               
+
                /* Check if config is not in user config dir */
-               if (it->second.branch_path().to_string().compare (export_config_dir.to_string())) {
-               
+               if (Glib::path_get_dirname (it->second) != export_config_dir) {
+
                        /* Write new file */
-               
-                       XMLTree tree (new_path.to_string());
+
+                       XMLTree tree (new_path);
                        tree.set_root (&format->get_state());
                        tree.write();
-               
+
                } else {
-               
+
                        /* Update file and rename if necessary */
-               
-                       XMLTree tree (it->second.to_string());
+
+                       XMLTree tree (it->second);
                        tree.set_root (&format->get_state());
                        tree.write();
-                       
-                       if (new_name.compare (it->second.leaf())) {
-                               sys::rename (it->second, new_path);
+
+                       if (new_name != Glib::path_get_basename (it->second)) {
+                               if (g_rename (it->second.c_str(), new_path.c_str()) != 0) {
+                                       error << string_compose (_("Unable to rename export format %1 to %2: %3"), it->second, new_path, g_strerror(errno)) << endmsg;
+                               };
                        }
                }
-               
+
                it->second = new_path;
-               
+
        } else {
                /* Write new file */
-               
-               XMLTree tree (new_path.to_string());
+
+               XMLTree tree (new_path);
                tree.set_root (&format->get_state());
                tree.write();
        }
-       
+
        FormatListChanged ();
        return new_path;
 }
 
 void
-ExportProfileManager::remove_format_profile (FormatPtr format)
+ExportProfileManager::remove_format_profile (ExportFormatSpecPtr format)
 {
        for (FormatList::iterator it = format_list->begin(); it != format_list->end(); ++it) {
                if (*it == format) {
@@ -526,31 +628,34 @@ ExportProfileManager::remove_format_profile (FormatPtr format)
 
        FileMap::iterator it = format_file_map.find (format->id());
        if (it != format_file_map.end()) {
-               sys::remove (it->second);
+               if (g_remove (it->second.c_str()) != 0) {
+                       error << string_compose (_("Unable to remove export profile %1: %2"), it->second, g_strerror(errno)) << endmsg;
+                       return;
+               }
                format_file_map.erase (it);
        }
-       
+
        FormatListChanged ();
 }
 
-ExportProfileManager::FormatPtr
-ExportProfileManager::get_new_format (FormatPtr original)
-{      
-       FormatPtr format;
+ExportFormatSpecPtr
+ExportProfileManager::get_new_format (ExportFormatSpecPtr original)
+{
+       ExportFormatSpecPtr format;
        if (original) {
                format.reset (new ExportFormatSpecification (*original));
        } else {
                format = handler->add_format();
-               format->set_name ("empty format");
+               format->set_name (_("empty format"));
        }
-       
-       sys::path path = save_format_to_disk (format);
+
+       std::string path = save_format_to_disk (format);
        FilePair pair (format->id(), path);
        format_file_map.insert (pair);
-       
+
        format_list->push_back (format);
        FormatListChanged ();
-       
+
        return format;
 }
 
@@ -566,13 +671,13 @@ ExportProfileManager::init_formats (XMLNodeList nodes)
                        formats.push_back (format);
                } else { ok = false; }
        }
-       
+
        if (formats.empty ()) {
-               FormatStatePtr format (new FormatState (format_list, FormatPtr ()));
+               FormatStatePtr format (new FormatState (format_list, ExportFormatSpecPtr ()));
                formats.push_back (format);
                return false;
        }
-       
+
        return ok;
 }
 
@@ -580,12 +685,12 @@ ExportProfileManager::FormatStatePtr
 ExportProfileManager::deserialize_format (XMLNode & root)
 {
        XMLProperty * prop;
-       UUID id;
-       
+       PBD::UUID id;
+
        if ((prop = root.property ("id"))) {
                id = prop->value();
        }
-       
+
        for (FormatList::iterator it = format_list->begin(); it != format_list->end(); ++it) {
                if ((*it)->id() == id) {
                        return FormatStatePtr (new FormatState (format_list, *it));
@@ -599,36 +704,36 @@ XMLNode &
 ExportProfileManager::serialize_format (FormatStatePtr state)
 {
        XMLNode * root = new XMLNode ("ExportFormat");
-       
+
        string id = state->format ? state->format->id().to_s() : "";
        root->add_property ("id", id);
-       
+
        return *root;
 }
 
 void
 ExportProfileManager::load_formats ()
 {
-       vector<sys::path> found = find_file (string_compose ("*%1", export_format_suffix));
+       vector<std::string> found = find_file (string_compose ("*%1", export_format_suffix));
 
-       for (vector<sys::path>::iterator it = found.begin(); it != found.end(); ++it) {
+       for (vector<std::string>::iterator it = found.begin(); it != found.end(); ++it) {
                load_format_from_disk (*it);
        }
 }
 
 void
-ExportProfileManager::load_format_from_disk (PBD::sys::path const & path)
+ExportProfileManager::load_format_from_disk (std::string const & path)
 {
-       XMLTree const tree (path.to_string());
-       FormatPtr format = handler->add_format (*tree.root());
-       
+       XMLTree const tree (path);
+       ExportFormatSpecPtr format = handler->add_format (*tree.root());
+
        /* Handle id to filename mapping and don't add duplicates to list */
-       
+
        FilePair pair (format->id(), path);
        if (format_file_map.insert (pair).second) {
                format_list->push_back (format);
        }
-       
+
        FormatListChanged ();
 }
 
@@ -651,23 +756,38 @@ ExportProfileManager::remove_filename_state (FilenameStatePtr state)
        }
 }
 
+std::string
+ExportProfileManager::get_sample_filename_for_format (ExportFilenamePtr filename, ExportFormatSpecPtr format)
+{
+       assert (format);
+       
+       if (channel_configs.empty()) { return ""; }
+
+       std::list<string> filenames;
+       build_filenames (filenames, filename, timespans.front()->timespans,
+                        channel_configs.front()->config, format);
+
+       if (filenames.empty()) { return ""; }
+       return filenames.front();
+}
+
 bool
 ExportProfileManager::init_filenames (XMLNodeList nodes)
 {
        filenames.clear ();
 
        for (XMLNodeList::const_iterator it = nodes.begin(); it != nodes.end(); ++it) {
-               FilenamePtr filename = handler->add_filename();
+               ExportFilenamePtr filename = handler->add_filename();
                filename->set_state (**it);
                filenames.push_back (FilenameStatePtr (new FilenameState (filename)));
        }
-       
+
        if (filenames.empty()) {
                FilenameStatePtr filename (new FilenameState (handler->add_filename()));
                filenames.push_back (filename);
                return false;
        }
-       
+
        return true;
 }
 
@@ -676,34 +796,47 @@ ExportProfileManager::get_warnings ()
 {
        boost::shared_ptr<Warnings> warnings (new Warnings ());
 
-       ChannelConfigStatePtr channel_config_state = channel_configs.front();
-       TimespanStatePtr timespan_state = timespans.front();
+       ChannelConfigStatePtr channel_config_state;
+       if (!channel_configs.empty ()) {
+               channel_config_state = channel_configs.front();
+       }
        
+       TimespanStatePtr timespan_state = timespans.front();
+
        /*** Check "global" config ***/
-       
+
        TimespanListPtr timespans = timespan_state->timespans;
-       ChannelConfigPtr channel_config = channel_config_state->config;
+
+       ExportChannelConfigPtr channel_config;
+       if (channel_config_state) {
+               channel_config = channel_config_state->config;
+       }
 
        /* Check Timespans are not empty */
-       
+
        if (timespans->empty()) {
                warnings->errors.push_back (_("No timespan has been selected!"));
        }
 
-       /* Check channel config ports */
-       
-       if (!channel_config->all_channels_have_ports ()) {
-               warnings->warnings.push_back (_("Some channels are empty"));
+       if (channel_config_state == 0) {
+               warnings->errors.push_back (_("No channels have been selected!"));
+       } else {
+               /* Check channel config ports */
+               if (!channel_config->all_channels_have_ports ()) {
+                       warnings->warnings.push_back (_("Some channels are empty"));
+               }
        }
-       
+
        /*** Check files ***/
-       
-       FormatStateList::const_iterator format_it;
-       FilenameStateList::const_iterator filename_it;
-       for (format_it = formats.begin(), filename_it = filenames.begin();
-            format_it != formats.end() && filename_it != filenames.end();
-            ++format_it, ++filename_it) {
+
+       if (channel_config_state) {
+               FormatStateList::const_iterator format_it;
+               FilenameStateList::const_iterator filename_it;
+               for (format_it = formats.begin(), filename_it = filenames.begin();
+                    format_it != formats.end() && filename_it != filenames.end();
+                    ++format_it, ++filename_it) {
                        check_config (warnings, timespan_state, channel_config_state, *format_it, *filename_it);
+               }
        }
        
        return warnings;
@@ -717,16 +850,16 @@ ExportProfileManager::check_config (boost::shared_ptr<Warnings> warnings,
                                    FilenameStatePtr filename_state)
 {
        TimespanListPtr timespans = timespan_state->timespans;
-       ChannelConfigPtr channel_config = channel_config_state->config;
-       FormatPtr format = format_state->format;
-       FilenamePtr filename = filename_state->filename;
+       ExportChannelConfigPtr channel_config = channel_config_state->config;
+       ExportFormatSpecPtr format = format_state->format;
+       ExportFilenamePtr filename = filename_state->filename;
 
        /* Check format and maximum channel count */
        if (!format || !format->type()) {
                warnings->errors.push_back (_("No format selected!"));
        } else if (!channel_config->get_n_chans()) {
                warnings->errors.push_back (_("All channels are empty!"));
-       } else if (!ExportFileFactory::check (format, channel_config->get_n_chans())) {
+       } else if (!check_format (format, channel_config->get_n_chans())) {
                warnings->errors.push_back (_("One or more of the selected formats is not compatible with this system!"));
        } else if (format->channel_limit() < channel_config->get_n_chans()) {
                warnings->errors.push_back
@@ -735,35 +868,83 @@ ExportProfileManager::check_config (boost::shared_ptr<Warnings> warnings,
                                     format->channel_limit(),
                                     channel_config->get_n_chans()));
        }
-       
+
        if (!warnings->errors.empty()) { return; }
-       
+
        /* Check filenames */
-       
+
 //     filename->include_timespan = (timespans->size() > 1); Disabled for now...
-       
-       for (std::list<TimespanPtr>::iterator timespan_it = timespans->begin(); timespan_it != timespans->end(); ++timespan_it) {
+
+       std::list<string> paths;
+       build_filenames(paths, filename, timespans, channel_config, format);
+
+       for (std::list<string>::const_iterator path_it = paths.begin(); path_it != paths.end(); ++path_it) {
+
+               string path = *path_it;
+
+               if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
+                       warnings->conflicting_filenames.push_back (path);
+               }
+
+               if (format->with_toc()) {
+                       string marker_file = handler->get_cd_marker_filename(path, CDMarkerTOC);
+                       if (Glib::file_test (marker_file, Glib::FILE_TEST_EXISTS)) {
+                               warnings->conflicting_filenames.push_back (marker_file);
+                       }
+               }
+
+               if (format->with_cue()) {
+                       string marker_file = handler->get_cd_marker_filename(path, CDMarkerCUE);
+                       if (Glib::file_test (marker_file, Glib::FILE_TEST_EXISTS)) {
+                               warnings->conflicting_filenames.push_back (marker_file);
+                       }
+               }
+       }
+}
+
+bool
+ExportProfileManager::check_format (ExportFormatSpecPtr format, uint32_t channels)
+{
+       switch (format->type()) {
+         case ExportFormatBase::T_Sndfile:
+               return check_sndfile_format (format, channels);
+
+         default:
+               throw ExportFailed (X_("Invalid format given for ExportFileFactory::check!"));
+       }
+}
+
+bool
+ExportProfileManager::check_sndfile_format (ExportFormatSpecPtr format, unsigned int channels)
+{
+       SF_INFO sf_info;
+       sf_info.channels = channels;
+       sf_info.samplerate = format->sample_rate ();
+       sf_info.format = format->format_id () | format->sample_format ();
+
+       return (sf_format_check (&sf_info) == SF_TRUE ? true : false);
+}
+
+void
+ExportProfileManager::build_filenames(std::list<std::string> & result, ExportFilenamePtr filename,
+                                      TimespanListPtr timespans, ExportChannelConfigPtr channel_config,
+                                      ExportFormatSpecPtr format)
+{
+       for (std::list<ExportTimespanPtr>::iterator timespan_it = timespans->begin();
+            timespan_it != timespans->end(); ++timespan_it) {
                filename->set_timespan (*timespan_it);
-       
+
                if (channel_config->get_split()) {
                        filename->include_channel = true;
-                       
+
                        for (uint32_t chan = 1; chan <= channel_config->get_n_chans(); ++chan) {
                                filename->set_channel (chan);
-                               
-                               Glib::ustring path = filename->get_path (format);
-                               
-                               if (sys::exists (sys::path (path))) {
-                                       warnings->conflicting_filenames.push_back (path);
-                               }
+                               result.push_back(filename->get_path (format));
                        }
-                       
+
                } else {
-                       Glib::ustring path = filename->get_path (format);
-                       
-                       if (sys::exists (sys::path (path))) {
-                               warnings->conflicting_filenames.push_back (path);
-                       }
+                       filename->include_channel = false;
+                       result.push_back(filename->get_path (format));
                }
        }
 }