Remove debug code.

[ardour.git] / libs / ardour / export_profile_manager.cc

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index 6ff73261de5197075420d5f766cab0772947bd58..54779cfa326817e2558dada332bf59fb8a1374a1 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -711,6 +711,21 @@ 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)
 {
@@ -815,33 +830,17 @@ ExportProfileManager::check_config (boost::shared_ptr<Warnings> warnings,
 
 //     filename->include_timespan = (timespans->size() > 1); Disabled for now...
 
-       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;
+       std::list<string> paths;
+       build_filenames(paths, filename, timespans, channel_config, format);
 
-                       for (uint32_t chan = 1; chan <= channel_config->get_n_chans(); ++chan) {
-                               filename->set_channel (chan);
+       for (std::list<string>::const_iterator path_it = paths.begin(); path_it != paths.end(); ++path_it) {
 
-                               string path = filename->get_path (format);
+               string path = *path_it;
 
-                               if (sys::exists (sys::path (path))) {
-                                       warnings->conflicting_filenames.push_back (path);
-                               }
-                       }
-
-               } else {
-                       string path = filename->get_path (format);
-
-                       if (sys::exists (sys::path (path))) {
-                               warnings->conflicting_filenames.push_back (path);
-                       }
+               if (sys::exists (sys::path (path))) {
+                       warnings->conflicting_filenames.push_back (path);
                }
 
-               // TODO check what happens with split channel configs...
-               string path = filename->get_path (format);
-
                if (format->with_toc()) {
                        string marker_file = handler->get_cd_marker_filename(path, CDMarkerTOC);
                        if (sys::exists (sys::path (marker_file))) {
@@ -881,4 +880,28 @@ ExportProfileManager::check_sndfile_format (ExportFormatSpecPtr format, unsigned
        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);
+                               result.push_back(filename->get_path (format));
+                       }
+
+               } else {
+                       filename->include_channel = false;
+                       result.push_back(filename->get_path (format));
+               }
+       }
+}
+
 }; // namespace ARDOUR