From: <rs...@us...> - 2011-11-04 14:48:12
|
Revision: 4323 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4323&view=rev Author: rsenden Date: 2011-11-04 14:48:05 +0000 (Fri, 04 Nov 2011) Log Message: ----------- Updated for MP 1.2.x compatibility Modified Paths: -------------- trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1 trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2 trunk/plugins/SPressoDisplayPlugin/README.HTML trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/AControl2.exe trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/SPressoDisplayPlugin.dll trunk/plugins/SPressoDisplayPlugin/Release/test/SPressoTest.exe trunk/plugins/SPressoDisplayPlugin/Source/AControl2/obj/Release/AControl2.exe trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.csproj.GenerateResource.Cache trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.dll trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin.suo trunk/plugins/SPressoDisplayPlugin/Source/SPressoTest/obj/Release/SPressoTest.exe Modified: trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2 =================================================================== --- trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2 2011-11-04 14:04:43 UTC (rev 4322) +++ trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2 2011-11-04 14:48:05 UTC (rev 4323) @@ -4,6 +4,7 @@ <Groups> <Items> <GroupItem Name="Default"> + <ParentGroup /> <DisplayName>Default</DisplayName> <DefaulChecked>true</DefaulChecked> <Description>Default</Description> @@ -23,12 +24,12 @@ <ZipFileName>Installer{CopyFile}\{725a57da-2ead-4fe5-b720-599c7ad0802a}-SPressoDisplayPlugin.dll</ZipFileName> <DestinationFilename>%Plugins%\process\SPressoDisplayPlugin.dll</DestinationFilename> </FileItem> - <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\Release\InputDeviceMappings\defaults\SPressoAFPD.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{333717a9-871f-491e-a8ec-797e9f44208d}-SPressoAFPD.xml</ZipFileName> - <DestinationFilename>%CustomInputDefault%\SPressoAFPD.xml</DestinationFilename> + <DestinationFilename>%Base%\defaults\InputDeviceMappings\SPressoAFPD.xml</DestinationFilename> </FileItem> </Items> </Files> @@ -261,8 +262,45 @@ </Items> </Sections> <Dependencies> - <Items /> + <Items> + <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message> + <Name>MediaPortal</Name> + </DependencyItem> + </Items> </Dependencies> + <PluginDependencies> + <Items> + <PluginDependencyItem AssemblyName="SPressoDisplayPlugin.dll"> + <CompatibleVersion> + <Items> + <CompatibleVersionItem> + <MinRequiredVersion>1.1.6.27644</MinRequiredVersion> + <DesignedForVersion>1.1.6.27644</DesignedForVersion> + </CompatibleVersionItem> + </Items> + </CompatibleVersion> + <SubSystemsUsed> + <Items /> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> <GeneralInfo> <Name>SPressoDisplayPlugin</Name> <Id>02fa2bda-53fe-4920-9e5a-72719fac7eee</Id> @@ -272,17 +310,12 @@ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/SPressoDisplayPlugin/MPE/update.xml</UpdateUrl> <Version> <Major>2</Major> - <Minor>1</Minor> + <Minor>2</Minor> <Build>0</Build> <Revision>0</Revision> </Version> <ExtensionDescription>This extension allows MediaPortal to update the front panel display on an Asus S-Presso barebone, and to react to front panel button presses.</ExtensionDescription> - <VersionDescription>Version 2.1 includes the following changes: - -- Removed support for MediaPortal built-in TV Client (not supported anymore by MediaPortal 1.1.0) -- AControl2 no longer shows date/time (may fix some interoperability issues between AControl2 and MediaPortal plugin) -- Created MediaPortal Extension Installer package -- Various smaller updates</VersionDescription> + <VersionDescription>Updated for MediaPortal 1.2.x</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1</OnlineLocation> <ReleaseDate>2010-07-29T13:02:35.9879365+02:00</ReleaseDate> @@ -336,41 +369,21 @@ <ZipFileName>Installer{CopyFile}\{725a57da-2ead-4fe5-b720-599c7ad0802a}-SPressoDisplayPlugin.dll</ZipFileName> <DestinationFilename>%Plugins%\process\SPressoDisplayPlugin.dll</DestinationFilename> </FileItem> - <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\Release\InputDeviceMappings\defaults\SPressoAFPD.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{333717a9-871f-491e-a8ec-797e9f44208d}-SPressoAFPD.xml</ZipFileName> - <DestinationFilename>%CustomInputDefault%\SPressoAFPD.xml</DestinationFilename> + <DestinationFilename>%Base%\defaults\InputDeviceMappings\SPressoAFPD.xml</DestinationFilename> </FileItem> </Items> </UniqueFileList> <ProjectSettings> - <FolderGroups> - <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true"> - <Param1 /> - <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName /> - <ZipFileName>Installer{CopyFile}\{8451714b-ac23-455d-a9c6-d07f57dbf6f9}-</ZipFileName> - <DestinationFilename>%Plugins%\process</DestinationFilename> - <Folder>..\Release\plugins\process</Folder> - <Group>Default</Group> - <Recursive>false</Recursive> - </FolderGroup> - <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true"> - <Param1 /> - <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName /> - <ZipFileName>Installer{CopyFile}\{338600a4-a888-4338-b765-ed47fb0848b4}-</ZipFileName> - <DestinationFilename>%CustomInputDefault%</DestinationFilename> - <Folder>..\Release\InputDeviceMappings\defaults</Folder> - <Group>Default</Group> - <Recursive>false</Recursive> - </FolderGroup> - </FolderGroups> - <ProjectFilename>D:\Development\MediaPortal\Plugins\SPressoDisplayPlugin\MPE\SPressoDisplayPlugin.xmp2</ProjectFilename> - <UpdatePath1 /> + <FolderGroups /> + <ProjectFilename>SPressoDisplayPlugin.xmp2</ProjectFilename> + <UpdatePath1>D:\Development\MediaPortal\Plugins\KeyboardInputPlugin\MPE\update.xml</UpdatePath1> <UpdatePath2 /> <UpdatePath3 /> </ProjectSettings> + <IsSkin>false</IsSkin> </PackageClass> \ No newline at end of file Modified: trunk/plugins/SPressoDisplayPlugin/README.HTML =================================================================== --- trunk/plugins/SPressoDisplayPlugin/README.HTML 2011-11-04 14:04:43 UTC (rev 4322) +++ trunk/plugins/SPressoDisplayPlugin/README.HTML 2011-11-04 14:48:05 UTC (rev 4323) @@ -26,8 +26,6 @@ <link rel=colorSchemeMapping href="README_files/colorschememapping.xml"> <!--[if gte mso 9]><xml> <w:WordDocument> - <w:SpellingState>Clean</w:SpellingState> - <w:GrammarState>Clean</w:GrammarState> <w:TrackMoves>false</w:TrackMoves> <w:TrackFormatting/> <w:HyphenationZone>21</w:HyphenationZone> @@ -234,12 +232,11 @@ mso-font-signature:0 0 0 0 0 0;} @font-face {font-family:Consolas; - panose-1:0 0 0 0 0 0 0 0 0 0; + panose-1:2 11 6 9 2 2 4 3 2 4; mso-font-charset:0; - mso-generic-font-family:roman; - mso-font-format:other; - mso-font-pitch:auto; - mso-font-signature:0 0 0 0 0 0;} + mso-generic-font-family:modern; + mso-font-pitch:fixed; + mso-font-signature:-520092929 1073806591 9 0 415 0;} /* Style Definitions */ p.MsoNormal, li.MsoNormal, div.MsoNormal {mso-style-unhide:no; @@ -265,7 +262,7 @@ mso-outline-level:1; font-size:16.0pt; font-family:"Arial","sans-serif"; - mso-fareast-font-family:SimSun; + mso-fareast-font-family:"Times New Roman"; mso-fareast-theme-font:minor-fareast; mso-font-kerning:16.0pt;} h2 @@ -282,7 +279,7 @@ mso-outline-level:2; font-size:14.0pt; font-family:"Arial","sans-serif"; - mso-fareast-font-family:SimSun; + mso-fareast-font-family:"Times New Roman"; mso-fareast-theme-font:minor-fareast; font-style:italic;} a:link, span.MsoHyperlink @@ -314,7 +311,7 @@ font-family:"Cambria","serif"; mso-ascii-font-family:Cambria; mso-ascii-theme-font:major-latin; - mso-fareast-font-family:SimSun; + mso-fareast-font-family:"Times New Roman"; mso-fareast-theme-font:major-fareast; mso-hansi-font-family:Cambria; mso-hansi-theme-font:major-latin; @@ -334,7 +331,7 @@ font-family:"Cambria","serif"; mso-ascii-font-family:Cambria; mso-ascii-theme-font:major-latin; - mso-fareast-font-family:SimSun; + mso-fareast-font-family:"Times New Roman"; mso-fareast-theme-font:major-fareast; mso-hansi-font-family:Cambria; mso-hansi-theme-font:major-latin; @@ -350,15 +347,10 @@ mso-style-link:"Plain Text"; mso-ansi-font-size:10.5pt; mso-bidi-font-size:10.5pt; - font-family:"Consolas","serif"; + font-family:Consolas; mso-ascii-font-family:Consolas; - mso-hansi-font-family:Consolas;} -span.SpellE - {mso-style-name:""; - mso-spl-e:yes;} -span.GramE - {mso-style-name:""; - mso-gram-e:yes;} + mso-hansi-font-family:Consolas; + mso-bidi-font-family:Consolas;} .MsoChpDefault {mso-style-type:export-only; mso-default-props:yes; @@ -375,8 +367,16 @@ {page:WordSection1;} /* List Definitions */ @list l0 - {mso-list-id:6635120; - mso-list-template-ids:75410220;} + {mso-list-id:573395997; + mso-list-template-ids:861022582;} +@list l0:level1 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:36.0pt; + mso-level-number-position:left; + text-indent:-18.0pt; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} @list l1 {mso-list-id:894004367; mso-list-type:hybrid; @@ -418,113 +418,105 @@ mso-level-number-position:left; text-indent:-18.0pt;} @list l2 + {mso-list-id:1272275385; + mso-list-template-ids:-2072723930;} +@list l2:level1 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:36.0pt; + mso-level-number-position:left; + text-indent:-18.0pt; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3 + {mso-list-id:1275290077; + mso-list-template-ids:866950128;} +@list l4 {mso-list-id:1852068051; mso-list-type:hybrid; mso-list-template-ids:183894846 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} -@list l2:level1 +@list l4:level1 {mso-level-number-format:bullet; mso-level-text:\F0B7; mso-level-tab-stop:36.0pt; mso-level-number-position:left; text-indent:-18.0pt; font-family:Symbol;} -@list l2:level2 +@list l4:level2 {mso-level-tab-stop:72.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l2:level3 +@list l4:level3 {mso-level-tab-stop:108.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l2:level4 +@list l4:level4 {mso-level-tab-stop:144.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l2:level5 +@list l4:level5 {mso-level-tab-stop:180.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l2:level6 +@list l4:level6 {mso-level-tab-stop:216.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l2:level7 +@list l4:level7 {mso-level-tab-stop:252.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l2:level8 +@list l4:level8 {mso-level-tab-stop:288.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l2:level9 +@list l4:level9 {mso-level-tab-stop:324.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l3 - {mso-list-id:1852261567; - mso-list-template-ids:113511196;} -@list l3:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:36.0pt; - mso-level-number-position:left; - text-indent:-18.0pt; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} -@list l4 +@list l5 {mso-list-id:1933656922; mso-list-type:hybrid; mso-list-template-ids:1039941474 68354049 68354051 68354053 68354049 68354051 68354053 68354049 68354051 68354053;} -@list l4:level1 +@list l5:level1 {mso-level-number-format:bullet; mso-level-text:\F0B7; mso-level-tab-stop:36.0pt; mso-level-number-position:left; text-indent:-18.0pt; font-family:Symbol;} -@list l4:level2 +@list l5:level2 {mso-level-tab-stop:72.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l4:level3 +@list l5:level3 {mso-level-tab-stop:108.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l4:level4 +@list l5:level4 {mso-level-tab-stop:144.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l4:level5 +@list l5:level5 {mso-level-tab-stop:180.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l4:level6 +@list l5:level6 {mso-level-tab-stop:216.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l4:level7 +@list l5:level7 {mso-level-tab-stop:252.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l4:level8 +@list l5:level8 {mso-level-tab-stop:288.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l4:level9 +@list l5:level9 {mso-level-tab-stop:324.0pt; mso-level-number-position:left; text-indent:-18.0pt;} -@list l5 - {mso-list-id:1956399818; - mso-list-template-ids:-1303510286;} -@list l5:level1 - {mso-level-number-format:bullet; - mso-level-text:\F0B7; - mso-level-tab-stop:36.0pt; - mso-level-number-position:left; - text-indent:-18.0pt; - mso-ansi-font-size:10.0pt; - font-family:Symbol;} ol {margin-bottom:0cm;} ul @@ -550,7 +542,7 @@ font-family:"Times New Roman","serif";} </style> <![endif]--><!--[if gte mso 9]><xml> - <o:shapedefaults v:ext="edit" spidmax="2050"/> + <o:shapedefaults v:ext="edit" spidmax="3074"/> </xml><![endif]--><!--[if gte mso 9]><xml> <o:shapelayout v:ext="edit"> <o:idmap v:ext="edit" data="1"/> @@ -568,15 +560,15 @@ mso-ansi-language:EN-GB'>License & Disclaimer<o:p></o:p></span></h2> <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>Copyright -(C) 2006-2008 <span class=SpellE>Ruud</span> <span class=SpellE>Senden</span><o:p></o:p></span></p> +(C) 2006-2010 Ruud Senden<o:p></o:p></span></p> <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p> <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This Program 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, or (at your option) any later version.<o:p></o:p></span></p> +terms of the GNU General Public License as published by the Free Software Foundation; +either version 2, or (at your option) any later version.<o:p></o:p></span></p> <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p> @@ -606,44 +598,38 @@ <h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman"; mso-ansi-language:EN-GB'>Introduction<o:p></o:p></span></h2> -<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This is a <span -class=SpellE>MediaPortal</span> <span class=SpellE>Plugin</span> for supporting -various features of the Asus S-<span class=SpellE>Presso</span> S1-P111 <span -class=SpellE>barebone</span>. This includes the following functionality:<o:p></o:p></span></p> +<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This is a +MediaPortal Plugin for supporting various features of the Asus S-Presso S1-P111 +barebone. This includes the following functionality:<o:p></o:p></span></p> <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><o:p> </o:p></span></p> <ul style='margin-top:0cm' type=disc> - <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span + <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Light the various mode icons - based on the currently playing media or the current screen in <span - class=SpellE>MediaPortal</span>.<o:p></o:p></span></li> - <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span + based on the currently playing media or the current screen in MediaPortal.<o:p></o:p></span></li> + <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Light the Play, Pause and - Record icons depending on the status of the <span class=SpellE>MediaPortal</span> - player.<o:p></o:p></span></li> - <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span + Record icons depending on the status of the MediaPortal player.<o:p></o:p></span></li> + <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Display the current time when - the <span class=SpellE>MediaPortal</span> player isn't playing.<o:p></o:p></span></li> - <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span + the MediaPortal player isn't playing.<o:p></o:p></span></li> + <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Display the elapsed time then - the <span class=SpellE>MediaPortal</span> player is playing.<o:p></o:p></span></li> - <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span + the MediaPortal player is playing.<o:p></o:p></span></li> + <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Perform actions when the front panel buttons are pressed.<o:p></o:p></span></li> </ul> <h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman"; -mso-ansi-language:EN-GB'>Supported <span class=SpellE>MediaPortal</span> -versions<o:p></o:p></span></h2> +mso-ansi-language:EN-GB'>Supported MediaPortal versions<o:p></o:p></span></h2> -<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This <span -class=SpellE>plugin</span> has been compiled against the <span class=SpellE>MediaPortal</span> -1.1.0 source code, and has also been tested against that version. However, it -may also work for earlier and/or later <span class=SpellE>MediaPortal</span> -versions. If you find that it works with any other version than <span -class=SpellE>MediaPortal</span> 1.1.0, please post a message on the forum (see -below).<o:p></o:p></span></p> +<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This plugin +has been compiled against the MediaPortal 1.1.0 source code, and has also been +tested against that version. However, it may also work for earlier and/or later +MediaPortal versions. If you find that it works with any other version than +MediaPortal 1.1.0, please post a message on the forum (see below).<o:p></o:p></span></p> <h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman"; mso-ansi-language:EN-GB'>Installation Instructions<o:p></o:p></span></h2> @@ -652,49 +638,43 @@ <li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Make sure that the Asus Front Panel Display utility has been installed. This is available on the Asus - Support CD that came with your S-<span class=SpellE>Presso</span>. When - installed, you should have files named AControl.exe, Afpd.dll and - AFPDSet.exe in your c:\windows\system32 directory. If the required - Afpd.dll and asusio.sys are not installed, the plug-in will not work.<o:p></o:p></span></li> + Support CD that came with your S-Presso. When installed, you should have + files named AControl.exe, Afpd.dll and AFPDSet.exe in your + c:\windows\system32 directory. If the required Afpd.dll and asusio.sys are + not installed, the plug-in will not work.<o:p></o:p></span></li> <li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Install the extension using the - <span class=SpellE>MediaPortal</span> Extension Installer, or perform the - following manual installation steps:<o:p></o:p></span></li> + MediaPortal Extension Installer, or perform the following manual + installation steps:<o:p></o:p></span></li> <ol style='margin-top:0cm' start=1 type=1> <li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span - lang=EN-GB style='mso-ansi-language:EN-GB'>Disable <span class=SpellE>autostart</span> - of the Asus-supplied AControl.exe program, for example a utility like <span - class=SpellE>Autoruns</span> from <span class=SpellE>SysInternals</span> - can be used for this (<a + lang=EN-GB style='mso-ansi-language:EN-GB'>Disable autostart of the + Asus-supplied AControl.exe program, for example a utility like Autoruns + from SysInternals can be used for this (<a href="http://www.sysinternals.com/Utilities/Autoruns.html">http://www.sysinternals.com/Utilities/Autoruns.html</a>). The plug-in will not work correctly if the AControl.exe program is running.<o:p></o:p></span></li> <li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Copy the AControl2.exe (replacement program for Asus AControl.exe) and SPressoDisplayPlugin.dll - (<span class=SpellE>MediaPortal</span> <span class=SpellE>plugin</span>) - files from the Release\<span class=SpellE>Plugins</span>\Process - directory to your <span class=SpellE>MediaPortal</span> <span - class=SpellE>Plugins</span>\Process directory.<o:p></o:p></span></li> + (MediaPortal plugin) files from the Release\Plugins\Process directory to + your MediaPortal Plugins\Process directory.<o:p></o:p></span></li> <li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Copy the SPressoAFPD.xml file - from the Release\<span class=SpellE>InputDeviceMappings</span>\defaults - directory to your <span class=SpellE>MediaPortal</span> <span - class=SpellE>InputDeviceMappings</span>\defaults folder.<o:p></o:p></span></li> + from the Release\InputDeviceMappings\defaults directory to your + MediaPortal InputDeviceMappings\defaults folder.<o:p></o:p></span></li> <li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Add a shortcut to - AControl2.exe to your Start -> All Programs -> <span class=SpellE>Startup</span> - folder.<o:p></o:p></span></li> + AControl2.exe to your Start -> All Programs -> Startup folder.<o:p></o:p></span></li> <li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span - lang=EN-GB style='mso-ansi-language:EN-GB'>Restart your <span - class=GramE>PC,</span> verify that the front panel display correctly - displays volume and temperatures.<o:p></o:p></span></li> + lang=EN-GB style='mso-ansi-language:EN-GB'>Restart your PC, verify that + the front panel display correctly displays volume and temperatures.<o:p></o:p></span></li> </ol> <li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>(Optional) Configure the plug-in (see next section).<o:p></o:p></span></li> <li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span - lang=EN-GB style='mso-ansi-language:EN-GB'>Start <span class=SpellE>MediaPortal</span>.<o:p></o:p></span></li> + lang=EN-GB style='mso-ansi-language:EN-GB'>Start MediaPortal.<o:p></o:p></span></li> </ol> <h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman"; @@ -702,49 +682,44 @@ <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>The plug-in is configurable via the plug-in configuration screen. This screen is available -via <span class=SpellE>MediaPortal</span> Configuration -> <span -class=SpellE>Plugins</span> -> Process <span class=SpellE>Plugins</span> --> <span class=SpellE>SPressDisplayPlugin</span> -> Configure). The -following configuration options are available:<o:p></o:p></span></p> +via MediaPortal Configuration -> Plugins -> Process Plugins -> +SPressDisplayPlugin -> Configure). The following configuration options are +available:<o:p></o:p></span></p> <ul style='margin-top:0cm' type=disc> - <li class=MsoNormal style='mso-list:l2 level1 lfo9;tab-stops:list 36.0pt'><span + <li class=MsoNormal style='mso-list:l4 level1 lfo9;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Enable/disable extensive logging.<br> Enabling this option makes the plug-in write more debugging information to - the <span class=SpellE>MediaPortal</span> log files. Please note however - that this will result in multiple log messages per second being written to - the log file, so this option should be used with care and only be enabled - for short periods.<o:p></o:p></span></li> - <li class=MsoNormal style='mso-list:l2 level1 lfo9;tab-stops:list 36.0pt'><span + the MediaPortal log files. Please note however that this will result in + multiple log messages per second being written to the log file, so this + option should be used with care and only be enabled for short periods.<o:p></o:p></span></li> + <li class=MsoNormal style='mso-list:l4 level1 lfo9;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Front Panel Button Mapping.<br> - This button will pop up another screen similar to the standard <span - class=SpellE>MediaPortal</span> Remote <span class=SpellE>Plugin</span> - configuration screens. This screen lists all available front panel - buttons, including the various mode changes. Using this screen, you can - configure the actions for each button. Please refer to the <span - class=SpellE>MediaPortal</span> documentation on Remote button mapping for - more information about this configuration window.<o:p></o:p></span></li> - <li class=MsoNormal style='mso-list:l2 level1 lfo9;tab-stops:list 36.0pt'><span + This button will pop up another screen similar to the standard MediaPortal + Remote Plugin configuration screens. This screen lists all available front + panel buttons, including the various mode changes. Using this screen, you + can configure the actions for each button. Please refer to the MediaPortal + documentation on Remote button mapping for more information about this + configuration window.<o:p></o:p></span></li> + <li class=MsoNormal style='mso-list:l4 level1 lfo9;tab-stops:list 36.0pt'><span lang=EN-GB style='mso-ansi-language:EN-GB'>Window -> Mode Display Mapping.<br> This button will pop up another screen on which you can define a mapping - between <span class=SpellE>MediaPortal</span> windows and the Mode - indicators on the front panel display. For each individual <span - class=SpellE>MediaPortal</span> window (including windows available in - plug-ins), you can define which mode icon (e.g. DVD, VCD, etc) is lit on - the front panel display.<o:p></o:p></span></li> + between MediaPortal windows and the Mode indicators on the front panel + display. For each individual MediaPortal window (including windows + available in plug-ins), you can define which mode icon (e.g. DVD, VCD, + etc) is lit on the front panel display.<o:p></o:p></span></li> </ul> <h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman"; mso-ansi-language:EN-GB'>Other information<o:p></o:p></span></h2> <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>A thread -about this <span class=SpellE>plugin</span> has been started on the <span -class=SpellE>MediaPortal</span> forum at <a +about this plugin has been started on the MediaPortal forum at <a href="http://forum.team-mediaportal.com/showthread.php?p=72281%20">http://forum.team-mediaportal.com/showthread.php?p=72281</a>. -Please let me know there how this <span class=SpellE>plugin</span> works for -you, and whether you have any suggestions. <o:p></o:p></span></p> +Please let me know there how this plugin works for you, and whether you have +any suggestions. <o:p></o:p></span></p> <p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><o:p> </o:p></span></p> Modified: trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/AControl2.exe =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/SPressoDisplayPlugin.dll =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/Release/test/SPressoTest.exe =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/Source/AControl2/obj/Release/AControl2.exe =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs 2011-11-04 14:04:43 UTC (rev 4322) +++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs 2011-11-04 14:48:05 UTC (rev 4323) @@ -1,6 +1,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using MediaPortal.Common.Utils; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -10,7 +11,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SPressoDisplayPlugin")] -[assembly: AssemblyCopyright("Copyright © 2006-2010")] +[assembly: AssemblyCopyright("Copyright © 2006-2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +32,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.0.0")] -[assembly: AssemblyFileVersion("2.1.0.0")] +[assembly: AssemblyVersion("2.2.0.0")] +[assembly: AssemblyFileVersion("2.2.0.0")] + +[assembly: CompatibleVersion("1.1.6.27644")] Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj =================================================================== --- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj 2011-11-04 14:04:43 UTC (rev 4322) +++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj 2011-11-04 14:48:05 UTC (rev 4323) @@ -29,6 +29,7 @@ <IsWebBootstrapper>true</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkVersion>v3.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> @@ -39,6 +40,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> + <Reference Include="Common.Utils, Version=1.2.1.0, Culture=neutral, processorArchitecture=x86" /> <Reference Include="Core, Version=1.0.2421.29687, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> <Private>False</Private> Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user =================================================================== --- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user 2011-11-04 14:04:43 UTC (rev 4322) +++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user 2011-11-04 14:48:05 UTC (rev 4323) @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <PublishUrlHistory> </PublishUrlHistory> @@ -12,6 +12,6 @@ </BootstrapperUrlHistory> <FallbackCulture>en-US</FallbackCulture> <VerifyUploadedFiles>true</VerifyUploadedFiles> - <ReferencePath>D:\Development\MediaPortal\Releases\Release 1.1.0\mediaportal\xbmc\bin\Release\</ReferencePath> + <ReferencePath>C:\Program Files\Team MediaPortal\MediaPortal</ReferencePath> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs =================================================================== --- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs 2011-11-04 14:04:43 UTC (rev 4322) +++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs 2011-11-04 14:48:05 UTC (rev 4323) @@ -169,51 +169,51 @@ _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TVFULLSCREEN] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TVGUIDE] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTV] = Mode.TV; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVCHANNEL] = Mode.TV; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVGENRE] = Mode.TV; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVCHANNEL] = Mode.TV; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVGENRE] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_SCHEDULER] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_SEARCHTV] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TELETEXT] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_FULLSCREEN_TELETEXT] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_SCHEDULER_PRIORITIES] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_CONFLICTS] = Mode.TV; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_MAIN] = Mode.TV; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_AUTO] = Mode.TV; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS] = Mode.TV; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS_STATUS] = Mode.TV; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_SETTINGS] = Mode.TV; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_MAIN] = Mode.TV; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_AUTO] = Mode.TV; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS] = Mode.TV; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS_STATUS] = Mode.TV; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_SETTINGS] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_NO_SIGNAL] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_PROGRAM_INFO] = Mode.TV; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_DVD] = Mode.DVD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_HOME] = Mode.NONE; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ALBUM] = Mode.MUSIC; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ARTIST] = Mode.MUSIC; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ALBUM] = Mode.MUSIC; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ARTIST] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_COVERART_GRABBER_PROGRESS] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_COVERART_GRABBER_RESULTS] = Mode.MUSIC; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_FAVORITES] = Mode.MUSIC; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_FAVORITES] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_FILES] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_GENRE] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_INFO] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_OVERLAY] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_PLAYING_NOW] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_PLAYLIST] = Mode.MUSIC; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_TOP100] = Mode.MUSIC; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_YEARS] = Mode.MUSIC; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_TOP100] = Mode.MUSIC; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_YEARS] = Mode.MUSIC; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_PICTURES] = Mode.PHOTO; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RADIO] = Mode.FM; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RADIO_GUIDE] = Mode.FM; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_SLIDESHOW] = Mode.PHOTO; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TRAILERS] = Mode.VCD; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_ACTOR] = Mode.VCD; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TRAILERS] = Mode.VCD; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_ACTOR] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_ARTIST_INFO] = Mode.VCD; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_GENRE] = Mode.VCD; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_GENRE] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_INFO] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_OVERLAY] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_OVERLAY_TOP] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_PLAYLIST] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_TITLE] = Mode.VCD; - _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_YEAR] = Mode.VCD; + //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_YEAR] = Mode.VCD; _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEOS] = Mode.VCD; } } Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.csproj.GenerateResource.Cache =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.dll =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin.suo =================================================================== (Binary files differ) Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoTest/obj/Release/SPressoTest.exe =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |