public enum class CecClientVersion
{
VersionPre1_5 = 0,
- Version1_5_0 = 0x1500
+ Version1_5_0 = 0x1500,
+ Version1_5_1 = 0x1501,
+ Version1_5_2 = 0x1502
+ };
+
+ public enum class CecServerVersion
+ {
+ VersionPre1_5 = 0,
+ Version1_5_0 = 0x1500,
+ Version1_5_1 = 0x1501,
+ Version1_5_2 = 0x1502
};
public ref class CecAdapter
void Clear(void)
{
for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
- Addresses[iPtr] = CecLogicalAddress::Unregistered;
+ Addresses[iPtr] = CecLogicalAddress::Unknown;
}
bool IsSet(CecLogicalAddress iAddress)
{
- return Addresses[(unsigned int)iAddress] != CecLogicalAddress::Unregistered;
+ return Addresses[(unsigned int)iAddress] != CecLogicalAddress::Unknown;
}
void Set(CecLogicalAddress iAddress)
{
DeviceName = "";
DeviceTypes = gcnew CecDeviceTypeList();
+ AutodetectAddress = true;
PhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS;
BaseDevice = (CecLogicalAddress)CEC_DEFAULT_BASE_DEVICE;
HDMIPort = CEC_DEFAULT_HDMI_PORT;
ClientVersion = CecClientVersion::VersionPre1_5;
+ ServerVersion = CecServerVersion::VersionPre1_5;
TvVendor = CecVendorId::Unknown;
GetSettingsFromROM = false;
PowerOffScreensaver = CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER == 1;
PowerOffOnStandby = CEC_DEFAULT_SETTING_POWER_OFF_ON_STANDBY == 1;
+ SendInactiveSource = CEC_DEFAULT_SETTING_SEND_INACTIVE_SOURCE == 1;
}
void SetCallbacks(CecCallbackMethods ^callbacks)
Callbacks = callbacks;
}
+ void Update(const CEC::libcec_configuration &config)
+ {
+ DeviceName = gcnew System::String(config.strDeviceName);
+
+ for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
+ DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
+
+ AutodetectAddress = config.bAutodetectAddress == 1;
+ PhysicalAddress = config.iPhysicalAddress;
+ BaseDevice = (CecLogicalAddress)config.baseDevice;
+ HDMIPort = config.iHDMIPort;
+ ClientVersion = (CecClientVersion)config.clientVersion;
+ ServerVersion = (CecServerVersion)config.serverVersion;
+ TvVendor = (CecVendorId)config.tvVendor;
+
+ // player specific settings
+ GetSettingsFromROM = config.bGetSettingsFromROM == 1;
+ UseTVMenuLanguage = config.bUseTVMenuLanguage == 1;
+ ActivateSource = config.bActivateSource == 1;
+
+ WakeDevices->Clear();
+ for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
+ if (config.wakeDevices[iPtr])
+ WakeDevices->Set((CecLogicalAddress)iPtr);
+
+ PowerOffDevices->Clear();
+ for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
+ if (config.powerOffDevices[iPtr])
+ PowerOffDevices->Set((CecLogicalAddress)iPtr);
+
+ PowerOffScreensaver = config.bPowerOffScreensaver == 1;
+ PowerOffOnStandby = config.bPowerOffOnStandby == 1;
+ SendInactiveSource = config.bSendInactiveSource == 1;
+ }
+
property System::String ^ DeviceName;
property CecDeviceTypeList ^ DeviceTypes;
+ property bool AutodetectAddress;
property uint16_t PhysicalAddress;
property CecLogicalAddress BaseDevice;
property uint8_t HDMIPort;
property CecClientVersion ClientVersion;
+ property CecServerVersion ServerVersion;
property CecVendorId TvVendor;
// player specific settings
property CecLogicalAddresses ^PowerOffDevices;
property bool PowerOffScreensaver;
property bool PowerOffOnStandby;
+ property bool SendInactiveSource;
property CecCallbackMethods ^ Callbacks;
};
public ref class CecCallbackMethods
{
public:
- CecCallbackMethods(void)
- {
- m_bHasCallbacks = false;
- msclr::interop::marshal_context ^ context = gcnew msclr::interop::marshal_context();
-
- // create the delegate method for the log message callback
- m_logMessageDelegate = gcnew CecLogMessageManagedDelegate(this, &CecCallbackMethods::CecLogMessageManaged);
- m_logMessageGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_logMessageDelegate);
- g_logCB = static_cast<LOGCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_logMessageDelegate).ToPointer());
- g_cecCallbacks.CBCecLogMessage = CecLogMessageCB;
-
- // create the delegate method for the keypress callback
- m_keypressDelegate = gcnew CecKeyPressManagedDelegate(this, &CecCallbackMethods::CecKeyPressManaged);
- m_keypressGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_keypressDelegate);
- g_keyCB = static_cast<KEYCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_keypressDelegate).ToPointer());
- g_cecCallbacks.CBCecKeyPress = CecKeyPressCB;
-
- // create the delegate method for the command callback
- m_commandDelegate = gcnew CecCommandManagedDelegate(this, &CecCallbackMethods::CecCommandManaged);
- m_commandGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_commandDelegate);
- g_commandCB = static_cast<COMMANDCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_commandDelegate).ToPointer());
- g_cecCallbacks.CBCecCommand = CecCommandCB;
-
- // create the delegate method for the configuration change callback
- m_configDelegate = gcnew CecConfigManagedDelegate(this, &CecCallbackMethods::CecConfigManaged);
- m_configGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_configDelegate);
- g_configCB = static_cast<CONFIGCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_configDelegate).ToPointer());
- g_cecCallbacks.CBCecConfigurationChanged = CecConfigCB;
-
- delete context;
- }
+ CecCallbackMethods(void)
+ {
+ m_bHasCallbacks = false;
+ m_bDelegatesCreated = false;
+ }
~CecCallbackMethods(void)
{
}
public:
+ virtual void DisableCallbacks(void)
+ {
+ DestroyDelegates();
+ }
+
virtual bool EnableCallbacks(CecCallbackMethods ^ callbacks)
{
+ CreateDelegates();
if (!m_bHasCallbacks)
{
m_bHasCallbacks = true;
if (m_bHasCallbacks)
{
LibCECConfiguration ^netConfig = gcnew LibCECConfiguration();
- netConfig->DeviceName = gcnew System::String(config.strDeviceName);
- for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
- netConfig->DeviceTypes->Types[iPtr] = (CecDeviceType)config.deviceTypes.types[iPtr];
-
- netConfig->PhysicalAddress = config.iPhysicalAddress;
- netConfig->BaseDevice = (CecLogicalAddress)config.baseDevice;
- netConfig->HDMIPort = config.iHDMIPort;
- netConfig->ClientVersion = (CecClientVersion)config.clientVersion;
- netConfig->GetSettingsFromROM = config.bGetSettingsFromROM == 1;
- netConfig->ActivateSource = config.bActivateSource == 1;
-
- netConfig->WakeDevices->Clear();
- int iDevices(0);
- for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
- if (config.wakeDevices[iPtr])
- netConfig->WakeDevices->Addresses[iDevices++] = (CecLogicalAddress)iPtr;
-
- netConfig->PowerOffDevices->Clear();
- iDevices = 0;
- for (uint8_t iPtr = 0; iPtr <= 16; iPtr++)
- if (config.powerOffDevices[iPtr])
- netConfig->PowerOffDevices->Addresses[iDevices++] = (CecLogicalAddress)iPtr;
-
- netConfig->PowerOffScreensaver = config.bPowerOffScreensaver == 1;
- netConfig->PowerOffOnStandby = config.bPowerOffOnStandby == 1;
-
+ netConfig->Update(config);
iReturn = m_callbacks->ConfigurationChanged(netConfig);
}
return iReturn;
void DestroyDelegates()
{
- if (m_bHasCallbacks)
+ m_bHasCallbacks = false;
+ if (m_bDelegatesCreated)
{
- m_bHasCallbacks = false;
- delete m_callbacks;
+ m_bDelegatesCreated = false;
m_logMessageGCHandle.Free();
m_keypressGCHandle.Free();
m_commandGCHandle.Free();
}
}
+ void CreateDelegates()
+ {
+ DestroyDelegates();
+
+ if (!m_bDelegatesCreated)
+ {
+ msclr::interop::marshal_context ^ context = gcnew msclr::interop::marshal_context();
+
+ // create the delegate method for the log message callback
+ m_logMessageDelegate = gcnew CecLogMessageManagedDelegate(this, &CecCallbackMethods::CecLogMessageManaged);
+ m_logMessageGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_logMessageDelegate);
+ g_logCB = static_cast<LOGCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_logMessageDelegate).ToPointer());
+ g_cecCallbacks.CBCecLogMessage = CecLogMessageCB;
+
+ // create the delegate method for the keypress callback
+ m_keypressDelegate = gcnew CecKeyPressManagedDelegate(this, &CecCallbackMethods::CecKeyPressManaged);
+ m_keypressGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_keypressDelegate);
+ g_keyCB = static_cast<KEYCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_keypressDelegate).ToPointer());
+ g_cecCallbacks.CBCecKeyPress = CecKeyPressCB;
+
+ // create the delegate method for the command callback
+ m_commandDelegate = gcnew CecCommandManagedDelegate(this, &CecCallbackMethods::CecCommandManaged);
+ m_commandGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_commandDelegate);
+ g_commandCB = static_cast<COMMANDCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_commandDelegate).ToPointer());
+ g_cecCallbacks.CBCecCommand = CecCommandCB;
+
+ // create the delegate method for the configuration change callback
+ m_configDelegate = gcnew CecConfigManagedDelegate(this, &CecCallbackMethods::CecConfigManaged);
+ m_configGCHandle = System::Runtime::InteropServices::GCHandle::Alloc(m_configDelegate);
+ g_configCB = static_cast<CONFIGCB>(System::Runtime::InteropServices::Marshal::GetFunctionPointerForDelegate(m_configDelegate).ToPointer());
+ g_cecCallbacks.CBCecConfigurationChanged = CecConfigCB;
+
+ delete context;
+ m_bDelegatesCreated = true;
+ }
+ }
+
CecLogMessageManagedDelegate ^ m_logMessageDelegate;
static System::Runtime::InteropServices::GCHandle m_logMessageGCHandle;
LOGCB m_logMessageCallback;
CecCallbackMethods ^ m_callbacks;
bool m_bHasCallbacks;
+ bool m_bDelegatesCreated;
};
}
repositories / deb_libcec.git / blobdiff