diff options
author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2009-12-27 14:46:23 +0000 |
---|---|---|
committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2009-12-27 14:46:23 +0000 |
commit | dde0848a984e06cbc1d4117d9cffa75c191f3b39 (patch) | |
tree | 11f3a5fe94ac792e753297e16e4e80dd7e296aea /libs/ardour/session_export.cc | |
parent | 35c72a53b4c6bbc61b4b86db9de629e18362b48d (diff) |
Re-integrate export-optimization branch.
Export now happens directly to file (unless normalizing is required), and can be easily optimized even further.
The Session process connection is still broken during export (as it was before this commit also).
git-svn-id: svn://localhost/ardour2/branches/3.0@6401 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_export.cc')
-rw-r--r-- | libs/ardour/session_export.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index 840c752bad..86a6250ffd 100644 --- a/libs/ardour/session_export.cc +++ b/libs/ardour/session_export.cc @@ -25,10 +25,8 @@ #include "ardour/audioengine.h" #include "ardour/butler.h" #include "ardour/export_failed.h" -#include "ardour/export_file_io.h" #include "ardour/export_handler.h" #include "ardour/export_status.h" -#include "ardour/export_utilities.h" #include "ardour/route.h" #include "ardour/session.h" @@ -183,7 +181,8 @@ Session::process_export (nframes_t nframes) ProcessExport (nframes); - } catch (ExportFailed e) { + } catch (std::exception & e) { + std::cout << e.what() << std::endl; export_status->abort (true); } } |