Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1370] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2008-02-16 13:08:03
|
Revision: 1370
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1370&view=rev
Author: and-81
Date: 2008-02-16 05:08:01 -0800 (Sat, 16 Feb 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs
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.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/ReceiverWindow.cs
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/DirectInputListener.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/GirderPluginWrapper.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/ReceiverWindow.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IConfigure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IKeyboardReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ILearnIR.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IMouseReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ITransmitIR.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/CSocketPacket.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/MceDetectionData.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/RemoteDetectionData.cs
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DeviceIoOverlapped.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/DriverReplacement.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Keyboard.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Mouse.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/NotifyWindow.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/RemoteDetectionData.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Mouse.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Setup.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Setup.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/CreateIRFile.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/CreateIRFile.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLircServer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/ReceiverWindow.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite - Debug.nsi
trunk/plugins/IR Server Suite/IR Server Suite - Release.nsi
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.Designer.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.Designer.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Configure.resx
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Tira2.dll
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginBase.cs
Property Changed:
----------------
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -9,7 +9,7 @@
using System.Text;
using System.Windows.Forms;
-using IRServerPluginInterface;
+using InputService.Plugin;
using IrssUtils;
namespace IRServer
@@ -20,7 +20,7 @@
#region Variables
- IRServerPluginBase[] _transceivers;
+ PluginBase[] _transceivers;
IRServerMode _mode = IRServerMode.ServerMode;
string _hostComputer = String.Empty;
@@ -167,7 +167,7 @@
row++;
- foreach (IRServerPluginBase transceiver in _transceivers)
+ foreach (PluginBase transceiver in _transceivers)
{
gridPlugins.Rows.Insert(row);
@@ -264,7 +264,7 @@
string plugin = gridPlugins[cell.Row.Index, 0].DisplayText;
- foreach (IRServerPluginBase transceiver in _transceivers)
+ foreach (PluginBase transceiver in _transceivers)
if (transceiver.Name.Equals(plugin, StringComparison.OrdinalIgnoreCase))
(transceiver as IConfigure).Configure(this);
}
@@ -353,7 +353,7 @@
{
string name = gridPlugins[row, 0].DisplayText;
- IRServerPluginBase plugin = Program.GetPlugin(name);
+ PluginBase plugin = Program.GetPlugin(name);
bool detected = plugin.Detect();
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -13,7 +13,7 @@
using Microsoft.Win32;
using Microsoft.Win32.SafeHandles;
-using IRServerPluginInterface;
+using InputService.Plugin;
using IrssComms;
using IrssUtils;
@@ -71,10 +71,10 @@
bool _registered; // Used for relay and repeater modes.
string[] _pluginNameReceive;
- List<IRServerPluginBase> _pluginReceive;
+ List<PluginBase> _pluginReceive;
string _pluginNameTransmit;
- IRServerPluginBase _pluginTransmit;
+ PluginBase _pluginTransmit;
bool _inConfiguration;
@@ -172,13 +172,13 @@
}
else
{
- _pluginReceive = new List<IRServerPluginBase>(_pluginNameReceive.Length);
+ _pluginReceive = new List<PluginBase>(_pluginNameReceive.Length);
for (int index = 0; index < _pluginNameReceive.Length; index++)
{
string pluginName = _pluginNameReceive[index];
- IRServerPluginBase plugin = Program.GetPlugin(pluginName);
+ PluginBase plugin = Program.GetPlugin(pluginName);
if (plugin == null)
{
@@ -236,9 +236,9 @@
if (_pluginReceive != null)
{
- List<IRServerPluginBase> removePlugins = new List<IRServerPluginBase>();
+ List<PluginBase> removePlugins = new List<PluginBase>();
- foreach (IRServerPluginBase plugin in _pluginReceive)
+ foreach (PluginBase plugin in _pluginReceive)
{
try
{
@@ -275,7 +275,7 @@
}
}
- foreach (IRServerPluginBase plugin in removePlugins)
+ foreach (PluginBase plugin in removePlugins)
_pluginReceive.Remove(plugin);
if (_pluginReceive.Count == 0)
@@ -336,7 +336,7 @@
if (_pluginReceive != null)
{
- foreach (IRServerPluginBase plugin in _pluginReceive)
+ foreach (PluginBase plugin in _pluginReceive)
{
try
{
@@ -467,7 +467,7 @@
if (_pluginReceive != null)
{
- foreach (IRServerPluginBase plugin in _pluginReceive)
+ foreach (PluginBase plugin in _pluginReceive)
{
try
{
@@ -512,7 +512,7 @@
if (_pluginReceive != null)
{
- foreach (IRServerPluginBase plugin in _pluginReceive)
+ foreach (PluginBase plugin in _pluginReceive)
{
try
{
@@ -1280,12 +1280,12 @@
{
IrssMessage response = new IrssMessage(MessageType.AvailableBlasters, MessageFlags.Response);
- IRServerPluginBase[] plugins = Program.AvailablePlugins();
+ PluginBase[] plugins = Program.AvailablePlugins();
StringBuilder blasters = new StringBuilder();
for (int index = 0; index < plugins.Length; index++)
{
- IRServerPluginBase plugin = plugins[index];
+ PluginBase plugin = plugins[index];
if (plugin is ITransmitIR)
{
@@ -1314,12 +1314,12 @@
{
IrssMessage response = new IrssMessage(MessageType.AvailableReceivers, MessageFlags.Response);
- IRServerPluginBase[] plugins = Program.AvailablePlugins();
+ PluginBase[] plugins = Program.AvailablePlugins();
StringBuilder receivers = new StringBuilder();
for (int index = 0; index < plugins.Length; index++)
{
- IRServerPluginBase plugin = plugins[index];
+ PluginBase plugin = plugins[index];
if (plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver)
{
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -8,7 +8,7 @@
using Microsoft.Win32;
-using IRServerPluginInterface;
+using InputService.Plugin;
using IrssUtils;
namespace IRServer
@@ -76,11 +76,11 @@
/// Retreives a list of available IR Server plugins.
/// </summary>
/// <returns>Array of plugin instances.</returns>
- internal static IRServerPluginBase[] AvailablePlugins()
+ internal static PluginBase[] AvailablePlugins()
{
try
{
- List<IRServerPluginBase> plugins = new List<IRServerPluginBase>();
+ List<PluginBase> plugins = new List<PluginBase>();
string installFolder = SystemRegistry.GetInstallFolder();
if (String.IsNullOrEmpty(installFolder))
@@ -97,9 +97,9 @@
foreach (Type type in types)
{
- if (type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(IRServerPluginBase)))
+ if (type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(PluginBase)))
{
- IRServerPluginBase plugin = (IRServerPluginBase)assembly.CreateInstance(type.FullName);
+ PluginBase plugin = (PluginBase)assembly.CreateInstance(type.FullName);
if (plugin != null)
plugins.Add(plugin);
@@ -139,16 +139,16 @@
/// </summary>
/// <param name="pluginName">Name of plugin to instantiate.</param>
/// <returns>Plugin instance.</returns>
- internal static IRServerPluginBase GetPlugin(string pluginName)
+ internal static PluginBase GetPlugin(string pluginName)
{
if (String.IsNullOrEmpty(pluginName))
throw new ArgumentNullException("pluginName");
- IRServerPluginBase[] serverPlugins = AvailablePlugins();
+ PluginBase[] serverPlugins = AvailablePlugins();
if (serverPlugins == null)
throw new FileNotFoundException("No available plugins found");
- foreach (IRServerPluginBase plugin in serverPlugins)
+ foreach (PluginBase plugin in serverPlugins)
if (plugin.Name.Equals(pluginName, StringComparison.OrdinalIgnoreCase))
return plugin;
@@ -163,11 +163,11 @@
{
try
{
- IRServerPluginBase[] plugins = AvailablePlugins();
+ PluginBase[] plugins = AvailablePlugins();
List<string> receivers = new List<string>();
- foreach (IRServerPluginBase plugin in plugins)
+ foreach (PluginBase plugin in plugins)
{
try
{
@@ -211,11 +211,11 @@
{
try
{
- IRServerPluginBase[] plugins = Program.AvailablePlugins();
+ PluginBase[] plugins = Program.AvailablePlugins();
List<string> blasters = new List<string>();
- foreach (IRServerPluginBase plugin in plugins)
+ foreach (PluginBase plugin in plugins)
if (plugin is ITransmitIR && plugin.Detect())
blasters.Add(plugin.Name);
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
<ProjectGuid>{E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>AdsTechPTV335Receiver</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>Ads Tech PTV-335 Receiver</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -3,15 +3,13 @@
using System.Threading;
using System.Runtime.InteropServices;
-using IRServerPluginInterface;
-
-namespace AdsTechPTV335Receiver
+namespace InputService.Plugin
{
/// <summary>
/// IR Server plugin to support the Ads Tech PTV-335 Receiver device.
/// </summary>
- public class AdsTechPTV335Receiver : IRServerPluginBase, IRemoteReceiver
+ public class AdsTechPTV335Receiver : PluginBase, IRemoteReceiver
{
#region Interop
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.Designer.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.Designer.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,4 +1,4 @@
-namespace CustomHIDReceiver
+namespace InputService.Plugin
{
partial class AdvancedSettings
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -6,7 +6,7 @@
using System.Text;
using System.Windows.Forms;
-namespace CustomHIDReceiver
+namespace InputService.Plugin
{
internal partial class AdvancedSettings : Form
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-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -11,17 +11,40 @@
using Microsoft.Win32.SafeHandles;
-using IRServerPluginInterface;
-
-namespace CustomHIDReceiver
+namespace InputService.Plugin
{
/// <summary>
/// IR Server plugin to support HID USB devices.
/// </summary>
- public class CustomHIDReceiver : IRServerPluginBase, IConfigure, IRemoteReceiver, IKeyboardReceiver, IMouseReceiver
+ public class CustomHIDReceiver : PluginBase, IConfigure, IRemoteReceiver, IKeyboardReceiver, IMouseReceiver
{
+ static void Remote(string code)
+ {
+ Console.WriteLine(code);
+ }
+
+ [STAThread]
+ static void Main()
+ {
+ CustomHIDReceiver c = new CustomHIDReceiver();
+
+ c.Configure(null);
+
+ c.RemoteCallback += new RemoteHandler(Remote);
+
+
+ c.Start();
+
+ Application.Run();
+
+ c.Stop();
+ c = null;
+
+
+ }
+
#region Constants
static readonly string ConfigurationFile =
@@ -57,21 +80,7 @@
#endregion Variables
- #region Constructor
-
/// <summary>
- /// Initializes a new instance of the <see cref="CustomHIDReceiver"/> class.
- /// </summary>
- public CustomHIDReceiver()
- {
- LoadSettings();
-
- _receiverWindow = new ReceiverWindow("Custom HID Receiver");
- }
-
- #endregion Constructor
-
- /// <summary>
/// Name of the IR Server plugin.
/// </summary>
/// <value>The name.</value>
@@ -93,22 +102,13 @@
public override string Description { get { return "Supports HID USB devices."; } }
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
- /// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
- {
- // TODO: Add detection code.
- return false;
- }
-
- /// <summary>
/// Start the IR Server plugin.
/// </summary>
public override void Start()
{
+ LoadSettings();
+
+ _receiverWindow = new ReceiverWindow("Custom HID Receiver");
_receiverWindow.ProcMsg += new ProcessMessage(ProcMessage);
_device.dwFlags = RawInput.RawInputDeviceFlags.InputSink;
@@ -140,6 +140,8 @@
RegisterForRawInput(_device);
_receiverWindow.ProcMsg -= new ProcessMessage(ProcMessage);
+ _receiverWindow.DestroyHandle();
+ _receiverWindow = null;
}
/// <summary>
@@ -147,7 +149,10 @@
/// </summary>
public void Configure(IWin32Window owner)
{
+ LoadSettings();
+
DeviceSelect deviceSelect = new DeviceSelect();
+ deviceSelect.SelectedDevice = _device;
if (deviceSelect.ShowDialog(owner) == DialogResult.OK)
{
@@ -400,6 +405,9 @@
#if TRACE
Trace.WriteLine( String.Format("E0: {0}", raw.keyboard.MakeCode));
#endif
+ if (_keyboardHandler != null)
+ _keyboardHandler(0xE000 | raw.keyboard.MakeCode, true);
+
break;
case RawInput.RawKeyboardFlags.KeyE1:
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -5,11 +5,12 @@
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0F6576B4-C88E-4E79-B7E9-9480498C5A32}</ProjectGuid>
- <OutputType>Library</OutputType>
+ <OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>CustomHIDReceiver</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>Custom HID Receiver</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <StartupObject>InputService.Plugin.CustomHIDReceiver</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -83,7 +84,7 @@
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
- <Private>False</Private>
+ <Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.Designer.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.Designer.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,4 +1,4 @@
-namespace CustomHIDReceiver
+namespace InputService.Plugin
{
partial class DeviceSelect
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -8,7 +8,7 @@
using System.Text;
using System.Windows.Forms;
-namespace CustomHIDReceiver
+namespace InputService.Plugin
{
internal partial class DeviceSelect : Form
@@ -29,7 +29,7 @@
if (listViewDevices.SelectedItems.Count == 1)
foreach (DeviceDetails details in _devices)
{
- if (details.ID.Equals(listViewDevices.SelectedItems[0].SubItems[1].Text))
+ if (details.ID.Equals(listViewDevices.SelectedItems[0].SubItems[1].Text, StringComparison.Ordinal))
{
RawInput.RAWINPUTDEVICE device = new RawInput.RAWINPUTDEVICE();
device.usUsagePage = details.UsagePage;
@@ -40,6 +40,27 @@
return new RawInput.RAWINPUTDEVICE();
}
+
+ set
+ {
+ listViewDevices.SelectedItems.Clear();
+
+ foreach (DeviceDetails details in _devices)
+ {
+ if (details.Usage == value.usUsage && details.UsagePage == value.usUsagePage)
+ {
+ foreach(ListViewItem item in listViewDevices.Items)
+ {
+ if (details.ID.Equals(item.SubItems[1].Text, StringComparison.Ordinal))
+ {
+ item.Selected = true;
+ return;
+ }
+ }
+ return;
+ }
+ }
+ }
}
#endregion Properties
@@ -100,7 +121,12 @@
private void buttonAdvanced_Click(object sender, EventArgs e)
{
+ AdvancedSettings advancedSettings = new AdvancedSettings();
+ if (advancedSettings.ShowDialog(this) == DialogResult.OK)
+ {
+ }
+
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -8,7 +8,7 @@
using Microsoft.Win32;
-namespace CustomHIDReceiver
+namespace InputService.Plugin
{
internal class DeviceDetails
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/ReceiverWindow.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/ReceiverWindow.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/ReceiverWindow.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
-namespace CustomHIDReceiver
+namespace InputService.Plugin
{
#region Delegates
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-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
<ProjectGuid>{732CDF64-D047-4D3C-91DA-E2FF27D84179}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DirectInputReceiver</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>Direct Input Receiver</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputListener.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputListener.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputListener.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -27,7 +27,7 @@
using System.Threading;
using Microsoft.DirectX.DirectInput;
-namespace DirectInputReceiver
+namespace InputService.Plugin
{
/// <summary>
/// Summary description for DirectInputListener.
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-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -8,15 +8,13 @@
using Microsoft.DirectX.DirectInput;
-using IRServerPluginInterface;
-
-namespace DirectInputReceiver
+namespace InputService.Plugin
{
/// <summary>
/// IR Server Plugin for Direct Input game controllers.
/// </summary>
- public class DirectInputReceiver : IRServerPluginBase, IRemoteReceiver, IMouseReceiver, IConfigure
+ public class DirectInputReceiver : PluginBase, IRemoteReceiver, IMouseReceiver, IConfigure
{
#region Constants
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
<ProjectGuid>{9FDD649E-0502-4FED-9AC1-AA0346394375}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>FusionRemoteReceiver</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>FusionREMOTE Receiver</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -14,15 +14,13 @@
using Microsoft.Win32.SafeHandles;
-using IRServerPluginInterface;
-
-namespace FusionRemoteReceiver
+namespace InputService.Plugin
{
/// <summary>
/// IR Server Plugin for the DViCO FusionREMOTE USB Receiver device.
/// </summary>
- public class FusionRemoteReceiver : IRServerPluginBase, IRemoteReceiver
+ public class FusionRemoteReceiver : PluginBase, IRemoteReceiver
{
#region Constants
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,18 +1,268 @@
using System;
-using System.Collections.Generic;
-using System.Text;
+using System.ComponentModel;
+#if TRACE
+using System.Diagnostics;
+#endif
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
-namespace GeneralHIDReceiver
+using Microsoft.Win32.SafeHandles;
+
+namespace InputService.Plugin
{
- public class GeneralHIDReceiver
+ /// <summary>
+ /// Input Service Plugin to support general HID devices.
+ /// </summary>
+ public class GeneralHIDReceiver : PluginBase, IRemoteReceiver
{
- public GeneralHIDReceiver()
+ #region Interop
+
+ [DllImport("user32.dll")]
+ static extern IntPtr SetWindowsHookEx(HookType code, HookDelegate func, IntPtr hInstance, int threadID);
+
+ [DllImport("user32.dll")]
+ static extern int UnhookWindowsHookEx(IntPtr hhook);
+
+ [DllImport("user32.dll")]
+ static extern int CallNextHookEx(IntPtr hhook, int code, int wParam, IntPtr lParam);
+
+ [DllImport("kernel32.dll")]
+ static extern IntPtr LoadLibrary(string lpFileName);
+
+ #endregion Interop
+
+ #region Delegates
+
+ delegate int HookDelegate(int code, int wParam, IntPtr lParam);
+
+ #endregion Delegates
+
+ #region Enumerations
+
+ enum HookType
{
+ WH_JOURNALRECORD = 0,
+ WH_JOURNALPLAYBACK = 1,
+ WH_KEYBOARD = 2,
+ WH_GETMESSAGE = 3,
+ WH_CALLWNDPROC = 4,
+ WH_CBT = 5,
+ WH_SYSMSGFILTER = 6,
+ WH_MOUSE = 7,
+ WH_HARDWARE = 8,
+ WH_DEBUG = 9,
+ WH_SHELL = 10,
+ WH_FOREGROUNDIDLE = 11,
+ WH_CALLWNDPROCRET = 12,
+ WH_KEYBOARD_LL = 13,
+ WH_MOUSE_LL = 14
+ }
+ enum AppCommands
+ {
+ None = 0,
+ BrowserBackward = 1,
+ BrowserForward = 2,
+ BrowserRefresh = 3,
+ BrowserStop = 4,
+ BrowserSearch = 5,
+ BrowserFavorites = 6,
+ BrowserHome = 7,
+ VolumeMute = 8,
+ VolumeDown = 9,
+ VolumeUp = 10,
+ MediaNextTrack = 11,
+ MediaPreviousTrack = 12,
+ MediaStop = 13,
+ MediaPlayPause = 14,
+ LaunchMail = 15,
+ LaunchMediaSelect = 16,
+ LaunchApp1 = 17,
+ LaunchApp2 = 18,
+ BassDown = 19,
+ BassBoost = 20,
+ BassUp = 21,
+ TrebleDown = 22,
+ TrebleUp = 23,
+ MicrophoneVolumeMute = 24,
+ MicrophoneVolumeDown = 25,
+ MicrophoneVolumeUp = 26,
+ Help = 27,
+ Find = 28,
+ New = 29,
+ Open = 30,
+ Close = 31,
+ Save = 32,
+ Print = 33,
+ Undo = 34,
+ Redo = 35,
+ Copy = 36,
+ Cut = 37,
+ Paste = 38,
+ ReplyToMail = 39,
+ ForwardMail = 40,
+ SendMail = 41,
+ SpellCheck = 42,
+ DictateOrCommandControlToggle = 43,
+ MicrophoneOnOffToggle = 44,
+ CorrectionList = 45,
+ MediaPlay = 46,
+ MediaPause = 47,
+ MediaRecord = 48,
+ MediaFastForward = 49,
+ MediaRewind = 50,
+ MediaChannelUp = 51,
+ MediaChannelDown = 52,
}
+ #endregion Enumerations
+
+ #region Structures
+
+ struct KeyboardHookStruct
+ {
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="KeyboardHookStruct"/> struct.
+ /// </summary>
+ /// <param name="lParam">The lParam to derive from.</param>
+ public KeyboardHookStruct(IntPtr lParam)
+ {
+ KeyboardHookStruct khs = (KeyboardHookStruct)Marshal.PtrToStructure(lParam, typeof(KeyboardHookStruct));
+
+ virtualKey = khs.virtualKey;
+ scanCode = khs.scanCode;
+ flags = khs.flags;
+ time = khs.time;
+ dwExtraInfo = khs.dwExtraInfo;
+ }
+
+ public int virtualKey;
+ public int scanCode;
+ public int flags;
+ public int time;
+ public int dwExtraInfo;
+ }
+
+ #endregion Structures
+
+ #region Variables
+
+ RemoteHandler _remoteButtonHandler;
+
+ IntPtr _hookHandle;
+
+ #endregion Variables
+
+ #region Implementation
+
+ /// <summary>
+ /// Name of the IR Server plugin.
+ /// </summary>
+ /// <value>The name.</value>
+ public override string Name { get { return "General HID"; } }
+ /// <summary>
+ /// IR Server plugin version.
+ /// </summary>
+ /// <value>The version.</value>
+ public override string Version { get { return "1.0.4.2"; } }
+ /// <summary>
+ /// The IR Server plugin's author.
+ /// </summary>
+ /// <value>The author.</value>
+ public override string Author { get { return "and-81"; } }
+ /// <summary>
+ /// A description of the IR Server plugin.
+ /// </summary>
+ /// <value>The description.</value>
+ public override string Description { get { return "Supports general HID devices"; } }
+
+ /// <summary>
+ /// Start the IR Server plugin.
+ /// </summary>
+ public override void Start()
+ {
+ IntPtr hInstance = LoadLibrary("User32");
+ _hookHandle = SetWindowsHookEx(HookType.WH_KEYBOARD_LL, new HookDelegate(InternalHookDelegate), hInstance, 0);
+ }
+ /// <summary>
+ /// Suspend the IR Server plugin when computer enters standby.
+ /// </summary>
+ public override void Suspend()
+ {
+ Stop();
+ }
+ /// <summary>
+ /// Resume the IR Server plugin when the computer returns from standby.
+ /// </summary>
+ public override void Resume()
+ {
+ Start();
+ }
+ /// <summary>
+ /// Stop the IR Server plugin.
+ /// </summary>
+ public override void Stop()
+ {
+ UnhookWindowsHookEx(_hookHandle);
+ _hookHandle = IntPtr.Zero;
+ }
+
+ /// <summary>
+ /// Callback for remote button presses.
+ /// </summary>
+ /// <value>The remote callback.</value>
+ public RemoteHandler RemoteCallback
+ {
+ get { return _remoteButtonHandler; }
+ set { _remoteButtonHandler = value; }
+ }
+
+
+ int InternalHookDelegate(int code, int wParam, IntPtr lParam)
+ {
+ if (code >= 0 && wParam == 256)
+ {
+ KeyboardHookStruct khs = new KeyboardHookStruct(lParam);
+
+ AppCommands appCommand = KeyCodeToAppCommand((Keys)khs.virtualKey);
+
+ if (appCommand != AppCommands.None)
+ {
+ int keys = (int)appCommand & ~0xF000;
+ int keyCode = (keys << 16) | code;
+
+ if (_remoteButtonHandler != null)
+ _remoteButtonHandler(keyCode.ToString());
+
+ return 1;
+ }
+ }
+
+ return CallNextHookEx(_hookHandle, code, wParam, lParam);
+ }
+
+ static AppCommands KeyCodeToAppCommand(Keys keyCode)
+ {
+ switch (keyCode)
+ {
+ case Keys.MediaNextTrack: return AppCommands.MediaNextTrack;
+ case Keys.MediaPlayPause: return AppCommands.MediaPlayPause;
+ case Keys.MediaPreviousTrack: return AppCommands.MediaPreviousTrack;
+ case Keys.MediaStop: return AppCommands.MediaStop;
+ case Keys.VolumeDown: return AppCommands.VolumeDown;
+ case Keys.VolumeMute: return AppCommands.VolumeMute;
+ case Keys.VolumeUp: return AppCommands.VolumeUp;
+ default: return AppCommands.None;
+ }
+ }
+
+ #endregion Implementation
+
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.csproj 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/General HID Receiver/General HID Receiver.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
<ProjectGuid>{26DEDF6D-F60D-4311-9A9E-DDF64500D5BF}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>General_HID_Receiver</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>General HID Receiver</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -18,6 +18,8 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -30,12 +32,21 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="General HID Receiver.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
+ <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
+ <Name>IR Server Plugin Interface</Name>
+ <Private>False</Private>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.Designer.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.Designer.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,4 +1,4 @@
-namespace GirderPlugin
+namespace InputService.Plugin
{
partial class Config
{
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -6,7 +6,7 @@
using System.Text;
using System.Windows.Forms;
-namespace GirderPlugin
+namespace InputService.Plugin
{
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -8,15 +8,13 @@
using System.Windows.Forms;
using System.Xml;
-using IRServerPluginInterface;
-
-namespace GirderPlugin
+namespace InputService.Plugin
{
/// <summary>
/// IR Server Plugin for using Girder 3.x plugins.
/// </summary>
- public class GirderPlugin : IRServerPluginBase, IRemoteReceiver, ITransmitIR, IConfigure
+ public class GirderPlugin : PluginBase, IRemoteReceiver, ITransmitIR, IConfigure
{
#region Constants
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
<ProjectGuid>{0C291BE9-5D15-4097-9119-4FFE19C23113}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>GirderPlugin</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>Girder Plugin</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<ApplicationIcon>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/GirderPluginWrapper.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/GirderPluginWrapper.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/GirderPluginWrapper.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -8,7 +8,7 @@
using System.Threading;
using System.Xml;
-namespace GirderPlugin
+namespace InputService.Plugin
{
#region Structures
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.Designer.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.Designer.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,4 +1,4 @@
-namespace HcwReceiver
+namespace InputService.Plugin
{
partial class Configure
{
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -6,7 +6,7 @@
using System.Text;
using System.Windows.Forms;
-namespace HcwReceiver
+namespace InputService.Plugin
{
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
<ProjectGuid>{EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>HcwReceiver</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>HCW Receiver</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -9,16 +9,14 @@
using Microsoft.Win32.SafeHandles;
-using IRServerPluginInterface;
-
-namespace HcwReceiver
+namespace InputService.Plugin
{
/// <summary>
/// IR Server plugin supporting Hauppauge devices.
/// </summary>
[CLSCompliant(false)]
- public class HcwReceiver : IRServerPluginBase, IRemoteReceiver, IConfigure
+ public class HcwReceiver : PluginBase, IRemoteReceiver, IConfigure
{
#region Constants
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
using Microsoft.Win32;
-namespace HcwReceiver
+namespace InputService.Plugin
{
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/ReceiverWindow.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/ReceiverWindow.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/ReceiverWindow.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
-namespace HcwReceiver
+namespace InputService.Plugin
{
#region Delegates
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IConfigure.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IConfigure.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IConfigure.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
-namespace IRServerPluginInterface
+namespace InputService.Plugin
{
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IKeyboardReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IKeyboardReceiver.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IKeyboardReceiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,6 +1,6 @@
using System;
-namespace IRServerPluginInterface
+namespace InputService.Plugin
{
#region Delegates
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ILearnIR.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ILearnIR.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ILearnIR.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,6 +1,6 @@
using System;
-namespace IRServerPluginInterface
+namespace InputService.Plugin
{
#region Enumerations
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IMouseReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IMouseReceiver.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IMouseReceiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,6 +1,6 @@
using System;
-namespace IRServerPluginInterface
+namespace InputService.Plugin
{
#region Delegates
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2008-02-16 13:08:01 UTC (rev 1370)
@@ -7,7 +7,7 @@
<ProjectGuid>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>IRServerPluginInterface</RootNamespace>
+ <RootNamespace>InputService.Plugin</RootNamespace>
<AssemblyName>IRServerPluginInterface</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
@@ -70,7 +70,7 @@
<Compile Include="ILearnIR.cs" />
<Compile Include="IMouseReceiver.cs" />
<Compile Include="IRemoteReceiver.cs" />
- <Compile Include="IRServerPluginBase.cs" />
+ <Compile Include="PluginBase.cs" />
<Compile Include="ITransmitIR.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
Deleted: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginBase.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginBase.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginBase.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,70 +0,0 @@
-namespace IRServerPluginInterface
-{
-
- /// <summary>
- /// Base class for all IR Server Plugins.
- /// </summary>
- public abstract class IRServerPluginBase
- {
-
- #region Properties
-
- /// <summary>
- /// Name of the IR Server plugin.
- /// </summary>
- /// <value>The name.</value>
- public abstract string Name { get; }
-
- /// <summary>
- /// IR Server plugin version.
- /// </summary>
- /// <value>The version.</value>
- public abstract string Version { get; }
-
- /// <summary>
- /// The IR Server plugin's author.
- /// </summary>
- /// <value>The author.</value>
- public abstract string Author { get; }
-
- /// <summary>
- /// A description of the IR Server plugin.
- /// </summary>
- /// <value>The description.</value>
- public abstract string Description { get; }
-
- #endregion Properties
-
- #region Methods
-
- /// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
- /// </summary>
- /// <returns><c>true</c> if the device is present, otherwise <c>false</c>.</returns>
- public virtual bool Detect() { return false; }
-
- /// <summary>
- /// Start the IR Server plugin.
- /// </summary>
- public abstract void Start();
-
- /// <summary>
- /// Suspend the IR Server plugin when computer enters standby.
- /// </summary>
- public abstract void Suspend();
-
- /// <summary>
- /// Resume the IR Server plugin when the computer returns from standby.
- /// </summary>
- public abstract void Resume();
-
- /// <summary>
- /// Stop the IR Server plugin.
- /// </summary>
- public abstract void Stop();
-
- #endregion Methods
-
- }
-
-}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRemoteReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRemoteReceiver.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRemoteReceiver.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,6 +1,6 @@
using System;
-namespace IRServerPluginInterface
+namespace InputService.Plugin
{
#region Delegates
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ITransmitIR.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ITransmitIR.cs 2008-02-16 11:23:45 UTC (rev 1369)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ITransmitIR.cs 2008-02-16 13:08:01 UTC (rev 1370)
@@ -1,6 +1,6 @@
using S...
[truncated message content] |
