From: <an...@us...> - 2007-08-19 14:44:48
|
Revision: 846 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=846&view=rev Author: and-81 Date: 2007-08-19 07:44:46 -0700 (Sun, 19 Aug 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs trunk/plugins/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite.sln 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/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -53,7 +53,8 @@ this.comboBoxComputer = new System.Windows.Forms.ComboBox(); this.groupBoxCommands = new System.Windows.Forms.GroupBox(); this.comboBoxPort = new System.Windows.Forms.ComboBox(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.toolTips = new System.Windows.Forms.ToolTip(this.components); + this.buttonIRBlastAutoTest = new System.Windows.Forms.Button(); this.buttonHelp = new System.Windows.Forms.Button(); this.groupBoxGenerateMessage.SuspendLayout(); this.groupBoxStatus.SuspendLayout(); @@ -70,7 +71,7 @@ this.buttonBlast.Size = new System.Drawing.Size(64, 24); this.buttonBlast.TabIndex = 2; this.buttonBlast.Text = "Blast IR"; - this.toolTip.SetToolTip(this.buttonBlast, "Blast learned IR code"); + this.toolTips.SetToolTip(this.buttonBlast, "Blast learned IR code"); this.buttonBlast.UseVisualStyleBackColor = true; this.buttonBlast.Click += new System.EventHandler(this.buttonBlast_Click); // @@ -81,7 +82,7 @@ this.buttonLearnIR.Size = new System.Drawing.Size(64, 24); this.buttonLearnIR.TabIndex = 0; this.buttonLearnIR.Text = "Learn IR"; - this.toolTip.SetToolTip(this.buttonLearnIR, "Learn an IR code"); + this.toolTips.SetToolTip(this.buttonLearnIR, "Learn an IR code"); this.buttonLearnIR.UseVisualStyleBackColor = true; this.buttonLearnIR.Click += new System.EventHandler(this.buttonLearnIR_Click); // @@ -103,7 +104,7 @@ this.buttonConnect.Size = new System.Drawing.Size(80, 24); this.buttonConnect.TabIndex = 2; this.buttonConnect.Text = "Connect"; - this.toolTip.SetToolTip(this.buttonConnect, "Connect to server"); + this.toolTips.SetToolTip(this.buttonConnect, "Connect to server"); this.buttonConnect.UseVisualStyleBackColor = true; this.buttonConnect.Click += new System.EventHandler(this.buttonConnect_Click); // @@ -115,7 +116,7 @@ this.buttonDisconnect.Size = new System.Drawing.Size(80, 24); this.buttonDisconnect.TabIndex = 3; this.buttonDisconnect.Text = "Disconnect"; - this.toolTip.SetToolTip(this.buttonDisconnect, "Disconnect from server"); + this.toolTips.SetToolTip(this.buttonDisconnect, "Disconnect from server"); this.buttonDisconnect.UseVisualStyleBackColor = true; this.buttonDisconnect.Click += new System.EventHandler(this.buttonDisconnect_Click); // @@ -127,7 +128,7 @@ this.buttonShutdownServer.Size = new System.Drawing.Size(64, 24); this.buttonShutdownServer.TabIndex = 5; this.buttonShutdownServer.Text = "Shutdown"; - this.toolTip.SetToolTip(this.buttonShutdownServer, "Shutdown server"); + this.toolTips.SetToolTip(this.buttonShutdownServer, "Shutdown server"); this.buttonShutdownServer.UseVisualStyleBackColor = true; this.buttonShutdownServer.Click += new System.EventHandler(this.buttonShutdownServer_Click); // @@ -144,7 +145,7 @@ this.listBoxStatus.ScrollAlwaysVisible = true; this.listBoxStatus.Size = new System.Drawing.Size(424, 192); this.listBoxStatus.TabIndex = 0; - this.toolTip.SetToolTip(this.listBoxStatus, "Status messages"); + this.toolTips.SetToolTip(this.listBoxStatus, "Status messages"); // // buttonCrash // @@ -154,7 +155,7 @@ this.buttonCrash.Size = new System.Drawing.Size(64, 24); this.buttonCrash.TabIndex = 6; this.buttonCrash.Text = "Crash"; - this.toolTip.SetToolTip(this.buttonCrash, "Crash this program"); + this.toolTips.SetToolTip(this.buttonCrash, "Crash this program"); this.buttonCrash.UseVisualStyleBackColor = true; this.buttonCrash.Click += new System.EventHandler(this.buttonCrash_Click); // @@ -166,7 +167,7 @@ this.buttonListConnected.Size = new System.Drawing.Size(64, 24); this.buttonListConnected.TabIndex = 8; this.buttonListConnected.Text = "# clients"; - this.toolTip.SetToolTip(this.buttonListConnected, "Get client count from server"); + this.toolTips.SetToolTip(this.buttonListConnected, "Get client count from server"); this.buttonListConnected.UseVisualStyleBackColor = true; this.buttonListConnected.Click += new System.EventHandler(this.buttonListConnected_Click); // @@ -178,7 +179,7 @@ this.buttonPing.Size = new System.Drawing.Size(64, 24); this.buttonPing.TabIndex = 7; this.buttonPing.Text = "Ping"; - this.toolTip.SetToolTip(this.buttonPing, "Ping the server"); + this.toolTips.SetToolTip(this.buttonPing, "Ping the server"); this.buttonPing.UseVisualStyleBackColor = true; this.buttonPing.Click += new System.EventHandler(this.buttonPing_Click); // @@ -205,7 +206,7 @@ this.textBoxCustom.Name = "textBoxCustom"; this.textBoxCustom.Size = new System.Drawing.Size(352, 56); this.textBoxCustom.TabIndex = 0; - this.toolTip.SetToolTip(this.textBoxCustom, "Create a custom message to send to the server"); + this.toolTips.SetToolTip(this.textBoxCustom, "Create a custom message to send to the server"); // // buttonSendCustom // @@ -215,7 +216,7 @@ this.buttonSendCustom.Size = new System.Drawing.Size(56, 24); this.buttonSendCustom.TabIndex = 1; this.buttonSendCustom.Text = "Send"; - this.toolTip.SetToolTip(this.buttonSendCustom, "Send custom message to server"); + this.toolTips.SetToolTip(this.buttonSendCustom, "Send custom message to server"); this.buttonSendCustom.UseVisualStyleBackColor = true; this.buttonSendCustom.Click += new System.EventHandler(this.buttonSendCustom_Click); // @@ -271,7 +272,7 @@ this.numericUpDownButton.TabIndex = 2; this.numericUpDownButton.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.numericUpDownButton.ThousandsSeparator = true; - this.toolTip.SetToolTip(this.numericUpDownButton, "Specify a custom button code to forward to the server"); + this.toolTips.SetToolTip(this.numericUpDownButton, "Specify a custom button code to forward to the server"); // // comboBoxRemoteButtons // @@ -283,7 +284,7 @@ this.comboBoxRemoteButtons.Name = "comboBoxRemoteButtons"; this.comboBoxRemoteButtons.Size = new System.Drawing.Size(120, 21); this.comboBoxRemoteButtons.TabIndex = 0; - this.toolTip.SetToolTip(this.comboBoxRemoteButtons, "Choose a remote control button to forward to the server"); + this.toolTips.SetToolTip(this.comboBoxRemoteButtons, "Choose a remote control button to forward to the server"); this.comboBoxRemoteButtons.SelectedIndexChanged += new System.EventHandler(this.comboBoxRemoteButtons_SelectedIndexChanged); // // buttonSendRemoteButton @@ -350,8 +351,21 @@ this.comboBoxPort.Name = "comboBoxPort"; this.comboBoxPort.Size = new System.Drawing.Size(80, 21); this.comboBoxPort.TabIndex = 3; - this.toolTip.SetToolTip(this.comboBoxPort, "Port for blasting IR"); + this.toolTips.SetToolTip(this.comboBoxPort, "Port for blasting IR"); // + // buttonIRBlastAutoTest + // + this.buttonIRBlastAutoTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonIRBlastAutoTest.Location = new System.Drawing.Point(336, 536); + this.buttonIRBlastAutoTest.Name = "buttonIRBlastAutoTest"; + this.buttonIRBlastAutoTest.Size = new System.Drawing.Size(112, 24); + this.buttonIRBlastAutoTest.TabIndex = 8; + this.buttonIRBlastAutoTest.Text = "IRBlast Auto-Test"; + this.toolTips.SetToolTip(this.buttonIRBlastAutoTest, "Runs a random number blasting test"); + this.buttonIRBlastAutoTest.UseVisualStyleBackColor = true; + this.buttonIRBlastAutoTest.Visible = false; + this.buttonIRBlastAutoTest.Click += new System.EventHandler(this.buttonAutoTest_Click); + // // buttonHelp // this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -368,6 +382,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(456, 566); + this.Controls.Add(this.buttonIRBlastAutoTest); this.Controls.Add(this.buttonHelp); this.Controls.Add(this.groupBoxCommands); this.Controls.Add(this.groupBoxSetup); @@ -415,10 +430,11 @@ private System.Windows.Forms.Label labelCustomButton; private System.Windows.Forms.GroupBox groupBoxSetup; private System.Windows.Forms.GroupBox groupBoxCommands; - private System.Windows.Forms.ToolTip toolTip; + private System.Windows.Forms.ToolTip toolTips; private System.Windows.Forms.ComboBox comboBoxPort; private System.Windows.Forms.ComboBox comboBoxComputer; private System.Windows.Forms.Button buttonHelp; + private System.Windows.Forms.Button buttonIRBlastAutoTest; } } Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -3,11 +3,13 @@ using System.Collections.Generic; using System.ComponentModel; using System.Data; +using System.Diagnostics; using System.Drawing; using System.IO; using System.Runtime.InteropServices; using System.Security; using System.Text; +using System.Threading; using System.Windows.Forms; using NamedPipes; @@ -587,6 +589,40 @@ #endregion Controls + Thread AutoTest; + + private void buttonAutoTest_Click(object sender, EventArgs e) + { + AutoTest = new Thread(new ThreadStart(AutoTestThread)); + AutoTest.IsBackground = true; + AutoTest.Start(); + } + + void AutoTestThread() + { + Random rand = new Random(); + + int randomNumber; + + Process process = new Process(); + process.StartInfo.FileName = "IRBlast-NoWindow.exe"; + process.StartInfo.WorkingDirectory = "C:\\Program Files\\IR Server Suite\\IR Blast\\"; + + while (true) + { + randomNumber = rand.Next(100000); + + this.Invoke(_AddStatusLine, new Object[] { String.Format("AutoTest: {0}", randomNumber) }); + + process.StartInfo.Arguments = "-host localhost -pad 4 -channel " + randomNumber.ToString(); + + process.Start(); + process.WaitForExit(); + + Thread.Sleep(10000); + } + } + } } Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.resx 2007-08-19 14:44:46 UTC (rev 846) @@ -117,7 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -42,7 +42,7 @@ { // TODO: Change log level to info for release. IrssLog.LogLevel = IrssLog.Level.Debug; - IrssLog.Open(Common.FolderIrssLogs + "IR Blast.log"); + IrssLog.Append(Common.FolderIrssLogs + "IR Blast.log"); ShowHeader(); Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -43,7 +43,7 @@ { // TODO: Change log level to info for release. IrssLog.LogLevel = IrssLog.Level.Debug; - IrssLog.Open(Common.FolderIrssLogs + "IR Blast (No Window).log"); + IrssLog.Append(Common.FolderIrssLogs + "IR Blast (No Window).log"); try { Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -3,6 +3,7 @@ using System.Diagnostics; using System.IO; using System.Reflection; +using System.Threading; using System.Windows.Forms; using Microsoft.Win32; @@ -34,30 +35,34 @@ return; } - // Open log file - try - { - // TODO: Change log level to info for release. - IrssLog.LogLevel = IrssLog.Level.Debug; - IrssLog.Open(Common.FolderIrssLogs + "IR Server.log"); - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - return; - } + // TODO: Change log level to info for release. + IrssLog.LogLevel = IrssLog.Level.Debug; + IrssLog.Open(Common.FolderIrssLogs + "IR Server.log"); + Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); + // Start Server IRServer irServer = new IRServer(); if (irServer.Start()) Application.Run(); + Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException); + IrssLog.Close(); - return; } /// <summary> + /// Handles unhandled exceptions. + /// </summary> + /// <param name="sender">Sender.</param> + /// <param name="e">Event args.</param> + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + IrssLog.Error(e.Exception.ToString()); + } + + /// <summary> /// Retreives a list of available IR Server plugins. /// </summary> /// <returns>Array of plugin instances.</returns> Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -81,12 +81,15 @@ void InsertKeystroke(string keystroke) { - string clipboardWas = Clipboard.GetText(); + //string clipboardWas = Clipboard.GetText(); - Clipboard.SetText(keystroke); - textBoxKeys.Paste(); + //Clipboard.SetText(keystroke); + textBoxKeys.Paste(keystroke); - Clipboard.SetText(clipboardWas); + //if (String.IsNullOrEmpty(clipboardWas)) +// Clipboard.SetText(String.Empty); + //else +// Clipboard.SetText(clipboardWas); } private void ButtonMappingForm_Load(object sender, EventArgs e) Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -75,13 +75,13 @@ this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.translatorHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.groupBoxProgram.SuspendLayout(); @@ -573,46 +573,58 @@ this.toolStripSeparator2, this.quitToolStripMenuItem}); this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem"; - this.configurationToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.configurationToolStripMenuItem.Text = "&File"; // // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.newToolStripMenuItem.Text = "&New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.openToolStripMenuItem.Text = "&Open ..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // // importToolStripMenuItem // this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.importToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.importToolStripMenuItem.Text = "&Import ..."; this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click); // // exportToolStripMenuItem // this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exportToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.exportToolStripMenuItem.Text = "&Export ..."; this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(119, 6); + // + // serverToolStripMenuItem + // + this.serverToolStripMenuItem.Name = "serverToolStripMenuItem"; + this.serverToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.serverToolStripMenuItem.Text = "&Server ..."; + this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click); + // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(119, 6); // // quitToolStripMenuItem // this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; - this.quitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.quitToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.quitToolStripMenuItem.Text = "&Quit"; this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); // @@ -622,35 +634,23 @@ this.translatorHelpToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.helpToolStripMenuItem.Text = "&Help"; // // translatorHelpToolStripMenuItem // this.translatorHelpToolStripMenuItem.Name = "translatorHelpToolStripMenuItem"; - this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.translatorHelpToolStripMenuItem.Text = "&Contents"; this.translatorHelpToolStripMenuItem.Click += new System.EventHandler(this.translatorHelpToolStripMenuItem_Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); - // - // serverToolStripMenuItem - // - this.serverToolStripMenuItem.Name = "serverToolStripMenuItem"; - this.serverToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.serverToolStripMenuItem.Text = "&Server ..."; - this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click); - // // openFileDialog // this.openFileDialog.FileName = "openFileDialog1"; Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -105,6 +105,8 @@ IrssLog.LogLevel = IrssLog.Level.Debug; IrssLog.Open(Common.FolderIrssLogs + "Translator.log"); + Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); + _config = Configuration.Load(ConfigFile); if (_config == null) _config = new Configuration(); @@ -161,6 +163,8 @@ //if (_focusWatcher.IsAlive) //_focusWatcher.Abort(); + Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException); + IrssLog.Close(); } @@ -168,6 +172,16 @@ #region Implementation + /// <summary> + /// Handles unhandled exceptions. + /// </summary> + /// <param name="sender">Sender.</param> + /// <param name="e">Event args.</param> + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + IrssLog.Error(e.Exception.ToString()); + } + /*static void FocusWatcherThread() { try @@ -255,11 +269,11 @@ static void ShowTranslatorMenu() { UpdateForegroundWindow(); - + + //Program._mainForm.Focus(); + _notifyIcon.ContextMenuStrip.Show(Screen.PrimaryScreen.Bounds.Width / 4, Screen.PrimaryScreen.Bounds.Height / 4); - - //Win32.SetForegroundWindow(_notifyIcon.ContextMenuStrip.Handle, true); - + //_notifyIcon.ContextMenuStrip.Focus(); } Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.Threading; using System.Windows.Forms; using IrssUtils; @@ -9,7 +10,10 @@ static class Program { - + + /// <summary> + /// The main entry point for the application. + /// </summary> [STAThread] static void Main() { @@ -24,14 +28,28 @@ IrssLog.LogLevel = IrssLog.Level.Debug; IrssLog.Open(Common.FolderIrssLogs + "Tray Launcher.log"); + Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); + Tray tray = new Tray(); if (tray.Start()) Application.Run(); + Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException); + IrssLog.Close(); } + /// <summary> + /// Handles unhandled exceptions. + /// </summary> + /// <param name="sender">Sender.</param> + /// <param name="e">Event args.</param> + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + IrssLog.Error(e.Exception.ToString()); + } + } } Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -535,7 +535,10 @@ { if (Path.GetFileName(process.MainModule.ModuleName).Equals(Path.GetFileName(_programFile), StringComparison.InvariantCultureIgnoreCase)) { - IrssLog.Info("Program already running"); + IrssLog.Info("Program already running, attempting to give focus."); + + Win32.SetForegroundWindow(process.MainWindowHandle, true); + return; } } @@ -545,7 +548,7 @@ // Launch program Process launch = new Process(); launch.StartInfo.FileName = _programFile; - launch.StartInfo.UseShellExecute = true; + launch.StartInfo.UseShellExecute = false; launch.Start(); } catch (Exception ex) Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -88,6 +88,8 @@ IrssLog.LogLevel = IrssLog.Level.Debug; IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote.log"); + Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); + LoadSettings(); if (args.Length > 0) // Command Line Start ... @@ -170,9 +172,21 @@ StopComms(); + Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException); + IrssLog.Close(); } + /// <summary> + /// Handles unhandled exceptions. + /// </summary> + /// <param name="sender">Sender.</param> + /// <param name="e">Event args.</param> + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + IrssLog.Error(e.Exception.ToString()); + } + static void LoadSettings() { try 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-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -279,10 +279,6 @@ private void MainForm_Load(object sender, EventArgs e) { - // TODO: Change log level to info for release. - IrssLog.LogLevel = IrssLog.Level.Debug; - IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote Skin Editor.log"); - UpdateWindowTitle(); comboBoxShortcut.Items.Clear(); Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -1,7 +1,10 @@ using System; using System.Collections.Generic; +using System.Threading; using System.Windows.Forms; +using IrssUtils; + namespace SkinEditor { @@ -16,9 +19,32 @@ { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); + + // TODO: Change log level to info for release. + IrssLog.LogLevel = IrssLog.Level.Debug; + IrssLog.Open(Common.FolderIrssLogs + "Virtual Remote Skin Editor.log"); + + Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException); + + MainForm mainForm = new MainForm(); + + Application.Run(mainForm); + + Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException); + + IrssLog.Close(); } + /// <summary> + /// Handles unhandled exceptions. + /// </summary> + /// <param name="sender">Sender.</param> + /// <param name="e">Event args.</param> + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + IrssLog.Error(e.Exception.ToString()); + } + } } Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -148,7 +148,7 @@ } private void radioButtonWindowTitle_CheckedChanged(object sender, EventArgs e) { - buttonFindMsgTarget.Enabled = false; + buttonFindMsgTarget.Enabled = true; textBoxMsgTarget.Enabled = true; } Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -90,7 +90,7 @@ comboBoxStopBits.Items.Clear(); comboBoxStopBits.Items.AddRange(Enum.GetNames(typeof(StopBits))); - comboBoxStopBits.SelectedIndex = 0; + comboBoxStopBits.SelectedIndex = 1; } private void buttonParamQuestion_Click(object sender, EventArgs e) Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -90,6 +90,46 @@ } } } + + /// <summary> + /// Open a log file to append log entries to. + /// </summary> + /// <param name="fileName">File path, absolute.</param> + public static void Append(string fileName) + { + if (_streamWriter == null && _logLevel > Level.Off) + { + try + { + if (File.Exists(fileName) && File.GetCreationTime(fileName).Ticks < DateTime.Now.Subtract(TimeSpan.FromDays(7)).Ticks) + { + string backup = Path.ChangeExtension(fileName, ".bak"); + + if (File.Exists(backup)) + File.Delete(backup); + + File.Move(fileName, backup); + } + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + + try + { + _streamWriter = new StreamWriter(fileName, true); + _streamWriter.AutoFlush = true; + + string message = DateTime.Now.ToString() + ":\tLog Opened"; + _streamWriter.WriteLine(message); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + } + } /// <summary> /// Close the currently open log file. @@ -100,6 +140,7 @@ { string message = DateTime.Now.ToString() + ":\tLog Closed"; _streamWriter.WriteLine(message); + _streamWriter.WriteLine(); _streamWriter.Close(); _streamWriter = null; Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -6,7 +6,7 @@ { /// <summary> - /// Used for accessing the Windows System Registry + /// Used for accessing the Windows System Registry. /// </summary> public static class SystemRegistry { 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-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -367,45 +367,21 @@ try { doc.Load(ConfigurationFile); } catch { return; } - try { _blasterType = (BlasterType)Enum.Parse(typeof(BlasterType), doc.DocumentElement.Attributes["BlastType"].Value); } - catch { _blasterType = BlasterType.Microsoft; } + try { _blasterType = (BlasterType)Enum.Parse(typeof(BlasterType), doc.DocumentElement.Attributes["BlastType"].Value); } catch {} + try { _learnTimeout = int.Parse(doc.DocumentElement.Attributes["LearnTimeout"].Value); } catch {} - try { _learnTimeout = int.Parse(doc.DocumentElement.Attributes["LearnTimeout"].Value); } - catch { _learnTimeout = 10000; } + try { _enableRemoteInput = bool.Parse(doc.DocumentElement.Attributes["EnableRemoteInput"].Value); } catch {} + try { _remoteFirstRepeat = int.Parse(doc.DocumentElement.Attributes["RemoteFirstRepeat"].Value); } catch {} + try { _remoteHeldRepeats = int.Parse(doc.DocumentElement.Attributes["RemoteHeldRepeats"].Value); } catch {} + try { _enableKeyboardInput = bool.Parse(doc.DocumentElement.Attributes["EnableKeyboardInput"].Value); } catch {} + try { _keyboardFirstRepeat = int.Parse(doc.DocumentElement.Attributes["KeyboardFirstRepeat"].Value); } catch {} + try { _keyboardHeldRepeats = int.Parse(doc.DocumentElement.Attributes["KeyboardHeldRepeats"].Value); } catch {} + try { _handleKeyboardLocally = bool.Parse(doc.DocumentElement.Attributes["HandleKeyboardLocally"].Value); } catch {} - try { _enableRemoteInput = bool.Parse(doc.DocumentElement.Attributes["EnableRemoteInput"].Value); } - catch { _enableRemoteInput = true; } - - try { _remoteFirstRepeat = int.Parse(doc.DocumentElement.Attributes["RemoteFirstRepeat"].Value); } - catch { _remoteFirstRepeat = 400; } - - try { _remoteHeldRepeats = int.Parse(doc.DocumentElement.Attributes["RemoteHeldRepeats"].Value); } - catch { _remoteHeldRepeats = 250; } - - - try { _enableKeyboardInput = bool.Parse(doc.DocumentElement.Attributes["EnableKeyboardInput"].Value); } - catch { _enableKeyboardInput = true; } - - try { _keyboardFirstRepeat = int.Parse(doc.DocumentElement.Attributes["KeyboardFirstRepeat"].Value); } - catch { _keyboardFirstRepeat = 350; } - - try { _keyboardHeldRepeats = int.Parse(doc.DocumentElement.Attributes["KeyboardHeldRepeats"].Value); } - catch { _keyboardHeldRepeats = 0; } - - try { _handleKeyboardLocally = bool.Parse(doc.DocumentElement.Attributes["HandleKeyboardLocally"].Value); } - catch { _handleKeyboardLocally = true; } - - - try { _enableMouseInput = bool.Parse(doc.DocumentElement.Attributes["EnableMouseInput"].Value); } - catch { _enableMouseInput = true; } - - try { _handleMouseLocally = bool.Parse(doc.DocumentElement.Attributes["HandleMouseLocally"].Value); } - catch { _handleMouseLocally = true; } - - try { _mouseSensitivity = double.Parse(doc.DocumentElement.Attributes["MouseSensitivity"].Value); } - catch { _mouseSensitivity = 1.0d; } - + try { _enableMouseInput = bool.Parse(doc.DocumentElement.Attributes["EnableMouseInput"].Value); } catch {} + try { _handleMouseLocally = bool.Parse(doc.DocumentElement.Attributes["HandleMouseLocally"].Value); } catch {} + try { _mouseSensitivity = double.Parse(doc.DocumentElement.Attributes["MouseSensitivity"].Value); } catch {} } void SaveSettings() { @@ -472,7 +448,7 @@ Guid deviceClass; string devicePath = null; - // Try eHome driver ... + // Try XP eHome driver ... deviceClass = new Guid(0x7951772d, 0xcd50, 0x49b7, 0xb1, 0x03, 0x2b, 0xaa, 0xc4, 0x94, 0xfc, 0x57); _replacementDriver = false; try @@ -493,6 +469,17 @@ catch { } } + // Try Vista eHome driver ... + /*if (devicePath == null) + { + deviceClass = new Guid(0x36fc9e60, 0xc465, 0x11cf, 0x80, 0x56, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); + try + { + devicePath = DeviceAccess.FindDevice(deviceClass); + } + catch { } + }*/ + if (devicePath == null) throw new Exception("No MCE Transceiver detected"); @@ -692,7 +679,7 @@ if (_remoteButtonHandler != null) _remoteButtonHandler(keyCode.ToString()); - //Console.WriteLine("Remote button: {0} - {1}", codeType, keyCode); + //String.Format("{0}: {1}", Enum.GetName(typeof(IRProtocol), codeType), keyCode); } void KeyboardEvent(uint keyCode, uint modifiers) { Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-08-19 14:44:46 UTC (rev 846) @@ -2,75 +2,233 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{0C209E91-5AD5-4662-AD0E-976A940D4806}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server", "Applications\IR Server\IR Server.csproj", "{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tray Launcher", "Applications\Tray Launcher\Tray Launcher.csproj", "{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debug Client", "Applications\Debug Client\Debug Client.csproj", "{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Translator", "Applications\Translator\Translator.csproj", "{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtual Remote", "Applications\Virtual Remote\Virtual Remote.csproj", "{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtual Remote Skin Editor", "Applications\Virtual Remote Skin Editor\Virtual Remote Skin Editor.csproj", "{D871AB9A-71B3-4D63-8320-084BAD75064E}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IR Server Plugins", "IR Server Plugins", "{0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IPC", "IPC", "{0E9CCB69-CEF0-4680-816B-18E949DEA727}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "IPC\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "IPC\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Named Pipes", "IPC\Named Pipes\Named Pipes.csproj", "{F4EA6055-7133-4F18-8971-E19ADEB482C1}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaPortal Plugins", "MediaPortal Plugins", "{6C18D808-E5ED-4CFB-A7CD-E2BDBB1D9BDA}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP Control Plugin", "MediaPortal Plugins\MP Control Plugin\MP Control Plugin.csproj", "{E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV2 Blaster Plugin", "MediaPortal Plugins\TV2 Blaster Plugin\TV2 Blaster Plugin.csproj", "{7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV3 Blaster Plugin", "MediaPortal Plugins\TV3 Blaster Plugin\TV3 Blaster Plugin.csproj", "{CD395FC2-70E2-42C4-8A20-5469A0C5EB50}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IgorPlug USB Receiver", "IR Server Plugins\IgorPlug USB Receiver\IgorPlug USB Receiver.csproj", "{A4023992-CCD6-461E-8E14-219A496734C5}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRMan Receiver", "IR Server Plugins\IRMan Receiver\IRMan Receiver.csproj", "{7C686499-7517-4338-8837-7E8617549D9A}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft MCE Transceiver", "IR Server Plugins\Microsoft MCE Transceiver\Microsoft MCE Transceiver.csproj", "{BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "USB-UIRT Transceiver", "IR Server Plugins\USB-UIRT Transceiver\USB-UIRT Transceiver.csproj", "{99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Windows Message Receiver", "IR Server Plugins\Windows Message Receiver\Windows Message Receiver.csproj", "{4CBA81F9-F0C2-4242-8D72-204597285042}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XBCDRC Receiver", "IR Server Plugins\XBCDRC Receiver\XBCDRC Receiver.csproj", "{2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP Blast Zone Plugin", "MediaPortal Plugins\MP Blast Zone Plugin\MP Blast Zone Plugin.csproj", "{907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRTrans Transceiver", "IR Server Plugins\IRTrans Transceiver\IRTrans Transceiver.csproj", "{883913F6-F4A7-4DE2-846A-C2102FAF499E}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X10 Transceiver", "IR Server Plugins\X10 Transceiver\X10 Transceiver.csproj", "{253FFB14-AB8E-49AB-A005-A42428C3F452}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FusionREMOTE Receiver", "IR Server Plugins\FusionRemote Receiver\FusionREMOTE Receiver.csproj", "{9FDD649E-0502-4FED-9AC1-AA0346394375}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{E757F80C-23C5-4AD6-B178-16799E337E03}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrssUtils", "Common\IrssUtils\IrssUtils.csproj", "{CA15769C-232E-4CA7-94FD-206A06CA3ABB}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MPUtils", "Common\MPUtils\MPUtils.csproj", "{08F57DD7-2C6E-484E-9CC5-835F70C5BC64}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server Plugin Interface", "IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj", "{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinLirc Receiver", "IR Server Plugins\WinLirc Receiver\WinLirc Receiver.csproj", "{E6A68244-8C31-44A9-9F85-B4A102B5F209}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Custom HID Receiver", "IR Server Plugins\Custom HID Receiver\Custom HID Receiver.csproj", "{0F6576B4-C88E-4E79-B7E9-9480498C5A32}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Blast", "Applications\IR Blast\IR Blast.csproj", "{C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Blast (No Window)", "Applications\IR Blast (No Window)\IR Blast (No Window).csproj", "{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IrssComms", "Common\IrssComms\IrssComms.csproj", "{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sage Setup", "Applications\SageSetup\Sage Setup.csproj", "{905131F8-F8AC-4A65-A722-37783902D7B8}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SMS Keyboard", "Applications\SMS Keyboard\SMS Keyboard.csproj", "{A533F58F-2402-47CF-A258-377A669DB56F}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR File Tool", "Applications\IR File Tool\IR File Tool.csproj", "{B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -306,11 +464,32 @@ {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|x86.ActiveCfg = Release|x86 {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|x86.Build.0 = Release|x86 {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|x86.ActiveCfg = Debug|Any CPU {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|Any CPU.Build.0 = Release|Any CPU {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|x86.ActiveCfg = Release|Any CPU + {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|x86.ActiveCfg = Debug|x86 + {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|x86.Build.0 = Debug|x86 + {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|Any CPU.Build.0 = Release|Any CPU + {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|x86.ActiveCfg = Release|x86 + {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|x86.Build.0 = Release|x86 + {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|x86.ActiveCfg = Debug|x86 + {A533F58F-2402-47CF-A258-377A669DB56F}.Debug|x86.Build.0 = Debug|x86 + {A533F58F-2402-47CF-A258-377A669DB56F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A533F58F-2402-47CF-A258-377A669DB56F}.Release|Any CPU.Build.0 = Release|Any CPU + {A533F58F-2402-47CF-A258-377A669DB56F}.Release|x86.ActiveCfg = Release|x86 + {A533F58F-2402-47CF-A258-377A669DB56F}.Release|x86.Build.0 = Release|x86 + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|x86.ActiveCfg = Debug|Any CPU + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|Any CPU.Build.0 = Release|Any CPU + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|x86.ActiveCfg = Release|x86 + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -324,6 +503,9 @@ {D871AB9A-71B3-4D63-8320-084BAD75064E} = {0C209E91-5AD5-4662-AD0E-976A940D4806} {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB} = {0C209E91-5AD5-4662-AD0E-976A940D4806} {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {905131F8-F8AC-4A65-A722-37783902D7B8} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {A533F58F-2402-47CF-A258-377A669DB56F} = {0C209E91-5AD5-4662-AD0E-976A940D4806} + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D} = {0C209E91-5AD5-4662-AD0E-976A940D4806} {A4023992-CCD6-461E-8E14-219A496734C5} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} {7C686499-7517-4338-8837-7E8617549D9A} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD} 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-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -862,6 +862,11 @@ string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length)); BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); } + else if (command.StartsWith(Common.CmdPrefixSTB)) // STB IR Code + { + string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixSTB.Length)); + BlastIR(Common.FolderSTB + commands[0], commands[1]); + } else if (command.StartsWith(Common.CmdPrefixRun)) // External Program { string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length)); 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-08-18 00:46:02 UTC (rev 845) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2007-08-19 14:44:46 UTC (rev 846) @@ -802,6 +802,11 @@ string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length)); BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); } + else if (command.StartsWith(Common.CmdPrefixSTB)) // STB IR Code + { + string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixSTB.Length)); + BlastIR(Common.FolderSTB + commands[0], commands[1]); + } else if (command.StartsWith(Common.CmdPrefixRun)) // External Program { string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Sourc... [truncated message content] |