LibCecSharp: better handling of callbacks

[deb_libcec.git] / src / LibCecSharp / LibCecSharp.cpp

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index fb723236eb0fa4fd3892dbc7b65c8ff3aa050d9f..cd0f6d05d3ae239afc2e8286b9e1ae7694c2e2c8 100644 (file)
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -82,6 +82,7 @@ namespace CecSharp
                        ConvertConfiguration(context, config, libCecConfig);
 
                        m_libCec = (ICECAdapter *) CECInitialise(&libCecConfig);
+                       config->Update(libCecConfig);
 
                        delete context;
                        return m_libCec != NULL;
@@ -134,7 +135,10 @@ namespace CecSharp
                                memcpy_s(config.strDeviceLanguage, 3, strDeviceLanguage, 3);
                        }
 
-                       config.callbacks            = &g_cecCallbacks;
+                       if (netConfig->ServerVersion >= CecServerVersion::Version1_6_3)
+                         config.bMonitorOnly = netConfig->MonitorOnlyClient ? 1 : 0;
+
+                       config.callbacks = &g_cecCallbacks;
                }
 
        public:
@@ -184,7 +188,7 @@ namespace CecSharp
                virtual bool EnableCallbacks(CecCallbackMethods ^ callbacks) override
                {
                        if (m_libCec && CecCallbackMethods::EnableCallbacks(callbacks))
-                               return m_libCec->EnableCallbacks(NULL, &g_cecCallbacks);
+                               return m_libCec->EnableCallbacks((void*)GetCallbackPtr(), &g_cecCallbacks);
 
                        return false;
                }
@@ -230,7 +234,7 @@ namespace CecSharp
                        cec_keypress key;
                        if (m_libCec->GetNextKeypress(&key))
                        {
-                               return gcnew CecKeypress(key.keycode, key.duration);
+                               return gcnew CecKeypress((CecUserControlCode)key.keycode, key.duration);
                        }
 
                        return gcnew CecKeypress();