git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index 5d9bf906f80ffbf8e496804fa7c1b7a1b1030ff7..18a08461af183bbe50a6c4c0dedea6dbdd9485e3 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -62,9 +62,9 @@ using namespace protocol;
 \r
 struct server::implementation : boost::noncopyable\r
 {\r
+       ogl_device                                                                      ogl_;\r
        std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_;     \r
        std::vector<safe_ptr<video_channel>>            channels_;\r
-       ogl_device                                                                      ogl_;\r
 \r
        implementation()                                                                                                \r
        {                       \r
@@ -114,7 +114,7 @@ struct server::implementation : boost::noncopyable
                                                channels_.back()->output()->add(index++, decklink::create_consumer(xml_consumer.second));                               \r
                                        //else if(name == "file")                                       \r
                                        //      channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));                                          \r
-                                       else if(name == "audio")\r
+                                       else if(name == "system-audio")\r
                                                channels_.back()->output()->add(index++, oal::create_consumer());               \r
                                        else if(name != "<xmlcomment>")\r
                                                CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);     \r