Re-enable export file tagging. No idea why this code has dropped out at some stage...

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

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index ef9d32474abf5130ae02c758436d566f53e55f3c..93f43f33a63ac65269566f0bbf1945285e0d95d3 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -24,17 +24,15 @@
 #include <glibmm/convert.h>
 
 #include "pbd/convert.h"
-#include "pbd/filesystem.h"
 
-#include "ardour/ardour.h"
-#include "ardour/configuration.h"
+#include "ardour/audiofile_tagger.h"
 #include "ardour/export_graph_builder.h"
 #include "ardour/export_timespan.h"
 #include "ardour/export_channel_configuration.h"
 #include "ardour/export_status.h"
 #include "ardour/export_format_specification.h"
 #include "ardour/export_filename.h"
-#include "ardour/export_failed.h"
+#include "ardour/session_metadata.h"
 
 #include "i18n.h"
 
@@ -106,7 +104,6 @@ ExportHandler::ExportHandler (Session & session)
   , session (session)
   , graph_builder (new ExportGraphBuilder (session))
   , export_status (session.get_export_status ())
-  , realtime (false)
   , normalizing (false)
   , cue_tracknum (0)
   , cue_indexnum (0)
@@ -115,23 +112,23 @@ ExportHandler::ExportHandler (Session & session)
 
 ExportHandler::~ExportHandler ()
 {
-       // TODO remove files that were written but not finsihed
+       // TODO remove files that were written but not finished
 }
 
+/** Add an export to the `to-do' list */
 bool
 ExportHandler::add_export_config (ExportTimespanPtr timespan, ExportChannelConfigPtr channel_config,
                                   ExportFormatSpecPtr format, ExportFilenamePtr filename,
                                   BroadcastInfoPtr broadcast_info)
 {
        FileSpec spec (channel_config, format, filename, broadcast_info);
-       ConfigPair pair (timespan, spec);
-       config_map.insert (pair);
+       config_map.insert (make_pair (timespan, spec));
 
        return true;
 }
 
 void
-ExportHandler::do_export (bool rt)
+ExportHandler::do_export ()
 {
        /* Count timespans */
 
@@ -147,7 +144,6 @@ ExportHandler::do_export (bool rt)
 
        /* Start export */
 
-       realtime = rt;
        start_timespan ();
 }
 
@@ -162,13 +158,22 @@ ExportHandler::start_timespan ()
                return;
        }
 
+       /* finish_timespan pops the config_map entry that has been done, so
+          this is the timespan to do this time
+       */
        current_timespan = config_map.begin()->first;
+       
+       export_status->total_frames_current_timespan = current_timespan->get_length();
+       export_status->timespan_name = current_timespan->name();
+       export_status->processed_frames_current_timespan = 0;
 
        /* Register file configurations to graph builder */
 
+       /* Here's the config_map entries that use this timespan */
        timespan_bounds = config_map.equal_range (current_timespan);
        graph_builder->reset ();
        graph_builder->set_current_timespan (current_timespan);
+       handle_duplicate_format_extensions();
        for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) {
                // Filenames can be shared across timespans
                FileSpec & spec = it->second;
@@ -181,7 +186,28 @@ ExportHandler::start_timespan ()
        normalizing = false;
        session.ProcessExport.connect_same_thread (process_connection, boost::bind (&ExportHandler::process, this, _1));
        process_position = current_timespan->get_start();
-       session.start_audio_export (process_position, realtime);
+       session.start_audio_export (process_position);
+}
+
+void
+ExportHandler::handle_duplicate_format_extensions()
+{
+       typedef std::map<std::string, int> ExtCountMap;
+
+       ExtCountMap counts;
+       for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) {
+               counts[it->second.format->extension()]++;
+       }
+
+       bool duplicates_found = false;
+       for (ExtCountMap::iterator it = counts.begin(); it != counts.end(); ++it) {
+               if (it->second > 1) { duplicates_found = true; }
+       }
+
+       // Set this always, as the filenames are shared...
+       for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) {
+               it->second.filename->include_format_name = duplicates_found;
+       }
 }
 
 int
@@ -215,8 +241,7 @@ ExportHandler::process_timespan (framecnt_t frames)
 
        process_position += frames_to_read;
        export_status->processed_frames += frames_to_read;
-       export_status->progress = (float) export_status->processed_frames /
-                                         export_status->total_frames;
+       export_status->processed_frames_current_timespan += frames_to_read;
 
        /* Do actual processing */
        int ret = graph_builder->process (frames_to_read, last_cycle);
@@ -246,8 +271,6 @@ ExportHandler::process_normalize ()
                export_status->normalizing = true;
        }
 
-       export_status->progress = (float) export_status->current_normalize_cycle /
-                                         export_status->total_normalize_cycles;
        export_status->current_normalize_cycle++;
 
        return 0;
@@ -259,13 +282,18 @@ ExportHandler::finish_timespan ()
        while (config_map.begin() != timespan_bounds.second) {
 
                ExportFormatSpecPtr fmt = config_map.begin()->second.format;
+               std::string filename = config_map.begin()->second.filename->get_path(fmt);
 
                if (fmt->with_cue()) {
-                       export_cd_marker_file (current_timespan, fmt, config_map.begin()->second.filename->get_path(fmt), CDMarkerCUE);
-               } 
+                       export_cd_marker_file (current_timespan, fmt, filename, CDMarkerCUE);
+               }
 
                if (fmt->with_toc()) {
-                       export_cd_marker_file (current_timespan, fmt, config_map.begin()->second.filename->get_path(fmt), CDMarkerTOC);
+                       export_cd_marker_file (current_timespan, fmt, filename, CDMarkerTOC);
+               }
+
+               if (fmt->tag()) {
+                       AudiofileTagger::tag_file(filename, *SessionMetadata::Metadata());
                }
 
                config_map.erase (config_map.begin());
@@ -424,7 +452,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status)
 {
        string title = status.timespan->name().compare ("Session") ? status.timespan->name() : (string) session.name();
 
-       status.out << "REM Cue file generated by Ardour" << endl;
+       status.out << "REM Cue file generated by " << PROGRAM_NAME << endl;
        status.out << "TITLE " << cue_escape_cdtext (title) << endl;
 
        /*  The original cue sheet sepc metions five file types