projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accommodate newly added/renamed source(s) in our MSVC project (libardour)
[ardour.git]
/
libs
/
ardour
/
export_status.cc
diff --git
a/libs/ardour/export_status.cc
b/libs/ardour/export_status.cc
index dbb96432ee5fb68aac8eded0611d069d51d68c6a..d5ccedaf3fd9f8534dcfb86744900198e23cabed 100644
(file)
--- a/
libs/ardour/export_status.cc
+++ b/
libs/ardour/export_status.cc
@@
-18,6
+18,8
@@
*/
*/
+#include <pbd/stacktrace.h>
+
#include "ardour/export_status.h"
namespace ARDOUR
#include "ardour/export_status.h"
namespace ARDOUR
@@
-31,38
+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;
- progress = 0.0;
- normalizing = false;
+ active_job = Exporting;
total_timespans = 0;
timespan = 0;
total_timespans = 0;
timespan = 0;
- total_frames = 0;
- processed_frames = 0;
+ total_samples = 0;
+ processed_samples = 0;
+
+ total_samples_current_timespan = 0;
+ processed_samples_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