mp-plugins-svn

[Mp-plugins-svn] SF.net SVN: mp-plugins:[3500] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3500
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3500&view=rev
Author:   chemelli_sf
Date:     2010-03-12 22:57:50 +0000 (Fri, 12 Mar 2010)

Log Message:
-----------
Solution and projects reference cleanup (part III)

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/Build/BuildScript.bat
    trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.sln

Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build/BuildScript.bat	2010-03-11 23:53:07 UTC (rev 3499)
+++ trunk/plugins/IR Server Suite/Build/BuildScript.bat	2010-03-12 22:57:50 UTC (rev 3500)
@@ -44,8 +44,8 @@
 if not %2!==MPplugins! goto NoMPplugins
 echo.
 echo Building MediaPortal plugins...
-rem "%ProgramDir%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
+"%ProgramDir%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
+rem "%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
 :NoMPplugins
 
 

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj	2010-03-11 23:53:07 UTC (rev 3499)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj	2010-03-12 22:57:50 UTC (rev 3500)
@@ -105,10 +105,6 @@
       <Project>{396C5208-5D46-4A11-92C1-FD0F2F42D7DD}</Project>
       <Name>Dialogs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\DirectShowLib\DirectShowLib.csproj">
-      <Project>{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}</Project>
-      <Name>DirectShowLib</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\Utils.csproj">
       <Project>{6DA0E4DF-6230-4642-98B5-E690BB6942BB}</Project>
       <Name>Utils</Name>

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.sln
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.sln	2010-03-11 23:53:07 UTC (rev 3499)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.sln	2010-03-12 22:57:50 UTC (rev 3500)
@@ -22,18 +22,12 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "..\..\..\..\..\mediaportal\trunk\mediaportal\Core\Core.csproj", "{02FFFC1F-2555-4B99-8B01-3432D0673855}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TvLibrary.Interfaces", "..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TvLibrary.Interfaces\TvLibrary.Interfaces.csproj", "{AE752FB4-7450-4150-9BAD-19EFA9D2AC37}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE} = {CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TVDatabase", "..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\TVDatabase.csproj", "{0FD8DEAE-37A4-49CC-A7BE-E86E0E0D85BD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TvControl", "..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TvControl\TvControl.csproj", "{0DB878C6-1B68-4DC5-B6EF-564B7C08486F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TvBusinessLayer", "..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\TvBusinessLayer\TvBusinessLayer.csproj", "{58C35C9D-F18D-40F2-8024-24E50D01E9C5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE} = {CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\..\..\..\..\mediaportal\trunk\mediaportal\Utils\Utils.csproj", "{6DA0E4DF-6230-4642-98B5-E690BB6942BB}"
 EndProject
