]> git.sesse.net Git - casparcg/commitdiff
Fixed bug where external keyer was not selected by default in decklink_consumer
authorHelge Norberg <helge.norberg@svt.se>
Thu, 12 Nov 2015 17:04:16 +0000 (18:04 +0100)
committerHelge Norberg <helge.norberg@svt.se>
Thu, 12 Nov 2015 17:04:16 +0000 (18:04 +0100)
modules/decklink/consumer/decklink_consumer.cpp

index 42794d1c6a5cbc20da81464626ad4abe604a5ed2..01e1afad8fb40e9e4776767e3827897b8624bc31 100644 (file)
@@ -62,14 +62,14 @@ struct configuration
                internal_keyer,
                external_keyer,
                external_separate_device_keyer,
-               default_keyer
+               default_keyer                                   = external_keyer
        };
 
        enum class latency_t
        {
                low_latency,
                normal_latency,
-               default_latency
+               default_latency = normal_latency
        };
 
        int                                                     device_index            = 1;
@@ -853,7 +853,7 @@ spl::shared_ptr<core::frame_consumer> create_preconfigured_consumer(
        else if (keyer == L"external_separate_device")
                config.keyer = configuration::keyer_t::external_separate_device_keyer;
 
-       auto latency = ptree.get(L"latency", L"normal");
+       auto latency = ptree.get(L"latency", L"default");
        if(latency == L"low")
                config.latency = configuration::latency_t::low_latency;
        else if(latency == L"normal")