From d7960a2e278c514249f0140e4dea078f3cfb56e3 Mon Sep 17 00:00:00 2001 From: tuomas-k Date: Sun, 28 Feb 2016 21:23:21 +0200 Subject: [PATCH] Away mode fixes --- CecRemote/.gitignore | 9 ++++++ CecRemote/Source/CecRemote.cs | 5 ++-- CecRemote/Source/CecRemote.csproj | 10 +++---- CecRemote/Source/CecRemote.sln | 33 +++++++++++++++++++++ CecRemote/Source/Properties/AssemblyInfo.cs | 4 +-- CecRemote/changelog.txt | 4 +++ 6 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 CecRemote/.gitignore create mode 100644 CecRemote/Source/CecRemote.sln diff --git a/CecRemote/.gitignore b/CecRemote/.gitignore new file mode 100644 index 0000000..adb455e --- /dev/null +++ b/CecRemote/.gitignore @@ -0,0 +1,9 @@ +/Source/bin/ +/Source/obj/ +/Source/CecRemoteMP2/obj/ +/Source/CecRemoteMP2/bin/ +/Tests/ +*.dll +*.mpe1 +*.suo +*_old* diff --git a/CecRemote/Source/CecRemote.cs b/CecRemote/Source/CecRemote.cs index b31913a..26f4cab 100644 --- a/CecRemote/Source/CecRemote.cs +++ b/CecRemote/Source/CecRemote.cs @@ -146,7 +146,7 @@ public bool GetHome(out string strButtonText, out string strButtonImage, public void Start() { - Log.Info("CeCRemote: Version 0.9.5"); + Log.Info("CeCRemote: Version 0.9.7"); _sleep = false; _away = false; @@ -259,7 +259,6 @@ public bool WndProc(ref Message msg) { if (_away && !_sleep) { - _away = false; Log.Info("CecRemote: PowerControl: System exiting away mode"); HandleResume(false); } @@ -300,7 +299,7 @@ public bool WndProc(ref Message msg) private void HandleResume(bool automatic) { - if (_sleep) + if (_sleep || _away) { _sleep = false; _away = false; diff --git a/CecRemote/Source/CecRemote.csproj b/CecRemote/Source/CecRemote.csproj index 2ba3275..adb9168 100644 --- a/CecRemote/Source/CecRemote.csproj +++ b/CecRemote/Source/CecRemote.csproj @@ -58,18 +58,18 @@ False - .\Common.Utils.dll + \\MEDIACENTER\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll False - .\Core.dll + \\MEDIACENTER\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll False - .\LibCecSharp.dll + \\MEDIACENTER\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process\LibCecSharp\LibCecSharp.dll - .\RemotePlugins.dll + \\MEDIACENTER\Program Files (x86)\Team MediaPortal\MediaPortal\RemotePlugins.dll @@ -78,7 +78,7 @@ False - .\Utils.dll + \\MEDIACENTER\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll diff --git a/CecRemote/Source/CecRemote.sln b/CecRemote/Source/CecRemote.sln new file mode 100644 index 0000000..20f99ed --- /dev/null +++ b/CecRemote/Source/CecRemote.sln @@ -0,0 +1,33 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CecRemote", "CecRemote.csproj", "{0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Debug|Any CPU.Build.0 = Release|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Debug|x86.ActiveCfg = Debug|x86 + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Release|Any CPU.Build.0 = Release|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Release|x86.ActiveCfg = Release|x86 + {0957F20E-9D11-46F8-8307-E9BF4ABBFB0F}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CecRemote/Source/Properties/AssemblyInfo.cs b/CecRemote/Source/Properties/AssemblyInfo.cs index 97c3dc6..2ed6d2e 100644 --- a/CecRemote/Source/Properties/AssemblyInfo.cs +++ b/CecRemote/Source/Properties/AssemblyInfo.cs @@ -56,5 +56,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.9.5.0")] -[assembly: AssemblyFileVersion("0.9.5.0")] +[assembly: AssemblyVersion("0.9.7.0")] +[assembly: AssemblyFileVersion("0.9.7.0")] diff --git a/CecRemote/changelog.txt b/CecRemote/changelog.txt index 7dbaeac..cd83f1e 100644 --- a/CecRemote/changelog.txt +++ b/CecRemote/changelog.txt @@ -1,5 +1,9 @@ CECREMOTE - Changelog +0.9.7 + +*fix When returning from away mode, sometimes devices are not powered on correctly. + 0.9.6 *change Libcec version update 3.0.0