From: <an...@us...> - 2007-06-12 17:50:36
|
Revision: 521 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=521&view=rev Author: and-81 Date: 2007-06-12 10:50:28 -0700 (Tue, 12 Jun 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Common/IrssUtils/TransceiverInfo.cs trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IPC/Named Pipes/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/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/MCE Replacement Transceiver/MceReplacementTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/Properties/AssemblyInfo.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/USB-UIRT Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.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 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/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.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/Forms/PluginSetup.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 Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -126,7 +126,6 @@ private void MainForm_Load(object sender, EventArgs e) { - IrssLog.LogLevel = IrssLog.Level.Debug; IrssLog.Open(Common.FolderIrssLogs + "Debug Client.log"); @@ -407,6 +406,16 @@ { AddStatusLine(ex.Message); } + + try + { + if (PipeAccess.ServerRunning) + PipeAccess.StopServer(); + } + catch (Exception ex) + { + AddStatusLine(ex.Message); + } } private void buttonBlast_Click(object sender, EventArgs e) { Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -984,9 +984,7 @@ if (_pluginTransmit != null) { - if (String.IsNullOrEmpty(transceiverInfo.Name)) - transceiverInfo.Name = _pluginTransmit.Name; - + transceiverInfo.Name = _pluginTransmit.Name; transceiverInfo.Ports = _pluginTransmit.AvailablePorts; transceiverInfo.Speeds = _pluginTransmit.AvailableSpeeds; transceiverInfo.CanLearn = _pluginTransmit.CanLearn; 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 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -30,7 +30,7 @@ // Build Number // Revision // -[assembly: AssemblyVersion("1.0.3.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(true)] \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -32,7 +32,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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(true)] \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/TransceiverInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/TransceiverInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/TransceiverInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -88,7 +88,7 @@ _ports = new string[] { "None" }; _speeds = new string[] { "None" }; - _name = String.Empty; + _name = "None"; _canLearn = false; _canReceive = false; _canTransmit = false; Modified: trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -32,7 +32,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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(true)] \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IPC/Named Pipes/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IPC/Named Pipes/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -33,7 +33,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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(false)] \ No newline at end of file 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -209,7 +209,7 @@ #region IIRServerPlugin Members public string Name { get { return "FusionREMOTE"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } public string Author { get { return "and-81"; } } public string Description { get { return "DViCO FusionREMOTE Receiver"; } } public bool CanReceive { get { return true; } } 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(true)] 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -49,7 +49,7 @@ #region IIRServerPlugin Members public string Name { get { return "IRMan"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } 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; } } 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -221,7 +221,7 @@ #region IIRServerPlugin Members public string Name { get { return "IRTrans (Experimental)"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } public string Author { get { return "and-81"; } } public string Description { get { return "IRTrans Transceiver (Experimental)"; } } public bool CanReceive { get { return true; } } 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/IgorPlug USB Receiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -63,7 +63,7 @@ #region IIRServerPlugin Members public string Name { get { return "IgorPlug USB"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } public string Author { get { return "and-81"; } } public string Description { get { return "IgorPlug USB Receiver"; } } public bool CanReceive { get { 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/MceReplacementTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/MceReplacementTransceiver.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/MceReplacementTransceiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -42,7 +42,7 @@ #region IIRServerPlugin Members public string Name { get { return "MCE Replacement"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } public string Author { get { return "and-81"; } } public string Description { get { return "Supports the MCE Replacement Driver for accessing the Microsoft MCE transceiver"; } } public bool CanReceive { get { return true; } } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -335,7 +335,7 @@ #region IIRServerPlugin Members public string Name { get { return "Microsoft MCE"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } public string Author { get { return "and-81"; } } public string Description { get { return "Microsoft MCE Infrared Transceiver"; } } public bool CanReceive { get { return true; } } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [assembly: CLSCompliant(true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -202,7 +202,7 @@ #region IIRServerPlugin Members public string Name { get { return "USB-UIRT"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } public string Author { get { return "and-81"; } } public string Description { get { return "Support for the USB-UIRT transceiver"; } } public bool CanReceive { get { return 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/WinLirc Receiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -43,7 +43,7 @@ #region IIRServerPlugin Members public string Name { get { return "WinLirc"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } 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; } } 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -54,7 +54,7 @@ #region IIRServerPlugin Members public string Name { get { return "Windows Messages"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } 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; } } 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -43,7 +43,7 @@ #region IIRServerPlugin Members public string Name { get { return "X10 (Experimental)"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } public string Author { get { return "and-81"; } } public string Description { get { return "X10 Transceiver (Experimental)"; } } public bool CanReceive { get { return true; } } 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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.1")] -[assembly: AssemblyFileVersion("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersion("1.0.3.2")] [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-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -187,7 +187,7 @@ #region IIRServerPlugin Members public string Name { get { return "XBCDRC"; } } - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } 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; } } Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -39,7 +39,7 @@ const int WindowID = 248101; - internal const string PluginVersion = "MP Blast Zone Plugin 1.0.3.1 for IR Server"; + internal const string PluginVersion = "MP Blast Zone Plugin 1.0.3.2 for IR Server"; internal static readonly string MenuFile = Common.FolderAppData + "MP Blast Zone Plugin\\Menu.xml"; @@ -156,19 +156,26 @@ public void ShowPlugin() { - InConfiguration = true; + try + { + InConfiguration = true; - if (LogVerbose) - Log.Info("MPBlastZonePlugin: ShowPlugin()"); + if (LogVerbose) + Log.Info("MPBlastZonePlugin: ShowPlugin()"); - SetupForm setupForm = new SetupForm(); - if (setupForm.ShowDialog() == DialogResult.OK) - SaveSettings(); + SetupForm setupForm = new SetupForm(); + if (setupForm.ShowDialog() == DialogResult.OK) + SaveSettings(); - StopComms(); + StopComms(); - if (LogVerbose) - Log.Info("MPBlastZonePlugin: ShowPlugin() - End"); + if (LogVerbose) + Log.Info("MPBlastZonePlugin: ShowPlugin() - End"); + } + catch (Exception ex) + { + Log.Error(ex); + } } #endregion @@ -183,16 +190,35 @@ public override bool Init() { - Start(); + InConfiguration = false; - return Load(GUIGraphicsContext.Skin + "\\BlastZone.xml"); + Log.Info("MPBlastZonePlugin: Starting ({0})", PluginVersion); + + if (!StartComms()) + Log.Error("MPBlastZonePlugin: Failed to start local comms, IR blasting is disabled for this session"); + + if (Load(GUIGraphicsContext.Skin + "\\BlastZone.xml")) + { + if (LogVerbose) + Log.Info("MPBlastZonePlugin: Started"); + + return true; + } + else + { + Log.Error("MPBlastZonePlugin: Failed to load skin file."); + return false; + } } public override void DeInit() { - Stop(); + StopComms(); base.DeInit(); + + if (LogVerbose) + Log.Info("MPBlastZonePlugin: Stopped"); } protected override void OnPageLoad() @@ -239,30 +265,6 @@ #region Implementation - static void Start() - { - Log.Info("MPBlastZonePlugin: Starting ({0})", PluginVersion); - - Log.Debug("MPBlastZonePlugin: Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit")); - - InConfiguration = false; - - if (!StartComms()) - Log.Error("MPBlastZonePlugin: Failed to start local comms, IR blasting is disabled for this session"); - - if (LogVerbose) - Log.Info("MPBlastZonePlugin: Started"); - } - static void Stop() - { - if (LogVerbose) - Log.Info("MPBlastZonePlugin: Stopping"); - - StopComms(); - - Log.Info("MPBlastZonePlugin: Stopped"); - } - static string GetCommand(string path, string name) { foreach (string collection in _menu.GetAllItems()) Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.3.1")] -[assembly: AssemblyFileVersionAttribute("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersionAttribute("1.0.3.2")] // // In order to sign your assembly you must specify a key to use. Refer to the Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -404,9 +404,7 @@ } else { - string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); - - BlastCommand blastCommand = new BlastCommand(commands); + BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); if (blastCommand.ShowDialog(this) == DialogResult.Cancel) return; Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -206,15 +206,13 @@ public void Start() { + InConfiguration = false; + Log.Info("MPControlPlugin: Starting ({0})", PluginVersion); - Log.Debug("MPControlPlugin: Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit")); - // Load basic settings LoadSettings(); - InConfiguration = false; - // Load the remote button mappings _remoteMap = LoadRemoteMap(RemotesFile); @@ -250,9 +248,6 @@ } public void Stop() { - if (LogVerbose) - Log.Info("MPControlPlugin: Stopping"); - //SystemEvents.SessionEnding -= new SessionEndingEventHandler(SystemEvents_SessionEnding); SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); @@ -273,7 +268,8 @@ for (int i = 0; i < _multiInputHandlers.Count; i++) _multiInputHandlers[i] = null; - Log.Info("MPControlPlugin: Stopped"); + if (LogVerbose) + Log.Info("MPControlPlugin: Stopped"); } #endregion IPlugin methods @@ -290,23 +286,30 @@ public void ShowPlugin() { - LoadSettings(); - LoadDefaultMapping(); - LoadMultiMappings(); + try + { + LoadSettings(); + LoadDefaultMapping(); + LoadMultiMappings(); - InConfiguration = true; + InConfiguration = true; - if (LogVerbose) - Log.Info("MPControlPlugin: ShowPlugin()"); + if (LogVerbose) + Log.Info("MPControlPlugin: ShowPlugin()"); - SetupForm setupForm = new SetupForm(); - if (setupForm.ShowDialog() == DialogResult.OK) - SaveSettings(); + SetupForm setupForm = new SetupForm(); + if (setupForm.ShowDialog() == DialogResult.OK) + SaveSettings(); - StopComms(); + StopComms(); - if (LogVerbose) - Log.Info("MPControlPlugin: ShowPlugin() - End"); + if (LogVerbose) + Log.Info("MPControlPlugin: ShowPlugin() - End"); + } + catch (Exception ex) + { + Log.Error(ex); + } } public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage) Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.3.1")] -[assembly: AssemblyFileVersionAttribute("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersionAttribute("1.0.3.2")] // // In order to sign your assembly you must specify a key to use. Refer to the Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -27,7 +27,7 @@ #region Constants - internal const string PluginVersion = "TV2 Blaster Plugin 1.0.3.1 for IR Server"; + internal const string PluginVersion = "TV2 Blaster Plugin 1.0.3.2 for IR Server"; internal static readonly string MPConfigFile = Config.GetFolder(Config.Dir.Config) + "\\MediaPortal.xml"; @@ -120,8 +120,6 @@ { Log.Info("TV2BlasterPlugin: Starting ({0})", PluginVersion); - Log.Debug("TV2BlasterPlugin: Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit")); - // Load basic settings LoadSettings(); @@ -140,14 +138,12 @@ } public void Stop() { - if (LogVerbose) - Log.Info("TV2BlasterPlugin: Stopping"); - GUIWindowManager.Receivers -= new SendMessageHandler(OnMessage); StopComms(); - Log.Info("TV2BlasterPlugin: Stopped"); + if (LogVerbose) + Log.Info("TV2BlasterPlugin: Stopped"); } #endregion IPlugin methods @@ -164,22 +160,29 @@ public void ShowPlugin() { - LoadSettings(); - LoadExternalConfigs(); + try + { + LoadSettings(); + LoadExternalConfigs(); - InConfiguration = true; + InConfiguration = true; - if (LogVerbose) - Log.Info("TV2BlasterPlugin: ShowPlugin()"); + if (LogVerbose) + Log.Info("TV2BlasterPlugin: ShowPlugin()"); - SetupForm setupForm = new SetupForm(); - if (setupForm.ShowDialog() == DialogResult.OK) - SaveSettings(); + SetupForm setupForm = new SetupForm(); + if (setupForm.ShowDialog() == DialogResult.OK) + SaveSettings(); - StopComms(); + StopComms(); - if (LogVerbose) - Log.Info("TV2BlasterPlugin: ShowPlugin() - End"); + if (LogVerbose) + Log.Info("TV2BlasterPlugin: ShowPlugin() - End"); + } + catch (Exception ex) + { + Log.Error(ex); + } } public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage) Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -28,7 +28,18 @@ public PluginSetup() { InitializeComponent(); + } + #endregion Constructor + + #region SetupTv.SectionSettings + + public override void OnSectionActivated() + { + Log.Info("TV3BlasterPlugin: Configuration activated"); + + TV3BlasterPlugin.InConfiguration = true; + TvBusinessLayer layer = new TvBusinessLayer(); TV3BlasterPlugin.LogVerbose = checkBoxLogVerbose.Checked = Convert.ToBoolean(layer.GetSetting("TV3BlasterPlugin_LogVerbose", "False").Value); TV3BlasterPlugin.ServerHost = layer.GetSetting("TV3BlasterPlugin_ServerHost", String.Empty).Value; @@ -41,14 +52,13 @@ if (!TV3BlasterPlugin.StartComms()) MessageBox.Show(this, "Failed to start local comms. IR functions temporarily disabled.", "TV3 Blaster Plugin - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + TV3BlasterPlugin.LoadExternalConfigs(); + RefreshIRList(); RefreshMacroList(); + + base.OnSectionActivated(); } - - #endregion Constructor - - #region SetupTv.SectionSettings - public override void OnSectionDeActivated() { Log.Info("TV3BlasterPlugin: Configuration deactivated"); @@ -66,23 +76,15 @@ setting.Value = TV3BlasterPlugin.ServerHost; setting.Persist(); - TV3BlasterPlugin.LoadExternalConfigs(); + //TV3BlasterPlugin.LoadExternalConfigs(); + TV3BlasterPlugin.StopComms(); + TV3BlasterPlugin.InConfiguration = false; base.OnSectionDeActivated(); } - public override void OnSectionActivated() - { - Log.Info("TV3BlasterPlugin: Configuration activated"); - TV3BlasterPlugin.InConfiguration = true; - - TV3BlasterPlugin.LoadExternalConfigs(); - - base.OnSectionActivated(); - } - #endregion SetupTv.SectionSettings #region Implementation Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -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.3.1")] -[assembly: AssemblyFileVersionAttribute("1.0.3.1")] +[assembly: AssemblyVersion("1.0.3.2")] +[assembly: AssemblyFileVersionAttribute("1.0.3.2")] // // In order to sign your assembly you must specify a key to use. Refer to the Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2007-06-12 16:40:14 UTC (rev 520) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2007-06-12 17:50:28 UTC (rev 521) @@ -28,7 +28,7 @@ #region Constants - internal const string PluginVersion = "TV3 Blaster Plugin 1.0.3.1 for IR Server"; + internal const string PluginVersion = "TV3 Blaster Plugin 1.0.3.2 for IR Server"; internal static readonly string FolderMacros = Common.FolderAppData + "TV3 Blaster Plugin\\Macro\\"; @@ -70,7 +70,7 @@ /// <summary> /// returns the version of the plugin /// </summary> - public string Version { get { return "1.0.3.1"; } } + public string Version { get { return "1.0.3.2"; } } /// <summary> /// returns the author of the plugin /// </summary> @@ -130,8 +130,6 @@ { Log.Info("TV3BlasterPlugin: Version {0}", PluginVersion); - Log.Debug("TV3BlasterPlugin: Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit")); - InConfiguration = false; TvBusinessLayer layer = new TvBusinessLayer(); @@ -146,6 +144,9 @@ if (!StartComms()) Log.Error("TV3BlasterPlugin: Failed to start local comms, IR blasting is disabled for this session"); + + if (LogVerbose) + Log.Info("TV3BlasterPlugin: Started"); } public void Stop() @@ -154,6 +155,9 @@ events.OnTvServerEvent -= _eventHandler; StopComms(); + + if (LogVerbose) + Log.Info("TV3BlasterPlugin: Stopped"); } [CLSCompliant(false)] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |