2.0. decklink_consumer: External-key enabled by default.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1268 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 408a283ad40c3b57a0746bdeafcd6a48192fcf17..9ead7d9bbf1ace07d8975cb2e7591d27ad60a771 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -48,7 +48,7 @@ struct configuration
 {\r
        size_t  device_index;\r
        bool    embedded_audio;\r
-       bool    external_key;\r
+       bool    internal_key;\r
        bool    low_latency;\r
        bool    key_only;\r
        size_t  buffer_depth;\r
@@ -56,7 +56,7 @@ struct configuration
        configuration()\r
                : device_index(1)\r
                , embedded_audio(false)\r
-               , external_key(false)\r
+               , internal_key(false)\r
                , low_latency(false)\r
                , key_only(false)\r
                , buffer_depth(core::consumer_buffer_depth()){}\r
@@ -159,7 +159,7 @@ public:
                        enable_audio();\r
 \r
                set_latency(config.low_latency);                                \r
-               set_keyer(config.external_key);\r
+               set_keyer(config.internal_key);\r
                                \r
                if(config.embedded_audio)               \r
                        output_->BeginAudioPreroll();           \r
@@ -207,9 +207,9 @@ public:
                }\r
        }\r
 \r
-       void set_keyer(bool external_key)\r
+       void set_keyer(bool internal_key)\r
        {\r
-               if(!external_key) \r
+               if(internal_key) \r
                {\r
                        if(FAILED(keyer_->Enable(FALSE)))                       \r
                                CASPAR_LOG(error) << print() << L" Failed to enable internal keyer.";                   \r
@@ -451,7 +451,7 @@ safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::w
        if(params.size() > 1)\r
                config.device_index = lexical_cast_or_default<int>(params[1], config.device_index);\r
        \r
-       config.external_key             = std::find(params.begin(), params.end(), L"EXTERNAL_KEY")       != params.end();\r
+       config.internal_key             = std::find(params.begin(), params.end(), L"INTERNAL_KEY")       != params.end();\r
        config.low_latency              = std::find(params.begin(), params.end(), L"LOW_LATENCY")        != params.end();\r
        config.embedded_audio   = std::find(params.begin(), params.end(), L"EMBEDDED_AUDIO") != params.end();\r
        config.key_only                 = std::find(params.begin(), params.end(), L"KEY_ONLY")           != params.end();\r
@@ -463,7 +463,7 @@ safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tr
 {\r
        configuration config;\r
 \r
-       config.external_key             = ptree.get("external-key",       config.external_key);\r
+       config.internal_key             = ptree.get("internal-key",       config.internal_key);\r
        config.low_latency              = ptree.get("low-latency",        config.low_latency);\r
        config.key_only                 = ptree.get("key-only",           config.key_only);\r
        config.device_index             = ptree.get("device",             config.device_index);\r