projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send a slightly more useful message if a control protocol's probe() method fails
[ardour.git]
/
libs
/
ardour
/
export_status.cc
diff --git
a/libs/ardour/export_status.cc
b/libs/ardour/export_status.cc
index af144746f71c0ed01ae36349209a5188ea009930..808d6f144c59d2d1617aee02243b7ffec8962dff 100644
(file)
--- a/
libs/ardour/export_status.cc
+++ b/
libs/ardour/export_status.cc
@@
-18,7
+18,9
@@
*/
*/
-#include <ardour/export_status.h>
+#include <pbd/stacktrace.h>
+
+#include "ardour/export_status.h"
namespace ARDOUR
{
namespace ARDOUR
{
@@
-31,41
+33,43
@@
ExportStatus::ExportStatus ()
void
ExportStatus::init ()
{
void
ExportStatus::init ()
{
+ Glib::Threads::Mutex::Lock l (_run_lock);
stop = false;
stop = false;
- running = false;
+
_
running = false;
_aborted = false;
_aborted = false;
- _finished = false;
_errors = false;
_errors = false;
-
- stage = export_None;
- progress = 0.0;
-
+
+ active_job = Exporting;
+
total_timespans = 0;
timespan = 0;
total_timespans = 0;
timespan = 0;
-
- total_channel_configs = 0;
- channel_config = 0;
-
- total_formats = 0;
- format = 0;
+
+ total_frames = 0;
+ processed_frames = 0;
+
+ total_frames_current_timespan = 0;
+ processed_frames_current_timespan = 0;
+
+ total_postprocessing_cycles = 0;
+ current_postprocessing_cycle = 0;
+ result_map.clear();
}
void
ExportStatus::abort (bool error_occurred)
{
}
void
ExportStatus::abort (bool error_occurred)
{
+ Glib::Threads::Mutex::Lock l (_run_lock);
_aborted = true;
_aborted = true;
- _finished = true;
_errors = _errors || error_occurred;
_errors = _errors || error_occurred;
- running = false;
- Aborting ();
+ _running = false;
}
void
ExportStatus::finish ()
{
}
void
ExportStatus::finish ()
{
-
_finished = true
;
-
running = false
;
- Finished();
+
Glib::Threads::Mutex::Lock l (_run_lock)
;
+
set_running (false)
;
+ Finished();
/* EMIT SIGNAL */
}
} // namespace ARDOUR
}
} // namespace ARDOUR