Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1457] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2008-03-13 06:59:55
|
Revision: 1457
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1457&view=rev
Author: and-81
Date: 2008-03-12 23:59:52 -0700 (Wed, 12 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.nsi
trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -1206,12 +1206,15 @@
// Check that the device maps are loaded for the forwarded device
bool foundDevice = false;
- foreach (PluginBase plugin in _pluginReceive)
+ if (_pluginReceive != null)
{
- if (plugin is IRemoteReceiver && plugin.Name.Equals(deviceName, StringComparison.OrdinalIgnoreCase))
+ foreach (PluginBase plugin in _pluginReceive)
{
- foundDevice = true;
- break;
+ if (plugin is IRemoteReceiver && plugin.Name.Equals(deviceName, StringComparison.OrdinalIgnoreCase))
+ {
+ foundDevice = true;
+ break;
+ }
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -22,6 +22,7 @@
{
#region Debug
+#if DEBUG
static void Remote(string deviceName, string code)
{
@@ -59,8 +60,10 @@
c = null;
}
+#endif
#endregion Debug
+
#region Constants
static readonly string ConfigurationFile = Path.Combine(ConfigurationPath, "Custom HID Receiver.xml");
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 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -20,15 +20,12 @@
{
#region Debug
+#if DEBUG
static void Remote(string deviceName, string code)
{
Console.WriteLine("Remote: {0}", code);
}
- static void Keyboard(string deviceName, int button, bool up)
- {
- Console.WriteLine("Keyboard: {0}, {1}", button, up);
- }
static void Mouse(string deviceName, int x, int y, int buttons)
{
Console.WriteLine("Mouse: ({0}, {1}) - {2}", x, y, buttons);
@@ -42,7 +39,6 @@
c.Configure(null);
c.RemoteCallback += new RemoteHandler(Remote);
- //c.KeyboardCallback += new KeyboardHandler(Keyboard);
c.MouseCallback += new MouseHandler(Mouse);
c.Start();
@@ -53,6 +49,7 @@
c = null;
}
+#endif
#endregion Debug
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -19,6 +19,7 @@
{
#region Debug
+#if DEBUG
[STAThread]
static void Main()
@@ -45,6 +46,7 @@
Console.WriteLine("Remote: {0}", code);
}
+#endif
#endregion Debug
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -21,6 +21,7 @@
{
#region Debug
+#if DEBUG
static void Remote(string deviceName, string code)
{
@@ -41,10 +42,10 @@
c = null;
}
+#endif
#endregion Debug
-
#region Interop
[DllImport("user32.dll")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -376,8 +376,8 @@
#endregion Static Methods
- #region Debug
+ #region Debug
#if DEBUG
protected static StreamWriter _debugFile;
@@ -496,7 +496,6 @@
}
#endif
-
#endregion Debug
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -54,6 +54,7 @@
{
#region Debug
+#if DEBUG
static void xRemote(string deviceName, string code)
{
@@ -175,10 +176,10 @@
c = null;
}
+#endif
#endregion Debug
-
#region Constants
static readonly string ConfigurationFile = Path.Combine(ConfigurationPath, "Microsoft MCE Transceiver.xml");
Modified: trunk/plugins/IR Server Suite/IR Server Suite.nsi
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi 2008-03-13 06:59:52 UTC (rev 1457)
@@ -405,8 +405,10 @@
File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
- ; Create App Data Folder for IR Server configuration files.
+ ; Create App Data Folder for IR Server configuration files
CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
+
+ ; Copy Abstract Remote maps
CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
SetOverwrite ifnewer
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-03-13 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -1166,12 +1166,15 @@
// Check that the device maps are loaded for the forwarded device
bool foundDevice = false;
- foreach (PluginBase plugin in _pluginReceive)
+ if (_pluginReceive != null)
{
- if (plugin is IRemoteReceiver && plugin.Name.Equals(deviceName, StringComparison.OrdinalIgnoreCase))
+ foreach (PluginBase plugin in _pluginReceive)
{
- foundDevice = true;
- break;
+ if (plugin is IRemoteReceiver && plugin.Name.Equals(deviceName, StringComparison.OrdinalIgnoreCase))
+ {
+ foundDevice = true;
+ break;
+ }
}
}
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 04:44:42 UTC (rev 1456)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs 2008-03-13 06:59:52 UTC (rev 1457)
@@ -49,6 +49,10 @@
/// </summary>
void InputServiceInstaller_AfterInstall(object sender, InstallEventArgs e)
{
+
+ // TODO: Set the restart options.
+
+
// Start the service ...
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.
|
