From: <an...@us...> - 2007-08-02 15:43:46
|
Revision: 785 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=785&view=rev Author: and-81 Date: 2007-08-02 08:43:42 -0700 (Thu, 02 Aug 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/IgorPlug USB Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/WinLirc Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 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 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -198,7 +198,7 @@ #region Variables - static RemoteButtonHandler _remoteButtonHandler = null; + static RemoteHandler _remoteButtonHandler = null; static FileStream _deviceStream; static byte[] _deviceBuffer; @@ -209,7 +209,7 @@ #region IIRServerPlugin Members public string Name { get { return "FusionREMOTE"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81"; } } public string Description { get { return "DViCO FusionREMOTE Receiver"; } } public bool CanReceive { get { return true; } } @@ -217,12 +217,16 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return false; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + public string[] AvailablePorts { get { return Ports; } @@ -270,8 +274,9 @@ { return false; } - public LearnStatus Learn(string file) + public LearnStatus Learn(out byte[] data) { + data = null; return LearnStatus.Failure; } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -11,8 +11,24 @@ /// IR Server callback for remote button press handling. /// </summary> /// <param name="keyCode">Remote button code.</param> - public delegate void RemoteButtonHandler(string keyCode); + public delegate void RemoteHandler(string keyCode); + /// <summary> + /// IR Server callback for keyboard key press handling. + /// </summary> + /// <param name="vKey">Virtual key code.</param> + /// <param name="keyUp">.</param> + public delegate void KeyboardHandler(int vKey, bool keyUp); + + /// <summary> + /// IR Server callback for mouse event handling. + /// </summary> + /// <param name="deltaX">Mouse movement on the X-axis.</param> + /// <param name="deltaY">Mouse movement on the Y-axis.</param> + /// <param name="rightButton">Is the right button pressed?</param> + /// <param name="leftButton">Is the left button pressed?</param> + public delegate void MouseHandler(int deltaX, int deltaY, int buttons); + #endregion Delegates #region Enumerations @@ -89,9 +105,19 @@ /// <summary> /// Callback for remote button presses. /// </summary> - RemoteButtonHandler RemoteButtonCallback { get; set; } + RemoteHandler RemoteCallback { get; set; } /// <summary> + /// Callback for keyboard presses. + /// </summary> + KeyboardHandler KeyboardCallback { get; set; } + + /// <summary> + /// Callback for mouse events. + /// </summary> + MouseHandler MouseCallback { get; set; } + + /// <summary> /// Lists the available blaster ports. /// </summary> string[] AvailablePorts { get; } @@ -141,9 +167,9 @@ /// <summary> /// Learn an infrared command. /// </summary> - /// <param name="file">New infrared command file to create.</param> + /// <param name="data">New infrared command.</param> /// <returns>Tells the calling code if the learn was Successful, Failed or Timed Out.</returns> - LearnStatus Learn(string file); + LearnStatus Learn(out byte[] data); /// <summary> /// Set the transmit port to use for infrared command output. @@ -163,4 +189,37 @@ } + /* + + public interface IConfigurable + { + + } + + public interface ITransmitIR + { + + } + + public interface ILearnIR + { + + } + + public interface IRemoteReceiver + { + + } + + public interface IKeyboardReceiver + { + + } + + public interface IMouseReceiver + { + + } + + */ } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: 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.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -34,7 +34,7 @@ SerialPort _serialPort; byte[] _deviceBuffer; - RemoteButtonHandler _remoteButtonHandler = null; + RemoteHandler _remoteButtonHandler = null; int _repeatDelay; string _serialPortName; @@ -49,7 +49,7 @@ #region IIRServerPlugin Members public string Name { get { return "IRMan"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81"; } } public string Description { get { return "Receiver support for the Serial IRMan device"; } } public bool CanReceive { get { return true; } } @@ -57,13 +57,17 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return true; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } - public string[] AvailablePorts { get { return Ports; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + + public string[] AvailablePorts { get { return Ports; } } public string[] AvailableSpeeds { get { return Speeds; } } public void Configure() @@ -134,7 +138,11 @@ } public bool Transmit(string file) { return false; } - public LearnStatus Learn(string file) { return LearnStatus.Failure; } + public LearnStatus Learn(out byte[] data) + { + data = null; + return LearnStatus.Failure; + } public bool SetPort(string port) { return true; } public bool SetSpeed(string speed) { return true; } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -204,7 +204,7 @@ #region Variables - static RemoteButtonHandler _remoteButtonHandler = null; + static RemoteHandler _remoteButtonHandler = null; static string _blasterSpeed = Speeds[0]; static string _blasterPort = Ports[0]; @@ -221,7 +221,7 @@ #region IIRServerPlugin Members public string Name { get { return "IRTrans (Experimental)"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81"; } } public string Description { get { return "IRTrans Transceiver (Experimental)"; } } public bool CanReceive { get { return true; } } @@ -229,12 +229,16 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return true; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + public string[] AvailablePorts { get { return Ports; } @@ -322,8 +326,10 @@ } */ } - public LearnStatus Learn(string file) + public LearnStatus Learn(out byte[] data) { + data = null; + /* try { Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/IgorPlug USB Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/IgorPlug USB Receiver.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/IgorPlug USB Receiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -27,7 +27,7 @@ #region Variables - RemoteButtonHandler _remoteButtonHandler = null; + RemoteHandler _remoteButtonHandler = null; Thread _readThread; @@ -63,7 +63,7 @@ #region IIRServerPlugin Members public string Name { get { return "IgorPlug USB"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81"; } } public string Description { get { return "IgorPlug USB Receiver"; } } public bool CanReceive { get { return true; } } @@ -71,13 +71,17 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return false; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } - public string[] AvailablePorts { get { return Ports; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + + public string[] AvailablePorts { get { return Ports; } } public string[] AvailableSpeeds { get { return Speeds; } } public void Configure() { } @@ -97,7 +101,11 @@ } public bool Transmit(string file) { return false; } - public LearnStatus Learn(string file) { return LearnStatus.Failure; } + public LearnStatus Learn(out byte[] data) + { + data = null; + return LearnStatus.Failure; + } public bool SetPort(string port) { return true; } public bool SetSpeed(string speed) { return true; } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/WinLirc Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/WinLirc Receiver.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/WinLirc Receiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ #region Variables - RemoteButtonHandler _remoteButtonHandler = null; + RemoteHandler _remoteButtonHandler = null; WinLircServer _server; IPAddress _serverIP; @@ -43,7 +43,7 @@ #region IIRServerPlugin Members public string Name { get { return "WinLirc"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81, original code for MediaPortal by Sven"; } } public string Description { get { return "Supports WinLirc as a reciever"; } } public bool CanReceive { get { return true; } } @@ -51,12 +51,16 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return true; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + public string[] AvailablePorts { get { return Ports; } } public string[] AvailableSpeeds { get { return Speeds; } } @@ -129,8 +133,9 @@ return false; } } - public LearnStatus Learn(string file) + public LearnStatus Learn(out byte[] data) { + data = null; return LearnStatus.Failure; } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: 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.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -47,14 +47,14 @@ int _messageType = WM_APP; int _wParam = DefaultMessageID; - RemoteButtonHandler _remoteButtonHandler = null; + RemoteHandler _remoteButtonHandler = null; #endregion Variables #region IIRServerPlugin Members public string Name { get { return "Windows Messages"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81"; } } public string Description { get { return "Supports receiving simulated button presses through Windows Messages"; } } public bool CanReceive { get { return true; } } @@ -62,12 +62,16 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return true; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + public string[] AvailablePorts { get { return Ports; } } public string[] AvailableSpeeds { get { return Speeds; } } @@ -120,8 +124,9 @@ */ return false; } - public LearnStatus Learn(string file) + public LearnStatus Learn(out byte[] data) { + data = null; return LearnStatus.Failure; } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -28,7 +28,7 @@ #region Variables - static RemoteButtonHandler _remoteButtonHandler = null; + static RemoteHandler _remoteButtonHandler = null; static string _blasterSpeed = Speeds[0]; static string _blasterPort = Ports[0]; @@ -43,7 +43,7 @@ #region IIRServerPlugin Members public string Name { get { return "X10 (Experimental)"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81"; } } public string Description { get { return "X10 Transceiver (Experimental)"; } } public bool CanReceive { get { return true; } } @@ -51,12 +51,16 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return false; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + public string[] AvailablePorts { get { return Ports; } @@ -105,8 +109,9 @@ { return false; } - public LearnStatus Learn(string file) + public LearnStatus Learn(out byte[] data) { + data = null; return LearnStatus.Failure; } @@ -132,8 +137,8 @@ { string keyCode = Enum.GetName(typeof(X10.EX10Command), eCommand); - if (RemoteButtonCallback != null) - RemoteButtonCallback(keyCode); + if (RemoteCallback != null) + RemoteCallback(keyCode); } catch (Exception ex) { Modified: trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -29,7 +29,7 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.3.2")] -[assembly: AssemblyFileVersion("1.0.3.2")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] [assembly: CLSCompliant(true)] Modified: 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.cs 2007-08-02 15:40:55 UTC (rev 784) +++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2007-08-02 15:43:42 UTC (rev 785) @@ -25,7 +25,7 @@ #region Variables - RemoteButtonHandler _remoteButtonHandler = null; + RemoteHandler _remoteButtonHandler = null; FileStream _deviceStream; byte[] _deviceBuffer; @@ -187,7 +187,7 @@ #region IIRServerPlugin Members public string Name { get { return "XBCDRC"; } } - public string Version { get { return "1.0.3.2"; } } + public string Version { get { return "1.0.3.3"; } } public string Author { get { return "and-81"; } } public string Description { get { return "Supports the XBox 1 IR receiver with XBCDRC"; } } public bool CanReceive { get { return true; } } @@ -195,13 +195,17 @@ public bool CanLearn { get { return false; } } public bool CanConfigure { get { return false; } } - public RemoteButtonHandler RemoteButtonCallback + public RemoteHandler RemoteCallback { get { return _remoteButtonHandler; } set { _remoteButtonHandler = value; } } - public string[] AvailablePorts { get { return Ports; } } + public KeyboardHandler KeyboardCallback { get { return null; } set { } } + + public MouseHandler MouseCallback { get { return null; } set { } } + + public string[] AvailablePorts { get { return Ports; } } public string[] AvailableSpeeds { get { return Speeds; } } public void Configure() { } @@ -248,7 +252,11 @@ } public bool Transmit(string file) { return false; } - public LearnStatus Learn(string file) { return LearnStatus.Failure; } + public LearnStatus Learn(out byte[] data) + { + data = null; + return LearnStatus.Failure; + } public bool SetPort(string port) { return true; } public bool SetSpeed(string speed) { return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |