From: <mic...@us...> - 2011-10-01 14:19:12
|
Revision: 4304 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4304&view=rev Author: michael-t Date: 2011-10-01 14:19:05 +0000 (Sat, 01 Oct 2011) Log Message: ----------- Stable version 1.2.1.0 for MP 1.2.1 FINAL (based on 1.1.7.1) Modified Paths: -------------- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/Common.Utils.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/Core.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/PluginBase.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/SetupControls.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TVDatabase.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TVLibrary.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvBusinessLayer.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvControl.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvLibrary.Interfaces.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvService.exe trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/Utils.dll trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/PowerScheduler++.xmp2 trunk/plugins/PowerScheduler++/Stable/1.2.1.0/PowerScheduler++.suo trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectShareForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.1.0/VersionInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.1.0/mediaportal/PowerSchedulerClientPlugin/Properties/AssemblyInfo.cs Added Paths: ----------- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CleanupFiles.bat trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CopyFiles.bat trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/PowerScheduler++ 1.2.1.0.mpe1 trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot01.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot02.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot03.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot04.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot05.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot06.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot07.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot08.jpg trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/update.xml trunk/plugins/PowerScheduler++/Stable/1.2.1.0/RestoreFiles.bat Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/Common.Utils.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/Core.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/PluginBase.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/SetupControls.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TVDatabase.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TVLibrary.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvBusinessLayer.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvControl.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvLibrary.Interfaces.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/TvService.exe =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/Binaries/Utils.dll =================================================================== (Binary files differ) Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CleanupFiles.bat =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CleanupFiles.bat (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CleanupFiles.bat 2011-10-01 14:19:05 UTC (rev 4304) @@ -0,0 +1,64 @@ +@echo off +set PROJECTPATH=%~dp0 +set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal +set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log +set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log +set COUNT=1 + +echo Stopping TV Server +echo --------------------- +:stop +echo trying... +net stop tvservice > nul 2>nul +tasklist | find /i "tvservice" >nul 2>nul +if not %ERRORLEVEL% == 1 ( + ping localhost >nul 2>nul + set /a COUNT=%COUNT%+1 + if %COUNT% GTR 5 goto end + goto stop +) +echo. + +echo MediaPortal TV Server +echo --------------------- +for %%f in (Plugins\PowerScheduler.dll) do ( + echo %%f + if exist "%SERVERPATH%\%%f.org" ( + del "%SERVERPATH%\%%f" + move /Y "%SERVERPATH%\%%f.org" "%SERVERPATH%\%%f" + ) 2>nul +) +echo. +echo MediaPortal Common Library +echo ---------------------------------- +for %%f in (PowerScheduler.Interfaces.dll) do ( + echo %%f + if exist "%SERVERPATH%\%%f.org" ( + del "%SERVERPATH%\%%f" + move /Y "%SERVERPATH%\%%f.org" "%SERVERPATH%\%%f" + ) 2>nul + if exist "%CLIENTPATH%\%%f.org" ( + del "%CLIENTPATH%\%%f" + move /Y "%CLIENTPATH%\%%f.org" "%CLIENTPATH%\%%f" + ) 2>nul +) +echo. +echo MediaPortal Client +echo ------------------ +for %%f in (plugins\process\PowerSchedulerClientPlugin.dll) do ( + echo %%f + if exist "%CLIENTPATH%\%%f.org" ( + del "%CLIENTPATH%\%%f" + move /Y "%CLIENTPATH%\%%f.org" "%CLIENTPATH%\%%f" + ) 2>nul +) +echo. +echo Cleanup +echo ------------------ +move /Y "%SERVERLOGPATH%\tv.log" "%SERVERLOGPATH%\tv_old.log" +net start tvservice +echo. +:end +pause +exit \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CopyFiles.bat =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CopyFiles.bat (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/CopyFiles.bat 2011-10-01 14:19:05 UTC (rev 4304) @@ -0,0 +1,63 @@ +@echo off +set PROJECTPATH=%~dp0 +set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal +set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log +set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log +set COUNT=1 + +echo Stopping TV Server +echo --------------------- +:stop +echo trying... +net stop tvservice > nul 2>nul +tasklist | find /i "tvservice" >nul 2>nul +if not %ERRORLEVEL% == 1 ( + ping localhost >nul 2>nul + set /a COUNT=%COUNT%+1 + if %COUNT% GTR 5 goto end + goto stop +) +echo. +echo MediaPortal TV Server +echo --------------------- +for %%f in (Plugins\PowerScheduler.dll) do ( + echo %%f + if not exist "%SERVERPATH%\%%f.org" ( + ren "%SERVERPATH%\%%f" "%%~nxf.org" + ) 2>nul + copy "%PROJECTPATH%\TvEngine3\TVLibrary\Plugins\%%~nf\bin\Debug\%%~nxf" "%SERVERPATH%\%%~f" +) +echo. +echo MediaPortal Common Library +echo ---------------------------------- +for %%f in (PowerScheduler.Interfaces.dll) do ( + echo %%f + if not exist "%SERVERPATH%\%%f.org" ( + ren "%SERVERPATH%\%%f" "%%~nxf.org" + ) 2>nul + copy "%PROJECTPATH%\Common-MP-TVE3\%%~nf\bin\Debug\%%~nxf" "%SERVERPATH%\%%~f" + if not exist "%CLIENTPATH%\%%f.org" ( + ren "%CLIENTPATH%\%%f" "%%~nxf.org" + ) 2>nul + copy "%PROJECTPATH%\Common-MP-TVE3\%%~nf\bin\Debug\%%~nxf" "%CLIENTPATH%\%%~f" +) +echo. +echo MediaPortal Client +echo ------------------ +for %%f in (plugins\process\PowerSchedulerClientPlugin.dll) do ( + echo %%f + if not exist "%CLIENTPATH%\%%f.org" ( + ren "%CLIENTPATH%\%%f" "%%~nxf.org" + ) 2>nul + copy "%PROJECTPATH%\mediaportal\%%~nf\bin\Debug\%%~nxf" "%CLIENTPATH%\%%~f" +) +echo. +echo Cleanup +echo ------------------ +move /Y "%SERVERLOGPATH%\tv.log" "%SERVERLOGPATH%\tv_old.log" +net start tvservice +echo. +:end +pause +exit \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/PowerScheduler++ 1.2.1.0.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/PowerScheduler++ 1.2.1.0.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/PowerScheduler++.xmp2 =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.1.7.1/MPEI/PowerScheduler++.xmp2 2011-09-22 18:07:35 UTC (rev 4303) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/PowerScheduler++.xmp2 2011-10-01 14:19:05 UTC (rev 4304) @@ -13,14 +13,14 @@ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\TvEngine3\TVLibrary\Plugins\PowerScheduler\bin\Release\PowerScheduler.dll</LocalFileName> + <LocalFileName>..\TvEngine3\TVLibrary\Plugins\PowerScheduler\bin\Debug\PowerScheduler.dll</LocalFileName> <ZipFileName>Installer{CopyFile}\{41ffe535-6bef-44af-8fda-549e2443aabc}-PowerScheduler.dll</ZipFileName> <DestinationFilename>%TvServerPlugins%\PowerScheduler.dll</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\Common-MP-TVE3\PowerScheduler.Interfaces\bin\Release\PowerScheduler.Interfaces.dll</LocalFileName> + <LocalFileName>..\Common-MP-TVE3\PowerScheduler.Interfaces\bin\Debug\PowerScheduler.Interfaces.dll</LocalFileName> <ZipFileName>Installer{CopyFile}\{fcb1df38-d861-4125-b4a0-8f062cb08d24}-PowerScheduler.Interfaces.dll</ZipFileName> <DestinationFilename>%TvServerBase%\PowerScheduler.Interfaces.dll</DestinationFilename> </FileItem> @@ -37,14 +37,14 @@ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\bin\Release\PowerSchedulerClientPlugin.dll</LocalFileName> + <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\bin\Debug\PowerSchedulerClientPlugin.dll</LocalFileName> <ZipFileName>Installer{CopyFile}\{ed9d9027-eca3-460f-b94e-d17ff4ab38ba}-PowerSchedulerClientPlugin.dll</ZipFileName> <DestinationFilename>%Plugins%\process\PowerSchedulerClientPlugin.dll</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\bin\Release\PowerScheduler.Interfaces.dll</LocalFileName> + <LocalFileName>..\Common-MP-TVE3\PowerScheduler.Interfaces\bin\Debug\PowerScheduler.Interfaces.dll</LocalFileName> <ZipFileName>Installer{CopyFile}\{ac7155e9-4a57-4108-8731-81f3fd669737}-PowerScheduler.Interfaces.dll</ZipFileName> <DestinationFilename>%Base%\PowerScheduler.Interfaces.dll</DestinationFilename> </FileItem> @@ -64,7 +64,7 @@ <Description /> </SectionParam> <SectionParam Name="Description"> - <Value>This will install the [Name] [Version] plugin on your computer. This plugin is designed for MediaPortal 1.2.0 Beta and will not work with other MediaPortal releases. + <Value>This will install the [Name] [Version] plugin on your computer. This plugin is designed for MediaPortal 1.2.1 FINAL and will not work with other MediaPortal releases. It is recommended that you close all other applications before continuing. @@ -424,34 +424,72 @@ </MinVersion> <MaxVersion> <Major>1</Major> - <Minor>1</Minor> - <Build>7</Build> + <Minor>2</Minor> + <Build>1</Build> <Revision>0</Revision> </MaxVersion> <WarnOnly>true</WarnOnly> - <Message>For MediaPortal release 1.2.0 beta (not compatible with 1.1.x stable releases and 1.2.0 alpha)</Message> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> <Name>MediaPortal</Name> </DependencyItem> + <DependencyItem> + <Type>MediaPortal</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> + <Name>MediaPortal</Name> + </DependencyItem> </Items> </Dependencies> + <PluginDependencies> + <Items> + <PluginDependencyItem AssemblyName="PowerSchedulerClientPlugin.dll"> + <CompatibleVersion> + <Items> + <CompatibleVersionItem> + <MinRequiredVersion>1.1.6.27644</MinRequiredVersion> + <DesignedForVersion>1.2.1.0</DesignedForVersion> + </CompatibleVersionItem> + </Items> + </CompatibleVersion> + <SubSystemsUsed> + <Items> + <SubSystemItem Name="MP" /> + </Items> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> <GeneralInfo> <Name>PowerScheduler++</Name> <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> <Author>michael_t (based on PowerScheduler by micheloe)</Author> <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> - <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/new-plugin-powerscheduler-new-version-1-1-1-5-a-87446/</ForumPage> - <UpdateUrl /> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-0-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> <Version> <Major>1</Major> - <Minor>1</Minor> - <Build>7</Build> - <Revision>1</Revision> + <Minor>2</Minor> + <Build>1</Build> + <Revision>0</Revision> </Version> <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription> - <VersionDescription>Version [Version] - [DevelopmentStatus] version for MP 1.2.0 Beta</VersionDescription> - <DevelopmentStatus>Beta</DevelopmentStatus> - <OnlineLocation>http://forum.team-mediaportal.com/attachments/tv-server-plugins-294/80178d1303458252-powerscheduler-test-versions-1-1-6-0-mediaportal-1-2-0-pre-beta-svn-27810-powerscheduler-1.1.7.1.mpe1</OnlineLocation> - <ReleaseDate>2011-04-24T16:03:54</ReleaseDate> + <VersionDescription>Version [Version] - [DevelopmentStatus] version for MP 1.2.1 FINAL</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2011-10-01T16:03:54</ReleaseDate> <Tags>tv server plugins, automation</Tags> <Location>..\MPEI\[Name] [Version].mpe1</Location> <Params> @@ -467,7 +505,7 @@ <Description>The icon file of the package stored online (jpg,png,bmp)</Description> </SectionParam> <SectionParam Name="Configuration file"> - <Value>%Plugins%\process\PowerSchedulerClientPlugin.dll</Value> + <Value /> <ValueType>Template</ValueType> <Description>The file used to configure the extension. If have .exe extension the will be executed @@ -498,52 +536,46 @@ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\TvEngine3\TVLibrary\Plugins\PowerScheduler\bin\Release\PowerScheduler.dll</LocalFileName> + <LocalFileName>..\TvEngine3\TVLibrary\Plugins\PowerScheduler\bin\Debug\PowerScheduler.dll</LocalFileName> <ZipFileName>Installer{CopyFile}\{41ffe535-6bef-44af-8fda-549e2443aabc}-PowerScheduler.dll</ZipFileName> <DestinationFilename>%TvServerPlugins%\PowerScheduler.dll</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\Common-MP-TVE3\PowerScheduler.Interfaces\bin\Release\PowerScheduler.Interfaces.dll</LocalFileName> + <LocalFileName>..\Common-MP-TVE3\PowerScheduler.Interfaces\bin\Debug\PowerScheduler.Interfaces.dll</LocalFileName> <ZipFileName>Installer{CopyFile}\{fcb1df38-d861-4125-b4a0-8f062cb08d24}-PowerScheduler.Interfaces.dll</ZipFileName> <DestinationFilename>%TvServerBase%\PowerScheduler.Interfaces.dll</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\bin\Release\PowerSchedulerClientPlugin.dll</LocalFileName> + <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\bin\Debug\PowerSchedulerClientPlugin.dll</LocalFileName> <ZipFileName>Installer{CopyFile}\{ed9d9027-eca3-460f-b94e-d17ff4ab38ba}-PowerSchedulerClientPlugin.dll</ZipFileName> <DestinationFilename>%Plugins%\process\PowerSchedulerClientPlugin.dll</DestinationFilename> </FileItem> - <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> - <Param1 /> - <UpdateOption>AlwaysOverwrite</UpdateOption> - <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\bin\Release\PowerScheduler.Interfaces.dll</LocalFileName> - <ZipFileName>Installer{CopyFile}\{ac7155e9-4a57-4108-8731-81f3fd669737}-PowerScheduler.Interfaces.dll</ZipFileName> - <DestinationFilename>%Base%\PowerScheduler.Interfaces.dll</DestinationFilename> - </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>PowerScheduler_high.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{15edb7d9-2dca-45c1-bf4e-54ae231e18b5}-PowerScheduler_high.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{b901333e-ef92-4772-9366-2856dde04a80}-PowerScheduler_high.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName> - <ZipFileName>Installer{CopyFile}\{97988cec-fca7-48b4-852a-f1d164a6089e}-PowerScheduler.gif</ZipFileName> + <ZipFileName>Installer{CopyFile}\{184ec9d9-145f-4989-98c3-d121f4e5ebb6}-PowerScheduler.gif</ZipFileName> <DestinationFilename /> </FileItem> </Items> </UniqueFileList> <ProjectSettings> <FolderGroups /> - <ProjectFilename>P:\PowerScheduler++ 1.1.7.0\MPEI\PowerScheduler++.xmp2</ProjectFilename> + <ProjectFilename>PowerScheduler++.xmp2</ProjectFilename> <UpdatePath1>..\MPEI\update.xml</UpdatePath1> <UpdatePath2 /> <UpdatePath3 /> </ProjectSettings> + <IsSkin>false</IsSkin> </PackageClass> \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot01.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot01.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot02.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot02.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot03.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot03.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot04.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot04.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot05.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot05.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot06.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot06.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot07.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot07.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot08.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/Screenshot08.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/update.xml =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/update.xml (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/update.xml 2011-10-01 14:19:05 UTC (rev 4304) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="utf-8"?> +<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <Items> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Server files"> + <DisplayName>Server files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Server files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Client files"> + <DisplayName>Client files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Client files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items> + <DependencyItem> + <Type>Installer</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>2</Minor> + <Build>1</Build> + <Revision>0</Revision> + </MaxVersion> + <WarnOnly>true</WarnOnly> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> + <Name>MediaPortal</Name> + </DependencyItem> + <DependencyItem> + <Type>MediaPortal</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> + <Name>MediaPortal</Name> + </DependencyItem> + </Items> + </Dependencies> + <PluginDependencies> + <Items> + <PluginDependencyItem AssemblyName="PowerSchedulerClientPlugin.dll"> + <CompatibleVersion> + <Items> + <CompatibleVersionItem> + <MinRequiredVersion>1.1.6.27644</MinRequiredVersion> + <DesignedForVersion>1.2.1.0</DesignedForVersion> + </CompatibleVersionItem> + </Items> + </CompatibleVersion> + <SubSystemsUsed> + <Items> + <SubSystemItem Name="MP" /> + </Items> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> + <GeneralInfo> + <Name>PowerScheduler++</Name> + <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> + <Author>michael_t (based on PowerScheduler by micheloe)</Author> + <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-0-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> + <Version> + <Major>1</Major> + <Minor>2</Minor> + <Build>1</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription> + <VersionDescription>Version [Version] - [DevelopmentStatus] version for MP 1.2.1 FINAL</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2011-10-01T16:03:54</ReleaseDate> + <Tags>tv server plugins, automation</Tags> + <Location>..\MPEI\[Name] [Version].mpe1</Location> + <Params> + <Items> + <SectionParam Name="Online Icon"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value /> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/480.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/481.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/482.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/483.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/484.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/485.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/486.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/487.jpg</Value> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>YES</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + <IsSkin>false</IsSkin> + </PackageClass> + </Items> +</ExtensionCollection> \ No newline at end of file Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/PowerScheduler++.suo =================================================================== (Binary files differ) Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/RestoreFiles.bat =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/RestoreFiles.bat (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/RestoreFiles.bat 2011-10-01 14:19:05 UTC (rev 4304) @@ -0,0 +1,63 @@ +@echo off +set PROJECTPATH=%~dp0 +set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal +set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log +set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log +set COUNT=1 + +echo Stopping TV Server +echo --------------------- +:stop +echo trying... +net stop tvservice > nul 2>nul +tasklist | find /i "tvservice" >nul 2>nul +if not %ERRORLEVEL% == 1 ( + ping localhost >nul 2>nul + set /a COUNT=%COUNT%+1 + if %COUNT% GTR 5 goto end + goto stop +) +echo. +echo MediaPortal TV Server +echo --------------------- +for %%f in (Plugins\PowerScheduler.dll) do ( + echo %%f + if exist "%SERVERPATH%\%%f.org" ( + del "%SERVERPATH%\%%f" + copy "%SERVERPATH%\%%f.org" "%SERVERPATH%\%%f" + ) 2>nul +) +echo. +echo MediaPortal Common Library +echo ---------------------------------- +for %%f in (PowerScheduler.Interfaces.dll) do ( + echo %%f + if exist "%SERVERPATH%\%%f.org" ( + del "%SERVERPATH%\%%f" + copy "%SERVERPATH%\%%f.org" "%SERVERPATH%\%%f" + ) 2>nul + if exist "%CLIENTPATH%\%%f.org" ( + del "%CLIENTPATH%\%%f" + copy "%CLIENTPATH%\%%f.org" "%CLIENTPATH%\%%f" + ) 2>nul +) +echo. +echo MediaPortal Client +echo ------------------ +for %%f in (plugins\process\PowerSchedulerClientPlugin.dll) do ( + echo %%f + if exist "%CLIENTPATH%\%%f.org" ( + del "%CLIENTPATH%\%%f" + copy "%CLIENTPATH%\%%f.org" "%CLIENTPATH%\%%f" + ) 2>nul +) +echo. +echo Cleanup +echo ------------------ +move /Y "%SERVERLOGPATH%\tv.log" "%SERVERLOGPATH%\tv_old.log" +net start tvservice +echo. +:end +pause +exit \ No newline at end of file Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.Designer.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.1.7.1/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.Designer.cs 2011-09-22 18:07:35 UTC (rev 4303) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.Designer.cs 2011-10-01 14:19:05 UTC (rev 4304) @@ -1654,7 +1654,6 @@ private System.Windows.Forms.CheckBox checkBoxActiveSharesAwayMode; private System.Windows.Forms.Button buttonSelectShare; private System.Windows.Forms.DataGridViewTextBoxColumn Sharename; - private System.Windows.Forms.DataGridViewTextBoxColumn Computername; private System.Windows.Forms.DataGridViewTextBoxColumn Username; private System.Windows.Forms.DataGridViewTextBoxColumn Hostname; Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.1.7.1/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/AssemblyInfo.cs 2011-09-22 18:07:35 UTC (rev 4303) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/AssemblyInfo.cs 2011-10-01 14:19:05 UTC (rev 4304) @@ -39,6 +39,6 @@ [assembly: Guid("a9ea8803-1a93-4233-8b3e-3cf2ee654e35")] -[assembly: CompatibleVersion("1.1.7.0", "1.1.6.27644")] +[assembly: CompatibleVersion("1.2.1.0", "1.1.6.27644")] [assembly: UsesSubsystem("TVE")] Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectShareForm.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.1.7.1/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectShareForm.cs 2011-09-22 18:07:35 UTC (rev 4303) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectShareForm.cs 2011-10-01 14:19:05 UTC (rev 4304) @@ -46,7 +46,7 @@ foreach (ManagementObject obj in new ManagementObjectSearcher( "SELECT ComputerName, ShareName, UserName FROM Win32_ServerConnection WHERE NumberOfFiles > 0").Get()) { - comboBox1.Items.Add(obj["ComputerName"].ToString() + "," + obj["ShareName"].ToString() + "," + obj["UserName"].ToString()); + comboBox1.Items.Add(obj["ShareName"].ToString() + "," + obj["ComputerName"].ToString() + "," + obj["UserName"].ToString()); } } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/VersionInfo.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.1.7.1/VersionInfo.cs 2011-09-22 18:07:35 UTC (rev 4303) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/VersionInfo.cs 2011-10-01 14:19:05 UTC (rev 4304) @@ -47,9 +47,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.7.1")] -[assembly: AssemblyFileVersion("1.1.7.1")] -[assembly: AssemblyInformationalVersion("1.1.7.1 for MP 1.2.0 Beta")] +[assembly: AssemblyVersion("1.2.1.0")] +[assembly: AssemblyFileVersion("1.2.1.0")] +[assembly: AssemblyInformationalVersion("1.2.1.0 for MP 1.2.1")] Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.0/mediaportal/PowerSchedulerClientPlugin/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.1.7.1/mediaportal/PowerSchedulerClientPlugin/Properties/AssemblyInfo.cs 2011-09-22 18:07:35 UTC (rev 4303) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.0/mediaportal/PowerSchedulerClientPlugin/Properties/AssemblyInfo.cs 2011-10-01 14:19:05 UTC (rev 4304) @@ -27,5 +27,5 @@ [assembly: ComVisible(false)] [assembly: Guid("f017b73a-abd9-4542-915c-3d13470a3053")] -[assembly: CompatibleVersion("1.1.7.0", "1.1.6.27644")] +[assembly: CompatibleVersion("1.2.1.0", "1.1.6.27644")] [assembly: UsesSubsystem("MP")] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2011-10-21 18:36:28
|
Revision: 4312 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4312&view=rev Author: michael-t Date: 2011-10-21 18:36:21 +0000 (Fri, 21 Oct 2011) Log Message: ----------- New version 1.2.1.1 Bugfix: NetworkMonitorIdleLimit was not saved correctly in server configuration tool Modified Paths: -------------- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++.xmp2 trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/update.xml trunk/plugins/PowerScheduler++/Stable/1.2.1.1/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs Added Paths: ----------- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/ trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++ 1.2.1.1.mpe1 Removed Paths: ------------- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++ 1.2.1.0.mpe1 trunk/plugins/PowerScheduler++/Stable/1.2.1.1/PowerScheduler++.suo Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.1 ___________________________________________________________________ Added: svn:ignore + PowerScheduler++.suo Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++ 1.2.1.0.mpe1 =================================================================== (Binary files differ) Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++ 1.2.1.1.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++ 1.2.1.1.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++.xmp2 =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/PowerScheduler++.xmp2 2011-10-18 08:18:48 UTC (rev 4311) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++.xmp2 2011-10-21 18:36:21 UTC (rev 4312) @@ -483,10 +483,15 @@ <Major>1</Major> <Minor>2</Minor> <Build>1</Build> - <Revision>0</Revision> + <Revision>1</Revision> </Version> <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription> - <VersionDescription>Version [Version] - [DevelopmentStatus] version for MP 1.2.1 FINAL</VersionDescription> + <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL + +Release Notes: +Version 1.2.1.1 +Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect +Version 1.2.1.0 - Initial version</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> <ReleaseDate>2011-10-01T16:03:54</ReleaseDate> @@ -558,14 +563,14 @@ <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>PowerScheduler_high.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{b901333e-ef92-4772-9366-2856dde04a80}-PowerScheduler_high.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{3787c1d2-5a62-4df7-a5a9-de1e9a974797}-PowerScheduler_high.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName> - <ZipFileName>Installer{CopyFile}\{184ec9d9-145f-4989-98c3-d121f4e5ebb6}-PowerScheduler.gif</ZipFileName> + <ZipFileName>Installer{CopyFile}\{ddb06ce2-4424-4de8-942e-0534e5e522f6}-PowerScheduler.gif</ZipFileName> <DestinationFilename /> </FileItem> </Items> Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/update.xml =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/MPEI/update.xml 2011-10-18 08:18:48 UTC (rev 4311) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/update.xml 2011-10-21 18:36:21 UTC (rev 4312) @@ -149,5 +149,158 @@ </ProjectSettings> <IsSkin>false</IsSkin> </PackageClass> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Server files"> + <DisplayName>Server files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Server files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Client files"> + <DisplayName>Client files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Client files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items> + <DependencyItem> + <Type>Installer</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>2</Minor> + <Build>1</Build> + <Revision>0</Revision> + </MaxVersion> + <WarnOnly>true</WarnOnly> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> + <Name>MediaPortal</Name> + </DependencyItem> + <DependencyItem> + <Type>MediaPortal</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> + <Name>MediaPortal</Name> + </DependencyItem> + </Items> + </Dependencies> + <PluginDependencies> + <Items> + <PluginDependencyItem AssemblyName="PowerSchedulerClientPlugin.dll"> + <CompatibleVersion> + <Items> + <CompatibleVersionItem> + <MinRequiredVersion>1.1.6.27644</MinRequiredVersion> + <DesignedForVersion>1.2.1.0</DesignedForVersion> + </CompatibleVersionItem> + </Items> + </CompatibleVersion> + <SubSystemsUsed> + <Items> + <SubSystemItem Name="MP" /> + </Items> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> + <GeneralInfo> + <Name>PowerScheduler++</Name> + <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> + <Author>michael_t (based on PowerScheduler by micheloe)</Author> + <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-0-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> + <Version> + <Major>1</Major> + <Minor>2</Minor> + <Build>1</Build> + <Revision>1</Revision> + </Version> + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription> + <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL + +Release Notes: +Version 1.2.1.1 +Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect +Version 1.2.1.0 - Initial version</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2011-10-01T16:03:54</ReleaseDate> + <Tags>tv server plugins, automation</Tags> + <Location>..\MPEI\[Name] [Version].mpe1</Location> + <Params> + <Items> + <SectionParam Name="Online Icon"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value /> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/480.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/481.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/482.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/483.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/484.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/485.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/486.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/487.jpg</Value> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>YES</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + <IsSkin>false</IsSkin> + </PackageClass> </Items> </ExtensionCollection> \ No newline at end of file Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.1.1/PowerScheduler++.suo =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.1/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs 2011-10-18 08:18:48 UTC (rev 4311) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.1/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs 2011-10-21 18:36:21 UTC (rev 4312) @@ -206,7 +206,7 @@ checkBoxNetworkMonitorAwayMode.Enabled = false; } - setting = _layer.GetSetting("PowerSchedulerNetworkIdleLimit", "2"); + setting = _layer.GetSetting("PowerSchedulerNetworkMonitorIdleLimit", "2"); numericUpDownNetworkIdleLimit.Value = Convert.ToDecimal(setting.Value); setting = _layer.GetSetting("PowerSchedulerNetworkMonitorAwayMode", "false"); @@ -401,7 +401,7 @@ setting.Value = checkBoxNetworkMonitorEnabled.Checked.ToString(); setting.Persist(); - setting = _layer.GetSetting("PowerSchedulerNetworkIdleLimit", "2"); + setting = _layer.GetSetting("PowerSchedulerNetworkMonitorIdleLimit", "2"); setting.Value = numericUpDownNetworkIdleLimit.Value.ToString(); setting.Persist(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2011-11-09 17:20:05
|
Revision: 4326 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4326&view=rev Author: michael-t Date: 2011-11-09 17:19:54 +0000 (Wed, 09 Nov 2011) Log Message: ----------- New version 1.2.1.2 Bugfix: Bug in WaitableTimer.cs caused 100 % CPU load on Windows XP systems Modified Paths: -------------- trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CleanupFiles.bat trunk/plugins/PowerScheduler++/Stable/1.2.1.2/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CopyFiles.bat trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++.xmp2 trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/update.xml trunk/plugins/PowerScheduler++/Stable/1.2.1.2/RestoreFiles.bat trunk/plugins/PowerScheduler++/Stable/1.2.1.2/VersionInfo.cs Added Paths: ----------- trunk/plugins/PowerScheduler++/Stable/1.2.1.2/ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1 Removed Paths: ------------- trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.1.mpe1 Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CleanupFiles.bat =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/CleanupFiles.bat 2011-11-06 13:41:46 UTC (rev 4325) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CleanupFiles.bat 2011-11-09 17:19:54 UTC (rev 4326) @@ -1,9 +1,20 @@ @echo off set PROJECTPATH=%~dp0 +if "%ProgramFiles(x86)%" == "" goto 32bit set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal +goto data +:32bit +set SERVERPATH=%ProgramFiles%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles%\Team MediaPortal\MediaPortal +:data +if "%ProgramData%" == "" goto winXP set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log -set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log +goto count +:winXP +set SERVERLOGPATH=%ALLUSERSPROFILE%\Application Data\Team MediaPortal\MediaPortal TV Server\log + +:count set COUNT=1 echo Stopping TV Server Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2011-11-06 13:41:46 UTC (rev 4325) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2011-11-09 17:19:54 UTC (rev 4326) @@ -167,7 +167,8 @@ // Create thread m_Waiting = new Thread(new ParameterizedThreadStart(WaitThread)); - m_Waiting.Priority = ThreadPriority.AboveNormal; + // Causes 100 % CPU load on XP systems + // m_Waiting.Priority = ThreadPriority.AboveNormal; m_Waiting.Name = "PowerScheduler Waiter"; using (ManualResetEvent handshake = new ManualResetEvent(false)) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CopyFiles.bat =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/CopyFiles.bat 2011-11-06 13:41:46 UTC (rev 4325) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CopyFiles.bat 2011-11-09 17:19:54 UTC (rev 4326) @@ -1,9 +1,20 @@ @echo off set PROJECTPATH=%~dp0 +if "%ProgramFiles(x86)%" == "" goto 32bit set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal +goto data +:32bit +set SERVERPATH=%ProgramFiles%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles%\Team MediaPortal\MediaPortal +:data +if "%ProgramData%" == "" goto winXP set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log -set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log +goto count +:winXP +set SERVERLOGPATH=%ALLUSERSPROFILE%\Application Data\Team MediaPortal\MediaPortal TV Server\log + +:count set COUNT=1 echo Stopping TV Server Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.1.mpe1 =================================================================== (Binary files differ) Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++.xmp2 =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++.xmp2 2011-11-06 13:41:46 UTC (rev 4325) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++.xmp2 2011-11-09 17:19:54 UTC (rev 4326) @@ -477,24 +477,24 @@ <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> <Author>michael_t (based on PowerScheduler by micheloe)</Author> <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> - <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-0-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-2-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage> <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> <Version> <Major>1</Major> <Minor>2</Minor> <Build>1</Build> - <Revision>1</Revision> + <Revision>2</Revision> </Version> <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription> - <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL + <VersionDescription>Version 1.2.1.2 - Stable version for MP 1.2.1 FINAL Release Notes: -Version 1.2.1.1 -Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect +Version 1.2.1.2 - Bugfix: Fixed periodic 100% CPU load on Windows XP (thx to daniel_1980 and umlaut) +Version 1.2.1.1 - Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect Version 1.2.1.0 - Initial version</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> - <ReleaseDate>2011-10-01T16:03:54</ReleaseDate> + <ReleaseDate>2011-11-01T16:03:54</ReleaseDate> <Tags>tv server plugins, automation</Tags> <Location>..\MPEI\[Name] [Version].mpe1</Location> <Params> @@ -563,14 +563,14 @@ <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>PowerScheduler_high.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{3787c1d2-5a62-4df7-a5a9-de1e9a974797}-PowerScheduler_high.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{cf7fec65-3cd1-4bba-9522-cf1e8617c50b}-PowerScheduler_high.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName> - <ZipFileName>Installer{CopyFile}\{ddb06ce2-4424-4de8-942e-0534e5e522f6}-PowerScheduler.gif</ZipFileName> + <ZipFileName>Installer{CopyFile}\{e45bd37f-259b-4280-af2b-7c5e718f7113}-PowerScheduler.gif</ZipFileName> <DestinationFilename /> </FileItem> </Items> Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/update.xml =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/update.xml 2011-11-06 13:41:46 UTC (rev 4325) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/update.xml 2011-11-09 17:19:54 UTC (rev 4326) @@ -249,15 +249,168 @@ <Revision>1</Revision> </Version> <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription> - <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL + <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL + +Release Notes: +Version 1.2.1.1 +Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect +Version 1.2.1.0 - Initial version</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2011-10-01T16:03:54</ReleaseDate> + <Tags>tv server plugins, automation</Tags> + <Location>..\MPEI\[Name] [Version].mpe1</Location> + <Params> + <Items> + <SectionParam Name="Online Icon"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value /> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/480.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/481.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/482.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/483.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/484.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/485.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/486.jpg; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/487.jpg</Value> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>YES</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + <IsSkin>false</IsSkin> + </PackageClass> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Server files"> + <DisplayName>Server files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Server files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Client files"> + <DisplayName>Client files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Client files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items> + <DependencyItem> + <Type>Installer</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>2</Minor> + <Build>1</Build> + <Revision>0</Revision> + </MaxVersion> + <WarnOnly>true</WarnOnly> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> + <Name>MediaPortal</Name> + </DependencyItem> + <DependencyItem> + <Type>MediaPortal</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message> + <Name>MediaPortal</Name> + </DependencyItem> + </Items> + </Dependencies> + <PluginDependencies> + <Items> + <PluginDependencyItem AssemblyName="PowerSchedulerClientPlugin.dll"> + <CompatibleVersion> + <Items> + <CompatibleVersionItem> + <MinRequiredVersion>1.1.6.27644</MinRequiredVersion> + <DesignedForVersion>1.2.1.0</DesignedForVersion> + </CompatibleVersionItem> + </Items> + </CompatibleVersion> + <SubSystemsUsed> + <Items> + <SubSystemItem Name="MP" /> + </Items> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> + <GeneralInfo> + <Name>PowerScheduler++</Name> + <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> + <Author>michael_t (based on PowerScheduler by micheloe)</Author> + <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-2-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> + <Version> + <Major>1</Major> + <Minor>2</Minor> + <Build>1</Build> + <Revision>2</Revision> + </Version> + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription> + <VersionDescription>Version 1.2.1.2 - Stable version for MP 1.2.1 FINAL Release Notes: -Version 1.2.1.1 -Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect +Version 1.2.1.2 - Bugfix: Fixed periodic 100% CPU load on Windows XP (thx to daniel_1980 and umlaut) +Version 1.2.1.1 - Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect Version 1.2.1.0 - Initial version</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> - <ReleaseDate>2011-10-01T16:03:54</ReleaseDate> + <ReleaseDate>2011-11-01T16:03:54</ReleaseDate> <Tags>tv server plugins, automation</Tags> <Location>..\MPEI\[Name] [Version].mpe1</Location> <Params> Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/RestoreFiles.bat =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/RestoreFiles.bat 2011-11-06 13:41:46 UTC (rev 4325) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/RestoreFiles.bat 2011-11-09 17:19:54 UTC (rev 4326) @@ -1,9 +1,20 @@ @echo off set PROJECTPATH=%~dp0 +if "%ProgramFiles(x86)%" == "" goto 32bit set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal +goto data +:32bit +set SERVERPATH=%ProgramFiles%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles%\Team MediaPortal\MediaPortal +:data +if "%ProgramData%" == "" goto winXP set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log -set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log +goto count +:winXP +set SERVERLOGPATH=%ALLUSERSPROFILE%\Application Data\Team MediaPortal\MediaPortal TV Server\log + +:count set COUNT=1 echo Stopping TV Server Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/VersionInfo.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/VersionInfo.cs 2011-11-06 13:41:46 UTC (rev 4325) +++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/VersionInfo.cs 2011-11-09 17:19:54 UTC (rev 4326) @@ -47,9 +47,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.2.1.0")] -[assembly: AssemblyFileVersion("1.2.1.0")] -[assembly: AssemblyInformationalVersion("1.2.1.0 for MP 1.2.1")] +[assembly: AssemblyVersion("1.2.1.2")] +[assembly: AssemblyFileVersion("1.2.1.2")] +[assembly: AssemblyInformationalVersion("1.2.1.2 for MP 1.2.1")] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2012-02-09 16:58:44
|
Revision: 4443 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4443&view=rev Author: michael-t Date: 2012-02-09 16:58:34 +0000 (Thu, 09 Feb 2012) Log Message: ----------- Added Paths: ----------- trunk/plugins/PowerScheduler++/Stable/test/ trunk/plugins/PowerScheduler++/Stable/test/Binaries/ trunk/plugins/PowerScheduler++/Stable/test/Binaries/Common.Utils.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/Core.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/Gentle.Common.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/Gentle.Framework.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/PluginBase.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/SetupControls.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/TVDatabase.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/TVLibrary.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvBusinessLayer.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvControl.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvLibrary.Interfaces.dll trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvService.exe trunk/plugins/PowerScheduler++/Stable/test/Binaries/Utils.dll trunk/plugins/PowerScheduler++/Stable/test/CleanupFiles.bat trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerScheduler.Interfaces.csproj trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs trunk/plugins/PowerScheduler++/Stable/test/CopyFiles.bat trunk/plugins/PowerScheduler++/Stable/test/MPEI/ trunk/plugins/PowerScheduler++/Stable/test/MPEI/PowerScheduler++ 1.2.2.1.mpe1 trunk/plugins/PowerScheduler++/Stable/test/MPEI/PowerScheduler++.xmp2 trunk/plugins/PowerScheduler++/Stable/test/MPEI/PowerScheduler_high.png trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot01.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot02.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot03.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot04.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot05.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot06.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot07.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/Screenshot08.jpg trunk/plugins/PowerScheduler++/Stable/test/MPEI/update.xml trunk/plugins/PowerScheduler++/Stable/test/PowerScheduler++.sln trunk/plugins/PowerScheduler++/Stable/test/RestoreFiles.bat trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/ trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/ trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/ trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/ trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/GenericStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/GenericWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.csproj trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerMasterSetup.resx trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/ trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectProcessForm.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectProcessForm.designer.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectProcessForm.resx trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectShareForm.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectShareForm.designer.cs trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/SelectShareForm.resx trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/TheAlgorithm.txt trunk/plugins/PowerScheduler++/Stable/test/TvEngine3/TVLibrary/Plugins/PowerScheduler/WindowsController.cs trunk/plugins/PowerScheduler++/Stable/test/VersionInfo.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/ trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/ trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/Handlers/ trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/Handlers/WakeableStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/Handlers/WakeableWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.gif trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerClientPlugin.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerClientPlugin.csproj trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerClientSetup.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerClientSetup.designer.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerClientSetup.resx trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/PowerScheduler_disabled.gif trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/Properties/ trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/test/mediaportal/PowerSchedulerClientPlugin/UnattendedWindow.cs Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Common.Utils.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Common.Utils.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Core.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Core.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Gentle.Common.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Gentle.Common.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Gentle.Framework.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Gentle.Framework.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/PluginBase.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/PluginBase.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/SetupControls.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/SetupControls.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TVDatabase.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TVDatabase.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TVLibrary.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TVLibrary.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvBusinessLayer.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvBusinessLayer.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvControl.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvControl.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvLibrary.Interfaces.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvLibrary.Interfaces.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvService.exe =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/TvService.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Utils.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/test/Binaries/Utils.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/PowerScheduler++/Stable/test/CleanupFiles.bat =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/CleanupFiles.bat (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/CleanupFiles.bat 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,75 @@ +@echo off +set PROJECTPATH=%~dp0 +if "%ProgramFiles(x86)%" == "" goto 32bit +set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal +goto data +:32bit +set SERVERPATH=%ProgramFiles%\Team MediaPortal\MediaPortal TV Server +set CLIENTPATH=%ProgramFiles%\Team MediaPortal\MediaPortal +:data +if "%ProgramData%" == "" goto winXP +set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log +goto count +:winXP +set SERVERLOGPATH=%ALLUSERSPROFILE%\Application Data\Team MediaPortal\MediaPortal TV Server\log + +:count +set COUNT=1 + +echo Stopping TV Server +echo --------------------- +:stop +echo trying... +net stop tvservice > nul 2>nul +tasklist | find /i "tvservice" >nul 2>nul +if not %ERRORLEVEL% == 1 ( + ping localhost >nul 2>nul + set /a COUNT=%COUNT%+1 + if %COUNT% GTR 5 goto end + goto stop +) +echo. + +echo MediaPortal TV Server +echo --------------------- +for %%f in (Plugins\PowerScheduler.dll) do ( + echo %%f + if exist "%SERVERPATH%\%%f.org" ( + del "%SERVERPATH%\%%f" + move /Y "%SERVERPATH%\%%f.org" "%SERVERPATH%\%%f" + ) 2>nul +) +echo. +echo MediaPortal Common Library +echo ---------------------------------- +for %%f in (PowerScheduler.Interfaces.dll) do ( + echo %%f + if exist "%SERVERPATH%\%%f.org" ( + del "%SERVERPATH%\%%f" + move /Y "%SERVERPATH%\%%f.org" "%SERVERPATH%\%%f" + ) 2>nul + if exist "%CLIENTPATH%\%%f.org" ( + del "%CLIENTPATH%\%%f" + move /Y "%CLIENTPATH%\%%f.org" "%CLIENTPATH%\%%f" + ) 2>nul +) +echo. +echo MediaPortal Client +echo ------------------ +for %%f in (plugins\process\PowerSchedulerClientPlugin.dll) do ( + echo %%f + if exist "%CLIENTPATH%\%%f.org" ( + del "%CLIENTPATH%\%%f" + move /Y "%CLIENTPATH%\%%f.org" "%CLIENTPATH%\%%f" + ) 2>nul +) +echo. +echo Cleanup +echo ------------------ +move /Y "%SERVERLOGPATH%\tv.log" "%SERVERLOGPATH%\tv_old.log" +net start tvservice +echo. +:end +pause +exit \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,125 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +using System; +using System.Collections.Generic; +using System.IO; +using System.Runtime.Serialization.Formatters.Binary; + +#endregion + +namespace TvEngine.PowerScheduler +{ + + #region Enums + + public enum EPGGrabDays + { + Monday, + Tuesday, + Wednesday, + Thursday, + Friday, + Saturday, + Sunday + } + + #endregion + + [Serializable] + public class EPGWakeupConfig + { + public DateTime LastRun = DateTime.MinValue; + public List<EPGGrabDays> Days = new List<EPGGrabDays>(); + public int Hour; + public int Minutes; + + public EPGWakeupConfig() {} + + public EPGWakeupConfig(string serializedConfig) + { + EPGWakeupConfig cfg = new EPGWakeupConfig(); + try + { + BinaryFormatter formatter = new BinaryFormatter(); + byte[] buffer = Convert.FromBase64String(serializedConfig); + using (MemoryStream stream = new MemoryStream(buffer, 0, buffer.Length)) + { + cfg = (EPGWakeupConfig)formatter.Deserialize(stream); + } + } + catch (Exception) {} + Hour = cfg.Hour; + Minutes = cfg.Minutes; + Days = cfg.Days; + LastRun = cfg.LastRun; + } + + public string SerializeAsString() + { + BinaryFormatter formatter = new BinaryFormatter(); + string result; + using (MemoryStream stream = new MemoryStream()) + { + formatter.Serialize(stream, this); + stream.Flush(); + stream.Seek(0, SeekOrigin.Begin); + byte[] buffer = new byte[stream.Length]; + int bytesRead = stream.Read(buffer, 0, buffer.Length); + result = Convert.ToBase64String(buffer, 0, bytesRead); + } + return result; + } + + public override bool Equals(object obj) + { + if (obj is EPGWakeupConfig) + { + EPGWakeupConfig cfg = (EPGWakeupConfig)obj; + if (cfg.Hour == Hour && cfg.Minutes == Minutes) + { + foreach (EPGGrabDays day in cfg.Days) + { + if (!Days.Contains(day)) + { + return false; + } + } + foreach (EPGGrabDays day in Days) + { + if (!cfg.Days.Contains(day)) + { + return false; + } + } + return true; + } + } + return false; + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,65 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +using System; + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + public delegate void EPGScheduleHandler(); + + /// <summary> + /// Provides access to PowerScheduler's EPG interface for + /// EPG plugins. + /// </summary> + public interface IEpgHandler + { + /// <summary> + /// Allows an external EPG source to prevent standby when it's + /// grabbing EPG + /// </summary> + /// <param name="source">the source preventing standby</param> + /// <param name="allowed">is standby allowed?</param> + void SetStandbyAllowed(object source, bool allowed, int timeout); + + /// <summary> + /// Allows an external EPG source to set a preferred next wakeup time + /// </summary> + /// <param name="source">the source that wants to wakeup the system for EPG grabbing</param> + /// <param name="time">the desired time to wakeup the system</param> + void SetNextEPGWakeupTime(object source, DateTime time); + + /// <summary> + /// Allows an external EPG source to retrieve the next wakeup time + /// for EPG grabbing. This time can be used to start an actual EPG + /// grabbing process. + /// </summary> + /// <returns>next EPG grab wakeup time</returns> + DateTime GetNextEPGWakeupTime(); + + /// <summary> + /// Event which gets fired when the configured EPG wakeup schedule is due. + /// </summary> + event EPGScheduleHandler EPGScheduleDue; + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,108 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +using System; + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + /// <summary> + /// Public interface to PowerScheduler power control + /// Intented to be used by singleseat setups + /// </summary> + public interface IPowerController + { + /// <summary> + /// Requests suspension of the system. Uses default action. + /// </summary> + /// <param name="source">description of who wants to suspend the system</param> + /// <param name="force">force the system to suspend (not recommended)</param> + void SuspendSystem(string source, bool force); + + /// <summary> + /// Requests suspension of the system. + /// </summary> + /// <param name="source"></param> + /// <param name="how">How to suspend, see MediaPortal.Util.RestartOptions</param> + /// <param name="force"></param> + void SuspendSystem(string source, int how, bool force); + + /// <summary> + /// Enables clients on singleseat setups to indicate whether or not the system + /// is allowed to enter standby + /// </summary> + /// <param name="standbyAllowed">is standby allowed?</param> + /// <param name="handlerName">client handlername which prevents standby</param> + void SetStandbyAllowed(bool standbyAllowed, string handlerName); + + /// <summary> + /// Enables clients on singleseat setups to indicate when the next + /// earliest wakeup time is due + /// </summary> + /// <param name="nextWakeupTime">DateTime when to wakeup the system</param> + /// <param name="handlerName">client handlername which is responsible for this wakeup time</param> + void SetNextWakeupTime(DateTime nextWakeupTime, string handlerName); + + /// <summary> + /// Resets the idle timer of the PowerScheduler. When enough time has passed (IdleTimeout), the system + /// is suspended as soon as possible (no handler disallows shutdown). + /// Note that the idle timer is automatically reset to now when the user moves the mouse or touchs the keyboard. + /// </summary> + void UserActivityDetected(DateTime when); + + /// <summary> + /// Register remote handlers. If an empty string or null is passed, no handler is registered for + /// that type. It returns a tag used to unregister the later. The returned tag is always not 0. + /// </summary> + /// <param name="standbyHandlerURI"></param> + /// <param name="wakeupHandlerURI"></param> + int RegisterRemote(String standbyHandlerURI, String wakeupHandlerURI); + + /// <summary> + /// Unregister remote handlers. + /// </summary> + void UnregisterRemote(int tag); + + /// <summary> + /// Indicates whether or not we're connected to the PowerScheduler power control interfaces + /// </summary> + bool IsConnected { get; } + + /// <summary> + /// Get the current state. If refresh is true, the state is the most current state, otherwise the state could be some seconds old. + /// Special case: If shutdown is not allowed because an event is almost due, the handler name is "EVENT-DUE". + /// </summary> + /// <param name="refresh"></param> + /// <param name="disAllowShutdown"></param> + /// <param name="disAllowShutdownHandler"></param> + /// <param name="nextWakeupTime"></param> + /// <param name="nextWakeupHandler"></param> + void GetCurrentState(bool refresh, out bool unattended, out bool disAllowShutdown, + out String disAllowShutdownHandler, out DateTime nextWakeupTime, out String nextWakeupHandler); + + /// <summary> + /// Provides access to PowerScheduler's settings + /// </summary> + IPowerSettings PowerSettings { get; } + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,129 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +using System; + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + /// <summary> + /// EvenHandler delegate for PowerScheduler events + /// </summary> + /// <param name="args"></param> + public delegate void PowerSchedulerEventHandler(PowerSchedulerEventArgs args); + + /// <summary> + /// Interface to PowerScheduler + /// </summary> + public interface IPowerScheduler + { + /// <summary> + /// Register to this event to receive status changes from the PowerScheduler + /// </summary> + event PowerSchedulerEventHandler OnPowerSchedulerEvent; + + /// <summary> + /// Registers an IStandbyHandler implementation + /// </summary> + /// <param name="handler">implementation to register for handling standby requests</param> + void Register(IStandbyHandler handler); + + /// <summary> + /// Registers an IWakeupHandler implementation + /// </summary> + /// <param name="handler">implementation to register for handling system resume time</param> + void Register(IWakeupHandler handler); + + /// <summary> + /// Unregisters an IStandbyHandler implementation + /// </summary> + /// <param name="handler">implementation to unregister for handling standby requests</param> + void Unregister(IStandbyHandler handler); + + /// <summary> + /// Registers an IWakeupHandler implementation + /// </summary> + /// <param name="handler">implementation to register for handling system resume time</param> + void Unregister(IWakeupHandler handler); + + /// <summary> + /// Checks if the given IStandbyHandler is registered + /// </summary> + /// <param name="handler">IStandbyHandler to check</param> + /// <returns>is the given handler registered?</returns> + bool IsRegistered(IStandbyHandler handler); + + /// <summary> + /// Checks if the given IWakeupHandler is registered + /// </summary> + /// <param name="handler">IWakeupHandler to check</param> + /// <returns>is the given handler registered?</returns> + bool IsRegistered(IWakeupHandler handler); + + /// <summary> + /// Requests suspension of the system + /// </summary> + /// <param name="source">description of who wants to suspend the system</param> + /// <param name="force">force the system to suspend (not recommended)</param> + void SuspendSystem(string source, bool force); + + /// <summary> + /// Requests suspension of the system. + /// </summary> + /// <param name="source"></param> + /// <param name="how">How to suspend, see MediaPortal.Util.RestartOptions</param> + /// <param name="force"></param> + void SuspendSystem(string source, int how, bool force); + + /// <summary> + /// Resets the idle timer of the PowerScheduler. When enough time has passed (IdleTimeout), the system + /// is suspended as soon as possible (no handler disallows shutdown). + /// Note that the idle timer is automatically reset to now when the user moves the mouse or touchs the keyboard. + /// </summary> + void UserActivityDetected(DateTime when); + + /// <summary> + /// Get the current state. If refresh is true, the state is the most current state, otherwise the state could be some seconds old. + /// Special case: If shutdown is not allowed because an event is almost due, the handler name is "EVENT-DUE". + /// </summary> + /// <param name="refresh"></param> + /// <param name="disAllowShutdown"></param> + /// <param name="disAllowShutdownHandler"></param> + /// <param name="nextWakeupTime"></param> + /// <param name="nextWakeupHandler"></param> + void GetCurrentState(bool refresh, out bool unattended, out bool disAllowShutdown, + out String disAllowShutdownHandler, out DateTime nextWakeupTime, out String nextWakeupHandler); + + + /// <summary> + /// Checks if a suspend request is in progress + /// </summary> + /// <returns>is the system currently trying to suspend?</returns> + bool IsSuspendInProgress(); + + /// <summary> + /// Provides access to PowerScheduler's settings + /// </summary> + PowerSettings Settings { get; } + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,82 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + /// <summary> + /// Provides access to PowerScheduler's settings + /// </summary> + public interface IPowerSettings + { + /// <summary> + /// Should PowerScheduler actively try to put the system into standby? + /// </summary> + bool ShutdownEnabled { get; } + + /// <summary> + /// Should PowerScheduler check when any plugin wants to wakeup the system? + /// </summary> + bool WakeupEnabled { get; } + + /// <summary> + /// Should the shutdown attemps be forced? + /// </summary> + bool ForceShutdown { get; } + + /// <summary> + /// Should PowerScheduler be verbose when logging? + /// </summary> + bool ExtensiveLogging { get; } + + /// <summary> + /// If ShutdownEnabled, how long (in minutes) to wait before putting the + /// system into standby + /// </summary> + int IdleTimeout { get; } + + /// <summary> + /// if WakeupEnabled, the time (in seconds) to wakeup the system earlier than + /// the actual wakeup time + /// </summary> + int PreWakeupTime { get; } + + /// <summary> + /// If WakeupEnabled, the time (in seconds) the system is not allowed to + /// go to shutdown before the next wakeup time + /// </summary> + int PreNoShutdownTime { get; } + + /// <summary> + /// Controls the granularity of the standby/wakeup checks in seconds + /// </summary> + int CheckInterval { get; } + + /// <summary> + /// How should put the system into standby? suspend/hibernate/stayon + /// suspend uses S3, hibernate uses S4, stayon is for debugging purposes and + /// doesn't put the system into standby at all + /// </summary> + ShutdownMode ShutdownMode { get; } + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,56 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + public interface IStandbyHandler + { + /// <summary> + /// Indicator whether or not to allow suspension/hibernation of the system + /// </summary> + bool DisAllowShutdown { get; } + + /// <summary> + /// Called when the user turns away from the system. + /// </summary> + void UserShutdownNow(); + + /// <summary> + /// Description of the source that allows / disallows shutdown + /// </summary> + string HandlerName { get; } + } + + /// <summary> + /// Extension to the IStandbyHandler interface for away mode + /// </summary> + public interface IStandbyHandlerEx : IStandbyHandler + { + /// <summary> + /// Indicator whether away mode is required by standby handler or not + /// </summary> + bool RequireAwayMode { get; } + } + +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,46 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +using System; + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + /// <summary> + /// To be implemented by classes who want to control system resume + /// </summary> + public interface IWakeupHandler + { + /// <summary> + /// Should return the earliest time the implementation desires to wake up the system. + /// </summary> + /// <param name="earliestWakeupTime">indicates the earliest valid wake up time that is considered valid by the PowerScheduler</param> + /// <returns>earliest time the implementation wants to wake up the system</returns> + DateTime GetNextWakeupTime(DateTime earliestWakeupTime); + + /// <summary> + /// Description of the source that want to wake up the system at the given time + /// </summary> + string HandlerName { get; } + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,283 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +using System; +using System.Runtime.InteropServices; +using System.Threading; + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + /// <summary> + /// Provides methods for handling system power events + /// </summary> + public class PowerManager + { + #region Variables + + /// <summary> + /// Enable / disable away mode + /// </summary> + private bool _awayMode; + + /// <summary> + /// Thread for calling SetThreadExecutionState() + /// </summary> + private Thread _awayModeThread; + + #endregion + + #region Constructor/Destructor + + /// <summary> + /// Constructor starts the thread for away mode and inits PowerSettings array + /// </summary> + unsafe public PowerManager() + { + if (Environment.OSVersion.Version.Major >= 6) + { + // Start the thread to enable/disable away mode + _awayModeThread = new Thread(AwayModeThread); + _awayModeThread.Name = "ExecutionStateThread"; + _awayModeThread.IsBackground = true; + _awayModeThread.Start(); + } + } + + ~PowerManager() + { + if (_awayModeThread != null) + { + _awayModeThread.Abort(); + _awayModeThread.Join(100); + _awayModeThread = null; + } + } + + #endregion + + #region External power management methods and enumerations + + /// <summary> + /// The thread's execution requirements + /// </summary> + [Flags] + private enum ExecutionState : uint + { + /// <summary> + /// Some error. + /// </summary> + Error = 0, + + /// <summary> + /// System is required, do not hibernate. + /// </summary> + ES_SYSTEM_REQUIRED = 0x00000001, + + /// <summary> + /// Display is required, do not hibernate. + /// </summary> + ES_DISPLAY_REQUIRED = 0x00000002, + + /// <summary> + /// User is active, do not hibernate. + /// </summary> + ES_USER_PRESENT = 0x00000004, + + /// <summary> + /// Enables away mode. + /// </summary> + ES_AWAYMODE_REQUIRED = 0x00000040, + + /// <summary> + /// Use together with the above options to report a + /// state until explicitly changed. + /// </summary> + ES_CONTINUOUS = 0x80000000 + } + + /// <summary> + /// Enables an application to inform the system that it is in use, thereby preventing the system + /// from entering sleep or turning off the display while the application is running. + /// </summary> + /// <param name="esFlags">The thread's execution requirements + /// /// </param> + /// <returns> + /// If the function succeeds, the return value is the previous thread execution state. + /// If the function fails, the return value is NULL. + /// </returns> + [DllImport("kernel32.dll", SetLastError = true, EntryPoint = "SetThreadExecutionState")] + private static extern ExecutionState SetThreadExecutionState(ExecutionState esFlags); + + #endregion + + #region Power management wrapper methods + + /// <summary> + /// Set the PowerManager to allow standby + /// </summary> + /// <returns>bool indicating whether or not standby is allowed</returns> + public bool AllowStandby() + { + return true; + } + + /// <summary> + /// Set the PowerManager to prevent standby + /// </summary> + /// <returns>bool indicating whether or not standby is prevented</returns> + public bool PreventStandby() + { + lock (this) + { + ExecutionState result = SetThreadExecutionState(ExecutionState.ES_SYSTEM_REQUIRED); + //Log.Debug("PowerManager.PreventStandBy: SetThreadExecutionState() returned: {0}", result.ToString()); + if (result == ExecutionState.Error) + { + return false; + } + return true; + } + } + + /// <summary> + /// Sets AwayModeRequired execution state; triggers AwayModeThread to do the real work + /// </summary> + /// <param name="awayModeRequired">Enable/disable away mode</param> + public void SetAwayModeRequired(bool awayModeRequired) + { + if (Environment.OSVersion.Version.Major >= 6) + { + Monitor.Enter(_awayModeThread); + _awayMode = awayModeRequired; + Monitor.Pulse(_awayModeThread); + Monitor.Exit(_awayModeThread); + } + } + + /// <summary> + /// Gets triggered by SetAwayMode and sets the execution state to the desired value + /// /// </summary> + private void AwayModeThread() + { + while (true) + { + Monitor.Enter(_awayModeThread); + Monitor.Wait(_awayModeThread); + if (_awayMode) + SetThreadExecutionState(ExecutionState.ES_AWAYMODE_REQUIRED | ExecutionState.ES_CONTINUOUS); + else + SetThreadExecutionState(ExecutionState.ES_CONTINUOUS); + Monitor.Exit(_awayModeThread); + } + } + + #endregion + + #region External power setting change notification methods and enumerations + + /// <summary> + /// Flags to register for power setting change notification + /// </summary> + private const int DEVICE_NOTIFY_WINDOW_HANDLE = 0x00000000; + private const int DEVICE_NOTIFY_SERVICE_HANDLE = 0x00000001; + + /// <summary> + /// Handle to unregister for power setting change notification + /// </summary> + private IntPtr hAwayMode; + + /// <summary> + /// Constants for power notifications + /// </summary> + public const int WM_POWERBROADCAST = 0x0218; + public const int PBT_APMQUERYSUSPEND = 0x0000; + public const int PBT_APMQUERYSUSPENDFAILED = 0x0002; + public const int PBT_APMSUSPEND = 0x0004; + public const int PBT_APMRESUMECRITICAL = 0x0006; + public const int PBT_APMRESUMESUSPEND = 0x0007; + public const int PBT_APMRESUMEAUTOMATIC = 0x0012; + public const int PBT_POWERSETTINGCHANGE = 0x8013; + public const int BROADCAST_QUERY_DENY = 0x424D5144; + + /// <summary> + /// This structure is sent when the PBT_POWERSETTINGSCHANGE message is sent. + /// It describes the power setting that has changed and contains data about the change + /// </summary> + [StructLayout(LayoutKind.Sequential, Pack = 4)] + public struct POWERBROADCAST_SETTING + { + public Guid PowerSetting; + public uint DataLength; + public byte Data; + } + + /// <summary> + /// Guid to register for power setting change notification + /// </summary> + public static Guid GUID_SYSTEM_AWAYMODE = new Guid("98a7f580-01f7-48aa-9c0f-44352c29e5C0"); + + /// <summary> + /// + /// </summary> + /// <param name="hRecipient"></param> + /// <param name="PowerSettingGuid"></param> + /// <param name="Flags"></param> + /// <returns></returns> + [DllImport(@"User32", SetLastError = true, EntryPoint = "RegisterPowerSettingNotification", CallingConvention = CallingConvention.StdCall)] + private static extern IntPtr RegisterPowerSettingNotification(IntPtr hRecipient, ref Guid PowerSettingGuid, Int32 Flags); + + /// <summary> + /// + /// </summary> + /// <param name="handle"></param> + /// <returns></returns> + [DllImport(@"User32", SetLastError = true, EntryPoint = "UnregisterPowerSettingNotification", CallingConvention = CallingConvention.StdCall)] + private static extern bool UnregisterPowerSettingNotification(IntPtr handle); + + #endregion + + #region Power setting change notification wrapper methods + + /// <summary> + /// Register for away mode notifications + /// </summary> + /// <param name="hRecipient">Window handle (e.g. GUIGraphicsContext.ActiveForm)</param> + public void RegisterAwayModeNotification(IntPtr hRecipient) + { + if (Environment.OSVersion.Version.Major >= 6) + hAwayMode = RegisterPowerSettingNotification(hRecipient, ref GUID_SYSTEM_AWAYMODE, DEVICE_NOTIFY_WINDOW_HANDLE); + } + + /// <summary> + /// Unregister for away mode notifications + /// </summary> + public void UnregisterAwayModeNotification() + { + if (Environment.OSVersion.Version.Major >= 6) + UnregisterPowerSettingNotification(hAwayMode); + } + + #endregion + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerScheduler.Interfaces.csproj =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerScheduler.Interfaces.csproj (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerScheduler.Interfaces.csproj 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{7701AA79-18D4-4A18-BB52-16774FB7943D}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>TvEngine.PowerScheduler.Interfaces</RootNamespace> + <AssemblyName>PowerScheduler.Interfaces</AssemblyName> + <StartupObject> + </StartupObject> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>3.5</OldToolsVersion> + <UpgradeBackupLocation> + </UpgradeBackupLocation> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <PlatformTarget>x86</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> + <ItemGroup> + <Compile Include="..\..\VersionInfo.cs"> + <Link>VersionInfo.cs</Link> + </Compile> + <Compile Include="EPGWakeupConfig.cs" /> + <Compile Include="Interfaces\IEpgHandler.cs" /> + <Compile Include="Interfaces\IPowerController.cs" /> + <Compile Include="Interfaces\IPowerScheduler.cs" /> + <Compile Include="Interfaces\IPowerSettings.cs" /> + <Compile Include="Interfaces\IStandbyHandler.cs" /> + <Compile Include="Interfaces\IWakeupHandler.cs" /> + <Compile Include="PowerManager.cs" /> + <Compile Include="PowerSchedulerEventArgs.cs" /> + <Compile Include="PowerSettings.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="RemotePowerControl.cs" /> + <Compile Include="TimerException.cs" /> + <Compile Include="WaitableTimer.cs" /> + <Compile Include="WakeOnLanManager.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> +</Project> \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs 2012-02-09 16:58:34 UTC (rev 4443) @@ -0,0 +1,127 @@ +#region Copyright (C) 2005-2011 Team MediaPortal + +// Copyright (C) 2005-2011 Team MediaPortal +// http://www.team-mediaportal.com +// +// MediaPortal is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// MediaPortal is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>. + +#endregion + +#region Usings + +using System; + +#endregion + +namespace TvEngine.PowerScheduler.Interfaces +{ + + #region Enums + + /// <summary> + /// All possible event types sent by PowerScheduler + /// </summary> + public enum PowerSchedulerEventType + { + /// <summary> + /// Sent when PowerScheduler is started + /// </summary> + Started, + /// <summary> + /// Sent when PowerScheduler is stopped + /// </summary> + Stopped, + /// <summary> + /// Sent when Powerscheduler settings have changed + /// </summary> + SettingsChanged, + /// <summary> + /// Sent when PowerScheduler detects the system state changed from idle to busy + /// </summary> + SystemBusy, + /// <summary> + /// Sent when PowerScheduler detects the system state changed from busy to idle + /// </summary> + SystemIdle, + /// <summary> + /// Sent when PowerScheduler is about to put the system into standby or when + /// powerscheduler detects the system is put into standby + /// </summary> + EnteringStandby, + /// <summary> + /// Sent when PowerScheduler detects the system resumed from standby + /// </summary> + ResumedFromStandby, + /// <summary> + /// Sent when PowerScheduler's check interval is due again + /// (so, sent every PowerSettings.CheckInterval seconds) + /// </summary> + Elapsed + } + + #endregion + + /// <summary> + /// PowerSchedulerEventArgs are sent by PowerScheduler when the status of PowerScheduler changes. + /// To find out the exact event type inspect the EventType property + /// </summary> + public class PowerSchedulerEventArgs : EventArgs + { + #region Variables + + private PowerSchedulerEventType _eventType; + private object _data; + private Type _dataType; + + #endregion + + #region Constructor + + public PowerSchedulerEventArgs(PowerSchedulerEventType eventType) + { + _eventType = eventType; + } + + #endregion + + #region Public methods + + public void SetData<T>(object o) + { + _dataType = typeof (T); + _data = o; + } + + public T GetData<T>() + { + Type dataType = typeof (T); + if (_dataType == dataType) + { + return (T)_data; + } + return default(T); + } + + #endregion + + #region Properties + + public PowerSchedulerEventType EventType + { + get { return _eventType; } + } + + #endregion + } +} \ No newline at end of file Added: trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs (rev 0) +++ trunk/plugins/PowerScheduler++/Stable/test/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSe... [truncated message content] |
From: <mic...@us...> - 2012-05-16 15:32:31
|
Revision: 4486 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4486&view=rev Author: michael-t Date: 2012-05-16 15:32:18 +0000 (Wed, 16 May 2012) Log Message: ----------- Stable Version 1.2.3.0 Modified Paths: -------------- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2 trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx trunk/plugins/PowerScheduler++/Stable/1.2.3.0/VersionInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx Added Paths: ----------- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.3.0.mpe1 Removed Paths: ------------- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.6.0.mpe1 Added: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.3.0.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.3.0.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.6.0.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2 =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/MPEI/PowerScheduler++.xmp2 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2 2012-05-16 15:32:18 UTC (rev 4486) @@ -93,7 +93,7 @@ <Items> <SectionParam Name="Header text"> <Value>[Name] [Version] -([DevelopmentStatus] / experimental)</Value> +([DevelopmentStatus])</Value> <ValueType>String</ValueType> <Description /> </SectionParam> @@ -439,7 +439,7 @@ <Params> <Items> <SectionParam Name="Header text"> - <Value>The Extension Installer Wizard has successfully installed [Name] [Version] ([DevelopmentStatus] / experimental).</Value> + <Value>The Extension Installer Wizard has successfully installed [Name] [Version] ([DevelopmentStatus]).</Value> <ValueType>String</ValueType> <Description /> </SectionParam> @@ -482,12 +482,12 @@ </MinVersion> <MaxVersion> <Major>1</Major> - <Minor>3</Minor> - <Build>0</Build> + <Minor>2</Minor> + <Build>99999</Build> <Revision>99999</Revision> </MaxVersion> - <WarnOnly>true</WarnOnly> - <Message>For MediaPortal release 1.2.x and 1.3.x (not compatible with 1.1.x releases)</Message> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> <Name>PowerScheduler++</Name> </DependencyItem> <DependencyItem> @@ -519,19 +519,27 @@ <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> <Author>michael_t (based on PowerScheduler by micheloe)</Author> <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> - <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-test-version-1-2-5-0-mediaportal-1-2-x-1-3-alpha-87446/</ForumPage> - <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=49</UpdateUrl> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-2-1-stable-version-mediaportal-1-2-1-final-95463/#post733512</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> <Version> <Major>1</Major> <Minor>2</Minor> - <Build>6</Build> + <Build>3</Build> <Revision>0</Revision> </Version> - <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features (easier configuration, reboot option, ...) and configurable support for "away mode" on Vista and Win7 systems.</ExtensionDescription> - <VersionDescription>Version 1.2.6.0 - Beta version for MP 1.2.x and 1.3.x</VersionDescription> - <DevelopmentStatus>Beta</DevelopmentStatus> - <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=40</OnlineLocation> - <ReleaseDate>2012-01-29T16:03:54</ReleaseDate> + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: +- Plug&Play mode (just select profile and idle time) +- Windows power settings are made automatically +- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) +- Client settings are automatically matched to server configuration on single-seat scenarios +- Configurable scheduler for automatic system reboot +- Processes, Network monitor and Active shares also for standalone clients +- Audio is unmuted after wakeup or return from away mode if necessary +- ...</ExtensionDescription> + <VersionDescription>Version 1.2.3.0 - Stable version for MP 1.2.x</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2012-05-15T16:03:54</ReleaseDate> <Tags>tv server plugins, automation</Tags> <Location>..\MPEI\[Name] [Version].mpe1</Location> <Params> @@ -554,7 +562,16 @@ If have .dll extension used like MP plugin configuration</Description> </SectionParam> <SectionParam Name="Online Screenshots"> - <Value /> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1373.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1374.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1375.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1376.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1377.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1378.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1379.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1380.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1381.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1382.png;</Value> <ValueType>String</ValueType> <Description>Online stored screenshot urls separated by ; </Description> </SectionParam> @@ -614,14 +631,14 @@ <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>PowerScheduler_high.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{fa2ede5d-3194-44b3-aee9-d1c15d3afbce}-PowerScheduler_high.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{34eff1a4-e2c5-45b8-bec9-5dee831bdf50}-PowerScheduler_high.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName> - <ZipFileName>Installer{CopyFile}\{bbb5447e-7524-4a9f-b516-cba334470cbc}-PowerScheduler.gif</ZipFileName> + <ZipFileName>Installer{CopyFile}\{022dd12c-f3ff-4cf1-a006-f456ecdba65c}-PowerScheduler.gif</ZipFileName> <DestinationFilename /> </FileItem> </Items> Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/MPEI/update.xml 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml 2012-05-16 15:32:18 UTC (rev 4486) @@ -56,157 +56,14 @@ <MaxVersion> <Major>1</Major> <Minor>2</Minor> - <Build>5</Build> - <Revision>0</Revision> + <Build>99999</Build> + <Revision>99999</Revision> </MaxVersion> - <WarnOnly>true</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> - <Name>PowerScheduler++</Name> - </DependencyItem> - <DependencyItem> - <Type>MediaPortal</Type> - <Id /> - <MinVersion> - <Major>1</Major> - <Minor>1</Minor> - <Build>6</Build> - <Revision>27644</Revision> - </MinVersion> - <MaxVersion> - <Major>1</Major> - <Minor>1</Minor> - <Build>6</Build> - <Revision>27644</Revision> - </MaxVersion> <WarnOnly>false</WarnOnly> <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> <Name>PowerScheduler++</Name> </DependencyItem> - </Items> - </Dependencies> - <PluginDependencies> - <Items /> - </PluginDependencies> - <GeneralInfo> - <Name>PowerScheduler++</Name> - <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> - <Author>michael_t (based on PowerScheduler by micheloe)</Author> - <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> - <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-test-version-1-2-5-0-mediaportal-1-2-x-1-3-alpha-87446/</ForumPage> - <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=49</UpdateUrl> - <Version> - <Major>1</Major> - <Minor>2</Minor> - <Build>5</Build> - <Revision>12</Revision> - </Version> - <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features (easier configuration, reboot option, ...) and configurable support for "away mode" on Vista and Win7 systems.</ExtensionDescription> - <VersionDescription>Version 1.2.5.12 - Alpha / experimental version for MP 1.2.x - -- Bugfix: No sudden suspend after client is started</VersionDescription> - <DevelopmentStatus>Alpha</DevelopmentStatus> - <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=40</OnlineLocation> - <ReleaseDate>2012-01-27T16:03:54</ReleaseDate> - <Tags>tv server plugins, automation</Tags> - <Location>..\MPEI\[Name] [Version].mpe1</Location> - <Params> - <Items> - <SectionParam Name="Online Icon"> - <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value> - <ValueType>String</ValueType> - <Description>The icon file of the package stored online (jpg,png,bmp)</Description> - </SectionParam> - <SectionParam Name="Configuration file"> - <Value>%TvServerBase%\SetupTv.exe</Value> - <ValueType>Template</ValueType> - <Description>The file used to configure the extension. - If have .exe extension the will be executed - If have .dll extension used like MP plugin configuration</Description> - </SectionParam> - <SectionParam Name="Online Screenshots"> - <Value /> - <ValueType>String</ValueType> - <Description>Online stored screenshot urls separated by ; </Description> - </SectionParam> - <SectionParam Name="Force to uninstall on update"> - <Value>YES</Value> - <ValueType>Bool</ValueType> - <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> - </SectionParam> - </Items> - </Params> - </GeneralInfo> - <UniqueFileList> - <Items /> - </UniqueFileList> - <ProjectSettings> - <FolderGroups /> - </ProjectSettings> - <IsSkin>false</IsSkin> - </PackageClass> - <PackageClass> - <Version>2.0</Version> - <Groups> - <Items> - <GroupItem Name="Server files"> - <DisplayName>Server files</DisplayName> - <DefaulChecked>true</DefaulChecked> - <Description>Server files</Description> - <Files> - <Items /> - </Files> - </GroupItem> - <GroupItem Name="Client files"> - <DisplayName>Client files</DisplayName> - <DefaulChecked>true</DefaulChecked> - <Description>Client files</Description> - <Files> - <Items /> - </Files> - </GroupItem> - <GroupItem Name="Original Files"> - <DisplayName>Original Files</DisplayName> - <DefaulChecked>true</DefaulChecked> - <Description>Original Files</Description> - <Files> - <Items /> - </Files> - </GroupItem> - <GroupItem Name="Never"> - <DisplayName>Never</DisplayName> - <DefaulChecked>true</DefaulChecked> - <Description>Never</Description> - <Files> - <Items /> - </Files> - </GroupItem> - </Items> - </Groups> - <Sections> - <Items /> - </Sections> - <Dependencies> - <Items> <DependencyItem> - <Type>Installer</Type> - <Id /> - <MinVersion> - <Major>1</Major> - <Minor>1</Minor> - <Build>6</Build> - <Revision>27644</Revision> - </MinVersion> - <MaxVersion> - <Major>1</Major> - <Minor>3</Minor> - <Build>0</Build> - <Revision>99999</Revision> - </MaxVersion> - <WarnOnly>true</WarnOnly> - <Message>For MediaPortal release 1.2.x and 1.3.x (not compatible with 1.1.x releases)</Message> - <Name>PowerScheduler++</Name> - </DependencyItem> - <DependencyItem> <Type>MediaPortal</Type> <Id /> <MinVersion> @@ -235,19 +92,27 @@ <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> <Author>michael_t (based on PowerScheduler by micheloe)</Author> <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> - <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-test-version-1-2-5-0-mediaportal-1-2-x-1-3-alpha-87446/</ForumPage> - <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=49</UpdateUrl> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-2-1-stable-version-mediaportal-1-2-1-final-95463/#post733512</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> <Version> <Major>1</Major> <Minor>2</Minor> - <Build>6</Build> + <Build>3</Build> <Revision>0</Revision> </Version> - <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features (easier configuration, reboot option, ...) and configurable support for "away mode" on Vista and Win7 systems.</ExtensionDescription> - <VersionDescription>Version 1.2.6.0 - Beta version for MP 1.2.x and 1.3.x</VersionDescription> - <DevelopmentStatus>Beta</DevelopmentStatus> - <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=40</OnlineLocation> - <ReleaseDate>2012-01-29T16:03:54</ReleaseDate> + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: +- Plug&Play mode (just select profile and idle time) +- Windows power settings are made automatically +- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) +- Client settings are automatically matched to server configuration on single-seat scenarios +- Configurable scheduler for automatic system reboot +- Processes, Network monitor and Active shares also for standalone clients +- Audio is unmuted after wakeup or return from away mode if necessary +- ...</ExtensionDescription> + <VersionDescription>Version 1.2.3.0 - Stable version for MP 1.2.x</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2012-05-15T16:03:54</ReleaseDate> <Tags>tv server plugins, automation</Tags> <Location>..\MPEI\[Name] [Version].mpe1</Location> <Params> @@ -265,7 +130,16 @@ If have .dll extension used like MP plugin configuration</Description> </SectionParam> <SectionParam Name="Online Screenshots"> - <Value /> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1373.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1374.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1375.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1376.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1377.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1378.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1379.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1380.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1381.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1382.png;</Value> <ValueType>String</ValueType> <Description>Online stored screenshot urls separated by ; </Description> </SectionParam> Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs 2012-05-16 15:32:18 UTC (rev 4486) @@ -175,11 +175,11 @@ this.checkBoxRebootWakeup.AutoSize = true; this.checkBoxRebootWakeup.Location = new System.Drawing.Point(12, 117); this.checkBoxRebootWakeup.Name = "checkBoxRebootWakeup"; - this.checkBoxRebootWakeup.Size = new System.Drawing.Size(150, 17); + this.checkBoxRebootWakeup.Size = new System.Drawing.Size(180, 17); this.checkBoxRebootWakeup.TabIndex = 4; - this.checkBoxRebootWakeup.Text = "Wakeup system for reboot"; - this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, reboot will be caught up when the system is running again.\r\nThe sys" + - "tem will reboot only when not busy with other tasks."); + this.checkBoxRebootWakeup.Text = "Wakeup the computer for reboot"; + this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, the reboot will be caught up when the system is running again.\r\nThe" + + " computer will reboot only when not busy with other tasks."); this.checkBoxRebootWakeup.UseVisualStyleBackColor = true; this.checkBoxRebootWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable); // @@ -280,11 +280,11 @@ this.checkBoxMPClientRunning.AutoSize = true; this.checkBoxMPClientRunning.Location = new System.Drawing.Point(12, 52); this.checkBoxMPClientRunning.Name = "checkBoxMPClientRunning"; - this.checkBoxMPClientRunning.Size = new System.Drawing.Size(309, 17); + this.checkBoxMPClientRunning.Size = new System.Drawing.Size(379, 17); this.checkBoxMPClientRunning.TabIndex = 2; - this.checkBoxMPClientRunning.Text = "No standby after idle timeout while MediaPortal client is not running"; - this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents standby after idle timeout while doing administrative work\r\n(only recommended for a single-" + - "seat HTPC)."); + this.checkBoxMPClientRunning.Text = "Do not put the computer to sleep while the MediaPortal client is not running"; + this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents automatic standby while doing administrative work\r\n(only recommended for" + + " a single-seat HTPC)."); this.checkBoxMPClientRunning.UseVisualStyleBackColor = true; this.checkBoxMPClientRunning.CheckedChanged += new System.EventHandler(this.checkBoxMPClientRunning_CheckedChanged); // @@ -293,9 +293,9 @@ this.checkBoxProcessesAwayMode.AutoSize = true; this.checkBoxProcessesAwayMode.Location = new System.Drawing.Point(34, 77); this.checkBoxProcessesAwayMode.Name = "checkBoxProcessesAwayMode"; - this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(372, 17); + this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxProcessesAwayMode.TabIndex = 3; - this.checkBoxProcessesAwayMode.Text = "No user standby while processes are running (enable away mode)"; + this.checkBoxProcessesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxProcessesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " while the selected processes are running.\r\n"); this.checkBoxProcessesAwayMode.UseVisualStyleBackColor = true; @@ -328,9 +328,9 @@ this.checkBoxEPGAwayMode.AutoSize = true; this.checkBoxEPGAwayMode.Location = new System.Drawing.Point(34, 175); this.checkBoxEPGAwayMode.Name = "checkBoxEPGAwayMode"; - this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(334, 17); + this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxEPGAwayMode.TabIndex = 6; - this.checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG (enable away mode)"; + this.checkBoxEPGAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxEPGAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " until EPG grabbing is completed."); this.checkBoxEPGAwayMode.UseVisualStyleBackColor = true; @@ -351,10 +351,11 @@ this.checkBoxEPGPreventStandby.AutoSize = true; this.checkBoxEPGPreventStandby.Location = new System.Drawing.Point(12, 150); this.checkBoxEPGPreventStandby.Name = "checkBoxEPGPreventStandby"; - this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(225, 17); + this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(277, 17); this.checkBoxEPGPreventStandby.TabIndex = 5; - this.checkBoxEPGPreventStandby.Text = "No standby after idle timeout while grabbing EPG"; - this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The system will not go to standby until EPG grabbing is completed."); + this.checkBoxEPGPreventStandby.Text = "Do not put the computer to sleep while grabbing EPG"; + this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The computer will not go to standby automatically until EPG grabbing is completed" + + "."); this.checkBoxEPGPreventStandby.UseVisualStyleBackColor = true; this.checkBoxEPGPreventStandby.CheckedChanged += new System.EventHandler(this.checkBoxEPGPreventStandby_CheckedChanged); // @@ -363,9 +364,9 @@ this.checkBoxNetworkAwayMode.AutoSize = true; this.checkBoxNetworkAwayMode.Location = new System.Drawing.Point(34, 72); this.checkBoxNetworkAwayMode.Name = "checkBoxNetworkAwayMode"; - this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(348, 17); + this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxNetworkAwayMode.TabIndex = 3; - this.checkBoxNetworkAwayMode.Text = "No user standby while network is active (enable away mode)"; + this.checkBoxNetworkAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxNetworkAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " while the network is active.\r\n"); this.checkBoxNetworkAwayMode.UseVisualStyleBackColor = true; @@ -376,9 +377,9 @@ this.checkBoxSharesAwayMode.AutoSize = true; this.checkBoxSharesAwayMode.Location = new System.Drawing.Point(34, 200); this.checkBoxSharesAwayMode.Name = "checkBoxSharesAwayMode"; - this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(349, 17); + this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxSharesAwayMode.TabIndex = 4; - this.checkBoxSharesAwayMode.Text = "No user standby while shares are active (enable away mode)"; + this.checkBoxSharesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxSharesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " while the selected shares are active.\r\n"); this.checkBoxSharesAwayMode.UseVisualStyleBackColor = true; @@ -458,9 +459,9 @@ this.checkBoxReinitializeController.AutoSize = true; this.checkBoxReinitializeController.Location = new System.Drawing.Point(12, 22); this.checkBoxReinitializeController.Name = "checkBoxReinitializeController"; - this.checkBoxReinitializeController.Size = new System.Drawing.Size(295, 17); + this.checkBoxReinitializeController.Size = new System.Drawing.Size(303, 17); this.checkBoxReinitializeController.TabIndex = 0; - this.checkBoxReinitializeController.Text = "Reinitialize tvcontroller on wakeup (also reinitializes tuner)"; + this.checkBoxReinitializeController.Text = "Reinitialize TV controller on wakeup (also reinitializes tuner)"; this.toolTip.SetToolTip(this.checkBoxReinitializeController, "Reinitializes the internal TV controller and tuner setup (does not restart the TV" + "-Server)."); this.checkBoxReinitializeController.UseVisualStyleBackColor = true; @@ -510,10 +511,10 @@ this.checkBoxNetworkEnabled.AutoSize = true; this.checkBoxNetworkEnabled.Location = new System.Drawing.Point(12, 22); this.checkBoxNetworkEnabled.Name = "checkBoxNetworkEnabled"; - this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(239, 17); + this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(309, 17); this.checkBoxNetworkEnabled.TabIndex = 0; - this.checkBoxNetworkEnabled.Text = "No standby after idle timeout while network is active"; - this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The system will not go to standby while the network is active."); + this.checkBoxNetworkEnabled.Text = "Do not put the computer to sleep while the network is active"; + this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The computer will not go to standby automatically while the network is active."); this.checkBoxNetworkEnabled.UseVisualStyleBackColor = true; this.checkBoxNetworkEnabled.CheckedChanged += new System.EventHandler(this.checkBoxNetworkEnabled_CheckedChanged); // @@ -522,10 +523,11 @@ this.checkBoxSharesEnabled.AutoSize = true; this.checkBoxSharesEnabled.Location = new System.Drawing.Point(12, 22); this.checkBoxSharesEnabled.Name = "checkBoxSharesEnabled"; - this.checkBoxSharesEnabled.Size = new System.Drawing.Size(240, 17); + this.checkBoxSharesEnabled.Size = new System.Drawing.Size(292, 17); this.checkBoxSharesEnabled.TabIndex = 0; - this.checkBoxSharesEnabled.Text = "No standby after idle timeout while shares are active"; - this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The system will not go to standby while the selected shares are active."); + this.checkBoxSharesEnabled.Text = "Do not put the computer to sleep while shares are active"; + this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The computer will not go to standby automatically while the selected shares are a" + + "ctive."); this.checkBoxSharesEnabled.UseVisualStyleBackColor = true; this.checkBoxSharesEnabled.CheckedChanged += new System.EventHandler(this.checkBoxSharesEnabled_CheckedChanged); // @@ -560,7 +562,7 @@ // this.numericUpDownIdleTimeout.Anchor = System.Windows.Forms.AnchorStyles.None; this.numericUpDownIdleTimeout.AutoSize = true; - this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(79, 3); + this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(161, 3); this.numericUpDownIdleTimeout.Maximum = new decimal(new int[] { 300, 0, @@ -782,9 +784,9 @@ this.checkBoxEPGWakeup.AutoSize = true; this.checkBoxEPGWakeup.Location = new System.Drawing.Point(12, 117); this.checkBoxEPGWakeup.Name = "checkBoxEPGWakeup"; - this.checkBoxEPGWakeup.Size = new System.Drawing.Size(186, 17); + this.checkBoxEPGWakeup.Size = new System.Drawing.Size(216, 17); this.checkBoxEPGWakeup.TabIndex = 4; - this.checkBoxEPGWakeup.Text = "Wakeup system for EPG grabbing"; + this.checkBoxEPGWakeup.Text = "Wakeup the computer for EPG grabbing"; this.checkBoxEPGWakeup.UseVisualStyleBackColor = true; this.checkBoxEPGWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable); // @@ -1283,26 +1285,26 @@ this.labelIdleTimeout1.AutoSize = true; this.labelIdleTimeout1.Location = new System.Drawing.Point(3, 6); this.labelIdleTimeout1.Name = "labelIdleTimeout1"; - this.labelIdleTimeout1.Size = new System.Drawing.Size(70, 13); + this.labelIdleTimeout1.Size = new System.Drawing.Size(152, 13); this.labelIdleTimeout1.TabIndex = 10; - this.labelIdleTimeout1.Text = "Standby after"; + this.labelIdleTimeout1.Text = "Put the computer to sleep after"; // // labelIdleTimeout2 // this.labelIdleTimeout2.Anchor = System.Windows.Forms.AnchorStyles.None; this.labelIdleTimeout2.AutoSize = true; - this.labelIdleTimeout2.Location = new System.Drawing.Point(126, 6); + this.labelIdleTimeout2.Location = new System.Drawing.Point(208, 6); this.labelIdleTimeout2.Name = "labelIdleTimeout2"; - this.labelIdleTimeout2.Size = new System.Drawing.Size(105, 13); + this.labelIdleTimeout2.Size = new System.Drawing.Size(43, 13); this.labelIdleTimeout2.TabIndex = 12; - this.labelIdleTimeout2.Text = "minutes (idle timeout)"; + this.labelIdleTimeout2.Text = "minutes"; // // labelExpertMode // this.labelExpertMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.labelExpertMode.AutoSize = true; this.labelExpertMode.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlLight; + this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlDark; this.labelExpertMode.Location = new System.Drawing.Point(237, 212); this.labelExpertMode.Name = "labelExpertMode"; this.labelExpertMode.RightToLeft = System.Windows.Forms.RightToLeft.No; Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs 2012-05-16 15:32:18 UTC (rev 4486) @@ -162,10 +162,10 @@ // For Windows XP change away mode label texts if (Environment.OSVersion.Version.Major < 6) { - checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG"; - checkBoxProcessesAwayMode.Text = "No user standby while processes are running"; - checkBoxNetworkAwayMode.Text = "No user standby while network is active"; - checkBoxSharesAwayMode.Text = "No user standby while shares are active"; + checkBoxEPGAwayMode.Text = "Prevent the user from putting the computer to sleep"; + checkBoxProcessesAwayMode.Text = "Prevent the user from putting the computer to sleep"; + checkBoxNetworkAwayMode.Text = "Prevent the user from putting the computer to sleep"; + checkBoxSharesAwayMode.Text = "Prevent the user from putting the computer to sleep"; } #if SERVER Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx 2012-05-16 15:32:18 UTC (rev 4486) @@ -170,6 +170,6 @@ <value>Available Profiles: HTPC: Dedicated multimedia appliance with MediaPortal GUI Desktop: MediaPortal as application for viewing media and recording TV -Notebook: Optimized for mobile use, no scheduled recordings</value> +Notebook: Optimized for mobile use, no scheduled wakeup</value> </data> </root> \ No newline at end of file Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/VersionInfo.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/VersionInfo.cs 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/VersionInfo.cs 2012-05-16 15:32:18 UTC (rev 4486) @@ -47,9 +47,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.2.6.0")] -[assembly: AssemblyFileVersion("1.2.6.0")] -[assembly: AssemblyInformationalVersion("1.2.6.0 beta version for MP 1.2.x and 1.3.x")] +[assembly: AssemblyVersion("1.2.3.0")] +[assembly: AssemblyFileVersion("1.2.3.0")] +[assembly: AssemblyInformationalVersion("1.2.3.0 version for MP 1.2.x")] Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs 2012-05-16 15:32:18 UTC (rev 4486) @@ -1031,7 +1031,7 @@ using (Settings reader = new MPSettings()) { // Check if we only should suspend in MP's home window - boolSetting = reader.GetValueAsBool("psclientplugin", "homeonly", false); + boolSetting = reader.GetValueAsBool("psclientplugin", "HomeOnly", false); setting = _settings.GetSetting("HomeOnly"); setting.Set<bool>(boolSetting); Log.Debug("PS: Only allow standby when on home window: {0}", boolSetting); @@ -1059,7 +1059,7 @@ else boolSetting = true; // HTPC, Desktop _settings.WakeupEnabled = boolSetting; - Log.Debug("PS: Wakeup system for varios events: {0}", boolSetting); + Log.Debug("PS: Wakeup system for various events: {0}", boolSetting); // Check configured shutdown mode intSetting = reader.GetValueAsInt("psclientplugin", "ShutdownMode", 0); @@ -1086,7 +1086,7 @@ if (_settings.ShutdownEnabled != boolSetting) { _settings.ShutdownEnabled = boolSetting; - Log.Debug("PS: PowerScheduler++ forces system to go to standby when idle: {0}", boolSetting); + Log.Debug("PS: Server plugin setting - PowerScheduler++ forces system to go to standby when idle: {0}", boolSetting); changed = true; } @@ -1095,7 +1095,7 @@ if (_settings.IdleTimeout != intSetting) { _settings.IdleTimeout = intSetting; - Log.Debug("PS: {0}: {1} minutes", (_settings.ShutdownEnabled ? "Standby after" : "System idle timeout"), intSetting); + Log.Debug("PS: Server plugin setting - {0}: {1} minutes", (_settings.ShutdownEnabled ? "Standby after" : "System idle timeout"), intSetting); changed = true; } @@ -1104,7 +1104,7 @@ if (_settings.WakeupEnabled != boolSetting) { _settings.WakeupEnabled = boolSetting; - Log.Debug("PS: Wakeup system for varios events: {0}", boolSetting); + Log.Debug("PS: Server plugin setting - Wakeup system for various events: {0}", boolSetting); changed = true; } @@ -1113,7 +1113,7 @@ if ((int)_settings.ShutdownMode != intSetting) { _settings.ShutdownMode = (ShutdownMode)intSetting; - Log.Debug("PS: Shutdown mode: {0}", _settings.ShutdownMode.ToString()); + Log.Debug("PS: Server plugin setting - Shutdown mode: {0}", _settings.ShutdownMode.ToString()); changed = true; } } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs 2012-05-16 15:32:18 UTC (rev 4486) @@ -175,11 +175,11 @@ this.checkBoxRebootWakeup.AutoSize = true; this.checkBoxRebootWakeup.Location = new System.Drawing.Point(12, 117); this.checkBoxRebootWakeup.Name = "checkBoxRebootWakeup"; - this.checkBoxRebootWakeup.Size = new System.Drawing.Size(150, 17); + this.checkBoxRebootWakeup.Size = new System.Drawing.Size(180, 17); this.checkBoxRebootWakeup.TabIndex = 4; - this.checkBoxRebootWakeup.Text = "Wakeup system for reboot"; - this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, reboot will be caught up when the system is running again.\r\nThe sys" + - "tem will reboot only when not busy with other tasks."); + this.checkBoxRebootWakeup.Text = "Wakeup the computer for reboot"; + this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, the reboot will be caught up when the system is running again.\r\nThe" + + " computer will reboot only when not busy with other tasks."); this.checkBoxRebootWakeup.UseVisualStyleBackColor = true; this.checkBoxRebootWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable); // @@ -280,11 +280,11 @@ this.checkBoxMPClientRunning.AutoSize = true; this.checkBoxMPClientRunning.Location = new System.Drawing.Point(12, 52); this.checkBoxMPClientRunning.Name = "checkBoxMPClientRunning"; - this.checkBoxMPClientRunning.Size = new System.Drawing.Size(309, 17); + this.checkBoxMPClientRunning.Size = new System.Drawing.Size(379, 17); this.checkBoxMPClientRunning.TabIndex = 2; - this.checkBoxMPClientRunning.Text = "No standby after idle timeout while MediaPortal client is not running"; - this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents standby after idle timeout while doing administrative work\r\n(only recommended for a single-" + - "seat HTPC)."); + this.checkBoxMPClientRunning.Text = "Do not put the computer to sleep while the MediaPortal client is not running"; + this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents automatic standby while doing administrative work\r\n(only recommended for" + + " a single-seat HTPC)."); this.checkBoxMPClientRunning.UseVisualStyleBackColor = true; this.checkBoxMPClientRunning.CheckedChanged += new System.EventHandler(this.checkBoxMPClientRunning_CheckedChanged); // @@ -293,9 +293,9 @@ this.checkBoxProcessesAwayMode.AutoSize = true; this.checkBoxProcessesAwayMode.Location = new System.Drawing.Point(34, 77); this.checkBoxProcessesAwayMode.Name = "checkBoxProcessesAwayMode"; - this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(372, 17); + this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxProcessesAwayMode.TabIndex = 3; - this.checkBoxProcessesAwayMode.Text = "No user standby while processes are running (enable away mode)"; + this.checkBoxProcessesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxProcessesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " while the selected processes are running.\r\n"); this.checkBoxProcessesAwayMode.UseVisualStyleBackColor = true; @@ -328,9 +328,9 @@ this.checkBoxEPGAwayMode.AutoSize = true; this.checkBoxEPGAwayMode.Location = new System.Drawing.Point(34, 175); this.checkBoxEPGAwayMode.Name = "checkBoxEPGAwayMode"; - this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(334, 17); + this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxEPGAwayMode.TabIndex = 6; - this.checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG (enable away mode)"; + this.checkBoxEPGAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxEPGAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " until EPG grabbing is completed."); this.checkBoxEPGAwayMode.UseVisualStyleBackColor = true; @@ -351,10 +351,11 @@ this.checkBoxEPGPreventStandby.AutoSize = true; this.checkBoxEPGPreventStandby.Location = new System.Drawing.Point(12, 150); this.checkBoxEPGPreventStandby.Name = "checkBoxEPGPreventStandby"; - this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(225, 17); + this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(277, 17); this.checkBoxEPGPreventStandby.TabIndex = 5; - this.checkBoxEPGPreventStandby.Text = "No standby after idle timeout while grabbing EPG"; - this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The system will not go to standby until EPG grabbing is completed."); + this.checkBoxEPGPreventStandby.Text = "Do not put the computer to sleep while grabbing EPG"; + this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The computer will not go to standby automatically until EPG grabbing is completed" + + "."); this.checkBoxEPGPreventStandby.UseVisualStyleBackColor = true; this.checkBoxEPGPreventStandby.CheckedChanged += new System.EventHandler(this.checkBoxEPGPreventStandby_CheckedChanged); // @@ -363,9 +364,9 @@ this.checkBoxNetworkAwayMode.AutoSize = true; this.checkBoxNetworkAwayMode.Location = new System.Drawing.Point(34, 72); this.checkBoxNetworkAwayMode.Name = "checkBoxNetworkAwayMode"; - this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(348, 17); + this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxNetworkAwayMode.TabIndex = 3; - this.checkBoxNetworkAwayMode.Text = "No user standby while network is active (enable away mode)"; + this.checkBoxNetworkAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxNetworkAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " while the network is active.\r\n"); this.checkBoxNetworkAwayMode.UseVisualStyleBackColor = true; @@ -376,9 +377,9 @@ this.checkBoxSharesAwayMode.AutoSize = true; this.checkBoxSharesAwayMode.Location = new System.Drawing.Point(34, 200); this.checkBoxSharesAwayMode.Name = "checkBoxSharesAwayMode"; - this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(349, 17); + this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(344, 17); this.checkBoxSharesAwayMode.TabIndex = 4; - this.checkBoxSharesAwayMode.Text = "No user standby while shares are active (enable away mode)"; + this.checkBoxSharesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep"; this.toolTip.SetToolTip(this.checkBoxSharesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" + " while the selected shares are active.\r\n"); this.checkBoxSharesAwayMode.UseVisualStyleBackColor = true; @@ -458,9 +459,9 @@ this.checkBoxReinitializeController.AutoSize = true; this.checkBoxReinitializeController.Location = new System.Drawing.Point(12, 22); this.checkBoxReinitializeController.Name = "checkBoxReinitializeController"; - this.checkBoxReinitializeController.Size = new System.Drawing.Size(295, 17); + this.checkBoxReinitializeController.Size = new System.Drawing.Size(303, 17); this.checkBoxReinitializeController.TabIndex = 0; - this.checkBoxReinitializeController.Text = "Reinitialize tvcontroller on wakeup (also reinitializes tuner)"; + this.checkBoxReinitializeController.Text = "Reinitialize TV controller on wakeup (also reinitializes tuner)"; this.toolTip.SetToolTip(this.checkBoxReinitializeController, "Reinitializes the internal TV controller and tuner setup (does not restart the TV" + "-Server)."); this.checkBoxReinitializeController.UseVisualStyleBackColor = true; @@ -510,10 +511,10 @@ this.checkBoxNetworkEnabled.AutoSize = true; this.checkBoxNetworkEnabled.Location = new System.Drawing.Point(12, 22); this.checkBoxNetworkEnabled.Name = "checkBoxNetworkEnabled"; - this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(239, 17); + this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(309, 17); this.checkBoxNetworkEnabled.TabIndex = 0; - this.checkBoxNetworkEnabled.Text = "No standby after idle timeout while network is active"; - this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The system will not go to standby while the network is active."); + this.checkBoxNetworkEnabled.Text = "Do not put the computer to sleep while the network is active"; + this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The computer will not go to standby automatically while the network is active."); this.checkBoxNetworkEnabled.UseVisualStyleBackColor = true; this.checkBoxNetworkEnabled.CheckedChanged += new System.EventHandler(this.checkBoxNetworkEnabled_CheckedChanged); // @@ -522,10 +523,11 @@ this.checkBoxSharesEnabled.AutoSize = true; this.checkBoxSharesEnabled.Location = new System.Drawing.Point(12, 22); this.checkBoxSharesEnabled.Name = "checkBoxSharesEnabled"; - this.checkBoxSharesEnabled.Size = new System.Drawing.Size(240, 17); + this.checkBoxSharesEnabled.Size = new System.Drawing.Size(292, 17); this.checkBoxSharesEnabled.TabIndex = 0; - this.checkBoxSharesEnabled.Text = "No standby after idle timeout while shares are active"; - this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The system will not go to standby while the selected shares are active."); + this.checkBoxSharesEnabled.Text = "Do not put the computer to sleep while shares are active"; + this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The computer will not go to standby automatically while the selected shares are a" + + "ctive."); this.checkBoxSharesEnabled.UseVisualStyleBackColor = true; this.checkBoxSharesEnabled.CheckedChanged += new System.EventHandler(this.checkBoxSharesEnabled_CheckedChanged); // @@ -560,7 +562,7 @@ // this.numericUpDownIdleTimeout.Anchor = System.Windows.Forms.AnchorStyles.None; this.numericUpDownIdleTimeout.AutoSize = true; - this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(79, 3); + this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(161, 3); this.numericUpDownIdleTimeout.Maximum = new decimal(new int[] { 300, 0, @@ -782,9 +784,9 @@ this.checkBoxEPGWakeup.AutoSize = true; this.checkBoxEPGWakeup.Location = new System.Drawing.Point(12, 117); this.checkBoxEPGWakeup.Name = "checkBoxEPGWakeup"; - this.checkBoxEPGWakeup.Size = new System.Drawing.Size(186, 17); + this.checkBoxEPGWakeup.Size = new System.Drawing.Size(216, 17); this.checkBoxEPGWakeup.TabIndex = 4; - this.checkBoxEPGWakeup.Text = "Wakeup system for EPG grabbing"; + this.checkBoxEPGWakeup.Text = "Wakeup the computer for EPG grabbing"; this.checkBoxEPGWakeup.UseVisualStyleBackColor = true; this.checkBoxEPGWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable); // @@ -1283,26 +1285,26 @@ this.labelIdleTimeout1.AutoSize = true; this.labelIdleTimeout1.Location = new System.Drawing.Point(3, 6); this.labelIdleTimeout1.Name = "labelIdleTimeout1"; - this.labelIdleTimeout1.Size = new System.Drawing.Size(70, 13); + this.labelIdleTimeout1.Size = new System.Drawing.Size(152, 13); this.labelIdleTimeout1.TabIndex = 10; - this.labelIdleTimeout1.Text = "Standby after"; + this.labelIdleTimeout1.Text = "Put the computer to sleep after"; // // labelIdleTimeout2 // this.labelIdleTimeout2.Anchor = System.Windows.Forms.AnchorStyles.None; this.labelIdleTimeout2.AutoSize = true; - this.labelIdleTimeout2.Location = new System.Drawing.Point(126, 6); + this.labelIdleTimeout2.Location = new System.Drawing.Point(208, 6); this.labelIdleTimeout2.Name = "labelIdleTimeout2"; - this.labelIdleTimeout2.Size = new System.Drawing.Size(105, 13); + this.labelIdleTimeout2.Size = new System.Drawing.Size(43, 13); this.labelIdleTimeout2.TabIndex = 12; - this.labelIdleTimeout2.Text = "minutes (idle timeout)"; + this.labelIdleTimeout2.Text = "minutes"; // // labelExpertMode // this.labelExpertMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.labelExpertMode.AutoSize = true; this.labelExpertMode.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlLight; + this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlDark; this.labelExpertMode.Location = new System.Drawing.Point(237, 212); this.labelExpertMode.Name = "labelExpertMode"; this.labelExpertMode.RightToLeft = System.Windows.Forms.RightToLeft.No; Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs 2012-05-16 15:32:18 UTC (rev 4486) @@ -162,10 +162,10 @@ // For Windows XP change away mode label texts if (Environment.OSVersion.Version.Major < 6) { - checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG"; - checkBoxProcessesAwayMode.Text = "No user standby while processes are running"; - checkBoxNetworkAwayMode.Text = "No user standby while network is active"; - checkBoxSharesAwayMode.Text = "No user standby while shares are active"; + checkBoxEPGAwayMode.Text = "Prevent the user from putting the computer to sleep"; + checkBoxProcessesAwayMode.Text = "Prevent the user from putting the computer to sleep"; + checkBoxNetworkAwayMode.Text = "Prevent the user from putting the computer to sleep"; + checkBoxSharesAwayMode.Text = "Prevent the user from putting the computer to sleep"; } #if SERVER Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx =================================================================== --- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx 2012-05-14 16:15:13 UTC (rev 4485) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx 2012-05-16 15:32:18 UTC (rev 4486) @@ -170,6 +170,6 @@ <value>Available Profiles: HTPC: Dedicated multimedia appliance with MediaPortal GUI Desktop: MediaPortal as application for viewing media and recording TV -Notebook: Optimized for mobile use, no scheduled recordings</value> +Notebook: Optimized for mobile use, no scheduled wakeup</value> </data> </root> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2012-07-06 17:36:19
|
Revision: 4495 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4495&view=rev Author: michael-t Date: 2012-07-06 17:36:09 +0000 (Fri, 06 Jul 2012) Log Message: ----------- Stable Version 1.2.3.3 Modified Paths: -------------- trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Common.Utils.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Core.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Common.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Framework.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/PluginBase.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/SetupControls.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVDatabase.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVLibrary.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvBusinessLayer.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvControl.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvLibrary.Interfaces.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvService.exe trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Utils.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++.xmp2 trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/update.xml trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSettingsForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/SelectProcessForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/WindowsController.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/VersionInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/ActiveNetworkStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/ActiveSharesStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/ProcessActiveStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/RebootWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerClientPlugin.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerFactory.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSettingsForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/SelectProcessForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/UnattendedWindow.cs Added Paths: ----------- trunk/plugins/PowerScheduler++/Stable/1.2.3.3/ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.3.mpe1 Removed Paths: ------------- trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.0.mpe1 Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Common.Utils.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Core.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Common.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Framework.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/PluginBase.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/SetupControls.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVDatabase.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVLibrary.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvBusinessLayer.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvControl.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvLibrary.Interfaces.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvService.exe =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Utils.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.0.mpe1 =================================================================== (Binary files differ) Added: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.3.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.3.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++.xmp2 =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++.xmp2 2012-07-06 17:36:09 UTC (rev 4495) @@ -98,7 +98,7 @@ <Description /> </SectionParam> <SectionParam Name="Description"> - <Value>This will install the [Name] [Version] plugin on your computer. This plugin is designed for MediaPortal 1.2.x and will not work with other MediaPortal releases. + <Value>This will install the [Name] [Version] plugin on your computer. This plugin is designed for MediaPortal 1.2.x and 1.3 and will not work with other MediaPortal releases. It is recommended that you close all other applications before continuing. @@ -476,18 +476,18 @@ <Id /> <MinVersion> <Major>1</Major> - <Minor>1</Minor> - <Build>6</Build> - <Revision>27644</Revision> + <Minor>2</Minor> + <Build>0</Build> + <Revision>0</Revision> </MinVersion> <MaxVersion> <Major>1</Major> - <Minor>2</Minor> - <Build>99999</Build> - <Revision>99999</Revision> + <Minor>3</Minor> + <Build>5</Build> + <Revision>0</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> <Name>PowerScheduler++</Name> </DependencyItem> <DependencyItem> @@ -506,7 +506,7 @@ <Revision>27644</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> <Name>PowerScheduler++</Name> </DependencyItem> </Items> @@ -525,21 +525,25 @@ <Major>1</Major> <Minor>2</Minor> <Build>3</Build> - <Revision>0</Revision> + <Revision>3</Revision> </Version> - <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: -- Plug&Play mode (just select profile and idle time) -- Windows power settings are made automatically -- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) -- Client settings are automatically matched to server configuration on single-seat scenarios -- Configurable scheduler for automatic system reboot -- Processes, Network monitor and Active shares also for standalone clients -- Audio is unmuted after wakeup or return from away mode if necessary + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: +- Plug&Play mode (just select profile and idle time) +- Windows power settings are made automatically +- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) +- Client settings are automatically matched to server configuration on single-seat scenarios +- Configurable scheduler for automatic system reboot +- Processes, Network monitor and Active shares also for standalone clients +- Audio is unmuted after wakeup or return from away mode if necessary - ...</ExtensionDescription> - <VersionDescription>Version 1.2.3.0 - Stable version for MP 1.2.x</VersionDescription> + <VersionDescription>Version 1.2.3.3 - Stable version for MP 1.2.x and 1.3 +- added awaymode/runmode attributes for external command (client only) +- removed workaround for 1.3 alpha compatibilty +- improved exception handling for ActiveNetworkStandbyHandler +- fixed RemoteClient standby handler and activity signalling</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> - <ReleaseDate>2012-05-15T16:03:54</ReleaseDate> + <ReleaseDate>2012-07-02T16:03:54</ReleaseDate> <Tags>tv server plugins, automation</Tags> <Location>..\MPEI\[Name] [Version].mpe1</Location> <Params> @@ -631,14 +635,14 @@ <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>PowerScheduler_high.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{34eff1a4-e2c5-45b8-bec9-5dee831bdf50}-PowerScheduler_high.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{a677e5c5-290b-4c00-a59c-743b364b8777}-PowerScheduler_high.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName> - <ZipFileName>Installer{CopyFile}\{022dd12c-f3ff-4cf1-a006-f456ecdba65c}-PowerScheduler.gif</ZipFileName> + <ZipFileName>Installer{CopyFile}\{97a773fa-9d37-4a89-b147-925ae48de647}-PowerScheduler.gif</ZipFileName> <DestinationFilename /> </FileItem> </Items> Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/update.xml =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/update.xml 2012-07-06 17:36:09 UTC (rev 4495) @@ -56,11 +56,11 @@ <MaxVersion> <Major>1</Major> <Minor>2</Minor> - <Build>99999</Build> - <Revision>99999</Revision> + <Build>9</Build> + <Revision>0</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal release 1.2.x (not compatible with 1.3 alpha and 1.1.x releases)</Message> <Name>PowerScheduler++</Name> </DependencyItem> <DependencyItem> @@ -79,7 +79,7 @@ <Revision>27644</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal release 1.2.x (not compatible with with 1.3 alpha and 1.1.x releases)</Message> <Name>PowerScheduler++</Name> </DependencyItem> </Items> @@ -159,5 +159,167 @@ </ProjectSettings> <IsSkin>false</IsSkin> </PackageClass> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Server files"> + <DisplayName>Server files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Server files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Client files"> + <DisplayName>Client files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Client files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Original Files"> + <DisplayName>Original Files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Original Files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Never"> + <DisplayName>Never</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Never</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items> + <DependencyItem> + <Type>Installer</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>2</Minor> + <Build>0</Build> + <Revision>0</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>3</Minor> + <Build>5</Build> + <Revision>0</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> + <Name>PowerScheduler++</Name> + </DependencyItem> + <DependencyItem> + <Type>MediaPortal</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>3</Minor> + <Build>5</Build> + <Revision>0</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> + <Name>PowerScheduler++</Name> + </DependencyItem> + </Items> + </Dependencies> + <PluginDependencies> + <Items /> + </PluginDependencies> + <GeneralInfo> + <Name>PowerScheduler++</Name> + <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> + <Author>michael_t (based on PowerScheduler by micheloe)</Author> + <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-2-1-stable-version-mediaportal-1-2-1-final-95463/#post733512</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> + <Version> + <Major>1</Major> + <Minor>2</Minor> + <Build>3</Build> + <Revision>3</Revision> + </Version> + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: +- Plug&Play mode (just select profile and idle time) +- Windows power settings are made automatically +- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) +- Client settings are automatically matched to server configuration on single-seat scenarios +- Configurable scheduler for automatic system reboot +- Processes, Network monitor and Active shares also for standalone clients +- Audio is unmuted after wakeup or return from away mode if necessary +- ...</ExtensionDescription> + <VersionDescription>Version 1.2.3.3 - Stable version for MP 1.2.x and 1.3 +- added awaymode/runmode attributes for external command (client only) +- removed workaround for 1.3 alpha compatibilty +- improved exception handling for ActiveNetworkStandbyHandler +- fixed RemoteClient standby handler and activity signalling</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2012-07-02T16:03:54</ReleaseDate> + <Tags>tv server plugins, automation</Tags> + <Location>..\MPEI\[Name] [Version].mpe1</Location> + <Params> + <Items> + <SectionParam Name="Online Icon"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value>%TvServerBase%\SetupTv.exe</Value> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1373.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1374.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1375.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1376.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1377.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1378.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1379.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1380.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1381.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1382.png;</Value> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>YES</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + <IsSkin>false</IsSkin> + </PackageClass> </Items> </ExtensionCollection> \ No newline at end of file Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -137,19 +137,18 @@ private void NetworkMonitorHandler_OnPowerSchedulerEvent(PowerSchedulerEventArgs args) { + IPowerScheduler ps = GlobalServiceProvider.Instance.Get<IPowerScheduler>(); + if (ps == null) + return; + + TvBusinessLayer layer = new TvBusinessLayer(); + PowerSetting setting; + bool enabled; + switch (args.EventType) { case PowerSchedulerEventType.Elapsed: - IPowerScheduler ps = GlobalServiceProvider.Instance.Get<IPowerScheduler>(); - if (ps == null) - return; - - TvBusinessLayer layer = new TvBusinessLayer(); - PowerSetting setting; - - bool enabled; - // Check if standby should be prevented setting = ps.Settings.GetSetting("NetworkMonitorEnabled"); enabled = Convert.ToBoolean(layer.GetSetting("PowerSchedulerNetworkMonitorEnabled", "false").Value); @@ -179,15 +178,15 @@ setting.Set<Int32>(_idleLimit); Log.Debug("NetworkMonitorHandler: Idle limit in KB/s: {0}", _idleLimit); } - } - // Check if away mode should be used - setting = ps.Settings.GetSetting("NetworkMonitorAwayMode"); - _useAwayMode = Convert.ToBoolean(layer.GetSetting("PowerSchedulerNetworkMonitorAwayMode", "false").Value); - if (setting.Get<bool>() != _useAwayMode) - { - setting.Set<bool>(_useAwayMode); - Log.Debug("NetworkMonitorHandler: Use away mode: {0}", _useAwayMode); + // Check if away mode should be used + setting = ps.Settings.GetSetting("NetworkMonitorAwayMode"); + _useAwayMode = Convert.ToBoolean(layer.GetSetting("PowerSchedulerNetworkMonitorAwayMode", "false").Value); + if (setting.Get<bool>() != _useAwayMode) + { + setting.Set<bool>(_useAwayMode); + Log.Debug("NetworkMonitorHandler: Use away mode: {0}", _useAwayMode); + } } break; @@ -217,7 +216,8 @@ } catch (Exception ex) { - Log.Error("NetworkMonitorHandler: Error in StartNetworkMonitor: {0}", ex); + Log.Error("NetworkMonitorHandler: Exception in StartNetworkMonitor: {0}", ex); + Log.Info("NetworkMonitorHandler: Exception in StartNetworkMonitor: {0}", ex); } } @@ -255,14 +255,22 @@ foreach (NetworkAdapter adapter in _monitoredAdapters) { - adapter.Update(); - if ((adapter.DlSpeed >= _idleLimit) || (adapter.UlSpeed >= _idleLimit)) + try { - // Log.Debug("NetworkMonitorHandler: standby prevented: {0}", adapter.Name); - // Log.Debug("NetworkMonitorHandler: dlSpeed: {0}", adapter.DlSpeed); - // Log.Debug("NetworkMonitorHandler: ulSpeed: {0}", adapter.UlSpeed); - _preventers++; + adapter.Update(); + if ((adapter.DlSpeed >= _idleLimit) || (adapter.UlSpeed >= _idleLimit)) + { + // Log.Debug("NetworkMonitorHandler: standby prevented: {0}", adapter.Name); + // Log.Debug("NetworkMonitorHandler: dlSpeed: {0}", adapter.DlSpeed); + // Log.Debug("NetworkMonitorHandler: ulSpeed: {0}", adapter.UlSpeed); + _preventers++; + } } + catch (Exception ex) + { + Log.Error("NetworkMonitorHandler: Exception in updating adapter {0}: {1}", adapter.Name, ex.Message); + Log.Info("NetworkMonitorHandler: Exception in updating adapter {0}: {1}", adapter.Name, ex.Message); + } } if (_preventers > 0) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -143,11 +143,12 @@ // Check if user is timeshifting if (_controller.CardCollection[cardId].TimeShifter.IsTimeShifting(ref users[i])) { - _handlerName = "ControllerActive (Timeshifting)"; + _handlerName = "ControllerActive (Local timeshifting)"; isTimeShifting = true; if (!PowerManager.IsLocal(users[i].Name)) { // Timeshifting to a remote client + _handlerName = "ControllerActive (Remote timeshifting)"; return StandbyMode.AwayModeRequested; } } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -263,7 +263,7 @@ psi.WindowStyle = ProcessWindowStyle.Minimized; psi.Arguments = action; psi.ErrorDialog = false; - if (OSInfo.OSInfo.VistaOrLater()) + if (System.Environment.Version.Major >= 6) { psi.Verb = "runas"; } @@ -275,9 +275,10 @@ p.Start(); p.WaitForExit(); } - catch (Exception e) + catch (Exception ex) { - Log.Write(e); + Log.Error("EpgGrabbingHandler: Exception in RunExternalCommand: {0}", ex.Message); + Log.Info("EpgGrabbingHandler: Exception in RunExternalCommand: {0}", ex.Message); } Log.Debug("EpgGrabbingHandler: External command finished"); } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -224,9 +224,10 @@ p.Start(); p.WaitForExit(); } - catch (Exception e) + catch (Exception ex) { - Log.Write(e); + Log.Error("RebootHandler: Exception in RunExternalCommand: {0}", ex.Message); + Log.Info("RebootHandler: Exception in RunExternalCommand: {0}", ex.Message); } Log.Debug("RebootHandler: External command finished"); } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -70,12 +70,11 @@ { get { - return _standbyMode != StandbyMode.StandbyAllowed; + return StandbyMode != StandbyMode.StandbyAllowed; } set { - _lastUpdate = DateTime.Now; - _standbyMode = value ? StandbyMode.AwayModeRequested : StandbyMode.StandbyAllowed; + StandbyMode = value ? StandbyMode.AwayModeRequested : StandbyMode.StandbyAllowed; } } @@ -94,7 +93,7 @@ { get { - // Check if last update was longer ago than idle timeout + // Check if last update was longer ago than timeout // If so, do not prevent standby any longer if (_lastUpdate.AddSeconds(_timeout) < DateTime.Now) { Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -347,7 +347,8 @@ Log.Debug("PS: Standby requested but system is configured to stay on"); break; default: - Log.Error("PS: unknown shutdown mode: {0}", _settings.ShutdownMode); + Log.Error("PS: Unknown shutdown mode: {0}", _settings.ShutdownMode); + Log.Info("PS: Unknown shutdown mode: {0}", _settings.ShutdownMode); break; } } @@ -889,7 +890,8 @@ } catch (Exception ex) { - Log.Error("PS: Exception in Start(): {0}", ex); + Log.Error("PS: Exception in Start: {0}", ex); + Log.Info("PS: Exception in Start: {0}", ex); Stop(); } } @@ -961,7 +963,8 @@ } catch (Exception ex) { - Log.Error("PS: Exception in Stop(): {0}", ex); + Log.Error("PS: Exception in Stop: {0}", ex); + Log.Info("PS: Exception in Stop: {0}", ex); } } @@ -1110,7 +1113,7 @@ if (!stringSetting.Equals(setting.Get<string>())) { setting.Set<string>(stringSetting); - Log.Debug("PS: Run command before standby / after wakeup: {0}", stringSetting); + Log.Debug("PS: Run command on power state change: {0}", stringSetting); changed = true; } @@ -1202,6 +1205,7 @@ _controller.EpgGrabberEnabled = false; DeInitController(); + // Run external command Log.Debug("PS: Run external command"); RunExternalCommand("Command", "suspend"); @@ -1422,7 +1426,7 @@ psi.WindowStyle = ProcessWindowStyle.Minimized; psi.Arguments = action; psi.ErrorDialog = false; - if (OSInfo.OSInfo.VistaOrLater()) + if (System.Environment.Version.Major >= 6) { psi.Verb = "runas"; } @@ -1436,7 +1440,8 @@ } catch (Exception ex) { - Log.Error("PS: Exception in RunExternalCommand(): {0}", ex); + Log.Error("PS: Exception in RunExternalCommand: {0}", ex); + Log.Info("PS: Exception in RunExternalCommand: {0}", ex); } Log.Debug("PS: External command finished"); } @@ -1452,7 +1457,7 @@ } else { - Log.Error("PS: Unable to register PowerScheduler as IPowerEventHandler service to GlobalServiceProvider"); + Log.Info("PS: Unable to register PowerScheduler as IPowerEventHandler service to GlobalServiceProvider"); } } @@ -1467,7 +1472,7 @@ } else { - Log.Error("PS: Unable to unregister IPowerEventHandler from GlobalServiceProvider"); + Log.Info("PS: Unable to unregister IPowerEventHandler from GlobalServiceProvider"); } } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/St... [truncated message content] |