summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-01-22 10:43:37 +0000
committerCarl Hetherington <carl@carlh.net>2012-01-22 10:43:37 +0000
commit9080c672a531a05b9b2f72a85faa5725457653de (patch)
tree4f20799aff7d29830e9f1ac9e898215747d4fc8d /libs
parentb447024c325a2b73fa7f181b9f5a071e74d24964 (diff)
Patch from anrug to always put a PERFORMER field in TOC
files (#4649). git-svn-id: svn://localhost/ardour2/branches/3.0@11299 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/export_handler.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index f19dfe048c..b789304bdc 100644
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -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;
}