From: Carl Hetherington <carl@carlh.net>
Date: Sun, 22 Jan 2012 10:43:37 +0000 (+0000)
Subject: Patch from anrug to always put a PERFORMER field in TOC
X-Git-Tag: 3.0-beta3~133
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=9080c672a531a05b9b2f72a85faa5725457653de;p=ardour.git

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
---

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;
 	}