From f8a6213454c7a0a80114ffa01c8ce432b19f4617 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 15 Jul 2016 17:04:34 +0200 Subject: libardour support for timespan realtime export --- libs/ardour/ardour/export_graph_builder.h | 8 ++++++-- libs/ardour/ardour/export_status.h | 1 + libs/ardour/ardour/export_timespan.h | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h index cee98ed7be..b692b03b32 100644 --- a/libs/ardour/ardour/export_graph_builder.h +++ b/libs/ardour/ardour/export_graph_builder.h @@ -69,13 +69,14 @@ class LIBARDOUR_API ExportGraphBuilder int process (framecnt_t frames, bool last_cycle); bool process_normalize (); // returns true when finished - bool will_normalize() { return !normalizers.empty(); } + bool will_normalize() const { return !normalizers.empty(); } + bool realtime() const { return _realtime; } unsigned get_normalize_cycle_count() const; void reset (); void cleanup (bool remove_out_files = false); void set_current_timespan (boost::shared_ptr span); - void add_config (FileSpec const & config); + void add_config (FileSpec const & config, bool rt); void get_analysis_results (AnalysisResults& results); private: @@ -175,6 +176,7 @@ class LIBARDOUR_API ExportGraphBuilder FileSpec config; framecnt_t max_frames_out; bool use_loudness; + bool use_peak; BufferPtr buffer; PeakReaderPtr peak_reader; TmpFilePtr tmp_file; @@ -265,6 +267,8 @@ class LIBARDOUR_API ExportGraphBuilder AnalysisMap analysis_map; + bool _realtime; + Glib::ThreadPool thread_pool; }; diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index f250ae0dc6..4782f49cb4 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -62,6 +62,7 @@ class LIBARDOUR_API ExportStatus { volatile enum Progress { Exporting, Normalizing, + Encoding, Tagging, Uploading, Command } diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h index 754335ba48..d4631cbccc 100644 --- a/libs/ardour/ardour/export_timespan.h +++ b/libs/ardour/ardour/export_timespan.h @@ -53,6 +53,9 @@ class LIBARDOUR_API ExportTimespan std::string range_id () const { return _range_id; } void set_range_id (std::string range_id) { _range_id = range_id; } + bool realtime () const { return _realtime; } + void set_realtime (bool rt) { _realtime = rt; } + void set_range (framepos_t start, framepos_t end); framecnt_t get_length () const { return end_frame - start_frame; } framepos_t get_start () const { return start_frame; } @@ -76,6 +79,7 @@ class LIBARDOUR_API ExportTimespan std::string _name; std::string _range_id; + bool _realtime; }; -- cgit v1.2.3