Merge branch 'release/0.8'

MPExtended · Jan 3, 2014 · dd27945 · dd27945
2 parents 63bacf9 + 5290800
commit dd27945
Show file tree

Hide file tree

Showing 47 changed files with 1,189 additions and 122 deletions.
diff --git a/Installer/WifiRemote_1_2_Installer.xmp2 b/Installer/WifiRemote_1_2_Installer.xmp2
@@ -168,8 +168,8 @@ Click Next to continue or Cancel to exit Setup.</Value>
           <Build>6</Build>
           <Revision>27644</Revision>
         </MaxVersion>
-        <WarnOnly>true</WarnOnly>
-        <Message>This version of WifiRemote requires MediaPortal 1.2.0 Beta or higher!</Message>
+        <WarnOnly>false</WarnOnly>
+        <Message>This version of WifiRemote requires MediaPortal 1.6 or higher!</Message>
         <Name>MediaPortal</Name>
       </DependencyItem>
     </Items>
@@ -181,28 +181,44 @@ Click Next to continue or Cancel to exit Setup.</Value>
     <Name>WifiRemote</Name>
     <Id>d2277c74-fdce-4146-9e23-d080d1799f72</Id>
     <Author>Shukuyen, DieBagger</Author>
-    <HomePage>http://code.google.com/p/wifiremote/</HomePage>
+    <HomePage>https://github.com/MPExtended/WifiRemote</HomePage>
     <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/wifiremote-tcp-remote-control-server-0-1-2011-05-05-a-96251</ForumPage>
-    <UpdateUrl>http://wifiremote.googlecode.com/svn/trunk/Installer/update.xml</UpdateUrl>
+    <UpdateUrl>https://raw.github.com/MPExtended/WifiRemote/master/Installer/update.xml</UpdateUrl>
     <Version>
       <Major>0</Major>
-      <Minor>7</Minor>
-      <Build>1</Build>
+      <Minor>8</Minor>
+      <Build>0</Build>
       <Revision>0</Revision>
     </Version>
     <ExtensionDescription>WifiRemote is a process plugin for the popular opensource mediacenter software "MediaPortal".
 
 
 
 It publishes a Bonjour Service on your local network which allows clients (for example an iPhone or Android app) to list all found MediaPortal installations and connect to it. </ExtensionDescription>
-    <VersionDescription>- fixes problems with installed 4tr/argus tv plugins (oxan)
-- Improve playback of playlist items (albums, artists, folders), reduce ui
-refreshing (DieBagger)</VersionDescription>
+    <VersionDescription>Developers: The WifiRemote source code moved to github! Please go to https://github.com/MPExtended/WifiRemote to check it out and feel free to fork and submit pull requests!
+
+New in 0.8:
+- api level increased to 14
+- MediaPortal 1.6 only, switched to .NET 4
+- Request a screenshot with the screenshot command
+- Fixed missing text in dialogs
+- Fixed crash related to music db changes in MediaPortal 1.6 (thanks, sebastiii!)
+- Fixed crash when encountering music with special chars in it (thanks, Martin K.!)
+- Added Artist to now playing radio message (thanks, johanj!)
+- Added methods for setting playlist repeat and shuffle (thanks, johanj!)
+- Improved starting radio channel (thanks, johanj!)
+- Send open dialogs to connecting clients
+- Send facade info to connecting clients
+- Added ViewType property to FacadeInfo message
+- Added support for the trakt plugin rating dialog
+
+
+</VersionDescription>
     <DevelopmentStatus>Stable</DevelopmentStatus>
-    <OnlineLocation>http://wifiremote.googlecode.com/files/WifiRemote_0.6.1.mpe1</OnlineLocation>
-    <ReleaseDate>2012-11-25T20:16:04</ReleaseDate>
+    <OnlineLocation>https://github.com/MPExtended/WifiRemote/releases/download/Release_0_8/WifiRemote_0.8.mpe1</OnlineLocation>
+    <ReleaseDate>2014-01-03T20:16:04</ReleaseDate>
     <Tags>remote, wifi, json, client control</Tags>
-    <Location>WifiRemote_0.7.1.mpe1</Location>
+    <Location>WifiRemote_0.8.mpe1</Location>
     <Params>
       <Items>
         <SectionParam Name="Icon">
