* Removed use of c++14 feature only supported by Visual Studio 2015 and not by gcc...

[casparcg] / core / consumer / frame_consumer.h

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index 9fe65434339b9a22246c11b7fc5eaed6d48c3063..e09e4edcfe263f8a36c5a22359b831fe3fab445b 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -22,8 +22,11 @@
 #pragma once
 
 #include "../monitor/monitor.h"
+#include "../fwd.h"
+#include "../help/help_repository.h"
 
 #include <common/memory.h>
+#include <common/future_fwd.h>
 
 #include <boost/property_tree/ptree_fwd.hpp>
 
@@ -32,9 +35,9 @@
 #include <vector>
 
 namespace caspar { namespace core {
-       
+
 // Interface
-class frame_consumer : public monitor::observable
+class frame_consumer
 {
        frame_consumer(const frame_consumer&);
        frame_consumer& operator=(const frame_consumer&);
@@ -51,13 +54,12 @@ public:
        
        // Methods
 
-       virtual bool                                                    send(class const_frame frame) = 0;
-       virtual void                                                    initialize(const struct video_format_desc& format_desc, int channel_index) = 0;
+       virtual std::future<bool>                               send(const_frame frame) = 0;
+       virtual void                                                    initialize(const video_format_desc& format_desc, const audio_channel_layout& channel_layout, int channel_index) = 0;
        
        // monitor::observable
 
-       virtual void subscribe(const monitor::observable::observer_ptr& o) = 0;
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) = 0;
+       virtual monitor::subject& monitor_output() = 0;
 
        // Properties
 
@@ -65,13 +67,38 @@ public:
        virtual std::wstring                                    name() const = 0;
        virtual boost::property_tree::wptree    info() const = 0;
        virtual bool                                                    has_synchronization_clock() const {return true;}
-       virtual int                                                             buffer_depth() const = 0;
+       virtual int                                                             buffer_depth() const = 0; // -1 to not participate in frame presentation synchronization
        virtual int                                                             index() const = 0;
+       virtual int64_t                                                 presentation_frame_age_millis() const = 0;
 };
 
-typedef std::function<spl::shared_ptr<frame_consumer>(const std::vector<std::wstring>&)> consumer_factory_t;
+typedef std::function<spl::shared_ptr<frame_consumer>(
+               const std::vector<std::wstring>&,
+               interaction_sink* sink)> consumer_factory_t;
+typedef std::function<spl::shared_ptr<frame_consumer>(
+               const boost::property_tree::wptree& element,
+               interaction_sink* sink)> preconfigured_consumer_factory_t;
+
+class frame_consumer_registry : boost::noncopyable
+{
+public:
+       frame_consumer_registry(spl::shared_ptr<help_repository> help_repo);
+       void register_consumer_factory(const std::wstring& name, const consumer_factory_t& factory, const help_item_describer& describer);
+       void register_preconfigured_consumer_factory(
+                       const std::wstring& element_name,
+                       const preconfigured_consumer_factory_t& factory);
+       spl::shared_ptr<frame_consumer> create_consumer(
+                       const std::vector<std::wstring>& params,
+                       interaction_sink* sink) const;
+       spl::shared_ptr<frame_consumer> create_consumer(
+                       const std::wstring& element_name,
+                       const boost::property_tree::wptree& element,
+                       interaction_sink* sink) const;
+private:
+       struct impl;
+       spl::shared_ptr<impl> impl_;
+};
 
-void register_consumer_factory(const consumer_factory_t& factory);
-spl::shared_ptr<frame_consumer> create_consumer(const std::vector<std::wstring>& params);
+void destroy_consumers_synchronously();
 
-}}
\ No newline at end of file
+}}