@@ -43,8 +37,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemotePlugins", "..\..\..\..\..\mediaportal\trunk\mediaportal\RemotePlugins\RemotePlugins.csproj", "{0A234721-1F13-4DF8-9B1E-64D9E3111203}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DirectShowLib", "..\..\..\..\..\mediaportal\trunk\mediaportal\DirectShowLib\DirectShowLib.csproj", "{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrssUtils", "..\IR Server Suite\Common\IrssUtils\IrssUtils.csproj", "{CA15769C-232E-4CA7-94FD-206A06CA3ABB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrssComms", "..\IR Server Suite\Common\IrssComms\IrssComms.csproj", "{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}"
@@ -117,10 +109,6 @@
 		{0A234721-1F13-4DF8-9B1E-64D9E3111203}.Debug|x86.Build.0 = Debug|x86
 		{0A234721-1F13-4DF8-9B1E-64D9E3111203}.Release|x86.ActiveCfg = Release|x86
 		{0A234721-1F13-4DF8-9B1E-64D9E3111203}.Release|x86.Build.0 = Release|x86
-		{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|x86.ActiveCfg = Debug|x86
-		{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Debug|x86.Build.0 = Debug|x86
-		{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Release|x86.ActiveCfg = Release|x86
-		{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE}.Release|x86.Build.0 = Release|x86
 		{CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Debug|x86.ActiveCfg = Debug|x86
 		{CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Debug|x86.Build.0 = Debug|x86
 		{CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Release|x86.ActiveCfg = Release|x86
@@ -160,7 +148,6 @@
 		{396C5208-5D46-4A11-92C1-FD0F2F42D7DD} = {1F14A9F2-92B5-4126-AA0D-AAB2B9C491CD}
 		{C1BCEC3E-6074-4328-B5D9-391A457C8FFB} = {1F14A9F2-92B5-4126-AA0D-AAB2B9C491CD}
 		{0A234721-1F13-4DF8-9B1E-64D9E3111203} = {1F14A9F2-92B5-4126-AA0D-AAB2B9C491CD}
-		{CE009BFA-5EF6-4153-B2A1-2FA79698A9AE} = {1F14A9F2-92B5-4126-AA0D-AAB2B9C491CD}
 		{CA15769C-232E-4CA7-94FD-206A06CA3ABB} = {1F14A9F2-92B5-4126-AA0D-AAB2B9C491CD}
 		{BCAFDF45-70DD-46FD-8B98-880DDA585AD2} = {1F14A9F2-92B5-4126-AA0D-AAB2B9C491CD}
 		{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {1F14A9F2-92B5-4126-AA0D-AAB2B9C491CD}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins:[3784] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3784
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3784&view=rev
Author:   chef_koch
Date:     2010-09-08 13:15:11 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
moved extraction of value for a MessageType.RemoteEvent to IRSSComms, values can be easily read from a dictionary now

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -288,11 +288,8 @@
             break;
 
           case MessageType.RemoteEvent:
-            byte[] data = received.GetDataAsBytes();
-            int deviceNameSize = BitConverter.ToInt32(data, 0);
-            string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-            int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-            string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+            string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+            string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
             RemoteHandlerCallback(deviceName, keyCode);
             return;

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -203,11 +203,8 @@
             break;
 
           case MessageType.RemoteEvent:
-            byte[] data = received.GetDataAsBytes();
-            int deviceNameSize = BitConverter.ToInt32(data, 0);
-            string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-            int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-            string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+            string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+            string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
             Invoke(_addStatusLine, new Object[] {String.Format("{0} ({1})", deviceName, keyCode)});
             return;

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -917,11 +917,8 @@
             break;
 
           case MessageType.RemoteEvent:
-            byte[] data = received.GetDataAsBytes();
-            int deviceNameSize = BitConverter.ToInt32(data, 0);
-            string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-            int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-            string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+            string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+            string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
             RemoteHandlerCallback(deviceName, keyCode);
             break;

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -47,11 +47,8 @@
     {
       if (received.Type == MessageType.RemoteEvent)
       {
-        byte[] data = received.GetDataAsBytes();
-        int deviceNameSize = BitConverter.ToInt32(data, 0);
-        string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-        int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-        string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+        string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+        string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
         _deviceName = deviceName;
 

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -794,11 +794,8 @@
         switch (received.Type)
         {
           case MessageType.RemoteEvent:
-            byte[] data = received.GetDataAsBytes();
-            int deviceNameSize = BitConverter.ToInt32(data, 0);
-            string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-            int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-            string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+            string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+            string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
             RemoteHandlerCallback(deviceName, keyCode);
             break;

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -47,11 +47,8 @@
     {
       if (received.Type == MessageType.RemoteEvent)
       {
-        byte[] data = received.GetDataAsBytes();
-        int deviceNameSize = BitConverter.ToInt32(data, 0);
-        string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-        int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-        string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+        string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+        string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
         _deviceName = deviceName;
 

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -441,11 +441,8 @@
             break;
 
           case MessageType.RemoteEvent:
-            byte[] data = received.GetDataAsBytes();
-            int deviceNameSize = BitConverter.ToInt32(data, 0);
-            string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-            int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-            string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+            string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+            string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
             RemoteHandlerCallback(deviceName, keyCode);
             break;

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -695,11 +695,7 @@
           case MessageType.RemoteEvent:
             if (listViewButtons.SelectedItems.Count == 1)
             {
-              byte[] data = received.GetDataAsBytes();
-              int deviceNameSize = BitConverter.ToInt32(data, 0);
-              string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-              int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-              string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+              string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
               listViewButtons.SelectedItems[0].SubItems[1].Text = keyCode;
             }

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj	2010-09-08 13:15:11 UTC (rev 3784)
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</ProjectGuid>
     <OutputType>Library</OutputType>

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -21,12 +21,12 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 
 namespace IrssComms
 {
-
   #region Enumerations
 
   /// <summary>
@@ -194,36 +194,22 @@
   [DebuggerDisplay("Type={Type}, Flags={Flags}, Data={GetDataAsString()}")]
   public class IrssMessage
   {
-    #region Members
+    #region Const
 
-    private byte[] _data;
-    [DebuggerBrowsable(DebuggerBrowsableState.Never)] private MessageFlags _flags;
-    [DebuggerBrowsable(DebuggerBrowsableState.Never)] private MessageType _type;
+    public const string DATA = "DATA";
+    public const string DEVICE_NAME = "DEVICE_NAME";
+    public const string KEY_CODE = "KEY_CODE";
 
-    #endregion Members
+    #endregion
 
-    #region Properties
+    #region Protected fields
 
-    /// <summary>
-    /// Type of message.
-    /// </summary>
-    public MessageType Type
-    {
-      get { return _type; }
-      set { _type = value; }
-    }
+    protected MessageType _messageType;
+    protected IDictionary<string, object> _messageData = new Dictionary<string, object>();
+    protected MessageFlags _messageFlags;
 
-    /// <summary>
-    /// Message flags.
-    /// </summary>
-    public MessageFlags Flags
-    {
-      get { return _flags; }
-      set { _flags = value; }
-    }
+    #endregion
 
-    #endregion Properties
-
     #region Constructors
 
     /// <summary>
@@ -231,8 +217,8 @@
     /// </summary>
     protected IrssMessage()
     {
-      _type = MessageType.Unknown;
-      _flags = MessageFlags.None;
+      _messageType = MessageType.Unknown;
+      _messageFlags = MessageFlags.None;
     }
 
     /// <summary>
@@ -242,8 +228,8 @@
     /// <param name="flags">The message flags.</param>
     public IrssMessage(MessageType type, MessageFlags flags)
     {
-      _type = type;
-      _flags = flags;
+      _messageType = type;
+      _messageFlags = flags;
     }
 
     /// <summary>
@@ -272,6 +258,37 @@
 
     #endregion Constructors
 
+    #region Properties
+
+    /// <summary>
+    /// Gets the type of this message.
+    /// </summary>
+    public MessageType Type
+    {
+      get { return _messageType; }
+    }
+
+    /// <summary>
+    /// Message flags.
+    /// </summary>
+    public MessageFlags Flags
+    {
+      get { return _messageFlags; }
+      set { _messageFlags = value; }
+    }
+
+    /// <summary>
+    /// Gets or sets the message data. The message data is a generic dictionary special
+    /// data entries defined by the message queue.
+    /// </summary>
+    public IDictionary<string, object> MessageData
+    {
+      get { return _messageData; }
+      set { _messageData = value; }
+    }
+
+    #endregion Properties
+
     #region Implementation
 
     /// <summary>
@@ -279,18 +296,22 @@
     /// </summary>
     public byte[] GetDataAsBytes()
     {
-      return _data;
+      if (!_messageData.ContainsKey(DATA)) return null;
+
+      return _messageData[DATA] as byte[];
     }
 
     /// <summary>
     /// Set message data as bytes.
     /// </summary>
-    public void SetDataAsBytes(byte[] data)
+    private void SetDataAsBytes(byte[] data)
     {
       if (data == null)
-        _data = null;
+        _messageData[DATA] = null;
       else
-        _data = (byte[]) data.Clone();
+        _messageData[DATA] = (byte[])data.Clone();
+
+      SetMessageData();
     }
 
     /// <summary>
@@ -298,40 +319,62 @@
     /// </summary>
     public string GetDataAsString()
     {
-      if (_data == null)
-        return String.Empty;
+      if (GetDataAsBytes() == null) return string.Empty;
 
-      return Encoding.ASCII.GetString(_data);
+      return Encoding.ASCII.GetString(GetDataAsBytes());
     }
 
     /// <summary>
     /// Set message data as string.
     /// </summary>
-    public void SetDataAsString(string data)
+    private void SetDataAsString(string data)
     {
       if (String.IsNullOrEmpty(data))
-        _data = null;
+        _messageData[DATA] = null;
       else
-        _data = Encoding.ASCII.GetBytes(data);
+        _messageData[DATA] = Encoding.ASCII.GetBytes(data);
+
+      SetMessageData();
     }
 
     /// <summary>
+    /// Converts data for some messages from bytes to data dictionary for easier reading the values.
+    /// </summary>
+    private void SetMessageData()
+    {
+      switch (_messageType)
+      {
+        case MessageType.RemoteEvent:
+          byte[] data = GetDataAsBytes();
+
+          int deviceNameSize = BitConverter.ToInt32(data, 0);
+          _messageData[DEVICE_NAME] = System.Text.Encoding.ASCII.GetString(data, 4, deviceNameSize);
+
+          int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
+          _messageData[KEY_CODE] = System.Text.Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+
+          break;
+      }
+    }
+
+
+    /// <summary>
     /// Turn this Message instance into a byte array.
     /// </summary>
     /// <returns>Byte array representation of this Message instance.</returns>
     public byte[] ToBytes()
     {
       int dataLength = 0;
-      if (_data != null)
-        dataLength = _data.Length;
+      if (GetDataAsBytes() != null)
+        dataLength = GetDataAsBytes().Length;
 
       byte[] byteArray = new byte[8 + dataLength];
 
-      BitConverter.GetBytes((int) _type).CopyTo(byteArray, 0);
-      BitConverter.GetBytes((int) _flags).CopyTo(byteArray, 4);
+      BitConverter.GetBytes((int)_messageType).CopyTo(byteArray, 0);
+      BitConverter.GetBytes((int)_messageFlags).CopyTo(byteArray, 4);
 
-      if (_data != null)
-        _data.CopyTo(byteArray, 8);
+      if (GetDataAsBytes() != null)
+        GetDataAsBytes().CopyTo(byteArray, 8);
 
       return byteArray;
     }
@@ -349,14 +392,15 @@
       if (from.Length < 8)
         throw new ArgumentException("Insufficient bytes to create message", "from");
 
-      MessageType type = (MessageType) BitConverter.ToInt32(from, 0);
-      MessageFlags flags = (MessageFlags) BitConverter.ToInt32(from, 4);
+      MessageType type = (MessageType)BitConverter.ToInt32(from, 0);
+      MessageFlags flags = (MessageFlags)BitConverter.ToInt32(from, 4);
 
       if (from.Length == 8)
         return new IrssMessage(type, flags);
 
       byte[] data = new byte[from.Length - 8];
       Array.Copy(from, 8, data, 0, data.Length);
+
       return new IrssMessage(type, flags, data);
     }
 

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -231,15 +231,15 @@
       {
         switch (Settings.Mode)
         {
-            case IRServerMode.ServerMode:
+          case IRServerMode.ServerMode:
             StopServer();
             break;
 
-            case IRServerMode.RelayMode:
+          case IRServerMode.RelayMode:
             StopRelay();
             break;
 
-            case IRServerMode.RepeaterMode:
+          case IRServerMode.RepeaterMode:
             StopRepeater();
             break;
         }
@@ -265,11 +265,11 @@
     /// <returns>true if the event is handled, otherwise false.</returns>
     protected override bool OnPowerEvent(PowerBroadcastStatus powerStatus)
     {
-      IrssLog.Info("PowerEvent: {0}", Enum.GetName(typeof (PowerBroadcastStatus), powerStatus));
+      IrssLog.Info("PowerEvent: {0}", Enum.GetName(typeof(PowerBroadcastStatus), powerStatus));
 
       switch (powerStatus)
       {
-          #region Suspend
+        #region Suspend
 
         case PowerBroadcastStatus.Suspend:
           // TODO: if anyone has any trouble with on-suspend commands then try changing this to QuerySuspend.
@@ -315,9 +315,9 @@
           }
           break;
 
-          #endregion Suspend
+        #endregion Suspend
 
-          #region Resume
+        #region Resume
 
         case PowerBroadcastStatus.ResumeAutomatic:
           //case PowerBroadcastStatus.ResumeCritical:
@@ -364,7 +364,7 @@
           }
           break;
 
-          #endregion Resume
+        #endregion Resume
       }
 
       return true;
@@ -771,7 +771,7 @@
 
       switch (Settings.Mode)
       {
-          case IRServerMode.ServerMode:
+        case IRServerMode.ServerMode:
           if (Settings.AbstractRemoteMode)
           {
             string abstractButton = LookupAbstractButton(deviceName, keyCode);
@@ -789,11 +789,11 @@
           }
           break;
 
-          case IRServerMode.RelayMode:
+        case IRServerMode.RelayMode:
           // Don't do anything in relay mode, just pass it on.
           break;
 
-          case IRServerMode.RepeaterMode:
+        case IRServerMode.RepeaterMode:
           IrssLog.Debug("Remote event ignored, IR Server is in Repeater Mode.");
           return;
       }
@@ -810,14 +810,14 @@
 
       switch (Settings.Mode)
       {
-          case IRServerMode.ServerMode:
+        case IRServerMode.ServerMode:
           {
             IrssMessage message = new IrssMessage(MessageType.RemoteEvent, MessageFlags.Notify, bytes);
             SendToAll(message);
             break;
           }
 
-          case IRServerMode.RelayMode:
+        case IRServerMode.RelayMode:
           {
             IrssMessage message = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request, bytes);
             _client.Send(message);
@@ -836,21 +836,21 @@
 
       switch (Settings.Mode)
       {
-          case IRServerMode.ServerMode:
+        case IRServerMode.ServerMode:
           {
             IrssMessage message = new IrssMessage(MessageType.KeyboardEvent, MessageFlags.Notify, bytes);
             SendToAll(message);
             break;
           }
 
-          case IRServerMode.RelayMode:
+        case IRServerMode.RelayMode:
           {
             IrssMessage message = new IrssMessage(MessageType.ForwardKeyboardEvent, MessageFlags.Request, bytes);
             _client.Send(message);
             break;
           }
 
-          case IRServerMode.RepeaterMode:
+        case IRServerMode.RepeaterMode:
           {
             IrssLog.Debug("Keyboard event ignored, IR Server is in Repeater Mode.");
             break;
@@ -870,21 +870,21 @@
 
       switch (Settings.Mode)
       {
-          case IRServerMode.ServerMode:
+        case IRServerMode.ServerMode:
           {
             IrssMessage message = new IrssMessage(MessageType.MouseEvent, MessageFlags.Notify, bytes);
             SendToAll(message);
             break;
           }
 
-          case IRServerMode.RelayMode:
+        case IRServerMode.RelayMode:
           {
             IrssMessage message = new IrssMessage(MessageType.ForwardMouseEvent, MessageFlags.Request, bytes);
             _client.Send(message);
             break;
           }
 
-          case IRServerMode.RepeaterMode:
+        case IRServerMode.RepeaterMode:
           {
             IrssLog.Debug("Mouse event ignored, IR Server is in Repeater Mode.");
             break;
@@ -1141,10 +1141,10 @@
       {
         switch (combo.Message.Type)
         {
-            #region ForwardRemoteEvent
+          #region ForwardRemoteEvent
 
           case MessageType.ForwardRemoteEvent:
-                if (Settings.Mode == IRServerMode.RelayMode)
+            if (Settings.Mode == IRServerMode.RelayMode)
             {
               IrssMessage forward = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request,
                                                     combo.Message.GetDataAsBytes());
@@ -1213,9 +1213,9 @@
             }
             break;
 
-            #endregion ForwardRemoteEvent
+          #endregion ForwardRemoteEvent
 
-            #region ForwardKeyboardEvent
+          #region ForwardKeyboardEvent
 
           case MessageType.ForwardKeyboardEvent:
             if (Settings.Mode == IRServerMode.RelayMode)
@@ -1232,9 +1232,9 @@
             }
             break;
 
-            #endregion ForwardKeyboardEvent
+          #endregion ForwardKeyboardEvent
 
-            #region ForwardMouseEvent
+          #region ForwardMouseEvent
 
           case MessageType.ForwardMouseEvent:
             if (Settings.Mode == IRServerMode.RelayMode)
@@ -1251,9 +1251,9 @@
             }
             break;
 
-            #endregion ForwardMouseEvent
+          #endregion ForwardMouseEvent
 
-            #region BlastIR
+          #region BlastIR
 
           case MessageType.BlastIR:
             {
@@ -1280,9 +1280,9 @@
               break;
             }
 
-            #endregion BlastIR
+          #endregion BlastIR
 
-            #region LearnIR
+          #region LearnIR
 
           case MessageType.LearnIR:
             {
@@ -1318,9 +1318,9 @@
               break;
             }
 
-            #endregion LearnIR
+          #endregion LearnIR
 
-            #region ServerShutdown
+          #region ServerShutdown
 
           case MessageType.ServerShutdown:
             if ((combo.Message.Flags & MessageFlags.Request) == MessageFlags.Request)
@@ -1330,9 +1330,9 @@
             }
             break;
 
-            #endregion ServerShutdown
+          #endregion ServerShutdown
 
-            #region RegisterClient
+          #region RegisterClient
 
           case MessageType.RegisterClient:
             {
@@ -1364,17 +1364,17 @@
               break;
             }
 
-            #endregion RegisterClient
+          #endregion RegisterClient
 
-            #region UnregisterClient
+          #region UnregisterClient
 
           case MessageType.UnregisterClient:
             UnregisterClient(combo.Manager);
             break;
 
-            #endregion UnregisterClient
+          #endregion UnregisterClient
 
-            #region RegisterRepeater
+          #region RegisterRepeater
 
           case MessageType.RegisterRepeater:
             {
@@ -1389,17 +1389,17 @@
               break;
             }
 
-            #endregion RegisterRepeater
+          #endregion RegisterRepeater
 
-            #region UnregisterRepeater
+          #region UnregisterRepeater
 
           case MessageType.UnregisterRepeater:
             UnregisterRepeater(combo.Manager);
             break;
 
-            #endregion UnregisterRepeater
+          #endregion UnregisterRepeater
 
-            #region ActiveBlasters
+          #region ActiveBlasters
 
           case MessageType.ActiveBlasters:
             {
@@ -1410,9 +1410,9 @@
               break;
             }
 
-            #endregion ActiveBlasters
+          #endregion ActiveBlasters
 
-            #region ActiveReceivers
+          #region ActiveReceivers
 
           case MessageType.ActiveReceivers:
             {
@@ -1440,9 +1440,9 @@
               break;
             }
 
-            #endregion ActiveReceivers
+          #endregion ActiveReceivers
 
-            #region AvailableBlasters
+          #region AvailableBlasters
 
           case MessageType.AvailableBlasters:
             {
@@ -1476,9 +1476,9 @@
               break;
             }
 
-            #endregion AvailableBlasters
+          #endregion AvailableBlasters
 
-            #region AvailableReceivers
+          #region AvailableReceivers
 
           case MessageType.AvailableReceivers:
             {
@@ -1512,9 +1512,9 @@
               break;
             }
 
-            #endregion AvailableReceivers
+          #endregion AvailableReceivers
 
-            #region DetectedBlasters
+          #region DetectedBlasters
 
           case MessageType.DetectedBlasters:
             {
@@ -1543,9 +1543,9 @@
               break;
             }
 
-            #endregion DetectedBlasters
+          #endregion DetectedBlasters
 
-            #region DetectedReceivers
+          #region DetectedReceivers
 
           case MessageType.DetectedReceivers:
             {
@@ -1574,7 +1574,7 @@
               break;
             }
 
-            #endregion DetectedReceivers
+          #endregion DetectedReceivers
         }
       }
       catch (Exception ex)
@@ -1717,20 +1717,20 @@
 
     public bool DoStart()
     {
-        this.OnStart(new string[] { });
-        return true;
+      this.OnStart(new string[] { });
+      return true;
     }
 
     public bool DoStop()
     {
-        this.OnStop();
-        return true;
+      this.OnStop();
+      return true;
     }
 
     public bool DoPowerEvent(PowerBroadcastStatus powerStatus)
     {
-        this.OnPowerEvent(powerStatus);
-        return true;
+      this.OnPowerEvent(powerStatus);
+      return true;
     }
 
     #endregion

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -160,11 +160,8 @@
     {
       if (received.Type == MessageType.RemoteEvent)
       {
-        byte[] data = received.GetDataAsBytes();
-        int deviceNameSize = BitConverter.ToInt32(data, 0);
-        string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-        int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-        string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+        //string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+        string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
         // TODO: Activate this code for 1.4.3
         //if (deviceName.Equals("Abstract", StringComparison.OrdinalIgnoreCase))

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs	2010-09-07 16:05:46 UTC (rev 3783)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs	2010-09-08 13:15:11 UTC (rev 3784)
@@ -791,11 +791,8 @@
           case MessageType.RemoteEvent:
             if (!_inConfiguration)
             {
-              byte[] data = received.GetDataAsBytes();
-              int deviceNameSize = BitConverter.ToInt32(data, 0);
-              string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
-              int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
-              string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+              string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+              string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
 
               RemoteHandler(deviceName, keyCode);
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins:[3820] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3820
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3820&view=rev
Author:   chemelli_sf
Date:     2010-10-11 21:09:30 +0000 (Mon, 11 Oct 2010)

Log Message:
-----------
Updated Resharper config files

Added Paths:
-----------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.1.ReSharper
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.1.ReSharper
    trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.1.resharper

Removed Paths:
-------------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.0.resharper
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.0.resharper
    trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.0.resharper

Deleted: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.0.resharper
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.0.resharper	2010-10-11 20:55:30 UTC (rev 3819)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.0.resharper	2010-10-11 21:09:30 UTC (rev 3820)
@@ -1,6 +0,0 @@
-<Configuration>
-  <CodeStyleSettings>
-    <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath>
-    <Sharing>EXTERNAL</Sharing>
-  </CodeStyleSettings>
-</Configuration>
\ No newline at end of file

Copied: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.1.ReSharper (from rev 3818, trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.0.resharper)
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.1.ReSharper	                        (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.5.1.ReSharper	2010-10-11 21:09:30 UTC (rev 3820)
@@ -0,0 +1,6 @@
+<Configuration>
+  <CodeStyleSettings>
+    <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath>
+    <Sharing>EXTERNAL</Sharing>
+  </CodeStyleSettings>
+</Configuration>
\ No newline at end of file

Deleted: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.0.resharper
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.0.resharper	2010-10-11 20:55:30 UTC (rev 3819)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.0.resharper	2010-10-11 21:09:30 UTC (rev 3820)
@@ -1,6 +0,0 @@
-<Configuration>
-  <CodeStyleSettings>
-    <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath>
-    <Sharing>EXTERNAL</Sharing>
-  </CodeStyleSettings>
-</Configuration>
\ No newline at end of file

Copied: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.1.ReSharper (from rev 3818, trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.0.resharper)
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.1.ReSharper	                        (rev 0)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal plugins.5.1.ReSharper	2010-10-11 21:09:30 UTC (rev 3820)
@@ -0,0 +1,6 @@
+<Configuration>
+  <CodeStyleSettings>
+    <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath>
+    <Sharing>EXTERNAL</Sharing>
+  </CodeStyleSettings>
+</Configuration>
\ No newline at end of file

Deleted: trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.0.resharper
===================================================================
--- trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.0.resharper	2010-10-11 20:55:30 UTC (rev 3819)
+++ trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.0.resharper	2010-10-11 21:09:30 UTC (rev 3820)
@@ -1,6 +0,0 @@
-<Configuration>
-  <CodeStyleSettings>
-    <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath>
-    <Sharing>EXTERNAL</Sharing>
-  </CodeStyleSettings>
-</Configuration>
\ No newline at end of file

Copied: trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.1.resharper (from rev 3818, trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.0.resharper)
===================================================================
--- trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.1.resharper	                        (rev 0)
+++ trunk/plugins/IR Server Suite/Virtual Remote/Virtual Remote.5.1.resharper	2010-10-11 21:09:30 UTC (rev 3820)
@@ -0,0 +1,6 @@
+<Configuration>
+  <CodeStyleSettings>
+    <ExternalPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\MediaPortal.ReSharper.xml</ExternalPath>
+    <Sharing>EXTERNAL</Sharing>
+  </CodeStyleSettings>
+</Configuration>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins:[3874] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3874
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3874&view=rev
Author:   chef_koch
Date:     2010-10-30 00:39:14 +0000 (Sat, 30 Oct 2010)

Log Message:
-----------
moved static methos GetIPFromName from IrssComms.Client to IrssUtils.Network

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -431,7 +431,7 @@
 
         _serverHost = comboBoxComputer.Text;
 
-        IPAddress serverIp = Client.GetIPFromName(_serverHost);
+        IPAddress serverIp = Network.GetIPFromName(_serverHost);
         IPEndPoint endPoint = new IPEndPoint(serverIp, Server.DefaultPort);
 
         StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -109,7 +109,7 @@
           }
           else
           {
-            IPAddress serverIP = Client.GetIPFromName(_serverHost);
+            IPAddress serverIP = Network.GetIPFromName(_serverHost);
             IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
             if (StartClient(endPoint))

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -108,7 +108,7 @@
           }
           else
           {
-            IPAddress serverIP = Client.GetIPFromName(_serverHost);
+            IPAddress serverIP = Network.GetIPFromName(_serverHost);
             IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
             if (StartClient(endPoint))

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -463,7 +463,7 @@
     {
       Invoke(new UpdateWindowDel(UpdateWindow), new string[] { "Connecting ..." });
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -83,7 +83,7 @@
 
       bool clientStarted = false;
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       try

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -299,7 +299,7 @@
 
       Tray.ServerHost = serverAddress.ServerHost;
 
-      IPAddress serverIP = Client.GetIPFromName(Tray.ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(Tray.ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       Tray.StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -219,7 +219,7 @@
 
         try
         {
-          IPAddress serverIP = Client.GetIPFromName(_serverHost);
+          IPAddress serverIP = Network.GetIPFromName(_serverHost);
           IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
           clientStarted = StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -364,7 +364,7 @@
 
     private void connectToolStripMenuItem_Click(object sender, EventArgs e)
     {
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -137,7 +137,7 @@
 
       bool clientStarted = false;
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       try

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -373,25 +373,6 @@
       return (bytesReadTotal == buffer.Length);
     }
 
-    /// <summary>
-    /// Translates a host name or address into an IPAddress object (IPv4).
-    /// </summary>
-    /// <param name="name">Host name or IP address.</param>
-    /// <returns>IPAddress object.</returns>
-    public static IPAddress GetIPFromName(string name)
-    {
-      // Automatically convert localhost to loopback address, avoiding lookup calls for systems that aren't on a network. 
-      if (name.Equals("localhost", StringComparison.OrdinalIgnoreCase))
-        return IPAddress.Loopback;
-
-      IPAddress[] addresses = Dns.GetHostAddresses(name);
-      foreach (IPAddress address in addresses)
-        if (address.AddressFamily == AddressFamily.InterNetwork)
-          return address;
-
-      return null;
-    }
-
     #endregion Implementation
   }
 }
\ No newline at end of file

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -22,6 +22,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Permissions;
@@ -130,6 +132,25 @@
       return null;
     }
 
+    /// <summary>
+    /// Translates a host name or address into an IPAddress object (IPv4).
+    /// </summary>
+    /// <param name="name">Host name or IP address.</param>
+    /// <returns>IPAddress object.</returns>
+    public static IPAddress GetIPFromName(string name)
+    {
+      // Automatically convert localhost to loopback address, avoiding lookup calls for systems that aren't on a network. 
+      if (name.Equals("localhost", StringComparison.OrdinalIgnoreCase))
+        return IPAddress.Loopback;
+
+      IPAddress[] addresses = Dns.GetHostAddresses(name);
+      foreach (IPAddress address in addresses)
+        if (address.AddressFamily == AddressFamily.InterNetwork)
+          return address;
+
+      return null;
+    }
+
     #endregion Methods
   }
 }
\ No newline at end of file

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -693,7 +693,7 @@
       {
         StartServer();
 
-        IPAddress serverIP = Client.GetIPFromName(Settings.HostComputer);
+        IPAddress serverIP = Network.GetIPFromName(Settings.HostComputer);
         IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
         StartClient(endPoint);
@@ -725,7 +725,7 @@
       {
         StartServer();
 
-        IPAddress serverIP = Client.GetIPFromName(Settings.HostComputer);
+        IPAddress serverIP = Network.GetIPFromName(Settings.HostComputer);
         IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
         StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -60,7 +60,7 @@
         MPBlastZonePlugin.ServerHost = serverAddress.ServerHost;
       }
 
-      IPAddress serverIP = Client.GetIPFromName(MPBlastZonePlugin.ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(MPBlastZonePlugin.ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       if (!MPBlastZonePlugin.StartClient(endPoint))
@@ -670,7 +670,7 @@
 
       MPBlastZonePlugin.ServerHost = serverAddress.ServerHost;
 
-      IPAddress serverIP = Client.GetIPFromName(MPBlastZonePlugin.ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(MPBlastZonePlugin.ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       MPBlastZonePlugin.StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -290,7 +290,7 @@
 
       Log.Info("MPBlastZonePlugin: Starting ({0})", PluginVersion);
 
-      IPAddress serverIP = Client.GetIPFromName(ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       if (!StartClient(endPoint))
@@ -447,7 +447,7 @@
 
       Log.Warn("MPBlastZonePlugin: Attempting communications restart ...");
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -64,7 +64,7 @@
         MPControlPlugin.ServerHost = serverAddress.ServerHost;
       }
 
-      IPAddress serverIP = Client.GetIPFromName(MPControlPlugin.ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(MPControlPlugin.ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       if (!MPControlPlugin.StartClient(endPoint))
@@ -834,7 +834,7 @@
 
       MPControlPlugin.ServerHost = serverAddress.ServerHost;
 
-      IPAddress serverIP = Client.GetIPFromName(MPControlPlugin.ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(MPControlPlugin.ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       MPControlPlugin.StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -286,7 +286,7 @@
       if (MultiMappingEnabled)
         LoadMultiMappings();
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       if (!StartClient(endPoint))
@@ -729,7 +729,7 @@
 
       Log.Warn("MPControlPlugin: Attempting communications restart ...");
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -61,7 +61,7 @@
 
       TvBusinessLayer layer = new TvBusinessLayer();
       TV3BlasterPlugin.ServerHost = layer.GetSetting("TV3BlasterPlugin_ServerHost", "localhost").Value;
-      IPAddress serverIP = Client.GetIPFromName(TV3BlasterPlugin.ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(TV3BlasterPlugin.ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       if (!TV3BlasterPlugin.StartClient(endPoint))
@@ -342,7 +342,7 @@
 
       TV3BlasterPlugin.ServerHost = serverAddress.ServerHost;
 
-      IPAddress serverIP = Client.GetIPFromName(TV3BlasterPlugin.ServerHost);
+      IPAddress serverIP = Network.GetIPFromName(TV3BlasterPlugin.ServerHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       TV3BlasterPlugin.StartClient(endPoint);

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs	2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs	2010-10-30 00:39:14 UTC (rev 3874)
@@ -160,7 +160,7 @@
       ITvServerEvent events = GlobalServiceProvider.Instance.Get<ITvServerEvent>();
       events.OnTvServerEvent += events_OnTvServerEvent;
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       if (!StartClient(endPoint))
@@ -209,7 +209,7 @@
 
       Log.Info("TV3BlasterPlugin: Attempting communications restart ...");
 
-      IPAddress serverIP = Client.GetIPFromName(_serverHost);
+      IPAddress serverIP = Network.GetIPFromName(_serverHost);
       IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
 
       StartClient(endPoint);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins:[3950] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3950
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3950&view=rev
Author:   chef_koch
Date:     2010-11-18 17:09:48 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
changed plugins directory from "IR Server Plugins" to "Plugins"

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs
    trunk/plugins/IR Server Suite/setup/setup.nsi

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs	2010-11-18 16:26:13 UTC (rev 3949)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs	2010-11-18 17:09:48 UTC (rev 3950)
@@ -155,8 +155,8 @@
     {
       List<PluginBase> plugins = new List<PluginBase>();
 
-      string path = Path.Combine(Application.StartupPath, "IR Server Plugins");
-      string[] files = Directory.GetFiles(path, "*.dll", SearchOption.TopDirectoryOnly);
+      string path = Path.Combine(Application.StartupPath, "Plugins");
+      string[] files = Directory.GetFiles(path, "*.dll", SearchOption.AllDirectories);
 
       // TODO: Return a Type[], don't instantiate unless required
 

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2010-11-18 16:26:13 UTC (rev 3949)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2010-11-18 17:09:48 UTC (rev 3950)
@@ -376,7 +376,7 @@
   File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*"
 
   ${LOG_TEXT} "INFO" "Installing IR Server Plugins..."
-  SetOutPath "$DIR_INSTALL\IR Server Plugins"
+  SetOutPath "$DIR_INSTALL\Plugins"
 
   File "..\IR Server Suite\IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${Build_Type}\Ads Tech PTV-335 Receiver.*"
   File "..\IR Server Suite\IR Server Plugins\CoolCommand Receiver\bin\${Build_Type}\CoolCommand Receiver.*"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins:[3995] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3995
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3995&view=rev
Author:   chef_koch
Date:     2010-12-03 15:54:31 +0000 (Fri, 03 Dec 2010)

Log Message:
-----------
removed WiimoteLib source
added WiimoteLib binary as reference
using new output directory for plugins in install script

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
    trunk/plugins/IR Server Suite/setup/setup.nsi

Added Paths:
-----------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll

Removed Paths:
-------------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/

Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/References/WiimoteLib.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj	2010-12-03 15:22:48 UTC (rev 3994)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj	2010-12-03 15:54:31 UTC (rev 3995)
@@ -60,6 +60,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WiimoteLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Mouse.cs" />
@@ -83,10 +84,6 @@
       <Name>IR Server Plugin Interface</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\WiimoteLib\WiimoteLib.csproj">
-      <Project>{37A555DF-7012-4B99-8A47-1C922A361E52}</Project>
-      <Name>WiimoteLib</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -101,6 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
+    <Content Include="References\WiimoteLib.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -111,6 +109,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???"  "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
+    <PostBuildEvent>xcopy /Y "$(TargetDir)$(ProjectName).???"  "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"
+xcopy /Y "$(ProjectDir)References\*.dll"  "$(SolutionDir)..\$(OutDir)Plugins\$(ProjectName)\"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln	2010-12-03 15:22:48 UTC (rev 3994)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln	2010-12-03 15:54:31 UTC (rev 3995)
@@ -63,8 +63,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wii Remote Receiver", "IR Server Plugins\Wii Remote Receiver\Wii Remote Receiver.csproj", "{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WiimoteLib", "IR Server Plugins\WiimoteLib\WiimoteLib.csproj", "{37A555DF-7012-4B99-8A47-1C922A361E52}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Direct Input Receiver", "IR Server Plugins\Direct Input Receiver\Direct Input Receiver.csproj", "{732CDF64-D047-4D3C-91DA-E2FF27D84179}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ads Tech PTV-335 Receiver", "IR Server Plugins\Ads Tech PTV-335 Receiver\Ads Tech PTV-335 Receiver.csproj", "{E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB}"
@@ -241,10 +239,6 @@
 		{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Debug|x86.Build.0 = Debug|x86
 		{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Release|x86.ActiveCfg = Release|x86
 		{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B}.Release|x86.Build.0 = Release|x86
-		{37A555DF-7012-4B99-8A47-1C922A361E52}.Debug|x86.ActiveCfg = Debug|x86
-		{37A555DF-7012-4B99-8A47-1C922A361E52}.Debug|x86.Build.0 = Debug|x86
-		{37A555DF-7012-4B99-8A47-1C922A361E52}.Release|x86.ActiveCfg = Release|x86
-		{37A555DF-7012-4B99-8A47-1C922A361E52}.Release|x86.Build.0 = Release|x86
 		{732CDF64-D047-4D3C-91DA-E2FF27D84179}.Debug|x86.ActiveCfg = Debug|x86
 		{732CDF64-D047-4D3C-91DA-E2FF27D84179}.Debug|x86.Build.0 = Debug|x86
 		{732CDF64-D047-4D3C-91DA-E2FF27D84179}.Release|x86.ActiveCfg = Release|x86
@@ -414,7 +408,6 @@
 		{A4023992-CCD6-461E-8E14-219A496734C5} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
 		{5A9954F8-344C-489C-B8DA-8E8927271A02} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
 		{A50080F4-53D1-41CC-9C5F-500AFDDE9E8B} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
-		{37A555DF-7012-4B99-8A47-1C922A361E52} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
 		{732CDF64-D047-4D3C-91DA-E2FF27D84179} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
 		{E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
 		{EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
@@ -434,11 +427,11 @@
 		{BCAFDF45-70DD-46FD-8B98-880DDA585AD2} = {E757F80C-23C5-4AD6-B178-16799E337E03}
 		{28923F6E-8A68-4BC8-A507-825B09C3F64E} = {E757F80C-23C5-4AD6-B178-16799E337E03}
 		{28098574-D22E-457C-AFFA-560554499EAC} = {E757F80C-23C5-4AD6-B178-16799E337E03}
+		{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
 		{46F1DB42-F082-4200-B939-6E4B72A8117C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
 		{1E84C2ED-92FC-43A4-9C12-374B3347F6D7} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
 		{5C0DF76E-D1AE-4161-B8D1-843925C8AB58} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
 		{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
-		{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
 		{21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
 		{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
 		{D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2010-12-03 15:22:48 UTC (rev 3994)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2010-12-03 15:54:31 UTC (rev 3995)
@@ -376,44 +376,7 @@
   File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*"
 
   ${LOG_TEXT} "INFO" "Installing IR Server Plugins..."
-  SetOutPath "$DIR_INSTALL\Plugins"
-
-  File "..\IR Server Suite\IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${Build_Type}\Ads Tech PTV-335 Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\CoolCommand Receiver\bin\${Build_Type}\CoolCommand Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Custom HID Receiver\bin\${Build_Type}\Custom HID Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Direct Input Receiver\bin\${Build_Type}\Direct Input Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\FireDTV Receiver\bin\${Build_Type}\FireDTV Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\FusionRemote Receiver\bin\${Build_Type}\FusionRemote Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Girder Plugin\bin\${Build_Type}\Girder Plugin.*"
-  File "..\IR Server Suite\IR Server Plugins\HCW Receiver\bin\${Build_Type}\HCW Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\IgorPlug Receiver\bin\${Build_Type}\IgorPlug Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Imon USB Receivers\bin\${Build_Type}\Imon USB Receivers.*"
-  File "..\IR Server Suite\IR Server Plugins\IR501 Receiver\bin\${Build_Type}\IR501 Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\IR507 Receiver\bin\${Build_Type}\IR507 Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\IRMan Receiver\bin\${Build_Type}\IRMan Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\IRTrans Transceiver\bin\${Build_Type}\IRTrans Transceiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Keyboard Input\bin\${Build_Type}\Keyboard Input.*"
-  File "..\IR Server Suite\IR Server Plugins\LiveDrive Receiver\bin\${Build_Type}\LiveDrive Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\MacMini Receiver\bin\${Build_Type}\MacMini Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Microsoft MCE Transceiver\bin\${Build_Type}\Microsoft MCE Transceiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Pinnacle Serial Receiver\bin\${Build_Type}\Pinnacle Serial Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\RC102 Receiver\bin\${Build_Type}\RC102 Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\RedEye Blaster\bin\${Build_Type}\RedEye Blaster.*"
-  File "..\IR Server Suite\IR Server Plugins\Serial IR Blaster\bin\${Build_Type}\Serial IR Blaster.*"
-  File "..\IR Server Suite\IR Server Plugins\Speech Receiver\bin\${Build_Type}\Speech Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\Technotrend Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Technotrend Receiver\bin\${Build_Type}\ttBdaDrvApi_Dll.dll"
-  File "..\IR Server Suite\IR Server Plugins\USB-UIRT Transceiver\bin\${Build_Type}\USB-UIRT Transceiver.*"
-  File "..\IR Server Suite\IR Server Plugins\Wii Remote Receiver\bin\${Build_Type}\Wii Remote Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\WiimoteLib\bin\${Build_Type}\WiimoteLib.*"
-  File "..\IR Server Suite\IR Server Plugins\Windows Message Receiver\bin\${Build_Type}\Windows Message Receiver.*"
-  File "..\IR Server Suite\IR Server Plugins\WinLirc Transceiver\bin\${Build_Type}\WinLirc Transceiver.*"
-  File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\X10 Transceiver.*"
-  File "..\IR Server Suite\IR Server Plugins\X10 Transceiver\bin\${Build_Type}\Interop.X10.dll"
-  File "..\IR Server Suite\IR Server Plugins\XBCDRC Receiver\bin\${Build_Type}\XBCDRC Receiver.*"
-  ; Ira project is not compiling currently
-  ; File "..\IR Server Suite\IR Server Plugins\Ira Transceiver\bin\${Build_Type}\Ira Transceiver.*"
-  ; File "..\IR Server Suite\IR Server Plugins\Tira Transceiver\bin\${Build_Type}\Tira Transceiver.*"
+  File /r "${svn_ROOT_IRSS}\bin\${Build_Type}\Plugins"
   
   ; Create App Data Folder for IR Server configuration files
   CreateDirectory "${COMMON_APPDATA}\IR Server"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins:[3998] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3998
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3998&view=rev
Author:   chef_koch
Date:     2010-12-04 08:16:12 +0000 (Sat, 04 Dec 2010)

Log Message:
-----------
added SolutionInfo.cs for shared AssemblyInformation
removed shared AssemblyInformation from AssemblyInfo.cs files
BuildScript.bat: DeployVersionSVN is only needed for IRServer directory now

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/Build/BuildScript.bat
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/TestApp/TestApp.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/IR Server Tray.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Ira Transceiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ira Transceiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/MPUtils.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MPUtils/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/MediaPortalCommands.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/Common/MediaPortalCommands/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
    trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (PocketPC2003)/Virtual Remote (PocketPC2003).csproj
    trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (Smartphone2003)/Virtual Remote (Smartphone2003).csproj
    trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/Virtual Remote/Applications/Virtual Remote (WinCE5)/Virtual Remote (WinCE5).csproj

Added Paths:
-----------
    trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/Properties/AssemblyInfo.cs
    trunk/plugins/IR Server Suite/IR Server Suite/SolutionInfo.cs

Removed Paths:
-------------
    trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/AssemblyInfo.cs

Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build/BuildScript.bat	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/Build/BuildScript.bat	2010-12-04 08:16:12 UTC (rev 3998)
@@ -32,7 +32,7 @@
 
 echo.
 echo Writing SVN revision assemblies...
-%DeployVersionSVN% /svn=".."  >> %LOG%
+%DeployVersionSVN% /svn="..\IR Server Suite"  >> %LOG%
 
 
 echo.
@@ -52,11 +52,11 @@
 
 echo.
 echo Reverting assemblies...
-%DeployVersionSVN% /svn=".." /revert >> %LOG%
+%DeployVersionSVN% /svn="..\IR Server Suite" /revert >> %LOG%
 
 echo.
 echo Reading the svn revision...
-%DeployVersionSVN% /svn=".." /GetVersion >> %LOG%
+%DeployVersionSVN% /svn="..\IR Server Suite" /GetVersion >> %LOG%
 rem SET /p version=<version.txt >> build.log
 SET version=%errorlevel%
 DEL version.txt >> %LOG%

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -72,6 +72,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -79,7 +83,6 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="MainForm.resx">
       <SubType>Designer</SubType>
       <DependentUpon>MainForm.cs</DependentUpon>

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,62 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
+//
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+//
 
 [assembly: AssemblyTitle("Abstractor")]
 [assembly: AssemblyDescription("Abstract Remote Map Creator")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("Abstractor")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("4d23d334-3b85-4d33-85a2-0071812ce053")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -66,6 +66,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SetupForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -73,7 +77,6 @@
       <DependentUpon>SetupForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="SetupForm.resx">

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,62 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
+//
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+//
 
 [assembly: AssemblyTitle("Dbox Tuner")]
 [assembly: AssemblyDescription("Tune channels on a Dreambox - based on Mark Koenig's MediaPortal plugin")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("Dbox Tuner")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("C4021B4F-1451-4a84-BF3B-213C254290D8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,6 +65,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -72,7 +76,6 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MainForm.resx">

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
 //
 // General Information about an assembly is controlled through the following 
@@ -33,32 +30,5 @@
 
 [assembly: AssemblyTitle("Debug Client")]
 [assembly: AssemblyDescription("Debug client for IR Server")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("DebugClient")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: CLSCompliant(true)]
-[assembly: Guid("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -55,8 +55,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,60 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
+using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
+//
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+//
 
 [assembly: AssemblyTitle("HCW PVR Tuner")]
 [assembly: AssemblyDescription("Command line tuner for Hauppauge PVR devices")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("HCW PVR Tuner")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("57d8b7f1-678f-4169-80ba-e190dd01fba4")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,8 +65,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
 //
 // General Information about an assembly is controlled through the following 
@@ -33,32 +30,5 @@
 
 [assembly: AssemblyTitle("IR Blast")]
 [assembly: AssemblyDescription("Command line application for blasting IR commands to IR Server")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("IRBlast")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: CLSCompliant(true)]
-[assembly: Guid("5eeca936-da49-4952-ab3b-9f11ec57e4aa")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -67,8 +67,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
 //
 // General Information about an assembly is controlled through the following 
@@ -33,32 +30,5 @@
 
 [assembly: AssemblyTitle("IR Blast (No Window)")]
 [assembly: AssemblyDescription("Command line application for blasting IR commands to IR Server")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("IRBlastNoWindow")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: CLSCompliant(true)]
-[assembly: Guid("81eb136b-cc74-4eed-976d-f96ebccd1ce4")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,6 +65,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -76,7 +80,6 @@
     <Compile Include="MceDetectionData.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Pronto.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RemoteDetectionData.cs" />
   </ItemGroup>
   <ItemGroup>

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,60 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
+using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
+//
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+//
 
 [assembly: AssemblyTitle("IR File Tool")]
 [assembly: AssemblyDescription("For learning, modifying, testing, correcting and converting IR command files")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("IR File Tool")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("74144852-ec06-4af4-925f-459e8053b2f8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -65,8 +65,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,62 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
+//
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+//
 
 [assembly: AssemblyTitle("Keyboard Input Relay")]
 [assembly: AssemblyDescription("Relays keyboard input to the IR Server to use like remote button presses")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("Keyboard Input Relay")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("cf85e48e-e867-49e5-b240-693378fdd11c")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -54,8 +54,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,60 +1,34 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
+using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
+//
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+//
 
 [assembly: AssemblyTitle("LogTimeCodeExtractor")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LogTimeCodeExtractor")]
-[assembly: AssemblyCopyright("Copyright �  2008")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("a20b9b41-55a2-454d-a461-9b4a77abdcf3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -61,6 +61,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -68,7 +72,6 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="MainForm.resx">
       <SubType>Designer</SubType>
       <DependentUpon>MainForm.cs</DependentUpon>

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs	2010-12-04 08:16:12 UTC (rev 3998)
@@ -1,29 +1,26 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
+#region Copyright (C) 2005-2010 Team MediaPortal
 
-// Copyright (C) 2005-2009 Team MediaPortal
+// Copyright (C) 2005-2010 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
-// This Program is free software; you can redistribute it and/or modify
+// 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, or (at your option)
-// any later version.
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
 // 
-// This Program is distributed in the hope that it will be useful,
+// 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 GNU Make; see the file COPYING.  If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
 
 #endregion
 
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 
 //
 // General Information about an assembly is controlled through the following 
@@ -33,32 +30,5 @@
 
 [assembly: AssemblyTitle("MacroScope")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("and-81")]
-[assembly: AssemblyProduct("MacroScope")]
-[assembly: AssemblyCopyright("Aaron Dinnage")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("3b4dbc18-a931-42eb-aa55-fc96a32f215f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en")]
\ No newline at end of file
+[assembly: NeutralResourcesLanguage("en")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj	2010-12-04 08:01:37 UTC (rev 3997)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj	2010-12-04 08:16:12 UTC (rev 3998)
@@ -70,6 +70,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ExternalChannelConfig.cs" />
     <Compile Include="Forms\ExternalChannels.cs">
       <SubType>Form</SubType>
@@ -97,7 +101,6 @@
     </Compile>
     <Compile Include="Program.cs">
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</Aut...
 
[truncated message content]

[Mp-plugins-svn] SF.net SVN: mp-plugins:[4160] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 4160
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4160&view=rev
Author:   chef_koch
Date:     2011-04-04 20:36:23 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
merged MPUtils.dll, IrssComms.dll and IrssUtils.dll into each MediaPortal plugin
removed them from installer

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/Build/BuildScript.bat
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
    trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
    trunk/plugins/IR Server Suite/setup/setup.nsi

Added Paths:
-----------
    trunk/plugins/IR Server Suite/External/
    trunk/plugins/IR Server Suite/External/ILMerge.exe
    trunk/plugins/IR Server Suite/External/ILMerge.exe.config
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/ILMerge.bat
    trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/ILMerge.bat
    trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/ILMerge.bat

Modified: trunk/plugins/IR Server Suite/Build/BuildScript.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build/BuildScript.bat	2011-04-03 23:38:11 UTC (rev 4159)
+++ trunk/plugins/IR Server Suite/Build/BuildScript.bat	2011-04-04 20:36:23 UTC (rev 4160)
@@ -44,14 +44,14 @@
 echo.
 echo Building IR Server Suite...
 rem "%ProgramDir%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "..\IR Server Suite\IR Server Suite.sln" >> %LOG%
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86;AllowUnsafeBlocks=true "..\IR Server Suite\IR Server Suite.sln" >> %LOG%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86;AllowUnsafeBlocks=true "..\IR Server Suite\IR Server Suite.sln" >> %LOG%
 if not %ERRORLEVEL%==0 EXIT
 
 if not %2!==MPplugins! goto NoMPplugins
 echo.
 echo Building MediaPortal plugins...
 "%ProgramDir%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
-rem "%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
+rem "%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "..\MediaPortal Plugins\MediaPortal plugins.sln" >> %LOG%
 if not %ERRORLEVEL%==0 EXIT
 :NoMPplugins
 

Added: trunk/plugins/IR Server Suite/External/ILMerge.exe
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/IR Server Suite/External/ILMerge.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/IR Server Suite/External/ILMerge.exe.config
===================================================================
--- trunk/plugins/IR Server Suite/External/ILMerge.exe.config	                        (rev 0)
+++ trunk/plugins/IR Server Suite/External/ILMerge.exe.config	2011-04-04 20:36:23 UTC (rev 4160)
@@ -0,0 +1,6 @@
+<?xml version ="1.0"?>
+<configuration>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <requiredRuntime safemode="true" imageVersion="v4.0.30319" version="v4.0.30319"/>
+  </startup>
+</configuration>
\ No newline at end of file

Added: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/ILMerge.bat
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/ILMerge.bat	                        (rev 0)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/ILMerge.bat	2011-04-04 20:36:23 UTC (rev 4160)
@@ -0,0 +1,15 @@
+ECHO parameter1=%1
+CD %1
+IF %2 == Release SET nodebug=/ndebug
+
+md tmp
+..\..\..\..\..\External\ILMerge.exe %nodebug% /out:tmp\MPBlastZonePlugin.dll MPBlastZonePlugin.dll MPUtils.dll IrssComms.dll IrssUtils.dll
+IF NOT %errorlevel% == 0 exit
+
+IF EXIST MPBlastZonePlugin_UNMERGED.dll del MPBlastZonePlugin_UNMERGED.dll
+ren MPBlastZonePlugin.dll MPBlastZonePlugin_UNMERGED.dll
+IF EXIST MPBlastZonePlugin_UNMERGED.pdb del MPBlastZonePlugin_UNMERGED.pdb
+ren MPBlastZonePlugin.pdb MPBlastZonePlugin_UNMERGED.pdb
+
+move tmp\*.* .
+rd tmp

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj	2011-04-03 23:38:11 UTC (rev 4159)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj	2011-04-04 20:36:23 UTC (rev 4160)
@@ -12,7 +12,7 @@
     <AssemblyName>MPBlastZonePlugin</AssemblyName>
     <StartupObject>
     </StartupObject>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
@@ -49,6 +49,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -98,8 +99,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>"$(ProjectDir)ILMerge.bat" "$(TargetDir)" $(ConfigurationName)</PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\..\..\MediaPortal\trunk\Common-MP-TVE3\Common.Utils\Common.Utils.csproj">
@@ -154,6 +154,7 @@
     <None Include="Graphics\MoveTop.png" />
     <None Include="Graphics\MoveUp.png" />
     <None Include="Graphics\Plus.png" />
+    <None Include="ILMerge.bat" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Graphics\Edit.png" />

Added: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/ILMerge.bat
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/ILMerge.bat	                        (rev 0)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/ILMerge.bat	2011-04-04 20:36:23 UTC (rev 4160)
@@ -0,0 +1,15 @@
+ECHO parameter1=%1
+CD %1
+IF %2 == Release SET nodebug=/ndebug
+
+md tmp
+..\..\..\..\..\External\ILMerge.exe %nodebug% /out:tmp\MPControlPlugin.dll MPControlPlugin.dll MPUtils.dll IrssComms.dll IrssUtils.dll
+IF NOT %errorlevel% == 0 exit
+
+IF EXIST MPControlPlugin_UNMERGED.dll del MPControlPlugin_UNMERGED.dll
+ren MPControlPlugin.dll MPControlPlugin_UNMERGED.dll
+IF EXIST MPControlPlugin_UNMERGED.pdb del MPControlPlugin_UNMERGED.pdb
+ren MPControlPlugin.pdb MPControlPlugin_UNMERGED.pdb
+
+move tmp\*.* .
+rd tmp

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj	2011-04-03 23:38:11 UTC (rev 4159)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj	2011-04-04 20:36:23 UTC (rev 4160)
@@ -12,7 +12,7 @@
     <AssemblyName>MPControlPlugin</AssemblyName>
     <StartupObject>
     </StartupObject>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
@@ -49,6 +49,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -130,8 +132,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>"$(ProjectDir)ILMerge.bat" "$(TargetDir)" $(ConfigurationName)</PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\..\..\MediaPortal\trunk\Common-MP-TVE3\Common.Utils\Common.Utils.csproj">
@@ -175,4 +176,7 @@
     <EmbeddedResource Include="iconGray.gif" />
     <EmbeddedResource Include="iconGreen.gif" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ILMerge.bat" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj	2011-04-03 23:38:11 UTC (rev 4159)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj	2011-04-04 20:36:23 UTC (rev 4160)
@@ -12,7 +12,7 @@
     <AssemblyName>TV2BlasterPlugin</AssemblyName>
     <StartupObject>
     </StartupObject>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
@@ -148,8 +148,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>"$(ProjectDir)ILMerge.bat" "$(TargetDir)" $(ConfigurationName)</PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Common\MPUtils\MPUtils.csproj">

Added: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/ILMerge.bat
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/ILMerge.bat	                        (rev 0)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/ILMerge.bat	2011-04-04 20:36:23 UTC (rev 4160)
@@ -0,0 +1,15 @@
+ECHO parameter1=%1
+CD %1
+IF %2 == Release SET nodebug=/ndebug
+
+md tmp
+..\..\..\..\..\External\ILMerge.exe %nodebug% /out:tmp\TV3BlasterPlugin.dll TV3BlasterPlugin.dll MPUtils.dll IrssComms.dll IrssUtils.dll
+IF NOT %errorlevel% == 0 exit
+
+IF EXIST TV3BlasterPlugin_UNMERGED.dll del TV3BlasterPlugin_UNMERGED.dll
+ren TV3BlasterPlugin.dll TV3BlasterPlugin_UNMERGED.dll
+IF EXIST TV3BlasterPlugin_UNMERGED.pdb del TV3BlasterPlugin_UNMERGED.pdb
+ren TV3BlasterPlugin.pdb TV3BlasterPlugin_UNMERGED.pdb
+
+move tmp\*.* .
+rd tmp

Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj	2011-04-03 23:38:11 UTC (rev 4159)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj	2011-04-04 20:36:23 UTC (rev 4160)
@@ -20,7 +20,7 @@
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
     <RootNamespace>TvEngine</RootNamespace>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
     <FileUpgradeFlags>
@@ -94,12 +94,12 @@
     <Reference Include="Gentle.Common, Version=1.2.9.1285, Culture=neutral, PublicKeyToken=80b5de62e27be49b">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\references\Gentle.Common.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Gentle.Framework, Version=1.2.9.1286, Culture=neutral, PublicKeyToken=80b5de62e27be49b">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\mediaportal\trunk\TvEngine3\TVLibrary\TVDatabase\references\Gentle.Framework.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -208,11 +208,13 @@
       <Name>MPUtils</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ILMerge.bat" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>"$(ProjectDir)ILMerge.bat" "$(TargetDir)" $(ConfigurationName)</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2011-04-03 23:38:11 UTC (rev 4159)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2011-04-04 20:36:23 UTC (rev 4160)
@@ -240,12 +240,9 @@
   !insertmacro "${MacroName}" "SectionIRServer"
 
 !ifdef MPplugins
-  !insertmacro "${MacroName}" "SectionMPCommon"
-    !insertmacro "${MacroName}" "SectionMPControlPlugin"
-    !insertmacro "${MacroName}" "SectionMPBlastZonePlugin"
-
-  !insertmacro "${MacroName}" "SectionTV3Common"
-    !insertmacro "${MacroName}" "SectionTV3BlasterPlugin"
+  !insertmacro "${MacroName}" "SectionMPControlPlugin"
+  !insertmacro "${MacroName}" "SectionMPBlastZonePlugin"
+  !insertmacro "${MacroName}" "SectionTV3BlasterPlugin"
 !endif
 
   #SectionGroupTools
@@ -440,42 +437,12 @@
 
 SectionGroup "MediaPortal plugins" SectionGroupMP
 
-Section "-commonMP" SectionMPCommon
-  ${LOG_TEXT} "INFO" "Installing common files for MediaPortal plugins..."
-  ${KILLPROCESS} "MediaPortal.exe"
-  ${KILLPROCESS} "configuration.exe"
+${MementoSection} "MP Control Plugin" SectionMPControlPlugin
+  ${LOG_TEXT} "INFO" "Installing MP Control Plugin..."
 
-  ; Write plugin dll
-  SetOutPath "$MPdir.Plugins\Process"
-  File "..\MediaPortal Plugins\Common\MPUtils\bin\${Build_Type}\MPUtils.*"
-  File "..\IR Server Suite\Common\IrssComms\bin\${Build_Type}\IrssComms.*"
-  File "..\IR Server Suite\Common\IrssUtils\bin\${Build_Type}\IrssUtils.*"
-
-  ; Write plugin dll
-  SetOutPath "$MPdir.Plugins\Windows"
-  File "..\MediaPortal Plugins\Common\MPUtils\bin\${Build_Type}\MPUtils.*"
-  File "..\IR Server Suite\Common\IrssComms\bin\${Build_Type}\IrssComms.*"
-  File "..\IR Server Suite\Common\IrssUtils\bin\${Build_Type}\IrssUtils.*"
-SectionEnd
-!macro Remove_${SectionMPCommon}
-  ${LOG_TEXT} "INFO" "Removing common files for MediaPortal plugins..."
   ${KILLPROCESS} "MediaPortal.exe"
   ${KILLPROCESS} "configuration.exe"
 
-  ; remove files
-  Delete "$MPdir.Plugins\Process\MPUtils.*"
-  Delete "$MPdir.Plugins\Process\IrssComms.*"
-  Delete "$MPdir.Plugins\Process\IrssUtils.*"
-  Delete "$MPdir.Plugins\Windows\MPUtils.*"
-  Delete "$MPdir.Plugins\Windows\IrssComms.*"
-  Delete "$MPdir.Plugins\Windows\IrssUtils.*"
-!macroend
-
-;======================================
-
-${MementoSection} "MP Control Plugin" SectionMPControlPlugin
-  ${LOG_TEXT} "INFO" "Installing MP Control Plugin..."
-
   ; Write plugin dll
   SetOutPath "$MPdir.Plugins\Process"
   File "..\MediaPortal Plugins\MediaPortal Plugins\MP Control Plugin\bin\${Build_Type}\MPControlPlugin.*"
@@ -498,6 +465,9 @@
 !macro Remove_${SectionMPControlPlugin}
   ${LOG_TEXT} "INFO" "MP Control Plugin..."
 
+  ${KILLPROCESS} "MediaPortal.exe"
+  ${KILLPROCESS} "configuration.exe"
+
   ; Delete plugin dll
   Delete "$MPdir.Plugins\Process\MPControlPlugin.*"
 
@@ -510,6 +480,9 @@
 ${MementoUnselectedSection} "MP Blast Zone Plugin" SectionMPBlastZonePlugin
   ${LOG_TEXT} "INFO" "Installing MP Blast Zone Plugin..."
 
+  ${KILLPROCESS} "MediaPortal.exe"
+  ${KILLPROCESS} "configuration.exe"
+
   ; use the all users context
   SetShellVarContext all
 
@@ -538,6 +511,9 @@
 !macro Remove_${SectionMPBlastZonePlugin}
   ${LOG_TEXT} "INFO" "Removing MP Blast Zone Plugin..."
 
+  ${KILLPROCESS} "MediaPortal.exe"
+  ${KILLPROCESS} "configuration.exe"
+
   Delete "$MPdir.Plugins\Windows\MPBlastZonePlugin.*"
 !macroend
 
@@ -573,36 +549,9 @@
 
 SectionGroup "TV Server plugins" SectionGroupTV3
 
-Section "-commonTV3" SectionTV3Common
-  ${LOG_TEXT} "INFO" "Installing common files for TV Server plugins..."
-  !insertmacro StopTVService
-
-  ; Write plugin dll
-  SetOutPath "$DIR_TVSERVER\Plugins"
-  File "..\MediaPortal Plugins\Common\MPUtils\bin\${Build_Type}\MPUtils.*"
-  File "..\IR Server Suite\Common\IrssComms\bin\${Build_Type}\IrssComms.*"
-  File "..\IR Server Suite\Common\IrssUtils\bin\${Build_Type}\IrssUtils.*"
-SectionEnd
-!macro Remove_${SectionTV3Common}
-  ${If} ${FileExists} "$DIR_TVSERVER\Plugins\MPUtils.*"
-  ${OrIf} ${FileExists} "$DIR_TVSERVER\Plugins\IrssComms.*"
-  ${OrIf} ${FileExists} "$DIR_TVSERVER\Plugins\IrssUtils.*"
-
-    ${LOG_TEXT} "INFO" "Removing common files for TV Server plugins..."
-    !insertmacro StopTVService
-
-    ; remove files
-    Delete "$DIR_TVSERVER\Plugins\MPUtils.*"
-    Delete "$DIR_TVSERVER\Plugins\IrssComms.*"
-    Delete "$DIR_TVSERVER\Plugins\IrssUtils.*"
-
-  ${EndIf}
-!macroend
-
-;======================================
-
 ${MementoUnselectedSection} "TV Server Blaster Plugin" SectionTV3BlasterPlugin
   ${LOG_TEXT} "INFO" "Installing TV Server Blaster Plugin..."
+  !insertmacro StopTVService
 
   ; Write plugin dll
   SetOutPath "$DIR_TVSERVER\Plugins"
@@ -1119,9 +1068,6 @@
     !insertmacro DisableSection "${SectionGroupTV3}" "TV Server plugins" " ($(TEXT_TVSERVER_NOT_INSTALLED))"
   ${Endif}
 !endif
-
-  ; update component selection
-  Call .onSelChange
 FunctionEnd
 
 
@@ -1172,29 +1118,6 @@
 ${LOG_CLOSE}
 FunctionEnd
 
-Function .onSelChange
-
-!ifdef MPplugins
-  ; disable/remove common files for MediaPortal plugins if all MediaPortal plugins are unselected
-  ${IfNot} ${SectionIsSelected} ${SectionMPControlPlugin}
-  ${AndIfNot} ${SectionIsSelected} ${SectionMPBlastZonePlugin}
-    !insertmacro UnselectSection ${SectionMPCommon}
-  ${Else}
-    !insertmacro SelectSection ${SectionMPCommon}
-  ${EndIf}
-
-  ; disable/remove common files for TVServer plugins if all TVServer plugins are unselected
-  ${IfNot} ${SectionIsSelected} ${SectionTV3BlasterPlugin}
-    !insertmacro UnselectSection ${SectionTV3Common}
-  ${Else}
-    !insertmacro SelectSection ${SectionTV3Common}
-  ${EndIf}
-!endif
-
-FunctionEnd
-
-;======================================
-
 Function PageReinstallLeave
   !ifdef MPplugins
     ; ExpressUpdate is selected


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.