projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor LTC File decoder, prepare for Lua bindings
[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 3322ca639c45bd024c2f22b8b16529b1ce88249a..90e6c1b56aac431587c443b9b3e72ee6da5b039f 100644
(file)
--- a/
libs/ardour/ardour/export_status.h
+++ b/
libs/ardour/ardour/export_status.h
@@
-21,59
+21,74
@@
#ifndef __ardour_export_status_h__
#define __ardour_export_status_h__
#ifndef __ardour_export_status_h__
#define __ardour_export_status_h__
-#include <list>
-
#include <stdint.h>
#include <stdint.h>
-#include <sigc++/signal.h>
-namespace ARDOUR
-{
+#include "ardour/libardour_visibility.h"
+#include "ardour/export_analysis.h"
+#include "ardour/types.h"
-enum ExportStage {
- export_None,
- export_ReadTimespan,
- export_PostProcess,
- export_Write
-};
+#include "pbd/signals.h"
-struct ExportStatus : public sigc::trackable {
+namespace ARDOUR
+{
+class LIBARDOUR_API ExportStatus {
+ public:
ExportStatus ();
void init ();
/* Status info */
volatile bool stop;
ExportStatus ();
void init ();
/* Status info */
volatile bool stop;
- volatile bool running;
- sigc::signal<void> Aborting;
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; }
-
sigc::signal
<void> Finished;
+
PBD::Signal0
<void> Finished;
void finish ();
void finish ();
- bool finished () const { return _finished; }
+
+ void cleanup ();
/* Progress info */
/* Progress info */
- volatile ExportStage stage;
- volatile float progress;
+ 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;
+ std::string timespan_name;
+
+ volatile samplecnt_t total_samples;
+ volatile samplecnt_t processed_samples;
+
+ volatile samplecnt_t total_samples_current_timespan;
+ volatile samplecnt_t processed_samples_current_timespan;
- volatile uint32_t total_
channel_config
s;
- volatile uint32_t c
hannel_config
;
+ volatile uint32_t total_
postprocessing_cycle
s;
+ volatile uint32_t c
urrent_postprocessing_cycle
;
- volatile uint32_t total_formats;
- volatile uint32_t format;
+ 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