Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1437] trunk/plugins
|
From: <an...@us...> - 2008-03-08 13:45:56
|
Revision: 1437
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1437&view=rev
Author: and-81
Date: 2008-03-08 05:45:51 -0800 (Sat, 08 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs
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 File Tool/FormMain.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/Pronto.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
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 (PocketPC2003)/Client.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/FormMain.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/IrssMessage.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/ServerAddress.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Virtual Remote (PocketPC2003).csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Client.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/FormMain.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/IrssMessage.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/ServerAddress.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Virtual Remote (Smartphone2003).csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Client.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/FormMain.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/IrssMessage.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Virtual Remote (WinCE5).csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Setup.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Display.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Exceptions/CommandExecutionException.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Exceptions/CommandStructureException.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Exceptions/MacroStructureException.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssMacro.cs
trunk/plugins/IR Server Suite/Common/MPUtils/Forms/GoToScreen.cs
trunk/plugins/IR Server Suite/Common/MPUtils/Forms/MPAction.cs
trunk/plugins/IR Server Suite/Common/MPUtils/Forms/MPMessage.cs
trunk/plugins/IR Server Suite/Common/MPUtils/MPCommon.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/GirderPluginWrapper.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/RawInput.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Setup.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WiimoteLib/HIDImports.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/CreateIRFile.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Configure.cs
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/Input Service/Input Service/InputService.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.Designer.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MultiMapNameBox.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/ExternalChannels.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/ExternalChannels.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs
trunk/plugins/MCEReplacement/Forms/LearnIR.cs
trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
trunk/plugins/MCEReplacement/Forms/MultiMapNameBox.cs
trunk/plugins/MCEReplacement/Forms/SetupForm.cs
trunk/plugins/MCEReplacement/Forms/StbSetup.cs
trunk/plugins/MCEReplacement/MCEReplacement.cs
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -23,6 +23,8 @@
public partial class MainForm : Form
{
+ #region Constants
+
/*
static readonly string[] AbstractButtons = new string[] {
@@ -101,7 +103,10 @@
static readonly string AbstractRemoteMapFolder = Path.Combine(Common.FolderAppData, "Input Service\\Abstract Remote Maps");
static readonly string AbstractRemoteSchemaFile = Path.Combine(Common.FolderAppData, "Input Service\\Abstract Remote Maps\\RemoteTable.xsd");
+ #endregion Constants
+ #region Enumerations
+
public enum AbstractButton
{
Up,
@@ -173,6 +178,7 @@
PageDown,
}
+ #endregion Enumerations
#region Variables
@@ -182,7 +188,7 @@
bool _registered;
- IRServerInfo _irServerInfo = new IRServerInfo();
+ //IRServerInfo _irServerInfo = new IRServerInfo();
string[] _devices;
string _selectedDevice;
@@ -215,6 +221,7 @@
textBoxRemoteName.Text = devices[0];
}
+ #region Constructor
public MainForm()
{
@@ -271,6 +278,9 @@
*/
}
+ #endregion Constructor
+
+
private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
{
buttonDisconnect_Click(null, null);
@@ -294,7 +304,7 @@
if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
{
_registered = true;
- _irServerInfo = IRServerInfo.FromBytes(received.GetDataAsBytes());
+ //_irServerInfo = IRServerInfo.FromBytes(received.GetDataAsBytes());
_client.Send(new IrssMessage(MessageType.ActiveReceivers, MessageFlags.Request));
_client.Send(new IrssMessage(MessageType.ActiveBlasters, MessageFlags.Request));
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.IO;
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -71,8 +71,6 @@
#endif
IrssLog.Append("Dbox Tuner.log");
- // TODO: Add standard IRSS logging ...
-
if (args.Length != 1)
{
Console.WriteLine("Usage:");
@@ -87,13 +85,13 @@
{
int channelNumber;
if (!int.TryParse(args[0], out channelNumber))
- throw new ApplicationException(String.Format("Failed to convert command line parameter ({0}) to channel number", args[0]));
+ throw new ArgumentException(String.Format("Failed to convert command line parameter ({0}) to channel number", args[0]));
Info("Attempting to tune channel {0} ...", channelNumber);
int returnValue = UIR_Open(0, 0);
if (returnValue == 0)
- throw new ApplicationException(String.Format("Failed to start device access ({0})", returnValue));
+ throw new InvalidOperationException(String.Format("Failed to start device access ({0})", returnValue));
else
deviceOpen = true;
@@ -112,18 +110,13 @@
}
else
{
- throw new ApplicationException(String.Format("Failed to retrieve device configuration ({0})", returnValue));
+ throw new InvalidOperationException(String.Format("Failed to retrieve device configuration ({0})", returnValue));
}
returnValue = UIR_GotoChannel(config.d, config.f, channelNumber);
if (returnValue == 0)
- throw new ApplicationException(String.Format("Failed to tune channel ({0})", returnValue));
+ throw new InvalidOperationException(String.Format("Failed to tune channel ({0})", returnValue));
}
- catch (ApplicationException ex)
- {
- Info("Error: {0}", ex.Message);
- return ReturnError;
- }
catch (Exception ex)
{
Info(ex.ToString());
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.IO;
using System.Net;
using System.Net.Sockets;
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 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.IO;
using System.Net;
using System.Net.Sockets;
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -68,7 +68,7 @@
else
this.Text = "IR File Tool - " + _fileName;
- textBoxPronto.Text = Encoding.ASCII.GetString(_code.ToByteArray(true));
+ textBoxPronto.Text = Encoding.ASCII.GetString(_code.ToByteArray());
switch (_code.Carrier)
{
@@ -543,7 +543,7 @@
this.Invoke(new UpdateWindowDel(UpdateWindow), new string[] { "Blasting ..." });
string port = comboBoxPort.Text;
- byte[] codeBytes = _code.ToByteArray(true);
+ byte[] codeBytes = _code.ToByteArray();
byte[] outData = new byte[4 + port.Length + codeBytes.Length];
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -30,9 +30,9 @@
public const int CarrierFrequencyDefault = 36000;
/// <summary>
- /// How long the longest IR Code space should be (microseconds).
+ /// How long the longest IR Code space should be (in microseconds).
/// </summary>
- const int LongestSpace = -100000;
+ const int LongestSpace = -75000;
#endregion Constants
@@ -89,8 +89,8 @@
if (_timingData.Length == 0)
return false;
+ // Find long spaces and trim the IR code ...
List<int> newData = new List<int>();
-
foreach (int time in _timingData)
{
if (time <= LongestSpace)
@@ -152,34 +152,18 @@
/// <summary>
/// Creates a byte array representation of this IR Code.
/// </summary>
- /// <param name="asPronto">Set this parameter true to convert the IR Code into Pronto format.</param>
- /// <returns>Byte array representation.</returns>
- public byte[] ToByteArray(bool asPronto)
+ /// <returns>Byte array representation (internally it is in Pronto format).</returns>
+ public byte[] ToByteArray()
{
StringBuilder output = new StringBuilder();
- if (asPronto)
- {
- ushort[] prontoData = Pronto.ConvertIrCodeToProntoRaw(this);
+ ushort[] prontoData = Pronto.ConvertIrCodeToProntoRaw(this);
- for (int index = 0; index < prontoData.Length; index++)
- {
- output.Append(prontoData[index].ToString("X4"));
- if (index != prontoData.Length - 1)
- output.Append(' ');
- }
- }
- else // Native format (only benefit is a slightly more accurate Carrier Frequency)
+ for (int index = 0; index < prontoData.Length; index++)
{
- output.Append("MCE,");
- output.AppendFormat("{0},", _carrier);
-
- for (int index = 0; index < _timingData.Length; index++)
- {
- output.Append(_timingData[index]);
- if (index != _timingData.Length - 1)
- output.Append(',');
- }
+ output.Append(prontoData[index].ToString("X4"));
+ if (index != prontoData.Length - 1)
+ output.Append(' ');
}
return Encoding.ASCII.GetBytes(output.ToString());
@@ -219,37 +203,30 @@
if (len != 0)
timingData.Add(len * 50);
- // Seems some old files have excessively long delays in them .. this might fix that problem ...
IrCode newCode = new IrCode(timingData.ToArray());
- newCode.FinalizeData();
+ newCode.FinalizeData(); // Seems some old files have excessively long delays in them .. this might fix that problem ...
return newCode;
}
/// <summary>
- /// Create an IrCode object from Native file bytes.
+ /// Creates an IrCode object from Pronto format file bytes.
/// </summary>
/// <param name="data">IR file bytes.</param>
/// <returns>New IrCode object.</returns>
- static IrCode FromNativeData(string data)
+ static IrCode FromProntoData(byte[] data)
{
- if (String.IsNullOrEmpty(data))
- throw new ArgumentNullException("data");
+ string code = Encoding.ASCII.GetString(data);
- string[] elements = data.Split(new char[] { ',' });
+ string[] stringData = code.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
- if (elements.Length < 3)
- throw new ApplicationException("Invalid native IR file data");
+ ushort[] prontoData = new ushort[stringData.Length];
+ for (int i = 0; i < stringData.Length; i++)
+ prontoData[i] = ushort.Parse(stringData[i], System.Globalization.NumberStyles.HexNumber);
- IrCode newCode = new IrCode();
- newCode.Carrier = int.Parse(elements[1]);
+ IrCode newCode = Pronto.ConvertProntoDataToIrCode(prontoData);
+ newCode.FinalizeData(); // Seems some old files have excessively long delays in them .. this might fix that problem ...
- int[] timingData = new int[elements.Length - 2];
- for (int index = 2; index < elements.Length; index++)
- timingData[index - 2] = int.Parse(elements[index]);
-
- newCode.TimingData = timingData;
-
return newCode;
}
@@ -261,27 +238,9 @@
public static IrCode FromByteArray(byte[] data)
{
if (data[4] == ' ')
- {
- string code = Encoding.ASCII.GetString(data);
-
- string[] stringData = code.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-
- ushort[] prontoData = new ushort[stringData.Length];
- for (int i = 0; i < stringData.Length; i++)
- prontoData[i] = ushort.Parse(stringData[i], System.Globalization.NumberStyles.HexNumber);
-
- return Pronto.ConvertProntoDataToIrCode(prontoData);
- }
- else if (data[0] == 'M' && data[1] == 'C' && data[2] == 'E')
- {
- string code = Encoding.ASCII.GetString(data);
-
- return FromNativeData(code);
- }
+ return FromProntoData(data);
else
- {
return FromOldData(data);
- }
}
#endregion Static Methods
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/Pronto.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/Pronto.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/Pronto.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -97,6 +97,11 @@
}
}
+ /// <summary>
+ /// Converts an IR Code represented in Pronto data to an IrCode object.
+ /// </summary>
+ /// <param name="prontoData">The Pronto data to convert.</param>
+ /// <returns>IrCode object of interpretted Pronto data.</returns>
public static IrCode ConvertProntoDataToIrCode(ushort[] prontoData)
{
if (prontoData == null || prontoData.Length == 0)
@@ -530,6 +535,24 @@
return new IrCode(ConvertFromProntoCarrier(prontoCarrier), timingData.ToArray());
}
+ /*
+ public static ushort[] ConvertIrCodeToPronto(IrCode irCode)
+ {
+ CodeType codeType;
+ Int64 value;
+
+ if (Decode(irCode, out codeType, out value))
+ return EncodePronto(codeType, value);
+ else
+ return null;
+ }
+ */
+
+ /// <summary>
+ /// Converts the ir code into Pronto raw format.
+ /// </summary>
+ /// <param name="irCode">The ir code to convert.</param>
+ /// <returns>Pronto data (raw format).</returns>
public static ushort[] ConvertIrCodeToProntoRaw(IrCode irCode)
{
List<ushort> prontoData = new List<ushort>();
@@ -580,11 +603,21 @@
return prontoData.ToArray();
}
+ /// <summary>
+ /// Converts from a Pronto format carrier frequency to an integer format.
+ /// </summary>
+ /// <param name="prontoCarrier">The Pronto format carrier.</param>
+ /// <returns>The carrier frequency as an integer number.</returns>
public static int ConvertFromProntoCarrier(ushort prontoCarrier)
{
return (int)(1000000 / (prontoCarrier * ProntoClock));
}
+ /// <summary>
+ /// Converts from an integer number carrier frequency to a Pronto carrier format.
+ /// </summary>
+ /// <param name="carrierFrequency">The integer carrier frequency.</param>
+ /// <returns>The carrier frequency in Pronto format.</returns>
public static ushort ConvertToProntoCarrier(int carrierFrequency)
{
return (ushort)(1000000 / (carrierFrequency * ProntoClock));
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -39,8 +39,15 @@
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.groupBoxAbstractRemoteModel = new System.Windows.Forms.GroupBox();
+ this.buttonExclusions = new System.Windows.Forms.Button();
this.checkBoxAbstractRemoteMode = new System.Windows.Forms.CheckBox();
+ this.groupBoxPriority = new System.Windows.Forms.GroupBox();
+ this.labelPriority = new System.Windows.Forms.Label();
+ this.comboBoxPriority = new System.Windows.Forms.ComboBox();
this.groupBoxMode.SuspendLayout();
+ this.groupBoxAbstractRemoteModel.SuspendLayout();
+ this.groupBoxPriority.SuspendLayout();
this.SuspendLayout();
//
// groupBoxMode
@@ -126,10 +133,10 @@
//
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(328, 136);
+ this.buttonCancel.Location = new System.Drawing.Point(328, 272);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(64, 24);
- this.buttonCancel.TabIndex = 2;
+ this.buttonCancel.TabIndex = 4;
this.buttonCancel.Text = "Cancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
@@ -137,47 +144,109 @@
// 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(256, 136);
+ this.buttonOK.Location = new System.Drawing.Point(256, 272);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(64, 24);
- this.buttonOK.TabIndex = 1;
+ this.buttonOK.TabIndex = 3;
this.buttonOK.Text = "OK";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
+ // groupBoxAbstractRemoteModel
+ //
+ this.groupBoxAbstractRemoteModel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxAbstractRemoteModel.Controls.Add(this.buttonExclusions);
+ this.groupBoxAbstractRemoteModel.Controls.Add(this.checkBoxAbstractRemoteMode);
+ this.groupBoxAbstractRemoteModel.Location = new System.Drawing.Point(8, 136);
+ this.groupBoxAbstractRemoteModel.Name = "groupBoxAbstractRemoteModel";
+ this.groupBoxAbstractRemoteModel.Size = new System.Drawing.Size(384, 56);
+ this.groupBoxAbstractRemoteModel.TabIndex = 1;
+ this.groupBoxAbstractRemoteModel.TabStop = false;
+ this.groupBoxAbstractRemoteModel.Text = "Abstract Remote Model";
+ //
+ // buttonExclusions
+ //
+ this.buttonExclusions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonExclusions.Enabled = false;
+ this.buttonExclusions.Location = new System.Drawing.Point(296, 24);
+ this.buttonExclusions.Name = "buttonExclusions";
+ this.buttonExclusions.Size = new System.Drawing.Size(80, 24);
+ this.buttonExclusions.TabIndex = 1;
+ this.buttonExclusions.Text = "Exclusions";
+ this.toolTips.SetToolTip(this.buttonExclusions, "Configure Abstract Remote Model exclusions");
+ this.buttonExclusions.UseVisualStyleBackColor = true;
+ this.buttonExclusions.Click += new System.EventHandler(this.buttonExclusions_Click);
+ //
// checkBoxAbstractRemoteMode
//
- this.checkBoxAbstractRemoteMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.checkBoxAbstractRemoteMode.AutoSize = true;
- this.checkBoxAbstractRemoteMode.Location = new System.Drawing.Point(8, 136);
+ this.checkBoxAbstractRemoteMode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.checkBoxAbstractRemoteMode.Location = new System.Drawing.Point(16, 24);
this.checkBoxAbstractRemoteMode.Name = "checkBoxAbstractRemoteMode";
- this.checkBoxAbstractRemoteMode.Size = new System.Drawing.Size(159, 17);
- this.checkBoxAbstractRemoteMode.TabIndex = 3;
- this.checkBoxAbstractRemoteMode.Text = "Use Abstract Remote Model";
+ this.checkBoxAbstractRemoteMode.Size = new System.Drawing.Size(264, 24);
+ this.checkBoxAbstractRemoteMode.TabIndex = 0;
+ this.checkBoxAbstractRemoteMode.Text = "Use the Abstract Remote Model";
this.toolTips.SetToolTip(this.checkBoxAbstractRemoteMode, "Enable automatic abstract remote model translation");
this.checkBoxAbstractRemoteMode.UseVisualStyleBackColor = true;
+ this.checkBoxAbstractRemoteMode.CheckedChanged += new System.EventHandler(this.checkBoxAbstractRemoteMode_CheckedChanged);
//
+ // groupBoxPriority
+ //
+ this.groupBoxPriority.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxPriority.Controls.Add(this.labelPriority);
+ this.groupBoxPriority.Controls.Add(this.comboBoxPriority);
+ this.groupBoxPriority.Location = new System.Drawing.Point(8, 200);
+ this.groupBoxPriority.Name = "groupBoxPriority";
+ this.groupBoxPriority.Size = new System.Drawing.Size(384, 56);
+ this.groupBoxPriority.TabIndex = 2;
+ this.groupBoxPriority.TabStop = false;
+ this.groupBoxPriority.Text = "Process Priority";
+ //
+ // labelPriority
+ //
+ this.labelPriority.Location = new System.Drawing.Point(8, 21);
+ this.labelPriority.Name = "labelPriority";
+ this.labelPriority.Size = new System.Drawing.Size(88, 24);
+ this.labelPriority.TabIndex = 0;
+ this.labelPriority.Text = "Set Priority:";
+ this.labelPriority.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // comboBoxPriority
+ //
+ this.comboBoxPriority.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBoxPriority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxPriority.FormattingEnabled = true;
+ this.comboBoxPriority.Location = new System.Drawing.Point(104, 24);
+ this.comboBoxPriority.Name = "comboBoxPriority";
+ this.comboBoxPriority.Size = new System.Drawing.Size(272, 21);
+ this.comboBoxPriority.TabIndex = 1;
+ //
// Advanced
//
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(398, 167);
- this.Controls.Add(this.checkBoxAbstractRemoteMode);
+ this.ClientSize = new System.Drawing.Size(400, 304);
+ this.Controls.Add(this.groupBoxPriority);
+ this.Controls.Add(this.groupBoxAbstractRemoteModel);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.Controls.Add(this.groupBoxMode);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(406, 194);
+ this.MinimumSize = new System.Drawing.Size(406, 336);
this.Name = "Advanced";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "IR Server - Advanced Configuration";
this.groupBoxMode.ResumeLayout(false);
this.groupBoxMode.PerformLayout();
+ this.groupBoxAbstractRemoteModel.ResumeLayout(false);
+ this.groupBoxPriority.ResumeLayout(false);
this.ResumeLayout(false);
- this.PerformLayout();
}
@@ -192,6 +261,11 @@
private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.ToolTip toolTips;
+ private System.Windows.Forms.GroupBox groupBoxAbstractRemoteModel;
+ private System.Windows.Forms.Button buttonExclusions;
private System.Windows.Forms.CheckBox checkBoxAbstractRemoteMode;
+ private System.Windows.Forms.GroupBox groupBoxPriority;
+ private System.Windows.Forms.Label labelPriority;
+ private System.Windows.Forms.ComboBox comboBoxPriority;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
+using System.Diagnostics;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
@@ -56,7 +56,19 @@
get { return comboBoxComputer.Text; }
set { comboBoxComputer.Text = value; }
}
+ public string ProcessPriority
+ {
+ get
+ {
+ return comboBoxPriority.SelectedText;
+ }
+ set
+ {
+ comboBoxPriority.SelectedItem = value;
+ }
+ }
+
#endregion Properties
#region Constructor
@@ -68,6 +80,10 @@
List<string> networkPCs = Network.GetComputers(false);
if (networkPCs != null)
comboBoxComputer.Items.AddRange(networkPCs.ToArray());
+
+ comboBoxPriority.Items.Add("No Change");
+ comboBoxPriority.Items.AddRange(Enum.GetNames(typeof(ProcessPriorityClass)));
+ comboBoxPriority.SelectedIndex = 0;
}
#endregion Constructor
@@ -85,6 +101,19 @@
this.Close();
}
+ private void buttonExclusions_Click(object sender, EventArgs e)
+ {
+ /*
+ Exclusions exclusions = new Exclusions(new string[] { "plugin1", "plugin2", "plugin3" });
+ exclusions.ExclusionList = new string[] { "plugin1" };
+
+ if (exclusions.ShowDialog(this) == DialogResult.OK)
+ {
+
+ }
+ */
+ }
+
private void radioButtonServer_CheckedChanged(object sender, EventArgs e)
{
comboBoxComputer.Enabled = false;
@@ -98,7 +127,13 @@
comboBoxComputer.Enabled = true;
}
+ private void checkBoxAbstractRemoteMode_CheckedChanged(object sender, EventArgs e)
+ {
+ //buttonExclusions.Enabled = checkBoxAbstractRemoteMode.Checked;
+ }
+
#endregion Controls
+
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Drawing;
using System.IO;
using System.Runtime.InteropServices;
@@ -250,7 +249,11 @@
// Setup Column Headers
gridPlugins.Rows.Insert(row);
- gridPlugins[row, ColIcon] = new SourceGrid.Cells.ColumnHeader(" ");
+
+ SourceGrid.Cells.ColumnHeader header = new SourceGrid.Cells.ColumnHeader(" ");
+ header.AutomaticSortEnabled = false;
+ gridPlugins[row, ColIcon] = header;
+
gridPlugins[row, ColName] = new SourceGrid.Cells.ColumnHeader("Name");
gridPlugins[row, ColReceive] = new SourceGrid.Cells.ColumnHeader("Receive");
gridPlugins[row, ColTransmit] = new SourceGrid.Cells.ColumnHeader("Transmit");
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -146,7 +146,7 @@
if (plugin.Name.Equals(pluginName, StringComparison.OrdinalIgnoreCase))
return plugin;
- throw new ApplicationException(String.Format("Plugin not found ({0})", pluginName));
+ throw new InvalidOperationException(String.Format("Plugin not found ({0})", pluginName));
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -38,7 +38,7 @@
static extern int UnhookWindowsHookEx(IntPtr hhook);
[DllImport("user32.dll")]
- static extern int CallNextHookEx(IntPtr hhook, int code, int wParam, IntPtr lParam);
+ static extern IntPtr CallNextHookEx(IntPtr hhook, int code, int wParam, IntPtr lParam);
[DllImport("kernel32.dll")]
static extern IntPtr LoadLibrary(string lpFileName);
@@ -47,7 +47,7 @@
#region Delegates
- delegate int HookDelegate(int code, int wParam, IntPtr lParam);
+ delegate IntPtr HookDelegate(int code, int wParam, IntPtr lParam);
#endregion Delegates
@@ -416,6 +416,9 @@
_notifyIcon.Text = "Keyboard Input Relay - Connecting ...";
_notifyIcon.ContextMenuStrip = new ContextMenuStrip();
+
+ _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripLabel("Keyboard Input Relay"));
+ _notifyIcon.ContextMenuStrip.Items.Add(new ToolStripSeparator());
_notifyIcon.ContextMenuStrip.Items.Add("&Setup", null, new EventHandler(NotifyIcon_ClickSetup));
_notifyIcon.ContextMenuStrip.Items.Add("&Quit", null, new EventHandler(NotifyIcon_ClickQuit));
@@ -456,7 +459,7 @@
_libPtr = IntPtr.Zero;
}
- static int InternalHookDelegate(int code, int wParam, IntPtr lParam)
+ static IntPtr InternalHookDelegate(int code, int wParam, IntPtr lParam)
{
try
{
@@ -498,7 +501,7 @@
}
if (_stealAppCommands && appCommand != AppCommands.None)
- return 1;
+ return new IntPtr(1);
}
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.IO;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.IO;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,6 +1,5 @@
using System;
using System.ComponentModel;
-using System.Data;
using System.Drawing;
using System.Text;
using System.Threading;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
#if TRACE
using System.Diagnostics;
#endif
@@ -277,7 +276,7 @@
}
else
{
- throw new ApplicationException(String.Format("Unknown macro command ({0})", selected));
+ throw new IrssUtils.Exceptions.CommandStructureException(String.Format("Unknown macro command ({0})", selected));
}
if (!String.IsNullOrEmpty(newCommand))
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.IO;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
#if TRACE
using System.Diagnostics;
#endif
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -994,7 +994,7 @@
internal static void BlastIR(string fileName, string port)
{
if (!_registered)
- throw new ApplicationException("Cannot Blast, not registered to an active Input Service");
+ throw new InvalidOperationException("Cannot Blast, not registered to an active Input Service");
using (FileStream file = File.OpenRead(fileName))
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2008-03-08 13:45:51 UTC (rev 1437)
@@ -166,6 +166,9 @@
<None Include="Icon16Connecting.ico" />
</ItemGroup>
<ItemGroup>
+ <Content Include="Default Settings\GBPVR.exe.xml" />
+ <Content Include="Default Settings\Meedio.exe.xml" />
+ <Content Include="Default Settings\PVRX2.exe.xml" />
<Content Include="Graphics\ClickLeft.png" />
<Content Include="Graphics\ClickMiddle.png" />
<Content Include="Graphics\ClickRight.png" />
@@ -184,9 +187,6 @@
<Content Include="Graphics\Shortcut.png" />
<Content Include="Graphics\WinLogo.png" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="Default Settings\" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,6 +1,5 @@
using System;
using System.ComponentModel;
-using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Security;
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -1,6 +1,5 @@
using System;
using System.ComponentModel;
-using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.IO;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Drawing;
using System.IO;
using System.Net;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Data;
using System.Drawing;
using System.IO;
using System.Net;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Client.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Client.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Client.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -13,14 +13,14 @@
/// Message handling delegate for client.
/// </summary>
/// <param name="message">Message received.</param>
- public delegate void ClientMessageSink(IrssMessage message);
+ delegate void ClientMessageSink(IrssMessage message);
#endregion Delegates
/// <summary>
/// TCP communications client class.
/// </summary>
- public class Client : IDisposable
+ class Client : IDisposable
{
#region Variables
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/FormMain.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/FormMain.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -22,7 +22,7 @@
#region Constants
- static readonly string ConfigurationFile = "VirtualRemote.xml";
+ const string ConfigurationFile = "VirtualRemote.xml";
const int ServerPort = 24000;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/IrssMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/IrssMessage.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/IrssMessage.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -9,7 +9,7 @@
/// <summary>
/// Type of message.
/// </summary>
- public enum MessageType
+ enum MessageType
{
/// <summary>
/// Unknown message type.
@@ -117,7 +117,7 @@
/// Flags to determine more information about the message.
/// </summary>
[Flags]
- public enum MessageFlags
+ enum MessageFlags
{
/// <summary>
/// No Flags.
@@ -168,7 +168,7 @@
/// <summary>
/// Message class for passing over network.
/// </summary>
- public class IrssMessage
+ class IrssMessage
{
#region Members
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -32,3 +32,4 @@
//
[assembly: AssemblyVersion("1.0.4.2")]
+[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/ServerAddress.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/ServerAddress.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/ServerAddress.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -8,7 +8,7 @@
/// <summary>
/// Server Address form.
/// </summary>
- public partial class ServerAddress : Form
+ partial class ServerAddress : Form
{
#region Properties
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Virtual Remote (PocketPC2003).csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Virtual Remote (PocketPC2003).csproj 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Virtual Remote (PocketPC2003).csproj 2008-03-08 13:45:51 UTC (rev 1437)
@@ -34,7 +34,8 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\VirtualRemote.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Client.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Client.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Client.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -13,14 +13,14 @@
/// Message handling delegate for client.
/// </summary>
/// <param name="message">Message received.</param>
- public delegate void ClientMessageSink(IrssMessage message);
+ delegate void ClientMessageSink(IrssMessage message);
#endregion Delegates
/// <summary>
/// TCP communications client class.
/// </summary>
- public class Client : IDisposable
+ class Client : IDisposable
{
#region Variables
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/FormMain.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/FormMain.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -23,7 +23,7 @@
#region Constants
- static readonly string ConfigurationFile = "VirtualRemote.xml";
+ const string ConfigurationFile = "VirtualRemote.xml";
const int ServerPort = 24000;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/IrssMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/IrssMessage.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/IrssMessage.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -9,7 +9,7 @@
/// <summary>
/// Type of message.
/// </summary>
- public enum MessageType
+ enum MessageType
{
/// <summary>
/// Unknown message type.
@@ -117,7 +117,7 @@
/// Flags to determine more information about the message.
/// </summary>
[Flags]
- public enum MessageFlags
+ enum MessageFlags
{
/// <summary>
/// No Flags.
@@ -168,7 +168,7 @@
/// <summary>
/// Message class for passing over network.
/// </summary>
- public class IrssMessage
+ class IrssMessage
{
#region Members
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -30,3 +30,5 @@
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.4.2")]
+
+[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/ServerAddress.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/ServerAddress.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/ServerAddress.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -12,7 +12,7 @@
/// <summary>
/// Summary description for ServerAddress.
/// </summary>
- public class ServerAddress : Form
+ class ServerAddress : Form
{
private MainMenu mainMenu;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Virtual Remote (Smartphone2003).csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Virtual Remote (Smartphone2003).csproj 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Virtual Remote (Smartphone2003).csproj 2008-03-08 13:45:51 UTC (rev 1437)
@@ -31,7 +31,8 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\VirtualRemote.xml</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Client.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Client.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Client.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -13,14 +13,14 @@
/// Message handling delegate for client.
/// </summary>
/// <param name="message">Message received.</param>
- public delegate void ClientMessageSink(IrssMessage message);
+ delegate void ClientMessageSink(IrssMessage message);
#endregion Delegates
/// <summary>
/// TCP communications client class.
/// </summary>
- public class Client : IDisposable
+ class Client : IDisposable
{
#region Variables
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/FormMain.cs 2008-03-08 10:05:03 UTC (rev 1436)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/FormMain.cs 2008-03-08 13:45:51 UTC (rev 1437)
@@ -22,7 +22,7 @@
#region Constants
- static readonly string ConfigurationFile = "VirtualRemote.xml";
+ const string ConfigurationFile = "VirtualRemote.xml";
const int ServerPort = 24000;
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/IrssMessage.cs
=================================...
[truncated message content] |
