Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
	core/consumer/output.h
	core/monitor/monitor.h
	core/producer/layer.h
	core/producer/stage.h
	core/video_channel.h
	core/video_format.cpp
	shell/server.h

diff --cc core/producer/layer.h
index d81baa0b85d12e8b3289e328c1580ba1b9f9b2b2,792bc4d827eeae4cfd6a4e8e1a09e61b16ec45b4..eb840782ca9206d322a4675c30ac9e984dde101b
--- 1/core/producer/layer.h
--- 2/core/producer/layer.h
+++ b/core/producer/layer.h
@@@ -38,7 -38,7 +38,7 @@@ FORWARD1(boost, template<typename T> cl
  
  namespace caspar { namespace core {
        
- class layer sealed : public interaction_sink
 -class layer /* final */ : public monitor::observable, public interaction_sink
++class layer /*final*/ : public interaction_sink
  {
        layer(const layer&);
        layer& operator=(const layer&);

diff --cc core/producer/stage.h
index 77595ecaec43673b620a50f4cf95d7817e97a276,4f542b6a6c9f3d09ae6f64bf4042a6ac84016637..8d308894b4cebc9d2f341f5199c6991ad57bfb6d
--- 1/core/producer/stage.h
--- 2/core/producer/stage.h
+++ b/core/producer/stage.h
@@@ -43,9 -43,9 +43,9 @@@ FORWARD2(caspar, diagnostics, class gra
  
  namespace caspar { namespace core {
  
 -typedef reactive::observable<std::map<int, class draw_frame>> frame_observable;
 +//typedef reactive::observable<std::map<int, class draw_frame>> frame_observable;
        
- class stage sealed : public interaction_sink
 -class stage /* final */ : public monitor::observable, public frame_observable, public interaction_sink
++class stage /* final */ : public interaction_sink
  {
        stage(const stage&);
        stage& operator=(const stage&);

diff --cc core/producer/text/text_producer.cpp
Simple merge

diff --cc core/video_channel.cpp
index 1bdf34e0f1e737d5508139236ade590b582ee439,10418e85f1a404f835d3e2d6146d354d1c06ff41..38a46aa2350615229155212c56a74dab362e4aab
--- 1/core/video_channel.cpp
--- 2/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@@ -47,9 -47,9 +47,9 @@@
  
  namespace caspar { namespace core {
  
- struct video_channel::impl sealed
+ struct video_channel::impl /* final */
  {
 -      monitor::basic_subject                                                  event_subject_;
 +      monitor::subject                                                                monitor_subject_;
  
        const int                                                                               index_;
  

diff --cc core/video_channel.h
index df3cc0411f979a6b77e90281f200a10e3e6c3642,91379e6fc2ba5f8aac6ab143b22aa8af0007c99b..e93bc1d073135780d41ad03755e86ee19f3ac39e
--- 1/core/video_channel.h
--- 2/core/video_channel.h
+++ b/core/video_channel.h
@@@ -39,7 -39,7 +39,7 @@@ FORWARD2(caspar, core, class frame_fact
  
  namespace caspar { namespace core {
        
- class video_channel sealed
 -class video_channel /* final */ : public monitor::observable
++class video_channel /*final*/
  {
        video_channel(const video_channel&);
        video_channel& operator=(const video_channel&);

diff --cc core/video_format.h
Simple merge

diff --cc modules/decklink/producer/decklink_producer.cpp
Simple merge

diff --cc protocol/amcp/AMCPCommandsImpl.cpp
Simple merge

diff --cc protocol/amcp/AMCPCommandsImpl.h
Simple merge

diff --cc protocol/amcp/AMCPProtocolStrategy.cpp
Simple merge

diff --cc shell/server.h
index 0ae69e5b05ed4d74b5126047a3cba89c201bf52a,51c3a5a0d2a412e9afc1a2d402455215ede7ec7a..00ea5eb72c5be6fb8c4f6be20eb6b7d995ce4fdc
--- 1/shell/server.h
--- 2/shell/server.h
+++ b/shell/server.h
@@@ -37,7 -37,8 +37,7 @@@ namespace core 
        class thumbnail_generator;
  }
  
- class server sealed : public boost::noncopyable
 -class server /* final */ : public monitor::observable
 -                                               , boost::noncopyable
++class server /* final */ : public boost::noncopyable
  {
  public:
        explicit server(boost::promise<bool>& shutdown_server_now);