@@ -255,22 +271,22 @@ refreshing (DieBagger)</VersionDescription>
         <Param1 />
         <UpdateOption>OverwriteIfOlder</UpdateOption>
         <LocalFileName>installer_logo.gif</LocalFileName>
-        <ZipFileName>Installer{CopyFile}\{f8f8413e-7b79-4951-a9e2-dc8617a03a55}-installer_logo.gif</ZipFileName>
+        <ZipFileName>Installer{CopyFile}\{5c4acac1-409f-40b4-bdcb-fb143f49472d}-installer_logo.gif</ZipFileName>
         <DestinationFilename />
       </FileItem>
       <FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
         <Param1 />
         <UpdateOption>OverwriteIfOlder</UpdateOption>
         <LocalFileName>logo_radio.png</LocalFileName>
-        <ZipFileName>Installer{CopyFile}\{5ab6c11c-a4ab-4d16-a13d-8f87806b783f}-logo_radio.png</ZipFileName>
+        <ZipFileName>Installer{CopyFile}\{76c05d6b-86b7-4bbc-9b74-e13e536cba88}-logo_radio.png</ZipFileName>
         <DestinationFilename />
       </FileItem>
     </Items>
   </UniqueFileList>
   <ProjectSettings>
     <FolderGroups />
     <ProjectFilename>WifiRemote_1_2_Installer.xmp2</ProjectFilename>
-    <UpdatePath1>D:\Documents\Visual Studio 2010\Projects\PluginDev\WifiRemote\WifiRemote\Installer\update.xml</UpdatePath1>
+    <UpdatePath1>D:\temp\wifiremote\Installer\update.xml</UpdatePath1>
     <UpdatePath2 />
     <UpdatePath3 />
   </ProjectSettings>

diff --git a/Installer/update.xml b/Installer/update.xml
@@ -73,12 +73,12 @@
           <Build>1</Build>
           <Revision>0</Revision>
         </Version>
-        <ExtensionDescription>WifiRemote is a process plugin for the popular opensource mediacenter software "MediaPortal".
-
-
-
+        <ExtensionDescription>WifiRemote is a process plugin for the popular opensource mediacenter software "MediaPortal".
+
+
+
 It publishes a Bonjour Service on your local network which allows clients (for example an iPhone or Android app) to list all found MediaPortal installations and connect to it. </ExtensionDescription>
-        <VersionDescription>* fixes problems with installed 4tr/argus tv plugins (oxan)
+        <VersionDescription>* fixes problems with installed 4tr/argus tv plugins (oxan)
 * Improve playback of playlist items (albums, artists, folders), reduce ui refreshing (DieBagger)</VersionDescription>
         <DevelopmentStatus>Stable</DevelopmentStatus>
         <OnlineLocation>http://wifiremote.googlecode.com/files/WifiRemote_0.7.1.mpe1</OnlineLocation>
