* 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

diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h
index 88c2feb4937ad6556c36ee40569adedacec5656b..42dd3aff4c770b31fcaa0214c5062f5227ae9ca3 100644 (file)
--- 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 ba26821a5b831b86fe65245887ee35001b5257ba..b48522670b553037d735c134ae27315e465f62a9 100644 (file)
--- 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 3ddceb6b00bce5de374d308f4d09d492afffa181..0438d808a047404601ab546811ecca10a069029c 100644 (file)
--- 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 ();
        }