fix CUE/TOC file creation with non ISO-8859-1 chars in source text (substitute unders...

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

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index cbc2ed3c911c1b52d421d234573ea8d424da4ea8..2dddd5240123e0629def5996f95fea5b8d7e5bad 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -234,7 +234,6 @@ ExportHandler::process (framecnt_t frames)
                Glib::Threads::Mutex::Lock l (export_status->lock());
                return process_normalize ();
        } else {
-               export_status->active_job = ExportStatus::Exporting;
                Glib::Threads::Mutex::Lock l (export_status->lock());
                return process_timespan (frames);
        }
@@ -243,6 +242,7 @@ ExportHandler::process (framecnt_t frames)
 int
 ExportHandler::process_timespan (framecnt_t frames)
 {
+       export_status->active_job = ExportStatus::Exporting;
        /* update position */
 
        framecnt_t frames_to_read = 0;
@@ -322,6 +322,8 @@ ExportHandler::finish_timespan ()
                        export_cd_marker_file (current_timespan, fmt, filename, MP4Chaps);
                }
 
+               Session::Exported (current_timespan->name(), filename); /* EMIT SIGNAL */
+
                /* close file first, otherwise TagLib enounters an ERROR_SHARING_VIOLATION
                 * The process cannot access the file because it is being used.
                 * ditto for post-export and upload.
@@ -337,8 +339,9 @@ ExportHandler::finish_timespan ()
                }
 
                if (!fmt->command().empty()) {
+                       SessionMetadata const & metadata (*SessionMetadata::Metadata());
 
-#if 0                  // would be nicer with C++11 initialiser...
+#if 0  // would be nicer with C++11 initialiser...
                        std::map<char, std::string> subs {
                                { 'f', filename },
                                { 'd', Glib::path_get_dirname(filename)  + G_DIR_SEPARATOR },
@@ -349,11 +352,38 @@ ExportHandler::finish_timespan ()
                        export_status->active_job = ExportStatus::Command;
                        PBD::ScopedConnection command_connection;
                        std::map<char, std::string> subs;
-                       subs.insert (std::pair<char, std::string> ('f', filename));
-                       subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname (filename) + G_DIR_SEPARATOR));
+
+                       std::stringstream track_number;
+                       track_number << metadata.track_number ();
+                       std::stringstream total_tracks;
+                       total_tracks << metadata.total_tracks ();
+                       std::stringstream year;
+                       year << metadata.year ();
+
+                       subs.insert (std::pair<char, std::string> ('a', metadata.artist ()));
                        subs.insert (std::pair<char, std::string> ('b', PBD::basename_nosuffix (filename)));
-                       subs.insert (std::pair<char, std::string> ('s', session.path ()));
+                       subs.insert (std::pair<char, std::string> ('c', metadata.copyright ()));
+                       subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname (filename) + G_DIR_SEPARATOR));
+                       subs.insert (std::pair<char, std::string> ('f', filename));
+                       subs.insert (std::pair<char, std::string> ('l', metadata.lyricist ()));
                        subs.insert (std::pair<char, std::string> ('n', session.name ()));
+                       subs.insert (std::pair<char, std::string> ('s', session.path ()));
+                       subs.insert (std::pair<char, std::string> ('o', metadata.conductor ()));
+                       subs.insert (std::pair<char, std::string> ('t', metadata.title ()));
+                       subs.insert (std::pair<char, std::string> ('z', metadata.organization ()));
+                       subs.insert (std::pair<char, std::string> ('A', metadata.album ()));
+                       subs.insert (std::pair<char, std::string> ('C', metadata.comment ()));
+                       subs.insert (std::pair<char, std::string> ('E', metadata.engineer ()));
+                       subs.insert (std::pair<char, std::string> ('G', metadata.genre ()));
+                       subs.insert (std::pair<char, std::string> ('L', total_tracks.str ()));
+                       subs.insert (std::pair<char, std::string> ('M', metadata.mixer ()));
+                       subs.insert (std::pair<char, std::string> ('N', current_timespan->name())); // =?= config_map.begin()->first->name ()
+                       subs.insert (std::pair<char, std::string> ('O', metadata.composer ()));
+                       subs.insert (std::pair<char, std::string> ('P', metadata.producer ()));
+                       subs.insert (std::pair<char, std::string> ('S', metadata.disc_subtitle ()));
+                       subs.insert (std::pair<char, std::string> ('T', track_number.str ()));
+                       subs.insert (std::pair<char, std::string> ('Y', year.str ()));
+                       subs.insert (std::pair<char, std::string> ('Z', metadata.country ()));
 
                        ARDOUR::SystemExec *se = new ARDOUR::SystemExec(fmt->command(), subs);
                        info << "Post-export command line : {" << se->to_s () << "}" << endmsg;
@@ -809,7 +839,7 @@ ExportHandler::toc_escape_cdtext (const std::string& txt)
        char buf[5];
 
        try {
-               latin1_txt = Glib::convert (txt, "ISO-8859-1", "UTF-8");
+               latin1_txt = Glib::convert_with_fallback (txt, "ISO-8859-1", "UTF-8", "_");
        } catch (Glib::ConvertError& err) {
                throw Glib::ConvertError (err.code(), string_compose (_("Cannot convert %1 to Latin-1 text"), txt));
        }