@@ -95,8 +95,144 @@ It publishes a Bonjour Service on your local network which allows clients (for e
             <SectionParam Name="Configuration file">
               <Value>%Plugins%\process\WifiRemote.dll</Value>
               <ValueType>Template</ValueType>
-              <Description>The file used to configure the extension.
- If have .exe extension the will be executed
+              <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="Default">
+            <DisplayName>Default</DisplayName>
+            <DefaulChecked>true</DefaulChecked>
+            <Description>Default</Description>
+            <Files>
+              <Items />
+            </Files>
+          </GroupItem>
+          <GroupItem Name="plugin_files">
+            <DisplayName>plugin_files</DisplayName>
+            <DefaulChecked>true</DefaulChecked>
+            <Description>plugin_files</Description>
+            <Files>
+              <Items />
+            </Files>
+          </GroupItem>
+          <GroupItem Name="config_files">
+            <DisplayName>config_files</DisplayName>
+            <DefaulChecked>true</DefaulChecked>
+            <Description>config_files</Description>
+            <Files>
+              <Items />
+            </Files>
+          </GroupItem>
+        </Items>
+      </Groups>
+      <Sections>
+        <Items />
+      </Sections>
+      <Dependencies>
+        <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>This version of WifiRemote requires MediaPortal 1.6 or higher!</Message>
+            <Name>MediaPortal</Name>
+          </DependencyItem>
+        </Items>
+      </Dependencies>
+      <PluginDependencies>
+        <Items />
+      </PluginDependencies>
+      <GeneralInfo>
+        <Name>WifiRemote</Name>
+        <Id>d2277c74-fdce-4146-9e23-d080d1799f72</Id>
+        <Author>Shukuyen, DieBagger</Author>
+        <HomePage>https://github.com/MPExtended/WifiRemote</HomePage>
+        <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/wifiremote-tcp-remote-control-server-0-1-2011-05-05-a-96251</ForumPage>
+        <UpdateUrl>https://raw.github.com/MPExtended/WifiRemote/master/Installer/update.xml</UpdateUrl>
+        <Version>
+          <Major>0</Major>
+          <Minor>8</Minor>
+          <Build>0</Build>
+          <Revision>0</Revision>
+        </Version>
+        <ExtensionDescription>WifiRemote is a process plugin for the popular opensource mediacenter software "MediaPortal".
+
+
+
+It publishes a Bonjour Service on your local network which allows clients (for example an iPhone or Android app) to list all found MediaPortal installations and connect to it. </ExtensionDescription>
+        <VersionDescription>Developers: The WifiRemote source code moved to github! Please go to https://github.com/MPExtended/WifiRemote to check it out and feel free to fork and submit pull requests!
+
+New in 0.8:
+- api level increased to 14
+- MediaPortal 1.6 only, switched to .NET 4
+- Request a screenshot with the screenshot command
+- Fixed missing text in dialogs
+- Fixed crash related to music db changes in MediaPortal 1.6 (thanks, sebastiii!)
+- Fixed crash when encountering music with special chars in it (thanks, Martin K.!)
+- Added Artist to now playing radio message (thanks, johanj!)
+- Added methods for setting playlist repeat and shuffle (thanks, johanj!)
+- Improved starting radio channel (thanks, johanj!)
+- Send open dialogs to connecting clients
+- Send facade info to connecting clients
+- Added ViewType property to FacadeInfo message
+- Added support for the trakt plugin rating dialog
+
+
+</VersionDescription>
+        <DevelopmentStatus>Stable</DevelopmentStatus>
+        <OnlineLocation>https://github.com/MPExtended/WifiRemote/releases/download/Release_0_8/WifiRemote_0.8.mpe1</OnlineLocation>
+        <ReleaseDate>2014-01-03T20:16:04</ReleaseDate>
+        <Tags>remote, wifi, json, client control</Tags>
+        <Location>WifiRemote_0.8.mpe1</Location>
+        <Params>
+          <Items>
+            <SectionParam Name="Online Icon">
+              <Value />
+              <ValueType>String</ValueType>
+              <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+            </SectionParam>
+            <SectionParam Name="Configuration file">
+              <Value>%Plugins%\process\WifiRemote.dll</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">

diff --git a/Libs/Common.Utils.dll b/Libs/Common.Utils.dll
diff --git a/Libs/Core.dll b/Libs/Core.dll
diff --git a/Libs/Cornerstone.MP.dll b/Libs/Cornerstone.MP.dll
diff --git a/Libs/Cornerstone.dll b/Libs/Cornerstone.dll
diff --git a/Libs/Databases.dll b/Libs/Databases.dll
diff --git a/Libs/Dialogs.dll b/Libs/Dialogs.dll
diff --git a/Libs/Gentle.Common.dll b/Libs/Gentle.Common.dll
diff --git a/Libs/Gentle.Framework.dll b/Libs/Gentle.Framework.dll
diff --git a/Libs/MP-TVSeries.dll b/Libs/MP-TVSeries.dll
diff --git a/Libs/MPNotificationBar.dll b/Libs/MPNotificationBar.dll
diff --git a/Libs/MediaPortal.Support.dll b/Libs/MediaPortal.Support.dll
diff --git a/Libs/MovingPictures.dll b/Libs/MovingPictures.dll
diff --git a/Libs/RemotePlugins.dll b/Libs/RemotePlugins.dll
diff --git a/Libs/TVDatabase.dll b/Libs/TVDatabase.dll
diff --git a/Libs/TraktPlugin.dll b/Libs/TraktPlugin.dll
diff --git a/Libs/TvPlugin.dll b/Libs/TvPlugin.dll
diff --git a/Libs/Utils.dll b/Libs/Utils.dll
diff --git a/Libs/WindowPlugins.dll b/Libs/WindowPlugins.dll
diff --git a/Libs/taglib-sharp.dll b/Libs/taglib-sharp.dll
diff --git a/README.md b/README.md
@@ -15,9 +15,15 @@ At the moment you can build the plugin in Visual Studio and run it on your HTPC,
 Please copy the WifiRemote.xml file to your MediaPortal custom keymaps folder.
 
 ### Building a client
-If you want to build a client app for this plugin please contact me via PM on the MediaPortal forum (user Shukuyen). In the future I will add complete information on how to build a client app to the wiki. I am developing a client app for iPhone myself, DieBagger is developing an Android remote app.
+You should start by taking a look at the DemoClient app, included in the WifiRemote solution.
+This app shows how you can discover a server via Bonjour, connect to it, issue commands and receive messages. It also introduces the concept of the autologin key. The DemoClient app is written in C# but should be relatively easy to understand. If you have questions about this please contact me via PM on the MediaPortal forum (user Shukuyen).
+
+JSON messages sent from your client to WifiRemote are called commands. You can find a list of available commands here:
+http://wiki.team-mediaportal.com/1_MEDIAPORTAL_1/17_Extensions/3_Plugins/WifiRemote/Commands
+
+WifiRemote will send JSON messages to your client, a list can be found here:
+http://wiki.team-mediaportal.com/1_MEDIAPORTAL_1/17_Extensions/3_Plugins/WifiRemote/Messages
 
-[A list of messages sent from and to WifiRemote is available here.](http://code.google.com/p/wifiremote/wiki/APIDocumentation)
 
 ### Acknowledgements
 WifiRemote uses the following libraries:

diff --git a/Sources/DemoClient/Messages/MessageScreenshot.cs b/Sources/DemoClient/Messages/MessageScreenshot.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DemoClient
+{
+    class MessageScreenshot : IMessage
+    {
+        string type = "screenshot";
+        public string Type
+        {
+            get { return type; }
+        }
+
+        public int Width
+        {
+            get { return 800; }
+        }
+
+        public String AutologinKey
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/Sources/WifiRemote/Core/SetupForm.cs b/Sources/WifiRemote/Core/SetupForm.cs
@@ -172,8 +172,8 @@ public SetupForm()
                         pluginsDataSource.Add(new WindowPlugin(aSavedPlugin.Value, 
                                                                aSavedPlugin.Key, 
                                                                (plugin.ActiveImage != null) 
-                                                                    ? WifiRemote.imageToByteArray(plugin.ActiveImage, System.Drawing.Imaging.ImageFormat.Png) 
-                                                                    : WifiRemote.imageToByteArray(Properties.Resources.NoPluginImage, System.Drawing.Imaging.ImageFormat.Png),
+                                                                    ? ImageHelper.imageToByteArray(plugin.ActiveImage, System.Drawing.Imaging.ImageFormat.Png)
+                                                                    : ImageHelper.imageToByteArray(Properties.Resources.NoPluginImage, System.Drawing.Imaging.ImageFormat.Png),
                                                                !ignoredPluginsList.Contains(aSavedPlugin.Key)));
                     }
                     break;
@@ -512,9 +512,9 @@ private void addPluginToList(ItemTag plugin)
             {
                 pluginsDataSource.Add(
                     new WindowPlugin(plugin.SetupForm.PluginName(), 
-                                     plugin.WindowId, 
-                                     (plugin.ActiveImage != null) ? WifiRemote.imageToByteArray(plugin.ActiveImage, System.Drawing.Imaging.ImageFormat.Png) 
-                                                                  : WifiRemote.imageToByteArray(Properties.Resources.NoPluginImage, System.Drawing.Imaging.ImageFormat.Png),
+                                     plugin.WindowId,
+                                     (plugin.ActiveImage != null) ? ImageHelper.imageToByteArray(plugin.ActiveImage, System.Drawing.Imaging.ImageFormat.Png)
+                                                                  : ImageHelper.imageToByteArray(Properties.Resources.NoPluginImage, System.Drawing.Imaging.ImageFormat.Png),
                                      !ignoredPluginsList.Contains(plugin.WindowId)));
             }
         }