Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [920] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2007-09-14 10:17:14
|
Revision: 920
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=920&view=rev
Author: and-81
Date: 2007-09-14 03:17:12 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj
trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj
trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj
trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.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/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLircServer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -35,7 +35,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -513,7 +513,7 @@
BitConverter.GetBytes(keyCode).CopyTo(data, 0);
BitConverter.GetBytes(0).CopyTo(data, 4);
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, data);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Notify, data);
PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -37,7 +37,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -37,7 +37,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -3,39 +3,18 @@
namespace IRServer
{
- class Client
+ struct Client
{
- #region Variables
-
- string _pipe;
- string _server;
+ public string Pipe;
+ public string Server;
- #endregion
-
- #region Properties
-
- public string Pipe
- {
- get { return _pipe; }
- }
- public string Server
- {
- get { return _server; }
- }
-
- #endregion
-
- #region Constructor
-
public Client(string pipe, string server)
{
- _pipe = pipe;
- _server = server;
+ Pipe = pipe;
+ Server = server;
}
- #endregion Constructor
-
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -34,23 +34,17 @@
this.buttonCancel = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
this.checkBoxRunAtBoot = new System.Windows.Forms.CheckBox();
- this.radioButtonServer = new System.Windows.Forms.RadioButton();
- this.radioButtonRelay = new System.Windows.Forms.RadioButton();
- this.radioButtonRepeater = new System.Windows.Forms.RadioButton();
this.groupBoxTransceiver = new System.Windows.Forms.GroupBox();
this.gridPlugins = new SourceGrid.Grid();
- this.groupBoxMode = new System.Windows.Forms.GroupBox();
- this.labelComputer = new System.Windows.Forms.Label();
- this.comboBoxComputer = new System.Windows.Forms.ComboBox();
this.buttonHelp = new System.Windows.Forms.Button();
+ this.buttonAdvanced = new System.Windows.Forms.Button();
this.groupBoxTransceiver.SuspendLayout();
- this.groupBoxMode.SuspendLayout();
this.SuspendLayout();
//
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.Location = new System.Drawing.Point(296, 408);
+ this.buttonOK.Location = new System.Drawing.Point(352, 280);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(64, 24);
this.buttonOK.TabIndex = 4;
@@ -62,7 +56,7 @@
//
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.Location = new System.Drawing.Point(368, 408);
+ this.buttonCancel.Location = new System.Drawing.Point(424, 280);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(64, 24);
this.buttonCancel.TabIndex = 5;
@@ -72,51 +66,16 @@
//
// checkBoxRunAtBoot
//
- this.checkBoxRunAtBoot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.checkBoxRunAtBoot.Location = new System.Drawing.Point(16, 408);
+ this.checkBoxRunAtBoot.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+ this.checkBoxRunAtBoot.AutoSize = true;
+ this.checkBoxRunAtBoot.Location = new System.Drawing.Point(168, 288);
this.checkBoxRunAtBoot.Name = "checkBoxRunAtBoot";
- this.checkBoxRunAtBoot.Size = new System.Drawing.Size(176, 24);
- this.checkBoxRunAtBoot.TabIndex = 2;
+ this.checkBoxRunAtBoot.Size = new System.Drawing.Size(165, 17);
+ this.checkBoxRunAtBoot.TabIndex = 3;
this.checkBoxRunAtBoot.Text = "&Start IR Server with Windows";
this.toolTips.SetToolTip(this.checkBoxRunAtBoot, "Run IR Server when windows boots up?");
this.checkBoxRunAtBoot.UseVisualStyleBackColor = true;
//
- // radioButtonServer
- //
- this.radioButtonServer.Location = new System.Drawing.Point(16, 24);
- this.radioButtonServer.Name = "radioButtonServer";
- this.radioButtonServer.Size = new System.Drawing.Size(128, 24);
- this.radioButtonServer.TabIndex = 0;
- this.radioButtonServer.TabStop = true;
- this.radioButtonServer.Text = "Server mode";
- this.toolTips.SetToolTip(this.radioButtonServer, "Server mode (default)");
- this.radioButtonServer.UseVisualStyleBackColor = true;
- this.radioButtonServer.CheckedChanged += new System.EventHandler(this.radioButtonServer_CheckedChanged);
- //
- // radioButtonRelay
- //
- this.radioButtonRelay.Location = new System.Drawing.Point(16, 56);
- this.radioButtonRelay.Name = "radioButtonRelay";
- this.radioButtonRelay.Size = new System.Drawing.Size(128, 24);
- this.radioButtonRelay.TabIndex = 1;
- this.radioButtonRelay.TabStop = true;
- this.radioButtonRelay.Text = "Button relay mode";
- this.toolTips.SetToolTip(this.radioButtonRelay, "Relays button presses to another IR Server");
- this.radioButtonRelay.UseVisualStyleBackColor = true;
- this.radioButtonRelay.CheckedChanged += new System.EventHandler(this.radioButtonRelay_CheckedChanged);
- //
- // radioButtonRepeater
- //
- this.radioButtonRepeater.Location = new System.Drawing.Point(16, 88);
- this.radioButtonRepeater.Name = "radioButtonRepeater";
- this.radioButtonRepeater.Size = new System.Drawing.Size(128, 24);
- this.radioButtonRepeater.TabIndex = 2;
- this.radioButtonRepeater.TabStop = true;
- this.radioButtonRepeater.Text = "IR repeater mode";
- this.toolTips.SetToolTip(this.radioButtonRepeater, "Acts as a repeater for another IR Server\'s IR blasting");
- this.radioButtonRepeater.UseVisualStyleBackColor = true;
- this.radioButtonRepeater.CheckedChanged += new System.EventHandler(this.radioButtonRepeater_CheckedChanged);
- //
// groupBoxTransceiver
//
this.groupBoxTransceiver.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -125,10 +84,10 @@
this.groupBoxTransceiver.Controls.Add(this.gridPlugins);
this.groupBoxTransceiver.Location = new System.Drawing.Point(8, 8);
this.groupBoxTransceiver.Name = "groupBoxTransceiver";
- this.groupBoxTransceiver.Size = new System.Drawing.Size(424, 256);
+ this.groupBoxTransceiver.Size = new System.Drawing.Size(480, 256);
this.groupBoxTransceiver.TabIndex = 0;
this.groupBoxTransceiver.TabStop = false;
- this.groupBoxTransceiver.Text = "Device plugin";
+ this.groupBoxTransceiver.Text = "Device plugins";
//
// gridPlugins
//
@@ -141,83 +100,53 @@
this.gridPlugins.Name = "gridPlugins";
this.gridPlugins.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows;
this.gridPlugins.SelectionMode = SourceGrid.GridSelectionMode.Row;
- this.gridPlugins.Size = new System.Drawing.Size(392, 216);
+ this.gridPlugins.Size = new System.Drawing.Size(448, 216);
this.gridPlugins.TabIndex = 0;
this.gridPlugins.TabStop = true;
this.gridPlugins.ToolTipText = "";
//
- // groupBoxMode
- //
- this.groupBoxMode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxMode.Controls.Add(this.labelComputer);
- this.groupBoxMode.Controls.Add(this.radioButtonRepeater);
- this.groupBoxMode.Controls.Add(this.radioButtonRelay);
- this.groupBoxMode.Controls.Add(this.radioButtonServer);
- this.groupBoxMode.Controls.Add(this.comboBoxComputer);
- this.groupBoxMode.Location = new System.Drawing.Point(8, 272);
- this.groupBoxMode.Name = "groupBoxMode";
- this.groupBoxMode.Size = new System.Drawing.Size(424, 120);
- this.groupBoxMode.TabIndex = 1;
- this.groupBoxMode.TabStop = false;
- this.groupBoxMode.Text = "Mode";
- //
- // labelComputer
- //
- this.labelComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.labelComputer.Location = new System.Drawing.Point(160, 56);
- this.labelComputer.Name = "labelComputer";
- this.labelComputer.Size = new System.Drawing.Size(248, 32);
- this.labelComputer.TabIndex = 3;
- this.labelComputer.Text = "Button Relay / IR Repeater mode host computer:";
- this.labelComputer.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // comboBoxComputer
- //
- this.comboBoxComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.comboBoxComputer.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
- this.comboBoxComputer.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
- this.comboBoxComputer.Enabled = false;
- this.comboBoxComputer.FormattingEnabled = true;
- this.comboBoxComputer.Location = new System.Drawing.Point(160, 88);
- this.comboBoxComputer.Name = "comboBoxComputer";
- this.comboBoxComputer.Size = new System.Drawing.Size(248, 21);
- this.comboBoxComputer.TabIndex = 4;
- //
// buttonHelp
//
- this.buttonHelp.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.buttonHelp.Location = new System.Drawing.Point(208, 408);
+ this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonHelp.Location = new System.Drawing.Point(8, 280);
this.buttonHelp.Name = "buttonHelp";
this.buttonHelp.Size = new System.Drawing.Size(64, 24);
- this.buttonHelp.TabIndex = 3;
+ this.buttonHelp.TabIndex = 1;
this.buttonHelp.Text = "Help";
this.buttonHelp.UseVisualStyleBackColor = true;
this.buttonHelp.Click += new System.EventHandler(this.buttonHelp_Click);
//
+ // buttonAdvanced
+ //
+ this.buttonAdvanced.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonAdvanced.Location = new System.Drawing.Point(80, 280);
+ this.buttonAdvanced.Name = "buttonAdvanced";
+ this.buttonAdvanced.Size = new System.Drawing.Size(64, 24);
+ this.buttonAdvanced.TabIndex = 2;
+ this.buttonAdvanced.Text = "Advanced";
+ this.toolTips.SetToolTip(this.buttonAdvanced, "Click here for advanced options");
+ this.buttonAdvanced.UseVisualStyleBackColor = true;
+ this.buttonAdvanced.Click += new System.EventHandler(this.buttonAdvanced_Click);
+ //
// Config
//
- this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(440, 440);
+ this.ClientSize = new System.Drawing.Size(496, 319);
+ this.Controls.Add(this.buttonAdvanced);
this.Controls.Add(this.buttonHelp);
this.Controls.Add(this.checkBoxRunAtBoot);
- this.Controls.Add(this.groupBoxMode);
this.Controls.Add(this.groupBoxTransceiver);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(448, 474);
+ this.MinimumSize = new System.Drawing.Size(504, 346);
this.Name = "Config";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "IR Server - Configuration";
this.groupBoxTransceiver.ResumeLayout(false);
- this.groupBoxMode.ResumeLayout(false);
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -227,14 +156,9 @@
private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.ToolTip toolTips;
private System.Windows.Forms.GroupBox groupBoxTransceiver;
- private System.Windows.Forms.GroupBox groupBoxMode;
private System.Windows.Forms.CheckBox checkBoxRunAtBoot;
- private System.Windows.Forms.ComboBox comboBoxComputer;
private System.Windows.Forms.Button buttonHelp;
- private System.Windows.Forms.RadioButton radioButtonRelay;
- private System.Windows.Forms.RadioButton radioButtonServer;
- private System.Windows.Forms.RadioButton radioButtonRepeater;
- private System.Windows.Forms.Label labelComputer;
private SourceGrid.Grid gridPlugins;
+ private System.Windows.Forms.Button buttonAdvanced;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -22,44 +22,24 @@
IRServerPlugin[] _transceivers;
+ IRServerMode _mode = IRServerMode.ServerMode;
+ string _hostComputer = String.Empty;
+
#endregion Variables
#region Properties
public IRServerMode Mode
{
- get
- {
- if (radioButtonRelay.Checked)
- return IRServerMode.RelayMode;
- else if (radioButtonRepeater.Checked)
- return IRServerMode.RepeaterMode;
- else
- return IRServerMode.ServerMode;
- }
- set
- {
- switch (value)
- {
- case IRServerMode.ServerMode:
- radioButtonServer.Checked = true;
- break;
-
- case IRServerMode.RelayMode:
- radioButtonRelay.Checked = true;
- break;
-
- case IRServerMode.RepeaterMode:
- radioButtonRepeater.Checked = true;
- break;
- }
- }
+ get { return _mode; }
+ set { _mode = value; }
}
public string HostComputer
{
- get { return comboBoxComputer.Text; }
- set { comboBoxComputer.Text = value; }
+ get { return _hostComputer; }
+ set { _hostComputer = value; }
}
+
public string PluginReceive
{
get
@@ -148,14 +128,6 @@
{
IrssLog.Error(ex.ToString());
}
-
- ArrayList networkPCs = IrssUtils.Win32.GetNetworkComputers();
- if (networkPCs != null)
- {
- foreach (string computer in networkPCs.ToArray(typeof(string)))
- if (computer != Environment.MachineName)
- comboBoxComputer.Items.Add(computer);
- }
}
#endregion Constructor
@@ -347,22 +319,24 @@
MessageBox.Show(this, ex.Message, "Failed to load help", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
-
- private void radioButtonServer_CheckedChanged(object sender, EventArgs e)
+
+ private void buttonAdvanced_Click(object sender, EventArgs e)
{
- comboBoxComputer.Enabled = false;
+ Advanced advanced = new Advanced();
+
+ advanced.Mode = _mode;
+ advanced.HostComputer = _hostComputer;
+
+ if (advanced.ShowDialog(this) == DialogResult.OK)
+ {
+ _mode = advanced.Mode;
+ _hostComputer = advanced.HostComputer;
+ }
}
- private void radioButtonRelay_CheckedChanged(object sender, EventArgs e)
- {
- comboBoxComputer.Enabled = true;
- }
- private void radioButtonRepeater_CheckedChanged(object sender, EventArgs e)
- {
- comboBoxComputer.Enabled = true;
- }
#endregion Controls
+
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -59,7 +59,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -95,6 +95,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Advanced.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Advanced.Designer.cs">
+ <DependentUpon>Advanced.cs</DependentUpon>
+ </Compile>
<Compile Include="Client.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -117,6 +123,10 @@
<Content Include="Icon16.ico" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="Advanced.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>Advanced.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Config.resx">
<DependentUpon>Config.cs</DependentUpon>
<SubType>Designer</SubType>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -57,16 +57,13 @@
List<Client> _registeredClients;
List<Client> _registeredRepeaters;
- Thread _messageHandlerThread;
+ MessageQueue _messageQueue;
- Queue _messageQueue;
- bool _processMessageQueue;
-
IRServerMode _mode;
string _hostComputer;
string _localPipeName = String.Empty;
- bool _registered = false;
+ bool _registered = false; // Used for relay and repeater modes.
string _pluginNameReceive = String.Empty;
IRServerPlugin _pluginReceive = null;
@@ -82,6 +79,8 @@
public IRServer()
{
+ _messageQueue = new MessageQueue(new MessageQueueSink(HandlePipeMessage));
+
// Setup taskbar icon
_notifyIcon = new NotifyIcon();
_notifyIcon.ContextMenuStrip = new ContextMenuStrip();
@@ -145,7 +144,7 @@
}
- StartMessageQueue();
+ _messageQueue.Start();
switch (_mode)
{
@@ -156,7 +155,7 @@
_registeredRepeaters = new List<Client>();
// Start server pipe
- PipeAccess.StartServer(Common.ServerPipeName, new PipeMessageHandler(QueueMessage));
+ PipeAccess.StartServer(Common.ServerPipeName, new PipeMessageHandler(_messageQueue.Enqueue));
IrssLog.Info("Server Mode: \\\\" + Environment.MachineName + "\\pipe\\" + Common.ServerPipeName);
break;
@@ -293,15 +292,7 @@
IrssLog.Error(ex.ToString());
}
- // Stop Message Queue
- try
- {
- StopMessageQueue();
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex.ToString());
- }
+ _messageQueue.Stop();
// Stop Server
try
@@ -369,34 +360,6 @@
_inConfiguration = false;
}
- void StartMessageQueue()
- {
- _processMessageQueue = true;
-
- // Create a FIFO message queue
- _messageQueue = Queue.Synchronized(new Queue());
-
- // Start message queue handling thread
- _messageHandlerThread = new Thread(new ThreadStart(MessageHandlerThread));
- _messageHandlerThread.IsBackground = true;
- _messageHandlerThread.Name = "IR Server Message Queue";
- _messageHandlerThread.Start();
- }
- void StopMessageQueue()
- {
- _processMessageQueue = false;
-
- try
- {
- if (_messageHandlerThread != null && _messageHandlerThread.IsAlive)
- _messageHandlerThread.Abort();
- }
- catch { }
-
- _messageQueue.Clear();
- _messageQueue = null;
- }
-
bool StartRelay()
{
bool retry = false;
@@ -424,7 +387,7 @@
}
else
{
- PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(QueueMessage));
+ PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(_messageQueue.Enqueue));
_localPipeName = localPipeTest;
retry = false;
}
@@ -491,7 +454,7 @@
}
else
{
- PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(QueueMessage));
+ PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(_messageQueue.Enqueue));
_localPipeName = localPipeTest;
retry = false;
}
@@ -822,23 +785,14 @@
if (_mode != IRServerMode.ServerMode)
return false;
- Client removeClient = null;
+ Client removeClient = new Client(pipe, server);
lock (_registeredClients)
{
- foreach (Client client in _registeredClients)
- {
- if (client.Pipe == pipe && client.Server == server)
- {
- removeClient = client;
- break;
- }
- }
-
- if (removeClient != null)
- _registeredClients.Remove(removeClient);
- else
+ if (!_registeredClients.Contains(removeClient))
return false;
+
+ _registeredClients.Remove(removeClient);
}
IrssLog.Info("Unregistered: \\\\{0}\\pipe\\{1}", server, pipe);
@@ -883,26 +837,17 @@
if (String.IsNullOrEmpty(pipe) || String.IsNullOrEmpty(server))
return false;
- if (_mode != IRServerMode.ServerMode)
+ if (_mode != IRServerMode.RepeaterMode)
return false;
- Client removeClient = null;
+ Client removeClient = new Client(pipe, server);
lock (_registeredRepeaters)
{
- foreach (Client client in _registeredRepeaters)
- {
- if (client.Pipe == pipe && client.Server == server)
- {
- removeClient = client;
- break;
- }
- }
-
- if (removeClient != null)
- _registeredRepeaters.Remove(removeClient);
- else
+ if (!_registeredRepeaters.Contains(removeClient))
return false;
+
+ _registeredRepeaters.Remove(removeClient);
}
IrssLog.Info("Unregistered Repeater: \\\\{0}\\pipe\\{1}", server, pipe);
@@ -982,10 +927,17 @@
return status;
}
- void HandlePipeMessage(PipeMessage received)
+ void HandlePipeMessage(string message)
{
- IrssLog.Debug("Message received from client \\\\{0}\\pipe\\{1} = {2}", received.FromServer, received.FromPipe, received.ToString());
+ PipeMessage received = PipeMessage.FromString(message);
+ if (received == null)
+ {
+ IrssLog.Warn("Invalid message received: {0}", message);
+ return;
+ }
+ IrssLog.Debug("Message received from client \\\\{0}\\pipe\\{1} = {2}", received.FromServer, received.FromPipe, message);
+
try
{
switch (received.Type)
@@ -1194,33 +1146,7 @@
}
}
- void QueueMessage(string message)
- {
- PipeMessage pipeMessage = PipeMessage.FromString(message);
- if (pipeMessage == null)
- return;
- lock (((ICollection)_messageQueue).SyncRoot)
- _messageQueue.Enqueue(pipeMessage);
- }
- void MessageHandlerThread()
- {
- try
- {
- while (_processMessageQueue)
- {
- Thread.Sleep(50);
-
- lock (((ICollection)_messageQueue).SyncRoot)
- {
- if (_messageQueue.Count > 0)
- HandlePipeMessage((PipeMessage)_messageQueue.Dequeue());
- }
- }
- }
- catch { }
- }
-
void ClickSetup(object sender, EventArgs e)
{
if (_inConfiguration)
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -28,7 +28,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
return;
}
@@ -112,7 +112,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
return null;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -48,7 +48,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -38,7 +38,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -188,7 +188,7 @@
if (!PipeAccess.ServerRunning)
return;
- PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, keyCode);
+ PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Notify, keyCode);
PipeAccess.SendMessage(Common.ServerPipeName, Program.ServerHost, message);
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -140,7 +140,7 @@
}
else
{
- PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, button);
+ PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Notify, button);
PipeAccess.SendMessage(Common.ServerPipeName, Program.ServerHost, message);
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -46,7 +46,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -510,7 +510,7 @@
{
_registered = false;
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient, PipeMessageFlags.Request);
PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -35,7 +35,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -72,7 +72,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
}
@@ -86,7 +86,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
}
}
@@ -113,7 +113,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
try
@@ -126,7 +126,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
}
}
Modified: trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -78,7 +78,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
Modified: trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -78,7 +78,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -63,6 +63,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="MessageQueue.cs" />
<Compile Include="PipeAccess.cs" />
<Compile Include="PipeManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -146,7 +146,7 @@
_data = null;
}
- public PipeMessage(string fromServer, string fromPipe, PipeMessageType type)
+ PipeMessage(string fromServer, string fromPipe, PipeMessageType type)
: this()
{
_fromServer = fromServer;
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -36,7 +36,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
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-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -216,7 +216,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
return false;
}
}
@@ -377,7 +377,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -37,7 +37,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
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-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -160,7 +160,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
@@ -197,7 +197,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
_repeatDelay = 500;
_serialPortName = "COM1";
@@ -223,7 +223,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -35,7 +35,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -36,7 +36,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
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-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -242,7 +242,7 @@
catch (SocketException ex)
{
// Nothing to worry about
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
@@ -285,7 +285,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
_irTransRemoteModel = DefaultRemoteModel;
_irTransServerAddress = DefaultServerAddress;
@@ -313,7 +313,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
@@ -330,7 +330,7 @@
}
catch (SocketException ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
return false;
}
@@ -350,7 +350,7 @@
}
catch (SocketException ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
static void OnDataReceived(IAsyncResult asyn)
@@ -390,7 +390,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
break;
@@ -409,7 +409,7 @@
}
catch (SocketException ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -123,7 +123,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("JVC HeaderPulse");
+ //Trace.WriteLine("JVC HeaderPulse");
if (pulse && duration >= 8200 && duration <= 8600)
{
@@ -135,7 +135,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("JVC HeaderSpace");
+ //Trace.WriteLine("JVC HeaderSpace");
if (!pulse && duration >= 4000 && duration <= 4400)
{
@@ -150,7 +150,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("JVC Data");
+ //Trace.WriteLine("JVC Data");
if (pulse && duration >= 350 && duration <= 750)
{
@@ -174,7 +174,7 @@
}
else
{
- //Console.WriteLine("JVC Error");
+ //Trace.WriteLine("JVC Error");
}
if (JVC_Data.Bit == 16)
@@ -187,7 +187,7 @@
#region Leading
case RemoteDetectionState.Leading:
- //Console.WriteLine("JVC Leading");
+ //Trace.WriteLine("JVC Leading");
if (pulse && duration >= 350 && duration <= 750)
{
@@ -223,7 +223,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("NEC HeaderPulse");
+ //Trace.WriteLine("NEC HeaderPulse");
if (pulse && duration >= 8800 && duration <= 9200)
{
@@ -235,7 +235,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("NEC HeaderSpace");
+ //Trace.WriteLine("NEC HeaderSpace");
if (!pulse && duration >= 4300 && duration <= 4700)
{
@@ -257,7 +257,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("NEC Data");
+ //Trace.WriteLine("NEC Data");
if (pulse && duration >= 350 && duration <= 750)
{
@@ -281,7 +281,7 @@
}
else
{
- //Console.WriteLine("NEC Error");
+ //Trace.WriteLine("NEC Error");
}
if (NEC_Data.Bit == 32)
@@ -317,7 +317,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RC5 HeaderPulse");
+ //Trace.WriteLine("RC5 HeaderPulse");
if (pulse)
{
@@ -342,7 +342,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RC5 HeaderSpace");
+ //Trace.WriteLine("RC5 HeaderSpace");
if (!pulse && (duration >= 750) && (duration <= 1000))
{
@@ -355,7 +355,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RC5 Data");
+ //Trace.WriteLine("RC5 Data");
if (RC5_Data.HalfBit == 0)
{
@@ -373,7 +373,7 @@
}
else
{
- //Console.WriteLine("RC5 Error {0} on bit {1}", duration, bit);
+ //Trace.WriteLine("RC5 Error {0} on bit {1}", duration, bit);
}
}
else
@@ -396,7 +396,7 @@
}
else
{
- //Console.WriteLine("RC5 Space Error {0} on bit {1}", duration, bit);
+ //Trace.WriteLine("RC5 Space Error {0} on bit {1}", duration, bit);
}
}
break;
@@ -419,14 +419,14 @@
}
else
{
- //Console.WriteLine("RC5 Duration Error {0} on bit {1}", duration, bit);
+ //Trace.WriteLine("RC5 Duration Error {0} on bit {1}", duration, bit);
}
break;
#endregion Data
#region Leading
case RemoteDetectionState.Leading:
- //Console.WriteLine("RC5 Leading");
+ //Trace.WriteLine("RC5 Leading");
if (pulse)
break;
@@ -477,7 +477,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RC6 HeaderPulse");
+ //Trace.WriteLine("RC6 HeaderPulse");
if (pulse && (duration >= 2600) && (duration <= 3300))
{
@@ -495,7 +495,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RC6 HeaderSpace");
+ //Trace.WriteLine("RC6 HeaderSpace");
if (!pulse && (duration >= 750) && (duration <= 1000))
{
@@ -508,7 +508,7 @@
#region PreData
case RemoteDetectionState.PreData:
- //Console.WriteLine("RC6 PreData");
+ //Trace.WriteLine("RC6 PreData");
if (pulse)
{
@@ -537,7 +537,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
}
}
else
@@ -571,7 +571,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
}
}
@@ -598,7 +598,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RC6 Data");
+ //Trace.WriteLine("RC6 Data");
if ((RC6_Data.HalfBit % 2) == 0)
{
@@ -619,7 +619,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Halfbit0 {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Halfbit0 {0} {1}", pulse ? "Pulse" : "Space", duration));
}
break;
}
@@ -629,7 +629,7 @@
RC6_Data.LongPulse = false;
if (pulse)
{
- //Console.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
break;
}
@@ -648,7 +648,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Pulse LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Pulse LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
}
}
else if (RC6_Data.LongSpace)
@@ -657,7 +657,7 @@
if (!pulse)
{
- //Console.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
break;
}
@@ -687,7 +687,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
}
}
break;
@@ -729,7 +729,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RCA HeaderPulse");
+ //Trace.WriteLine("RCA HeaderPulse");
if (pulse && duration >= 3800 && duration <= 4200)
{
@@ -741,7 +741,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RCA HeaderSpace");
+ //Trace.WriteLine("RCA HeaderSpace");
if (!pulse && duration >= 3800 && duration <= 4200)
{
@@ -756,7 +756,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RCA Data");
+ //Trace.WriteLine("RCA Data");
if (pulse && duration >= 300 && duration <= 700)
{
@@ -780,7 +780,7 @@
}
else
{
- //Console.WriteLine("RCA Error");
+ //Trace.WriteLine("RCA Error");
}
if (RCA_Data.Bit == 12)
@@ -816,7 +816,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RECS80 HeaderPulse");
+ //Trace.WriteLine("RECS80 HeaderPulse");
if (pulse && (duration >= 3300) && (duration <= 4100))
{
@@ -828,7 +828,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RECS80 HeaderSpace");
+ //Trace.WriteLine("RECS80 HeaderSpace");
if (!pulse && (duration >= 1400) && (duration <= 1800))
{
@@ -844,7 +844,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RECS80 Data");
+ //Trace.WriteLine("RECS80 Data");
if ((RECS80_Data.HalfBit % 2) == 0)
{
@@ -919,7 +919,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- /...
[truncated message content] |
