]> git.sesse.net Git - casparcg/commitdiff
2.0.0.2: Added some warning on invalid consumer config.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 17 May 2011 23:14:17 +0000 (23:14 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 17 May 2011 23:14:17 +0000 (23:14 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@770 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

shell/server.cpp

index 956a9bcde677ebe78719233af4f682dc7fde1eb4..b9521a9ff48ac3775fa95eacfe6d4ddef9f8afdb 100644 (file)
@@ -91,7 +91,7 @@ struct server::implementation : boost::noncopyable
                {               \r
                        auto format_desc = video_format_desc::get(widen(xml_channel.second.get("videomode", "PAL")));           \r
                        if(format_desc.format == video_format::invalid)\r
-                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Invalid videomode."));\r
+                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Invalid video-mode."));\r
                        \r
                        channels_.push_back(channel(channels_.size(), format_desc));\r
                        \r
@@ -108,7 +108,9 @@ struct server::implementation : boost::noncopyable
                                        else if(name == "decklink")                                     \r
                                                channels_.back()->consumer()->add(index++, create_decklink_consumer(xml_consumer.second));                                      \r
                                        else if(name == "audio")\r
-                                               channels_.back()->consumer()->add(index++, oal_consumer());                     \r
+                                               channels_.back()->consumer()->add(index++, oal_consumer());             \r
+                               else\r
+                                       BOOST_THROW_EXCEPTION(caspar_exception() << arg_name_info(name) << msg_info("Invalid consumer."));      \r
                                }\r
                                catch(...)\r
                                {\r