Patch from anrug to always put a PERFORMER field in TOC
authorCarl Hetherington <carl@carlh.net>
Sun, 22 Jan 2012 10:43:37 +0000 (10:43 +0000)
committerCarl Hetherington <carl@carlh.net>
Sun, 22 Jan 2012 10:43:37 +0000 (10:43 +0000)
files (#4649).

git-svn-id: svn://localhost/ardour2/branches/3.0@11299 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/export_handler.cc

index f19dfe048cec4b7a75b2b7f6871f24e4008a5811..b789304bdc75bb616f36455dba519c7bb2427a15 100644 (file)
@@ -431,7 +431,8 @@ ExportHandler::write_toc_header (CDMarkerStatus & status)
 
        status.out << "CD_DA" << endl;
        status.out << "CD_TEXT {" << endl << "  LANGUAGE_MAP {" << endl << "    0 : EN" << endl << "  }" << endl;
-       status.out << "  LANGUAGE 0 {" << endl << "    TITLE \"" << title << "\"" << endl << "  }" << endl << "}" << endl;
+       status.out << "  LANGUAGE 0 {" << endl << "    TITLE \"" << title << "\"" << endl ;
+       status.out << "    PERFORMER \"\"" << endl << "  }" << endl << "}" << endl;
 }
 
 void
@@ -505,9 +506,13 @@ ExportHandler::write_track_info_toc (CDMarkerStatus & status)
        }
 
        status.out << "CD_TEXT {" << endl << "  LANGUAGE 0 {" << endl << "     TITLE \"" << status.marker->name() << "\"" << endl;
+       
+       status.out << "     PERFORMER \"";
        if (status.marker->cd_info.find("performer") != status.marker->cd_info.end()) {
-               status.out << "     PERFORMER \"" << status.marker->cd_info["performer"]  << "\"" << endl;
+               status.out << status.marker->cd_info["performer"];
        }
+       status.out << "\"" << endl;
+       
        if (status.marker->cd_info.find("composer") != status.marker->cd_info.end()) {
                status.out  << "     COMPOSER \"" << status.marker->cd_info["composer"] << "\"" << endl;
        }