projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Amend f3c0c1a865 (Add quarter-note position methods).
[ardour.git]
/
libs
/
ardour
/
ardour
/
export_status.h
diff --git
a/libs/ardour/ardour/export_status.h
b/libs/ardour/ardour/export_status.h
index 31027269f8ca376e9ccb9a886469f35ae7488b3a..99642a2d7c31fd6ad38e40644efda46a15c2df57 100644
(file)
--- a/
libs/ardour/ardour/export_status.h
+++ b/
libs/ardour/ardour/export_status.h
@@
-23,6
+23,8
@@
#include <stdint.h>
#include <stdint.h>
+#include "ardour/libardour_visibility.h"
+#include "ardour/export_analysis.h"
#include "ardour/types.h"
#include "pbd/signals.h"
#include "ardour/types.h"
#include "pbd/signals.h"
@@
-30,7
+32,7
@@
namespace ARDOUR
{
namespace ARDOUR
{
-class ExportStatus {
+class
LIBARDOUR_API
ExportStatus {
public:
ExportStatus ();
void init ();
public:
ExportStatus ();
void init ();
@@
-38,21
+40,33
@@
class ExportStatus {
/* Status info */
volatile bool stop;
/* Status info */
volatile bool stop;
- volatile bool running;
void abort (bool error_occurred = false);
bool aborted () const { return _aborted; }
bool errors () const { return _errors; }
void abort (bool error_occurred = false);
bool aborted () const { return _aborted; }
bool errors () const { return _errors; }
+ bool running () const { return _running; }
+
+ void set_running (bool r) {
+ assert (!_run_lock.trylock()); // must hold lock
+ _running = r;
+ }
+ Glib::Threads::Mutex& lock () { return _run_lock; }
PBD::Signal0<void> Finished;
void finish ();
PBD::Signal0<void> Finished;
void finish ();
- bool finished () const { return _finished; }
-
void cleanup ();
+ void cleanup ();
/* Progress info */
/* Progress info */
- volatile bool normalizing;
+ volatile enum Progress {
+ Exporting,
+ Normalizing,
+ Encoding,
+ Tagging,
+ Uploading,
+ Command }
+ active_job;
volatile uint32_t total_timespans;
volatile uint32_t timespan;
volatile uint32_t total_timespans;
volatile uint32_t timespan;
@@
-64,14
+78,17
@@
class ExportStatus {
volatile framecnt_t total_frames_current_timespan;
volatile framecnt_t processed_frames_current_timespan;
volatile framecnt_t total_frames_current_timespan;
volatile framecnt_t processed_frames_current_timespan;
- volatile uint32_t total_normalize_cycles;
- volatile uint32_t current_normalize_cycle;
+ volatile uint32_t total_postprocessing_cycles;
+ volatile uint32_t current_postprocessing_cycle;
+
+ AnalysisResults result_map;
private:
volatile bool _aborted;
volatile bool _errors;
private:
volatile bool _aborted;
volatile bool _errors;
- volatile bool _
finished
;
+ volatile bool _
running
;
+ Glib::Threads::Mutex _run_lock;
};
} // namespace ARDOUR
};
} // namespace ARDOUR