repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into release
[deb_libcec.git]
/
src
/
LibCecSharp
/
LibCecSharp.cpp
diff --git
a/src/LibCecSharp/LibCecSharp.cpp
b/src/LibCecSharp/LibCecSharp.cpp
index fb723236eb0fa4fd3892dbc7b65c8ff3aa050d9f..81c857fb2fed67c2475365eab980289d32aaf21b 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);
ConvertConfiguration(context, config, libCecConfig);
m_libCec = (ICECAdapter *) CECInitialise(&libCecConfig);
+ config->Update(libCecConfig);
delete context;
return m_libCec != NULL;
delete context;
return m_libCec != NULL;
@@
-134,7
+135,10
@@
namespace CecSharp
memcpy_s(config.strDeviceLanguage, 3, strDeviceLanguage, 3);
}
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:
}
public:
@@
-184,7
+188,7
@@
namespace CecSharp
virtual bool EnableCallbacks(CecCallbackMethods ^ callbacks) override
{
if (m_libCec && CecCallbackMethods::EnableCallbacks(callbacks))
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;
}
return false;
}
@@
-230,7
+234,7
@@
namespace CecSharp
cec_keypress key;
if (m_libCec->GetNextKeypress(&key))
{
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();
}
return gcnew CecKeypress();
@@
-594,6
+598,17
@@
namespace CecSharp
return gcnew String(retVal);
}
return gcnew String(retVal);
}
+ String ^ GetLibInfo()
+ {
+ const char *retVal = m_libCec->GetLibInfo();
+ return gcnew String(retVal);
+ }
+
+ void InitVideoStandalone()
+ {
+ m_libCec->InitVideoStandalone();
+ }
+
private:
ICECAdapter * m_libCec;
CecCallbackMethods ^ m_callbacks;
private:
ICECAdapter * m_libCec;
CecCallbackMethods ^ m_callbacks;