Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1145] trunk/plugins
|
From: <an...@us...> - 2007-12-11 14:47:44
|
Revision: 1145
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1145&view=rev
Author: and-81
Date: 2007-12-11 06:47:41 -0800 (Tue, 11 Dec 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Documentation/Plugins/stb.html
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.Designer.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.resx
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -21,7 +21,7 @@
None,
/// <summary>
- /// Daewoo protocol.
+ /// Daewoo protocol. 38kHz carrier.
/// </summary>
Daewoo,
/// <summary>
@@ -29,75 +29,79 @@
/// </summary>
ITT,
/// <summary>
- /// JVC protocol.
+ /// JVC protocol. 38kHz carrier.
/// </summary>
JVC,
/// <summary>
- /// Matsushita protocol.
+ /// Matsushita protocol. 56.8kHz carrier.
/// </summary>
Matsushita,
/// <summary>
- /// Mitsubishi protocol.
+ /// Mitsubishi protocol. 40kHz carrier.
/// </summary>
Mitsubishi,
/// <summary>
- /// NEC protocol.
+ /// NEC protocol. 38kHz carrier.
/// </summary>
NEC,
/// <summary>
- /// Nokia NRC17 protocol.
+ /// Nokia NRC17 protocol. 38kHz carrier.
/// </summary>
NRC17,
/// <summary>
- /// Panasonic protocol.
+ /// Panasonic protocol. 38kHz carrier.
/// </summary>
Panasonic,
/// <summary>
- /// Philips RC5 protocol.
+ /// Philips RC5 protocol. 36kHz carrier.
/// </summary>
RC5,
/// <summary>
- /// Philips RC5X protocol.
+ /// Philips RC5X protocol. 36kHz carrier.
/// </summary>
RC5X,
/// <summary>
- /// Philips RC6 protocol (Mode 0).
+ /// Philips RC6 protocol (Mode 0). 36kHz carrier.
/// </summary>
RC6,
/// <summary>
- /// Philips RC6 protocol (Mode 6A).
+ /// Philips RC6 protocol (Mode 6A). 36kHz carrier.
/// </summary>
RC6A,
/// <summary>
- /// Microsoft's protocol variation of Philips RC6.
+ /// Microsoft's protocol variation of Philips RC6. 36kHz carrier.
/// </summary>
RC6_MCE,
/// <summary>
- /// RCA protocol.
+ /// Foxtel's protocol variation of Philips RC6. 36kHz carrier.
/// </summary>
+ RC6_Foxtel,
+ /// <summary>
+ /// RCA protocol. 56kHz carrier.
+ /// </summary>
RCA,
/// <summary>
- /// Philips RC-MM protocol. This protocol cannot be reliably (if at all) decoded by the MCE device.
+ /// Philips RC-MM protocol. This protocol cannot be reliably (if at all) decoded by the MCE device. 36kHz carrier.
/// </summary>
RCMM,
/// <summary>
- /// RECS-80 protocol.
+ /// RECS-80 protocol. 38kHz carrier.
/// </summary>
RECS80,
/// <summary>
- /// Sharp protocol (unsupported).
+ /// Sharp protocol (unsupported). 38kHz carrier
/// </summary>
Sharp,
/// <summary>
- /// Sony SIRC protocol.
+ /// Sony SIRC protocol. 40kHz carrier.
/// </summary>
SIRC,
/// <summary>
- /// Toshiba protocol.
+ /// Toshiba protocol. 38kHz carrier.
/// </summary>
Toshiba,
/// <summary>
- /// X-Sat protocol (unsupported).
+ /// X-Sat protocol (unsupported). 38kHz carrier.
/// </summary>
XSAT,
@@ -139,6 +143,7 @@
const uint PrefixRC6 = 0x000FC950;
const uint PrefixRC6A = 0x000FCA90;
+ const uint PrefixRC6Foxtel = 0x000FCA93;
const uint MceMouse = 1;
const uint MceKeyboard = 4;
@@ -614,7 +619,7 @@
bool pulse = (timingData[i] > 0);
bool ignored = true;
- //Trace.WriteLine("NEC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NEC_Data.State), timingData[i]);
+ //Trace.WriteLine(String.Format("NEC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NEC_Data.State), timingData[i]));
switch (NEC_Data.State)
{
@@ -1142,6 +1147,8 @@
bool pulse = (timingData[i] > 0);
bool ignored = true;
+ //Trace.WriteLine(String.Format("RC6 - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), RC6_Data.State), timingData[i]));
+
switch (RC6_Data.State)
{
@@ -1240,6 +1247,10 @@
{
RC6_Data.Bit = 16;
}
+ else if (RC6_Data.Header == PrefixRC6Foxtel)
+ {
+ RC6_Data.Bit = 20;
+ }
else if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
{
RC6_Data.Bit = 32;
@@ -1338,8 +1349,7 @@
{
bool first = false;
- bool mceVariation;
- bool aVariation;
+ IrProtocol protocolVariation = IrProtocol.RC6;
if ((~RC6_Data.Code >> 16) == CustomerMce) // MCE RC6 variation
{
@@ -1353,10 +1363,9 @@
RC6_Data.Code &= ToggleMaskMce;
- mceVariation = true;
- aVariation = false;
+ protocolVariation = IrProtocol.RC6_MCE;
}
- else // Standard RC6 (Non-MCE)
+ else // Standard RC6 or Non-MCE variations
{
bool toggleOn = (RC6_Data.Toggle & 1) == 1;
@@ -1369,20 +1378,13 @@
else
RC6_Data.Toggle = 4;
- mceVariation = false;
-
- if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
- aVariation = true;
- else
- aVariation = false;
+ if (RC6_Data.Header == PrefixRC6Foxtel)
+ protocolVariation = IrProtocol.RC6_Foxtel;
+ else if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
+ protocolVariation = IrProtocol.RC6A;
}
- if (mceVariation)
- remoteCallback(IrProtocol.RC6_MCE, RC6_Data.Code, first);
- else if (aVariation)
- remoteCallback(IrProtocol.RC6A, RC6_Data.Code, first);
- else
- remoteCallback(IrProtocol.RC6, RC6_Data.Code, first);
+ remoteCallback(protocolVariation, RC6_Data.Code, first);
RC6_Data.State = RemoteDetectionState.HeaderPulse;
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -189,11 +189,9 @@
}
else if (selected.Equals(Common.UITextHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
HttpMessageCommand httpMessageCommand = new HttpMessageCommand();
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
@@ -442,13 +440,11 @@
}
else if (selected.StartsWith(Common.CmdPrefixHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
string[] commands = Common.SplitHttpMessageCommand(selected.Substring(Common.CmdPrefixHttpMsg.Length));
HttpMessageCommand httpMessageCommand = new HttpMessageCommand(commands);
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -667,8 +667,10 @@
WebRequest request = WebRequest.Create(uri);
request.Timeout = int.Parse(commands[1]);
- request.Credentials = new NetworkCredential(commands[2], commands[3]);
+ if (!String.IsNullOrEmpty(commands[2]))
+ request.Credentials = new NetworkCredential(commands[2], commands[3]);
+
using (WebResponse response = request.GetResponse())
using (Stream responseStream = response.GetResponseStream())
using (StreamReader streamReader = new StreamReader(responseStream))
Added: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.Designer.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.Designer.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -0,0 +1,232 @@
+namespace IrssUtils.Forms
+{
+ partial class HttpMessageCommand
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.groupBoxMessageDetails = new System.Windows.Forms.GroupBox();
+ this.numericUpDownTimeout = new System.Windows.Forms.NumericUpDown();
+ this.labelTimeout = new System.Windows.Forms.Label();
+ this.textBoxUsername = new System.Windows.Forms.TextBox();
+ this.textBoxAddress = new System.Windows.Forms.TextBox();
+ this.labelAddress = new System.Windows.Forms.Label();
+ this.buttonOK = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.textBoxPassword = new System.Windows.Forms.TextBox();
+ this.checkBoxUsernameAndPassword = new System.Windows.Forms.CheckBox();
+ this.labelPassword = new System.Windows.Forms.Label();
+ this.labelUsername = new System.Windows.Forms.Label();
+ this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.groupBoxMessageDetails.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTimeout)).BeginInit();
+ this.SuspendLayout();
+ //
+ // groupBoxMessageDetails
+ //
+ this.groupBoxMessageDetails.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxMessageDetails.Controls.Add(this.labelUsername);
+ this.groupBoxMessageDetails.Controls.Add(this.labelPassword);
+ this.groupBoxMessageDetails.Controls.Add(this.checkBoxUsernameAndPassword);
+ this.groupBoxMessageDetails.Controls.Add(this.textBoxPassword);
+ this.groupBoxMessageDetails.Controls.Add(this.numericUpDownTimeout);
+ this.groupBoxMessageDetails.Controls.Add(this.labelTimeout);
+ this.groupBoxMessageDetails.Controls.Add(this.textBoxUsername);
+ this.groupBoxMessageDetails.Controls.Add(this.textBoxAddress);
+ this.groupBoxMessageDetails.Controls.Add(this.labelAddress);
+ this.groupBoxMessageDetails.Location = new System.Drawing.Point(8, 8);
+ this.groupBoxMessageDetails.Name = "groupBoxMessageDetails";
+ this.groupBoxMessageDetails.Size = new System.Drawing.Size(288, 176);
+ this.groupBoxMessageDetails.TabIndex = 0;
+ this.groupBoxMessageDetails.TabStop = false;
+ this.groupBoxMessageDetails.Text = "HTTP message details";
+ //
+ // numericUpDownTimeout
+ //
+ this.numericUpDownTimeout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.numericUpDownTimeout.Location = new System.Drawing.Point(104, 56);
+ this.numericUpDownTimeout.Maximum = new decimal(new int[] {
+ 120000,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownTimeout.Name = "numericUpDownTimeout";
+ this.numericUpDownTimeout.Size = new System.Drawing.Size(72, 20);
+ this.numericUpDownTimeout.TabIndex = 3;
+ this.numericUpDownTimeout.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.toolTips.SetToolTip(this.numericUpDownTimeout, "Web request timeout");
+ this.numericUpDownTimeout.Value = new decimal(new int[] {
+ 30000,
+ 0,
+ 0,
+ 0});
+ //
+ // labelTimeout
+ //
+ this.labelTimeout.Location = new System.Drawing.Point(8, 56);
+ this.labelTimeout.Name = "labelTimeout";
+ this.labelTimeout.Size = new System.Drawing.Size(96, 20);
+ this.labelTimeout.TabIndex = 2;
+ this.labelTimeout.Text = "Timeout:";
+ this.labelTimeout.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // textBoxUsername
+ //
+ this.textBoxUsername.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxUsername.Location = new System.Drawing.Point(104, 112);
+ this.textBoxUsername.Name = "textBoxUsername";
+ this.textBoxUsername.Size = new System.Drawing.Size(176, 20);
+ this.textBoxUsername.TabIndex = 6;
+ this.toolTips.SetToolTip(this.textBoxUsername, "Username for HTTP request");
+ //
+ // textBoxAddress
+ //
+ this.textBoxAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxAddress.Location = new System.Drawing.Point(104, 24);
+ this.textBoxAddress.Name = "textBoxAddress";
+ this.textBoxAddress.Size = new System.Drawing.Size(176, 20);
+ this.textBoxAddress.TabIndex = 1;
+ this.textBoxAddress.Text = "http://";
+ this.toolTips.SetToolTip(this.textBoxAddress, "Web address to request");
+ //
+ // labelAddress
+ //
+ this.labelAddress.Location = new System.Drawing.Point(8, 24);
+ this.labelAddress.Name = "labelAddress";
+ this.labelAddress.Size = new System.Drawing.Size(96, 20);
+ this.labelAddress.TabIndex = 0;
+ this.labelAddress.Text = "Web address:";
+ this.labelAddress.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // 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(160, 192);
+ this.buttonOK.Name = "buttonOK";
+ this.buttonOK.Size = new System.Drawing.Size(64, 24);
+ this.buttonOK.TabIndex = 1;
+ this.buttonOK.Text = "OK";
+ this.buttonOK.UseVisualStyleBackColor = true;
+ this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+ //
+ // buttonCancel
+ //
+ 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(232, 192);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(64, 24);
+ this.buttonCancel.TabIndex = 2;
+ this.buttonCancel.Text = "Cancel";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // textBoxPassword
+ //
+ this.textBoxPassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxPassword.Location = new System.Drawing.Point(104, 144);
+ this.textBoxPassword.Name = "textBoxPassword";
+ this.textBoxPassword.Size = new System.Drawing.Size(176, 20);
+ this.textBoxPassword.TabIndex = 8;
+ this.toolTips.SetToolTip(this.textBoxPassword, "WARNING: This password is not securely stored.");
+ //
+ // checkBoxUsernameAndPassword
+ //
+ this.checkBoxUsernameAndPassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.checkBoxUsernameAndPassword.Location = new System.Drawing.Point(8, 88);
+ this.checkBoxUsernameAndPassword.Name = "checkBoxUsernameAndPassword";
+ this.checkBoxUsernameAndPassword.Size = new System.Drawing.Size(272, 20);
+ this.checkBoxUsernameAndPassword.TabIndex = 4;
+ this.checkBoxUsernameAndPassword.Text = "Use a username and password";
+ this.toolTips.SetToolTip(this.checkBoxUsernameAndPassword, "Use a username and password for the HTTP request");
+ this.checkBoxUsernameAndPassword.UseVisualStyleBackColor = true;
+ //
+ // labelPassword
+ //
+ this.labelPassword.Location = new System.Drawing.Point(8, 144);
+ this.labelPassword.Name = "labelPassword";
+ this.labelPassword.Size = new System.Drawing.Size(96, 20);
+ this.labelPassword.TabIndex = 7;
+ this.labelPassword.Text = "Password:";
+ this.labelPassword.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // labelUsername
+ //
+ this.labelUsername.Location = new System.Drawing.Point(8, 112);
+ this.labelUsername.Name = "labelUsername";
+ this.labelUsername.Size = new System.Drawing.Size(96, 20);
+ this.labelUsername.TabIndex = 5;
+ this.labelUsername.Text = "Username:";
+ this.labelUsername.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // HttpMessageCommand
+ //
+ 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(304, 233);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonOK);
+ this.Controls.Add(this.groupBoxMessageDetails);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "HttpMessageCommand";
+ this.ShowIcon = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "HTTP Message Command";
+ this.groupBoxMessageDetails.ResumeLayout(false);
+ this.groupBoxMessageDetails.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTimeout)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.GroupBox groupBoxMessageDetails;
+ private System.Windows.Forms.Label labelAddress;
+ private System.Windows.Forms.NumericUpDown numericUpDownTimeout;
+ private System.Windows.Forms.Label labelTimeout;
+ private System.Windows.Forms.TextBox textBoxUsername;
+ private System.Windows.Forms.TextBox textBoxAddress;
+ private System.Windows.Forms.Button buttonOK;
+ private System.Windows.Forms.Button buttonCancel;
+ private System.Windows.Forms.TextBox textBoxPassword;
+ private System.Windows.Forms.CheckBox checkBoxUsernameAndPassword;
+ private System.Windows.Forms.Label labelPassword;
+ private System.Windows.Forms.Label labelUsername;
+ private System.Windows.Forms.ToolTip toolTips;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace IrssUtils.Forms
+{
+
+ /// <summary>
+ /// HTTP Message Command form.
+ /// </summary>
+ public partial class HttpMessageCommand : Form
+ {
+
+ #region Properties
+
+ /// <summary>
+ /// Gets the command string.
+ /// </summary>
+ /// <value>The command string.</value>
+ public string CommandString
+ {
+ get
+ {
+ return String.Format("{0}|{1}|{2}|{3}",
+ textBoxAddress.Text,
+ numericUpDownTimeout.Value.ToString(),
+ checkBoxUsernameAndPassword.Checked ? textBoxUsername.Text : String.Empty,
+ checkBoxUsernameAndPassword.Checked ? textBoxPassword.Text : String.Empty);
+ }
+ }
+
+ #endregion Properties
+
+ #region Constructors
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="TcpMessageCommand"/> class.
+ /// </summary>
+ public HttpMessageCommand()
+ {
+ InitializeComponent();
+ }
+ /// <summary>
+ /// Initializes a new instance of the <see cref="TcpMessageCommand"/> class.
+ /// </summary>
+ /// <param name="commands">The command elements.</param>
+ public HttpMessageCommand(string[] commands)
+ : this()
+ {
+ if (commands == null)
+ throw new ArgumentNullException("commands");
+
+ textBoxAddress.Text = commands[0];
+ numericUpDownTimeout.Value = Convert.ToDecimal(commands[1]);
+ textBoxUsername.Text = commands[2];
+ textBoxPassword.Text = commands[3];
+ }
+
+ #endregion Constructors
+
+ #region Buttons
+
+ private void buttonOK_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.OK;
+ this.Close();
+ }
+ private void buttonCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ this.Close();
+ }
+
+ #endregion Buttons
+
+ }
+
+}
Added: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.resx
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.resx (rev 0)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/HttpMessageCommand.resx 2007-12-11 14:47:41 UTC (rev 1145)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2007-12-11 14:47:41 UTC (rev 1145)
@@ -83,6 +83,12 @@
<Compile Include="Forms\BeepCommand.Designer.cs">
<DependentUpon>BeepCommand.cs</DependentUpon>
</Compile>
+ <Compile Include="Forms\HttpMessageCommand.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Forms\HttpMessageCommand.Designer.cs">
+ <DependentUpon>HttpMessageCommand.cs</DependentUpon>
+ </Compile>
<Compile Include="Forms\SmsKeyboard.cs">
<SubType>Form</SubType>
</Compile>
@@ -198,6 +204,10 @@
<DependentUpon>BeepCommand.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Forms\HttpMessageCommand.resx">
+ <DependentUpon>HttpMessageCommand.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Forms\SmsKeyboard.resx">
<DependentUpon>SmsKeyboard.cs</DependentUpon>
<SubType>Designer</SubType>
Modified: trunk/plugins/IR Server Suite/Documentation/Plugins/stb.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/Plugins/stb.html 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/Documentation/Plugins/stb.html 2007-12-11 14:47:41 UTC (rev 1145)
@@ -9,18 +9,29 @@
<UL>
<LI>ADB 3100</LI>
<LI>ADB ABQ-1H4G</LI>
+<LI>ADB SCV-3800C</LI>
<LI>Amstrad DRX-300</LI>
<LI>Coolsat</LI>
<LI>D-Box</LI>
<LI>Dilog DT-355</LI>
<LI>DirecTV D10</LI>
-<LI>DirecTV D10-100 (Serial)</LI>
-<LI>DirecTV D10-200 (Serial)</LI>
<LI>DirecTV HR10-250</LI>
<LI>DirecTV R15</LI>
<LI>Dish 301</LI>
<LI>Dish 811</LI>
<LI>DreamBox 7000</LI>
+<LI>DSS DishPlayer 7200</LI>
+<LI>Echostar 1000</LI>
+<LI>Echostar 2500</LI>
+<LI>Echostar 3000</LI>
+<LI>Echostar 370</LI>
+<LI>Echostar 3800</LI>
+<LI>Echostar 4000</LI>
+<LI>Echostar 4700</LI>
+<LI>Echostar 4720</LI>
+<LI>Echostar 4722</LI>
+<LI>Echostar 6000</LI>
+<LI>Echostar 7700</LI>
<LI>Force 536</LI>
<LI>Foxtel Digital DC420NF</LI>
<LI>Foxtel STU100</LI>
@@ -28,12 +39,14 @@
<LI>General Instruments DCT2224</LI>
<LI>Israel HOT</LI>
<LI>JVC TU-4700</LI>
+<LI>Motorola DCT-2000</LI>
+<LI>Motorola DCT-2244</LI>
+<LI>Motorola DCT-6200</LI>
<LI>MultiChoice DSD660</LI>
<LI>Nokia 221T</LI>
-<LI>Nokia 9800s and 9902s (Serial)</LI>
<LI>Nokia 9800s</LI>
+<LI>OnDigital</LI>
<LI>OnDigital DTR730</LI>
-<LI>OnDigital</LI>
<LI>Pace 4100</LI>
<LI>Panasat IRD624DSTV</LI>
<LI>Pioneer BCT-1540</LI>
@@ -42,10 +55,14 @@
<LI>Sagem D-Box II</LI>
<LI>Sagem ICD-503</LI>
<LI>Samsung SMT 2100C</LI>
+<LI>Scientific Atlanta 8602</LI>
+<LI>Scientific Atlanta Explorer 2000</LI>
<LI>Scientific Atlanta Explorer 2100</LI>
+<LI>Scientific Atlanta Explorer 3100</LI>
<LI>Scientific Atlanta Explorer 3250</LI>
<LI>Scientific Atlanta Explorer 4000DVB</LI>
<LI>Scientific Atlanta Explorer 8300</LI>
+<LI>Sky</LI>
<LI>Sky DigiBox 2500N</LI>
<LI>Sky DigiBox Amstrad</LI>
<LI>Sky DigiBox TU-DSB20</LI>
@@ -53,9 +70,14 @@
<LI>Sky DigiBox TU-DSB31</LI>
<LI>Sky DigiBox TU-DSB40</LI>
<LI>Sky Zenith</LI>
-<LI>Sky</LI>
<LI>Sky+ BSKYB 2200</LI>
<LI>SkyNZ Pace DSR6000</LI>
+<LI>Sony DHG-M55CV</LI>
+<LI>Sony SAS-A3</LI>
+<LI>Sony SAS-A4</LI>
+<LI>Sony SAT-A2</LI>
+<LI>Sony SAT-A3</LI>
+<LI>Sony SAT-A50</LI>
<LI>Xsat CDTV-410</LI>
</UL>
Modified: trunk/plugins/IR Server Suite/Documentation/new.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/new.html 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/Documentation/new.html 2007-12-11 14:47:41 UTC (rev 1145)
@@ -27,7 +27,11 @@
<LI>Added support for the RedEye blaster device.</LI>
<LI>Added support for the Nintendo Wii Remote (no classic controller or accelerometer support yet).</LI>
<LI>Improved suspend/resume handling ... again ... hopefully this works!</LI>
-<LI>Re-synchronized InputHandler with MediaPortal</LI>
+<LI>Re-synchronized InputHandler with MediaPortal.</LI>
+<LI>Jens has helped me get 64-bit MCE remote support working properly, finally! :)</LI>
+<LI>Added a swag of new STB presets.</LI>
+<LI>Added RC6 Foxtel variation support for MCE Remote protocol decoding.</LI>
+<LI>Simplified Macro file format. Old macro's must be converted or rebuilt. This change will speed up the introduction of new features.</LI>
</UL></P>
<BR>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -21,7 +21,7 @@
None,
/// <summary>
- /// Daewoo protocol.
+ /// Daewoo protocol. 38kHz carrier.
/// </summary>
Daewoo,
/// <summary>
@@ -29,75 +29,79 @@
/// </summary>
ITT,
/// <summary>
- /// JVC protocol.
+ /// JVC protocol. 38kHz carrier.
/// </summary>
JVC,
/// <summary>
- /// Matsushita protocol.
+ /// Matsushita protocol. 56.8kHz carrier.
/// </summary>
Matsushita,
/// <summary>
- /// Mitsubishi protocol.
+ /// Mitsubishi protocol. 40kHz carrier.
/// </summary>
Mitsubishi,
/// <summary>
- /// NEC protocol.
+ /// NEC protocol. 38kHz carrier.
/// </summary>
NEC,
/// <summary>
- /// Nokia NRC17 protocol.
+ /// Nokia NRC17 protocol. 38kHz carrier.
/// </summary>
NRC17,
/// <summary>
- /// Panasonic protocol.
+ /// Panasonic protocol. 38kHz carrier.
/// </summary>
Panasonic,
/// <summary>
- /// Philips RC5 protocol.
+ /// Philips RC5 protocol. 36kHz carrier.
/// </summary>
RC5,
/// <summary>
- /// Philips RC5X protocol.
+ /// Philips RC5X protocol. 36kHz carrier.
/// </summary>
RC5X,
/// <summary>
- /// Philips RC6 protocol (Mode 0).
+ /// Philips RC6 protocol (Mode 0). 36kHz carrier.
/// </summary>
RC6,
/// <summary>
- /// Philips RC6 protocol (Mode 6A).
+ /// Philips RC6 protocol (Mode 6A). 36kHz carrier.
/// </summary>
RC6A,
/// <summary>
- /// Microsoft's protocol variation of Philips RC6.
+ /// Microsoft's protocol variation of Philips RC6. 36kHz carrier.
/// </summary>
RC6_MCE,
/// <summary>
- /// RCA protocol.
+ /// Foxtel's protocol variation of Philips RC6. 36kHz carrier.
/// </summary>
+ RC6_Foxtel,
+ /// <summary>
+ /// RCA protocol. 56kHz carrier.
+ /// </summary>
RCA,
/// <summary>
- /// Philips RC-MM protocol. This protocol cannot be reliably (if at all) decoded by the MCE device.
+ /// Philips RC-MM protocol. This protocol cannot be reliably (if at all) decoded by the MCE device. 36kHz carrier.
/// </summary>
RCMM,
/// <summary>
- /// RECS-80 protocol.
+ /// RECS-80 protocol. 38kHz carrier.
/// </summary>
RECS80,
/// <summary>
- /// Sharp protocol (unsupported).
+ /// Sharp protocol (unsupported). 38kHz carrier
/// </summary>
Sharp,
/// <summary>
- /// Sony SIRC protocol.
+ /// Sony SIRC protocol. 40kHz carrier.
/// </summary>
SIRC,
/// <summary>
- /// Toshiba protocol.
+ /// Toshiba protocol. 38kHz carrier.
/// </summary>
Toshiba,
/// <summary>
- /// X-Sat protocol (unsupported).
+ /// X-Sat protocol (unsupported). 38kHz carrier.
/// </summary>
XSAT,
@@ -139,6 +143,7 @@
const uint PrefixRC6 = 0x000FC950;
const uint PrefixRC6A = 0x000FCA90;
+ const uint PrefixRC6Foxtel = 0x000FCA93;
const uint MceMouse = 1;
const uint MceKeyboard = 4;
@@ -614,7 +619,7 @@
bool pulse = (timingData[i] > 0);
bool ignored = true;
- //Trace.WriteLine("NEC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NEC_Data.State), timingData[i]);
+ //Trace.WriteLine(String.Format("NEC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NEC_Data.State), timingData[i]));
switch (NEC_Data.State)
{
@@ -1142,6 +1147,8 @@
bool pulse = (timingData[i] > 0);
bool ignored = true;
+ //Trace.WriteLine(String.Format("RC6 - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), RC6_Data.State), timingData[i]));
+
switch (RC6_Data.State)
{
@@ -1240,6 +1247,10 @@
{
RC6_Data.Bit = 16;
}
+ else if (RC6_Data.Header == PrefixRC6Foxtel)
+ {
+ RC6_Data.Bit = 20;
+ }
else if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
{
RC6_Data.Bit = 32;
@@ -1338,8 +1349,7 @@
{
bool first = false;
- bool mceVariation;
- bool aVariation;
+ IrProtocol protocolVariation = IrProtocol.RC6;
if ((~RC6_Data.Code >> 16) == CustomerMce) // MCE RC6 variation
{
@@ -1353,10 +1363,9 @@
RC6_Data.Code &= ToggleMaskMce;
- mceVariation = true;
- aVariation = false;
+ protocolVariation = IrProtocol.RC6_MCE;
}
- else // Standard RC6 (Non-MCE)
+ else // Standard RC6 or Non-MCE variations
{
bool toggleOn = (RC6_Data.Toggle & 1) == 1;
@@ -1369,20 +1378,13 @@
else
RC6_Data.Toggle = 4;
- mceVariation = false;
-
- if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
- aVariation = true;
- else
- aVariation = false;
+ if (RC6_Data.Header == PrefixRC6Foxtel)
+ protocolVariation = IrProtocol.RC6_Foxtel;
+ else if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
+ protocolVariation = IrProtocol.RC6A;
}
- if (mceVariation)
- remoteCallback(IrProtocol.RC6_MCE, RC6_Data.Code, first);
- else if (aVariation)
- remoteCallback(IrProtocol.RC6A, RC6_Data.Code, first);
- else
- remoteCallback(IrProtocol.RC6, RC6_Data.Code, first);
+ remoteCallback(protocolVariation, RC6_Data.Code, first);
RC6_Data.State = RemoteDetectionState.HeaderPulse;
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -73,6 +73,10 @@
/// </summary>
RC6_MCE,
/// <summary>
+ /// Foxtel's protocol variation of Philips RC6. 36kHz carrier.
+ /// </summary>
+ RC6_Foxtel,
+ /// <summary>
/// RCA protocol. 56kHz carrier.
/// </summary>
RCA,
@@ -139,6 +143,7 @@
const uint PrefixRC6 = 0x000FC950;
const uint PrefixRC6A = 0x000FCA90;
+ const uint PrefixRC6Foxtel = 0x000FCA93;
const uint MceMouse = 1;
const uint MceKeyboard = 4;
@@ -614,7 +619,7 @@
bool pulse = (timingData[i] > 0);
bool ignored = true;
- //Trace.WriteLine("NEC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NEC_Data.State), timingData[i]);
+ //Trace.WriteLine(String.Format("NEC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NEC_Data.State), timingData[i]));
switch (NEC_Data.State)
{
@@ -1142,6 +1147,8 @@
bool pulse = (timingData[i] > 0);
bool ignored = true;
+ //Trace.WriteLine(String.Format("RC6 - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), RC6_Data.State), timingData[i]));
+
switch (RC6_Data.State)
{
@@ -1240,6 +1247,10 @@
{
RC6_Data.Bit = 16;
}
+ else if (RC6_Data.Header == PrefixRC6Foxtel)
+ {
+ RC6_Data.Bit = 20;
+ }
else if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
{
RC6_Data.Bit = 32;
@@ -1338,8 +1349,7 @@
{
bool first = false;
- bool mceVariation;
- bool aVariation;
+ IrProtocol protocolVariation = IrProtocol.RC6;
if ((~RC6_Data.Code >> 16) == CustomerMce) // MCE RC6 variation
{
@@ -1353,10 +1363,9 @@
RC6_Data.Code &= ToggleMaskMce;
- mceVariation = true;
- aVariation = false;
+ protocolVariation = IrProtocol.RC6_MCE;
}
- else // Standard RC6 (Non-MCE)
+ else // Standard RC6 or Non-MCE variations
{
bool toggleOn = (RC6_Data.Toggle & 1) == 1;
@@ -1369,20 +1378,13 @@
else
RC6_Data.Toggle = 4;
- mceVariation = false;
-
- if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
- aVariation = true;
- else
- aVariation = false;
+ if (RC6_Data.Header == PrefixRC6Foxtel)
+ protocolVariation = IrProtocol.RC6_Foxtel;
+ else if ((RC6_Data.Header & RC6HeaderMask) == PrefixRC6A)
+ protocolVariation = IrProtocol.RC6A;
}
- if (mceVariation)
- remoteCallback(IrProtocol.RC6_MCE, RC6_Data.Code, first);
- else if (aVariation)
- remoteCallback(IrProtocol.RC6A, RC6_Data.Code, first);
- else
- remoteCallback(IrProtocol.RC6, RC6_Data.Code, first);
+ remoteCallback(protocolVariation, RC6_Data.Code, first);
RC6_Data.State = RemoteDetectionState.HeaderPulse;
}
Modified: 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/MacroEditor.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -195,11 +195,9 @@
}
else if (selected.Equals(Common.UITextHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
HttpMessageCommand httpMessageCommand = new HttpMessageCommand();
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
@@ -472,13 +470,11 @@
}
else if (selected.StartsWith(Common.CmdPrefixHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
string[] commands = Common.SplitHttpMessageCommand(selected.Substring(Common.CmdPrefixHttpMsg.Length));
HttpMessageCommand httpMessageCommand = new HttpMessageCommand(commands);
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -197,11 +197,9 @@
}
else if (selected.Equals(Common.UITextHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
HttpMessageCommand httpMessageCommand = new HttpMessageCommand();
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
@@ -482,13 +480,11 @@
}
else if (selected.StartsWith(Common.CmdPrefixHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
string[] commands = Common.SplitHttpMessageCommand(selected.Substring(Common.CmdPrefixHttpMsg.Length));
HttpMessageCommand httpMessageCommand = new HttpMessageCommand(commands);
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -190,11 +190,9 @@
}
else if (selected.Equals(Common.UITextHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
HttpMessageCommand httpMessageCommand = new HttpMessageCommand();
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
@@ -438,13 +436,11 @@
}
else if (selected.StartsWith(Common.CmdPrefixHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
string[] commands = Common.SplitHttpMessageCommand(selected.Substring(Common.CmdPrefixHttpMsg.Length));
HttpMessageCommand httpMessageCommand = new HttpMessageCommand(commands);
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -180,11 +180,9 @@
}
else if (selected.Equals(Common.UITextHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
HttpMessageCommand httpMessageCommand = new HttpMessageCommand();
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
@@ -392,13 +390,11 @@
}
else if (selected.StartsWith(Common.CmdPrefixHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
string[] commands = Common.SplitHttpMessageCommand(selected.Substring(Common.CmdPrefixHttpMsg.Length));
HttpMessageCommand httpMessageCommand = new HttpMessageCommand(commands);
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
Modified: trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-12-11 14:00:24 UTC (rev 1144)
+++ trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-12-11 14:47:41 UTC (rev 1145)
@@ -197,11 +197,9 @@
}
else if (selected.Equals(Common.UITextHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
HttpMessageCommand httpMessageCommand = new HttpMessageCommand();
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
@@ -482,13 +480,11 @@
}
else if (selected.StartsWith(Common.CmdPrefixHttpMsg, StringComparison.OrdinalIgnoreCase))
{
- /*
string[] commands = Common.SplitHttpMessageCommand(selected.Substring(Common.CmdPrefixHttpMsg.Length));
HttpMessageCommand httpMessageCommand = new HttpMessageCommand(commands);
if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
- */
}
else if (selected.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
