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

[<an...@us...>]

Revision: 1460
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1460&view=rev
Author:   and-81
Date:     2008-03-14 02:55:40 -0700 (Fri, 14 Mar 2008)

Log Message:
-----------


Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
    trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
    trunk/plugins/IR Server Suite/IR Server Suite.nsi
    trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs

Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj	2008-03-13 15:48:42 UTC (rev 1459)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj	2008-03-14 09:55:40 UTC (rev 1460)
@@ -39,10 +39,12 @@
     <Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\WINDOWS\Microsoft.NET\DirectX for Managed Code\1.0.2902.0\Microsoft.DirectX.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.DirectX.DirectInput, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\WINDOWS\Microsoft.NET\DirectX for Managed Code\1.0.2902.0\Microsoft.DirectX.DirectInput.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />

Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs	2008-03-13 15:48:42 UTC (rev 1459)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs	2008-03-14 09:55:40 UTC (rev 1460)
@@ -159,14 +159,12 @@
       {
         InitDeviceList();
 
-        if (_deviceList.Count != 0)
-          return true;
+        return (_deviceList.Count != 0);
       }
       catch
       {
+        return false;
       }
-
-      return false;
     }
 
     /// <summary>

Modified: trunk/plugins/IR Server Suite/IR Server Suite.nsi
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi	2008-03-13 15:48:42 UTC (rev 1459)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi	2008-03-14 09:55:40 UTC (rev 1460)
@@ -80,19 +80,34 @@
 
     ${DisableX64FSRedirection}
 
+      ; Get IR Server Suite installation directory ...
       ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
       ${If} $DIR_INSTALL == ""
         StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
       ${Endif}
 
+      ; Get MediaPortal installation directory ...
       ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
       ${If} $DIR_MEDIAPORTAL == ""
-        StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+
+        ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+        ${If} $DIR_MEDIAPORTAL == ""
+          StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+        ${Endif}
+
       ${Endif}
 
+      ; Get MediaPortal TV Server installation directory ...
       ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
       ${If} $DIR_TVSERVER == ""
-        StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+
+        ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+        ${If} $DIR_TVSERVER == ""
+          StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+        ${Endif}
+
       ${Endif}
 
       ${EnableX64FSRedirection}
@@ -101,19 +116,34 @@
 
     SetRegView 32
 
+    ; Get IR Server Suite installation directory ...
     ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
     ${If} $DIR_INSTALL == ""
       StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
     ${Endif}
 
+    ; Get MediaPortal installation directory ...
     ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
     ${If} $DIR_MEDIAPORTAL == ""
-      StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+
+      ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+      ${If} $DIR_MEDIAPORTAL == ""
+        StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+      ${Endif}
+
     ${Endif}
 
+    ; Get MediaPortal TV Server installation directory ...
     ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
     ${If} $DIR_TVSERVER == ""
-      StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+
+      ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+      ${If} $DIR_TVSERVER == ""
+        StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+      ${Endif}
+
     ${Endif}
 
   ${Endif}
@@ -377,6 +407,8 @@
   File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
   File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
   File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
+  File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
+  File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
   File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
   File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
   File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"

Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs	2008-03-13 15:48:42 UTC (rev 1459)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs	2008-03-14 09:55:40 UTC (rev 1460)
@@ -54,8 +54,8 @@
 
 
       // Start the service ...
-      using (ServiceController serviceController = new ServiceController(Program.ServiceName))
-        serviceController.Start();
+      //using (ServiceController serviceController = new ServiceController(Program.ServiceName))
+        //serviceController.Start();
     }
 
     /*


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