From: <an...@us...> - 2008-01-09 16:09:03
|
Revision: 1230 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1230&view=rev Author: and-81 Date: 2008-01-09 08:06:45 -0800 (Wed, 09 Jan 2008) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Documentation/new.html 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/Properties/AssemblyInfo.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/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs 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/Girder Plugin/Girder Plugin.cs trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/HcwTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Properties/AssemblyInfo.cs 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/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 Receiver/IgorPlug Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.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/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs 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/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/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.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 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/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Input Service Configuration.exe.manifest trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs trunk/plugins/IR Server Suite/Util Apps/IR File Tool/IrCode.cs trunk/plugins/IR Server Suite/Util Apps/IR File Tool/IrDecoder.cs trunk/plugins/IR Server Suite/Util Apps/IR File Tool/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Util Apps/Log File Multi-Viewer/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Util Apps/MacroConverter/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Util Apps/PVR150 Tuner/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Util Apps/SageSetup/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Util Apps/SageSetup/SageSetup.exe.manifest trunk/plugins/MCEReplacement/MCEReplacement.cs trunk/plugins/MCEReplacement/Properties/AssemblyInfo.cs Removed Paths: ------------- trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/NativeMethods.cs Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")] Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("5eeca936-da49-4952-ab3b-9f11ec57e4aa")] Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("81eb136b-cc74-4eed-976d-f96ebccd1ce4")] Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -242,33 +242,28 @@ { try { - if (plugin.Start()) - { - IRemoteReceiver remoteReceiver = plugin as IRemoteReceiver; - if (remoteReceiver != null) - remoteReceiver.RemoteCallback += new RemoteHandler(RemoteHandlerCallback); + plugin.Start(); - IKeyboardReceiver keyboardReceiver = plugin as IKeyboardReceiver; - if (keyboardReceiver != null) - keyboardReceiver.KeyboardCallback += new KeyboardHandler(KeyboardHandlerCallback); + IRemoteReceiver remoteReceiver = plugin as IRemoteReceiver; + if (remoteReceiver != null) + remoteReceiver.RemoteCallback += new RemoteHandler(RemoteHandlerCallback); - IMouseReceiver mouseReceiver = plugin as IMouseReceiver; - if (mouseReceiver != null) - mouseReceiver.MouseCallback += new MouseHandler(MouseHandlerCallback); + IKeyboardReceiver keyboardReceiver = plugin as IKeyboardReceiver; + if (keyboardReceiver != null) + keyboardReceiver.KeyboardCallback += new KeyboardHandler(KeyboardHandlerCallback); - if (plugin.Name.Equals(_pluginNameTransmit, StringComparison.OrdinalIgnoreCase)) - { - startedTransmit = true; - IrssLog.Info("Transmit and Receive plugin started: \"{0}\"", plugin.Name); - } - else - { - IrssLog.Info("Receiver plugin started: \"{0}\"", plugin.Name); - } + IMouseReceiver mouseReceiver = plugin as IMouseReceiver; + if (mouseReceiver != null) + mouseReceiver.MouseCallback += new MouseHandler(MouseHandlerCallback); + + if (plugin.Name.Equals(_pluginNameTransmit, StringComparison.OrdinalIgnoreCase)) + { + startedTransmit = true; + IrssLog.Info("Transmit and Receive plugin started: \"{0}\"", plugin.Name); } else { - IrssLog.Error("Failed to start receive plugin: \"{0}\"", plugin.Name); + IrssLog.Info("Receiver plugin started: \"{0}\"", plugin.Name); } } catch (Exception ex) @@ -291,10 +286,9 @@ { try { - if (_pluginTransmit.Start()) - IrssLog.Info("Transmit plugin started: \"{0}\"", _pluginNameTransmit); - else - IrssLog.Error("Failed to start transmit plugin: \"{0}\"", _pluginNameTransmit); + _pluginTransmit.Start(); + + IrssLog.Info("Transmit plugin started: \"{0}\"", _pluginNameTransmit); } catch (Exception ex) { Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-01-09 16:06:45 UTC (rev 1230) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" > - <assemblyIdentity version="1.0.4.0" processorArchitecture="X86" name="IRServer" type="win32" /> + <assemblyIdentity version="1.0.4.2" processorArchitecture="X86" name="IRServer" type="win32" /> <description>Provides multiple connections for local and network access to a remote control transceiver</description> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security> Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -34,8 +34,8 @@ // 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.4.0")] -[assembly: AssemblyFileVersion("1.0.4.0")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -1211,7 +1211,7 @@ } private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { - MessageBox.Show(this, "Translator\nVersion 1.0.4.1 for IR Server Suite\nBy Aaron Dinnage, 2007", "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show(this, "Translator\nVersion 1.0.4.2 for IR Server Suite\nBy Aaron Dinnage, 2007", "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void addProgramToolStripMenuItem_Click(object sender, EventArgs e) Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("2011f0d4-cec8-43d2-8678-79f24cd6c517")] Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("b9084277-405c-48e6-80d1-c0d0e1dae27d")] Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -30,7 +30,7 @@ // Build Number // Revision // -[assembly: AssemblyVersion("1.0.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("1.0.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -33,8 +33,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/Documentation/new.html =================================================================== --- trunk/plugins/IR Server Suite/Documentation/new.html 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-01-09 16:06:45 UTC (rev 1230) @@ -7,10 +7,12 @@ <P>Version 1.0.4.2 <UL> <LI>MP Control plugin: Fixed Macro command for Multi-Mapping.</LI> -<LI>MCE Transceiver: Fixed blasting bug that has existed since October.</LI> +<LI>MCE Transceiver: Fixed XP and Replacement driver blasting bug that has existed since October.</LI> <LI>AdsTech 335 Receiver: Fixed a bug that caused Input Service to crash roughly every 5 minutes.</LI> <LI>Installer: New IR Server Suite installer. It looks more professional and you can now change the MediaPortal plugin install paths.</LI> <LI>General: Fixed the "pause" macro command.</LI> +<LI>MCE Transceiver: Fixed another XP and Vista suspend/resume bug. When will it all end? ;)</LI> +<LI>IR Server plugins: Modified some method signitures.</LI> </UL></P> <BR> 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-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -55,7 +55,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -77,7 +77,7 @@ { try { - return (Init() == 1); + return (Init() != 0); } catch { @@ -89,22 +89,13 @@ /// Start the IR Server plugin. /// </summary> /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public override bool Start() + public override void Start() { - try - { - int retVal = Init(); - if (retVal == 0) - return false; + int retVal = Init(); + if (retVal == 0) + throw new ApplicationException("Failed to initialize device access"); - StartReadThread(); - - return true; - } - catch - { - return false; - } + StartReadThread(); } /// <summary> /// Suspend the IR Server plugin when computer enters standby. Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -31,5 +31,5 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] 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-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -80,7 +80,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -100,21 +100,22 @@ /// </returns> public override bool Detect() { + // TODO: Add detection code. return false; } /// <summary> /// Start the IR Server plugin. /// </summary> - /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public override bool Start() + public override void Start() { _receiverWindow.ProcMsg += new ProcessMessage(ProcMessage); _device.dwFlags = RawInput.RawInputDeviceFlags.InputSink; _device.hwndTarget = _receiverWindow.Handle; - - return RegisterForRawInput(_device); + + if (!RegisterForRawInput(_device)) + throw new ApplicationException("Failed to register for HID Raw input"); } /// <summary> /// Suspend the IR Server plugin when computer enters standby. Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -29,8 +29,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("A03753AF-FBBF-44e0-9964-144C48A4D2CF")] 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-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -133,7 +133,7 @@ /// <summary> /// IR Server plugin version. /// </summary> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -151,6 +151,7 @@ /// </returns> public override bool Detect() { + // TODO: Add detection code. return false; } @@ -158,7 +159,7 @@ /// Start the IR Server plugin. /// </summary> /// <returns>true if successful, otherwise false.</returns> - public override bool Start() + public override void Start() { LoadSettings(); @@ -168,19 +169,22 @@ _diListener.Delay = 150; _diListener.OnStateChange += new DirectInputListener.diStateChange(diListener_OnStateChange); - return AcquireDevice(); + if (!AcquireDevice()) + throw new ApplicationException("Failed to acquire device"); } /// <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. Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -31,5 +31,5 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] 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-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -211,7 +211,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -249,29 +249,13 @@ /// <summary> /// Start the IR Server plugin. /// </summary> - /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public override bool Start() + public override void Start() { - try - { - OpenDevice(); + OpenDevice(); - _deviceBuffer = new byte[128]; + _deviceBuffer = new byte[128]; - _deviceStream.BeginRead(_deviceBuffer, 0, _deviceBuffer.Length, new AsyncCallback(OnReadComplete), null); - - return true; - } -#if TRACE - catch (Exception ex) - { - Trace.WriteLine("FusionRemoteReceiver: " + ex.ToString()); -#else - catch - { -#endif - return false; - } + _deviceStream.BeginRead(_deviceBuffer, 0, _deviceBuffer.Length, new AsyncCallback(OnReadComplete), null); } /// <summary> /// Suspend the IR Server plugin when computer enters standby. 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 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -30,8 +30,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("db244336-eeac-4789-af94-6fbe53df225f")] 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-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -53,7 +53,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -66,21 +66,9 @@ public override string Description { get { return "Supports using Girder 3.x plugins with IR Server"; } } /// <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() - { - return false; - } - - /// <summary> /// Start the IR Server plugin. /// </summary> - /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public override bool Start() + public override void Start() { LoadSettings(); @@ -88,11 +76,23 @@ _pluginWrapper.EventCallback += new PluginEventCallback(PluginCallback); - bool open = _pluginWrapper.GirOpen(); - if (open) - _pluginWrapper.GirStart(); + if (!_pluginWrapper.GirOpen()) + { + _pluginWrapper.Dispose(); + _pluginWrapper = null; - return open; + throw new ApplicationException("Failed to initiate girder plugin"); + } + + if (!_pluginWrapper.GirStart()) + { + _pluginWrapper.GirClose(); + _pluginWrapper.Dispose(); + _pluginWrapper = null; + + throw new ApplicationException("Failed to start girder plugin"); + } + } /// <summary> /// Suspend the IR Server plugin when computer enters standby. Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -35,7 +35,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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.Designer.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.Designer.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -32,15 +32,9 @@ this.buttonOK = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); this.toolTips = new System.Windows.Forms.ToolTip(this.components); - this.labelRepeatCount = new System.Windows.Forms.Label(); this.numericUpDownButtonRepeatDelay = new System.Windows.Forms.NumericUpDown(); - this.numericUpDownRepeatCount = new System.Windows.Forms.NumericUpDown(); this.labelButtonRepeatDelay = new System.Windows.Forms.Label(); - this.numericUpDownLearnTimeout = new System.Windows.Forms.NumericUpDown(); - this.labelLearnIRTimeout = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownButtonRepeatDelay)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownRepeatCount)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLearnTimeout)).BeginInit(); this.SuspendLayout(); // // buttonOK @@ -66,15 +60,6 @@ this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // - // labelRepeatCount - // - this.labelRepeatCount.Location = new System.Drawing.Point(8, 40); - this.labelRepeatCount.Name = "labelRepeatCount"; - this.labelRepeatCount.Size = new System.Drawing.Size(144, 20); - this.labelRepeatCount.TabIndex = 2; - this.labelRepeatCount.Text = "IR blast repeat count:"; - this.labelRepeatCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // numericUpDownButtonRepeatDelay // this.numericUpDownButtonRepeatDelay.Increment = new decimal(new int[] { @@ -105,25 +90,6 @@ 0, 0}); // - // numericUpDownRepeatCount - // - this.numericUpDownRepeatCount.Location = new System.Drawing.Point(152, 40); - this.numericUpDownRepeatCount.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDownRepeatCount.Name = "numericUpDownRepeatCount"; - this.numericUpDownRepeatCount.Size = new System.Drawing.Size(88, 20); - this.numericUpDownRepeatCount.TabIndex = 3; - this.numericUpDownRepeatCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numericUpDownRepeatCount.ThousandsSeparator = true; - this.numericUpDownRepeatCount.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // // labelButtonRepeatDelay // this.labelButtonRepeatDelay.Location = new System.Drawing.Point(8, 8); @@ -133,56 +99,13 @@ this.labelButtonRepeatDelay.Text = "Button repeat delay:"; this.labelButtonRepeatDelay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // numericUpDownLearnTimeout - // - this.numericUpDownLearnTimeout.Increment = new decimal(new int[] { - 500, - 0, - 0, - 0}); - this.numericUpDownLearnTimeout.Location = new System.Drawing.Point(152, 72); - this.numericUpDownLearnTimeout.Maximum = new decimal(new int[] { - 60000, - 0, - 0, - 0}); - this.numericUpDownLearnTimeout.Minimum = new decimal(new int[] { - 2000, - 0, - 0, - 0}); - this.numericUpDownLearnTimeout.Name = "numericUpDownLearnTimeout"; - this.numericUpDownLearnTimeout.Size = new System.Drawing.Size(88, 20); - this.numericUpDownLearnTimeout.TabIndex = 7; - this.numericUpDownLearnTimeout.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numericUpDownLearnTimeout.ThousandsSeparator = true; - this.toolTips.SetToolTip(this.numericUpDownLearnTimeout, "When teaching IR commands this is how long before the process times out"); - this.numericUpDownLearnTimeout.Value = new decimal(new int[] { - 10000, - 0, - 0, - 0}); - // - // labelLearnIRTimeout - // - this.labelLearnIRTimeout.Location = new System.Drawing.Point(8, 72); - this.labelLearnIRTimeout.Name = "labelLearnIRTimeout"; - this.labelLearnIRTimeout.Size = new System.Drawing.Size(144, 20); - this.labelLearnIRTimeout.TabIndex = 6; - this.labelLearnIRTimeout.Text = "Learn IR timeout:"; - this.labelLearnIRTimeout.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // Configure // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(248, 137); - this.Controls.Add(this.labelLearnIRTimeout); - this.Controls.Add(this.numericUpDownLearnTimeout); this.Controls.Add(this.labelButtonRepeatDelay); - this.Controls.Add(this.numericUpDownRepeatCount); this.Controls.Add(this.numericUpDownButtonRepeatDelay); - this.Controls.Add(this.labelRepeatCount); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); this.MaximizeBox = false; @@ -194,8 +117,6 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "HCW Configuration"; ((System.ComponentModel.ISupportInitialize)(this.numericUpDownButtonRepeatDelay)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownRepeatCount)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownLearnTimeout)).EndInit(); this.ResumeLayout(false); } @@ -205,11 +126,7 @@ private System.Windows.Forms.Button buttonOK; private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.ToolTip toolTips; - private System.Windows.Forms.Label labelRepeatCount; private System.Windows.Forms.NumericUpDown numericUpDownButtonRepeatDelay; - private System.Windows.Forms.NumericUpDown numericUpDownRepeatCount; private System.Windows.Forms.Label labelButtonRepeatDelay; - private System.Windows.Forms.NumericUpDown numericUpDownLearnTimeout; - private System.Windows.Forms.Label labelLearnIRTimeout; } } \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Configure.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -26,24 +26,6 @@ get { return Decimal.ToInt32(numericUpDownButtonRepeatDelay.Value); } set { numericUpDownButtonRepeatDelay.Value = new Decimal(value); } } - /// <summary> - /// Gets or sets the blast repeats. - /// </summary> - /// <value>The blast repeats.</value> - public int BlastRepeats - { - get { return Decimal.ToInt32(numericUpDownRepeatCount.Value); } - set { numericUpDownRepeatCount.Value = new Decimal(value); } - } - /// <summary> - /// Gets or sets the learn timeout. - /// </summary> - /// <value>The learn timeout.</value> - public int LearnTimeout - { - get { return Decimal.ToInt32(numericUpDownLearnTimeout.Value); } - set { numericUpDownLearnTimeout.Value = new Decimal(value); } - } #endregion Properties Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/HcwTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/HcwTransceiver.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/HcwTransceiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -17,7 +17,7 @@ /// IR Server plugin supporting Hauppauge devices. /// </summary> [CLSCompliant(false)] - public class HcwTransceiver : IRServerPluginBase, IRemoteReceiver // IConfigure, ITransmitIR, ILearnIR, + public class HcwTransceiver : IRServerPluginBase, IRemoteReceiver, IConfigure { #region Delegates @@ -34,22 +34,15 @@ Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\IR Server Suite\\IR Server\\HCW Transceiver.xml"; - static readonly string[] Ports = new string[] { "Default", "Port 1", "Port 2" }; - #endregion Constants #region Variables RemoteHandler _remoteButtonHandler = null; - string _blastPort = Ports[0]; int _repeatDelay; - int _blastRepeats; - int _learnTimeout; - //ulong _learnCarrierFreq; - string _lastCode = String.Empty; DateTime _lastCodeTime = DateTime.Now; @@ -66,7 +59,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.0"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -81,12 +74,11 @@ /// <summary> /// Start the IR Server plugin. /// </summary> - /// <returns>true if successful, otherwise false.</returns> - public override bool Start() + public override void Start() { LoadSettings(); - - return true; + + } /// <summary> /// Suspend the IR Server plugin when computer enters standby. @@ -122,14 +114,10 @@ Configure config = new Configure(); config.RepeatDelay = _repeatDelay; - config.BlastRepeats = _blastRepeats; - config.LearnTimeout = _learnTimeout; if (config.ShowDialog(owner) == DialogResult.OK) { _repeatDelay = config.RepeatDelay; - _blastRepeats = config.BlastRepeats; - _learnTimeout = config.LearnTimeout; SaveSettings(); } @@ -146,14 +134,7 @@ set { _remoteButtonHandler = value; } } - /// <summary> - /// Gets the available ports. - /// </summary> - /// <value>The available ports.</value> - public string[] AvailablePorts { get { return Ports; } } - - void LoadSettings() { try @@ -162,8 +143,6 @@ doc.Load(ConfigurationFile); _repeatDelay = int.Parse(doc.DocumentElement.Attributes["RepeatDelay"].Value); - _blastRepeats = int.Parse(doc.DocumentElement.Attributes["BlastRepeats"].Value); - _learnTimeout = int.Parse(doc.DocumentElement.Attributes["LearnTimeout"].Value); } #if TRACE catch (Exception ex) @@ -174,8 +153,6 @@ { #endif _repeatDelay = 500; - _blastRepeats = 4; - _learnTimeout = 10000; } } void SaveSettings() @@ -190,8 +167,6 @@ writer.WriteStartElement("settings"); // <settings> writer.WriteAttributeString("RepeatDelay", _repeatDelay.ToString()); - writer.WriteAttributeString("BlastRepeats", _blastRepeats.ToString()); - writer.WriteAttributeString("LearnTimeout", _learnTimeout.ToString()); writer.WriteEndElement(); // </settings> writer.WriteEndDocument(); Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Transceiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -29,8 +29,8 @@ // // 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.4.0")] -[assembly: AssemblyFileVersion("1.0.4.0")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("560F8887-A826-40c8-BAB2-022FB7011EEF")] Modified: 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-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginBase.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -46,18 +46,17 @@ /// <summary> /// Start the IR Server plugin. /// </summary> - /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public abstract bool Start(); + public abstract void Start(); /// <summary> /// Suspend the IR Server plugin when computer enters standby. /// </summary> - public virtual void Suspend() { } + public abstract void Suspend(); /// <summary> /// Resume the IR Server plugin when the computer returns from standby. /// </summary> - public virtual void Resume() { } + public abstract void Resume(); /// <summary> /// Stop the IR Server plugin. 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 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -29,8 +29,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("efdc4eaa-6ccc-4928-a1e7-f4b634780081")] 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 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -59,7 +59,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -85,8 +85,7 @@ /// <summary> /// Start the IR Server plugin. /// </summary> - /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public override bool Start() + public override void Start() { LoadSettings(); @@ -114,11 +113,11 @@ { _serialPort.ReceivedBytesThreshold = DeviceBufferSize; _serialPort.DataReceived += new SerialDataReceivedEventHandler(SerialPort_DataReceived); - - return true; } - - return false; + else + { + throw new ApplicationException("Failed to initialize device"); + } } /// <summary> /// Suspend the IR Server plugin when computer enters standby. 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 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -29,8 +29,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("a50e930e-1653-40d5-ba5a-3c0315868c1b")] 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 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -221,7 +221,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -241,24 +241,30 @@ /// </returns> public override bool Detect() { - return false; + LoadSettings(); + + if (Connect(_irTransServerAddress, _irTransServerPort)) + { + _socket.Close(); + return true; + } + else + { + return false; + } } /// <summary> /// Start the IR Server plugin. /// </summary> - /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public override bool Start() + public override void Start() { LoadSettings(); if (Connect(_irTransServerAddress, _irTransServerPort)) - { BeginReceive(); - return true; - } - - return false; + else + throw new ApplicationException("Failed to connect"); } /// <summary> /// Suspend the IR Server plugin when computer enters standby. 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 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -29,8 +29,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("fef45a20-12af-4750-b7fa-8c8b6ea42a15")] Modified: 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.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -159,7 +159,7 @@ /// IR Server plugin version. /// </summary> /// <value>The version.</value> - public override string Version { get { return "1.0.4.1"; } } + public override string Version { get { return "1.0.4.2"; } } /// <summary> /// The IR Server plugin's author. /// </summary> @@ -175,14 +175,12 @@ /// Start the IR Server plugin. /// </summary> /// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns> - public override bool Start() + public override void Start() { ThreadStart readThreadStart = new ThreadStart(ReadThread); _readThread = new Thread(readThreadStart); _readThread.IsBackground = true; _readThread.Start(); - - return true; } /// <summary> /// Suspend the IR Server plugin when computer enters standby. Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -29,8 +29,8 @@ // // 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.4.1")] -[assembly: AssemblyFileVersion("1.0.4.1")] +[assembly: AssemblyVersion("1.0.4.2")] +[assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] [assembly: GuidAttribute("2286B6BF-A7F8-4f1a-B72A-764B5002C949")] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2008-01-08 21:59:08 UTC (rev 1229) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2008-01-09 16:06:45 UTC (rev 1230) @@ -15,7 +15,7 @@ { /// <summary> - /// Driver class for replacement driver. + /// Driver class for the replacement driver. /// </summary> class DriverReplacement : Driver { @@ -85,8 +85,10 @@ #region Constants - const double ClockFrequency = 2412460.0; + const int TimingResolution = 50; // In microseconds. + //const double ClockFrequency = 2412460.0; + // Vendor ID's for SMK and Topseed devices. const string VidSMK = "vid_1784"; const string VidTopseed = "vid_0609"; @@ -191,21 +193,14 @@ #endif _notifyWindow = new NotifyWindow(); + _notifyWindow.Create(); _notifyWindow.Class = _deviceGuid; + _notifyWindow.RegisterDeviceArrival(); OpenDevice(); StartReadThread(); + InitializeDevice(); - // Initialize device ... - WriteSync(StartPacket); - Thread.Sleep(PacketTimeout); - - SetTimeout(PacketTimeout); - SetInputPort(InputPort.Receive); - - _notifyWindow.Create(); - _notifyWindow.RegisterDeviceArrival(); - _notifyWindow.RegisterDeviceRemoval(_readHandle.DangerousGetHandle()); _notifyWindow.DeviceArrival += new DeviceEventHandler(OnDeviceArrival); _notifyWindow.DeviceRemoval += new DeviceEventHandler(OnDeviceRemoval); } @@ -219,36 +214,34 @@ DebugWriteLine("Stop()"); #endif - _notifyWindow.DeviceArrival -= new DeviceEventHandler(OnDeviceArrival); - _notifyWindow.DeviceRemoval -= new DeviceEventHandler(OnDeviceRemoval); - - /* try { + _notifyWindow.DeviceArrival -= new DeviceEventHandler(OnDeviceArrival); + _notifyWindow.DeviceRemoval -= new DeviceEventHandler(OnDeviceRemoval); + WriteSync(StopPacket); - Thread.Sleep(PacketTimeout); + StopReadThread(); + CloseDevice(); } #if DEBUG catch (Exception ex) { DebugWriteLine(ex.ToString()); - } #else catch { +#endif + throw; } -#endif - */ + finally + { + _notifyWindow.Dispose(); + _notifyWindow = null; - StopReadThread(); - CloseDevice(); - - _notifyWindow.Dispose(); - _notifyWindow = null; - #if DEBUG - DebugClose(); + DebugClose(); #endif + } } /// <summary> @@ -261,7 +254,6 @@ #endif WriteSync(St... [truncated message content] |