From 63a0b02bd5b8432353e9848468d3b0cf64012c93 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Wed, 25 Jul 2012 12:24:19 +0200 Subject: [PATCH] sync LibCecSharp --- src/CecSharpTester/CecSharpClient.cs | 3 ++- src/LibCecSharp/LibCecSharp.cpp | 5 +++++ src/cec-config-gui/CecConfigGUI.cs | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index 4afbb53..843823c 100644 --- a/src/CecSharpTester/CecSharpClient.cs +++ b/src/CecSharpTester/CecSharpClient.cs @@ -43,11 +43,12 @@ namespace CecSharpClient Config = new LibCECConfiguration(); Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; Config.DeviceName = "CEC Tester"; - Config.ClientVersion = CecClientVersion.Version1_7_1; + Config.ClientVersion = CecClientVersion.Version1_8_0; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; Lib = new LibCecSharp(Config); + Lib.InitVideoStandalone(); Console.WriteLine("CEC Parser created - libCEC version " + Lib.ToString(Config.ServerVersion)); } diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp index 634edc5..81c857f 100644 --- a/src/LibCecSharp/LibCecSharp.cpp +++ b/src/LibCecSharp/LibCecSharp.cpp @@ -604,6 +604,11 @@ namespace CecSharp return gcnew String(retVal); } + void InitVideoStandalone() + { + m_libCec->InitVideoStandalone(); + } + private: ICECAdapter * m_libCec; CecCallbackMethods ^ m_callbacks; diff --git a/src/cec-config-gui/CecConfigGUI.cs b/src/cec-config-gui/CecConfigGUI.cs index 1bd2f07..a57ac35 100644 --- a/src/cec-config-gui/CecConfigGUI.cs +++ b/src/cec-config-gui/CecConfigGUI.cs @@ -28,11 +28,12 @@ namespace CecConfigGui Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; Config.DeviceName = "CEC Config"; Config.GetSettingsFromROM = true; - Config.ClientVersion = CecClientVersion.Version1_7_1; + Config.ClientVersion = CecClientVersion.Version1_8_0; Callbacks = new CecCallbackWrapper(this); Config.SetCallbacks(Callbacks); LoadXMLConfiguration(ref Config); Lib = new LibCecSharp(Config); + Lib.InitVideoStandalone(); InitializeComponent(); LoadButtonConfiguration(); -- 2.34.1