diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
| commit | 4d112a8e6b90fa64a5cd333042044768111ba994 (patch) | |
| tree | 6688c5250bc55de106f74ef9be93d7ee574ec9d8 /libs/ardour/export_handler.cc | |
| parent | 875f0befd5fb52678d25544fcbcb6e6b55a2c483 (diff) | |
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/export_handler.cc')
| -rw-r--r-- | libs/ardour/export_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index b4131a5cf8..05fa1d881d 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -364,7 +364,7 @@ ExportHandler::export_cd_marker_file (TimespanPtr timespan, FormatPtr file_forma void ExportHandler::write_cue_header (CDMarkerStatus & status) { - Glib::ustring title = status.timespan->name().compare ("Session") ? status.timespan->name() : (Glib::ustring) session.name(); + string title = status.timespan->name().compare ("Session") ? status.timespan->name() : (string) session.name(); status.out << "REM Cue file generated by Ardour" << endl; status.out << "TITLE \"" << title << "\"" << endl; @@ -388,7 +388,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status) status.out << "FILE \"" << Glib::path_get_basename(status.filename) << "\" "; if (!status.format->format_name().compare ("WAV")) { status.out << "WAVE"; - } else if (status.format->format_name() == ExportFormatBase::F_RAW && + } else if (status.format->format_id() == ExportFormatBase::F_RAW && status.format->sample_format() == ExportFormatBase::SF_16 && status.format->sample_rate() == ExportFormatBase::SR_44_1) { // Format is RAW 16bit 44.1kHz @@ -407,7 +407,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status) void ExportHandler::write_toc_header (CDMarkerStatus & status) { - Glib::ustring title = status.timespan->name().compare ("Session") ? status.timespan->name() : (Glib::ustring) session.name(); + string title = status.timespan->name().compare ("Session") ? status.timespan->name() : (string) session.name(); status.out << "CD_DA" << endl; status.out << "CD_TEXT {" << endl << " LANGUAGE_MAP {" << endl << " 0 : EN" << endl << " }" << endl; |