cec: added a callback that is called when libCEC's configuration changed.

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

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 92a4eee84e18116a847b11bae513b238013941a1..1c073d9baedaae0e15989df8daf2821f54447c63 100644 (file)
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -43,32 +43,67 @@ namespace CecSharp
        public ref class LibCecSharp : public CecCallbackMethods
        {
        public:
+         LibCecSharp(LibCECConfiguration ^config)
+               {
+                       CecCallbackMethods::EnableCallbacks(config->Callbacks);
+                       if (!InitialiseLibCec(config))
+                               throw gcnew Exception("Could not initialise LibCecSharp");
+               }
+
                LibCecSharp(String ^ strDeviceName, CecDeviceTypeList ^ deviceTypes)
+               {
+                       LibCECConfiguration ^config = gcnew LibCECConfiguration();
+                       config->SetCallbacks(this);
+                       config->DeviceName  = strDeviceName;
+                       config->DeviceTypes = deviceTypes;
+                       if (!InitialiseLibCec(config))
+                               throw gcnew Exception("Could not initialise LibCecSharp");
+               }
+          
+               ~LibCecSharp(void)
+               {
+                       Close();
+                       m_libCec = NULL;
+               }
+
+       private:
+               !LibCecSharp(void)
+               {
+                       Close();
+                       m_libCec = NULL;
+               }
+
+               bool InitialiseLibCec(LibCECConfiguration ^config)
                {
                        marshal_context ^ context = gcnew marshal_context();
-                       m_bHasCallbacks = false;
-                       const char* strDeviceNameC = context->marshal_as<const char*>(strDeviceName);
+                       libcec_configuration libCecConfig;
+                       ConvertConfiguration(context, config, libCecConfig);
 
-                       cec_device_type_list types;
-                       for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
-                               types.types[iPtr] = (cec_device_type)deviceTypes->Types[iPtr];
-                       m_libCec = (ICECAdapter *) CECInit(strDeviceNameC, types);
+                       m_libCec = (ICECAdapter *) CECInitialise(&libCecConfig);
 
                        delete context;
+                       return m_libCec != NULL;
+               }
+
+         void ConvertConfiguration(marshal_context ^context, LibCECConfiguration ^netConfig, CEC::libcec_configuration &config)
+               {
+                       config.Clear();
+
+                       _snprintf_s(config.strDeviceName, 13, context->marshal_as<const char*>(netConfig->DeviceName));
+                       for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
+                               config.deviceTypes.types[iPtr] = (cec_device_type)netConfig->DeviceTypes->Types[iPtr];
+
+                       config.iPhysicalAddress     = netConfig->PhysicalAddress;
+                       config.baseDevice           = (cec_logical_address)netConfig->BaseDevice;
+                       config.iHDMIPort            = netConfig->HDMIPort;
+                       config.clientVersion        = (cec_client_version)netConfig->ClientVersion;
+                       config.bGetSettingsFromROM  = netConfig->GetSettingsFromROM;
+                       config.bPowerOnStartup      = netConfig->PowerOnStartup;
+                       config.bPowerOffShutdown    = netConfig->PowerOffShutdown;
+                       config.bPowerOffScreensaver = netConfig->PowerOffScreensaver;
+                       config.bPowerOffOnStandby   = netConfig->PowerOffOnStandby;
+                       config.callbacks            = &g_cecCallbacks;
                }
-          
-                ~LibCecSharp(void)
-                {
-                        Close();
-                        m_libCec = NULL;
-                }
-
-       protected:
-                !LibCecSharp(void)
-                {
-                        Close();
-                        m_libCec = NULL;
-                }
 
        public:
                array<CecAdapter ^> ^ FindAdapters(String ^ path)
@@ -100,6 +135,8 @@ namespace CecSharp
 
                void Close(void)
                {
+                       // delete the callbacks, since these might already have been destroyed in .NET
+                       m_libCec->EnableCallbacks(NULL, NULL);
                        m_libCec->Close();
                }
 
@@ -190,7 +227,7 @@ namespace CecSharp
                        return m_libCec->SetLogicalAddress((cec_logical_address) logicalAddress);
                }
 
-               bool SetPhysicalAddress(int16_t physicalAddress)
+               bool SetPhysicalAddress(uint16_t physicalAddress)
                {
                        return m_libCec->SetPhysicalAddress(physicalAddress);
                }
@@ -352,6 +389,78 @@ namespace CecSharp
                        return m_libCec->GetDevicePhysicalAddress((cec_logical_address)iAddress);
                }
 
+               bool SetStreamPath(CecLogicalAddress iAddress)
+               {
+                       return m_libCec->SetStreamPath((cec_logical_address)iAddress);
+               }
+
+               bool SetStreamPath(uint16_t iPhysicalAddress)
+               {
+                       return m_libCec->SetStreamPath(iPhysicalAddress);
+               }
+
+               CecLogicalAddresses ^GetLogicalAddresses(void)
+               {
+                       CecLogicalAddresses ^addr = gcnew CecLogicalAddresses();
+                       cec_logical_addresses libAddr = m_libCec->GetLogicalAddresses();
+                       for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+                               addr->Addresses[iPtr] = (CecLogicalAddress)libAddr.addresses[iPtr];
+                       addr->Primary = (CecLogicalAddress)libAddr.primary;
+                       return addr;
+               }
+
+               bool GetCurrentConfiguration(LibCECConfiguration ^configuration)
+               {
+                       libcec_configuration config;
+                       config.Clear();
+
+                       if (m_libCec->GetCurrentConfiguration(&config))
+                       {
+                               configuration->BaseDevice = (CecLogicalAddress)config.baseDevice;
+                               configuration->DeviceName = gcnew String(config.strDeviceName);
+                               configuration->HDMIPort = config.iHDMIPort;
+                               configuration->PhysicalAddress = config.iPhysicalAddress;
+                               configuration->PowerOffOnStandby = config.bPowerOffOnStandby == 1;
+                               configuration->PowerOffScreensaver = config.bPowerOffScreensaver == 1;
+                               configuration->PowerOffShutdown = config.bPowerOffShutdown == 1;
+                               configuration->PowerOnStartup = config.bPowerOnStartup == 1;
+                               configuration->UseTVMenuLanguage = config.bUseTVMenuLanguage == 1;
+                               for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
+                                       configuration->DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
+                               return true;
+                       }
+                       return false;
+               }
+
+    bool CanPersistConfiguration(void)
+               {
+                       return m_libCec->CanPersistConfiguration();
+               }
+
+    bool PersistConfiguration(LibCECConfiguration ^configuration)
+               {
+                       marshal_context ^ context = gcnew marshal_context();
+                       libcec_configuration config;
+                       ConvertConfiguration(context, configuration, config);
+
+                       bool bReturn = m_libCec->PersistConfiguration(&config);
+
+                       delete context;
+                       return bReturn;
+               }
+
+               bool SetConfiguration(LibCECConfiguration ^configuration)
+               {
+                       marshal_context ^ context = gcnew marshal_context();
+                       libcec_configuration config;
+                       ConvertConfiguration(context, configuration, config);
+
+                       bool bReturn = m_libCec->SetConfiguration(&config);
+
+                       delete context;
+                       return bReturn;
+               }
+
                String ^ ToString(CecLogicalAddress iAddress)
                {
                        const char *retVal = m_libCec->ToString((cec_logical_address)iAddress);