X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FCecSharpTester%2FCecSharpClient.cs;h=d2ab99000aca1854e1eb5728f7d82b33f2a8f0b3;hb=1db788cb36e0549150ac61c34db3bdd190f33e93;hp=2f4977691f958d522aabf44a58ff5d016dcf8688;hpb=a42ad439ecc9eccae64404ae8124d17308ce2c96;p=deb_libcec.git diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index 2f49776..d2ab990 100644 --- a/src/CecSharpTester/CecSharpClient.cs +++ b/src/CecSharpTester/CecSharpClient.cs @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -43,13 +43,14 @@ namespace CecSharpClient Config = new LibCECConfiguration(); Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; Config.DeviceName = "CEC Tester"; - Config.ClientVersion = CecClientVersion.Version1_5_0; + Config.ClientVersion = CecClientVersion.CurrentVersion; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; Lib = new LibCecSharp(Config); + Lib.InitVideoStandalone(); - Console.WriteLine("CEC Parser created - libcec version " + Lib.ToString(Config.ServerVersion)); + Console.WriteLine("CEC Parser created - libCEC version " + Lib.ToString(Config.ServerVersion)); } public override int ReceiveCommand(CecCommand command) @@ -93,45 +94,7 @@ namespace CecSharpClient return 1; } - void FlushLog() - { - CecLogMessage message = Lib.GetNextLogMessage(); - bool bGotMessage = !message.Empty; - while (bGotMessage) - { - if (((int)message.Level & LogLevel) == (int)message.Level) - { - string strLevel = ""; - switch (message.Level) - { - case CecLogLevel.Error: - strLevel = "ERROR: "; - break; - case CecLogLevel.Warning: - strLevel = "WARNING: "; - break; - case CecLogLevel.Notice: - strLevel = "NOTICE: "; - break; - case CecLogLevel.Traffic: - strLevel = "TRAFFIC: "; - break; - case CecLogLevel.Debug: - strLevel = "DEBUG: "; - break; - default: - break; - } - string strLog = string.Format("{0} {1,16} {2}", strLevel, message.Time, message.Message); - Console.WriteLine(strLog); - } - - message = Lib.GetNextLogMessage(); - bGotMessage = !message.Empty; - } - } - - public bool Connect(int timeout) + public bool Connect(int timeout) { CecAdapter[] adapters = Lib.FindAdapters(string.Empty); if (adapters.Length > 0)