LibCecSharp: fixed - set the primary LA in CecLogicalAddresses

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

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 97329b3e9cd773e8dd531528c3c815dc24588261..634edc5ecbb62abafb8a911488049e680c7a5439 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;
@@ -135,11 +136,9 @@ namespace CecSharp
                        }
 
                        if (netConfig->ServerVersion >= CecServerVersion::Version1_6_3)
-                       {
-                         config.bMonitorOnly              = netConfig->MonitorOnlyClient ? 1 : 0;
-                       }
+                         config.bMonitorOnly = netConfig->MonitorOnlyClient ? 1 : 0;
 
-                       config.callbacks            = &g_cecCallbacks;
+                       config.callbacks = &g_cecCallbacks;
                }
 
        public:
@@ -189,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;
                }
@@ -235,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();
@@ -599,6 +598,12 @@ namespace CecSharp
                        return gcnew String(retVal);
                }
 
+               String ^ GetLibInfo()
+               {
+                       const char *retVal = m_libCec->GetLibInfo();
+                       return gcnew String(retVal);
+               }
+
        private:
                ICECAdapter *        m_libCec;
     CecCallbackMethods ^ m_callbacks;