diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-11-06 20:22:48 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-11-06 20:22:48 +0000 |
| commit | 641dbfcaa2ea1b7d8ce2aa6058e191aa760f4791 (patch) | |
| tree | 3fc911d1d53757bf21b72e90825ed68d77747cff /libs | |
| parent | 1d4b3c2f056bf940320d6ef2ac73093e81044eb2 (diff) | |
* Fix problem with JACK being left in freewheeling after export
* Add quotes to cuefile filename entries
git-svn-id: svn://localhost/ardour2/branches/3.0@4098 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/export_status.h | 2 | ||||
| -rw-r--r-- | libs/ardour/export_handler.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_export.cc | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index 88c2feb493..42dd3aff4c 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -53,7 +53,7 @@ struct ExportStatus { sigc::signal<void> Finished; void finish (); - bool finished () const { return _aborted; } + bool finished () const { return _finished; } /* Progress info */ diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index ba26821a5b..b48522670b 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -292,7 +292,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status) if (!status.format->format_name().compare ("WAV")) { status.out << "FILE " << status.filename << " WAVE" << endl; } else { - status.out << "FILE " << status.filename << ' ' << status.format->format_name() << endl; + status.out << "FILE \"" << status.filename << "\" " << status.format->format_name() << endl; } } diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index 3ddceb6b00..0438d808a0 100644 --- a/libs/ardour/session_export.cc +++ b/libs/ardour/session_export.cc @@ -93,6 +93,7 @@ Session::pre_export () _exporting = true; export_status->running = true; export_abort_connection = export_status->Aborting.connect (sigc::hide_return (sigc::mem_fun (*this, &Session::stop_audio_export))); + export_abort_connection = export_status->Finished.connect (sigc::hide_return (sigc::mem_fun (*this, &Session::finalize_audio_export))); return 0; } @@ -214,9 +215,7 @@ Session::stop_audio_export () if (!export_status->aborted()) { ExportReadFinished (); - } - - if (export_status->finished()) { + } else { finalize_audio_export (); } |