mp-plugins-svn

[Mp-plugins-svn] SF.net SVN: mp-plugins: [39] trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/ TunerPlugin

[<pat...@us...>]

Revision: 39
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=39&view=rev
Author:   patrick_sf
Date:     2007-01-29 05:18:00 -0800 (Mon, 29 Jan 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/DirecTVSettings.cs
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.Designer.cs
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.cs
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/DirecTVSettings.cs
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/DirecTVSettings.cs	2007-01-29 13:17:12 UTC (rev 38)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/DirecTVSettings.cs	2007-01-29 13:18:00 UTC (rev 39)
@@ -36,6 +36,7 @@
     private bool _advanced;
     private bool _twowaydisable;
     private bool _hideOSD;
+    private bool _allowDigitalSubchannels;
 
     #endregion
 
@@ -65,6 +66,7 @@
         _advanced = reader.GetValueAsBool(_sectionName, "advanced", false);
         _twowaydisable = reader.GetValueAsBool(_sectionName, "twowaydisable", false);
         _hideOSD = reader.GetValueAsBool(_sectionName, "hideOSD", false);
+        _allowDigitalSubchannels = reader.GetValueAsBool(_sectionName, "allowsubchannels", false);
       }
       BoxName = _boxName;
       KeyMapName = _keyMapName;
@@ -87,6 +89,7 @@
         writer.SetValueAsBool(_sectionName, "advanced", _advanced);
         writer.SetValueAsBool(_sectionName, "twowaydisable", _twowaydisable);
         writer.SetValueAsBool(_sectionName, "hideOSD", _hideOSD);
+        writer.SetValueAsBool(_sectionName, "allowsubchannels", _allowDigitalSubchannels);
       }
     }
 
@@ -250,6 +253,12 @@
       get { return _hideOSD; }
       set { _hideOSD = value; }
     }
+
+    public bool AllowDigitalSubchannels
+    {
+      get { return _allowDigitalSubchannels; }
+      set { _allowDigitalSubchannels = value; }
+    }
     #endregion
 
   }

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.Designer.cs
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.Designer.cs	2007-01-29 13:17:12 UTC (rev 38)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.Designer.cs	2007-01-29 13:18:00 UTC (rev 39)
@@ -28,325 +28,319 @@
     /// </summary>
     private void InitializeComponent()
     {
-      this.components = new System.ComponentModel.Container();
-      this.globalBox = new System.Windows.Forms.GroupBox();
-      this.cbAdvanced = new System.Windows.Forms.CheckBox();
-      this.typeLabel = new System.Windows.Forms.Label();
-      this.modelComboBox = new System.Windows.Forms.ComboBox();
-      this.portComboBox = new System.Windows.Forms.ComboBox();
-      this.serialPortLabel = new System.Windows.Forms.Label();
-      this.keyMapLabel = new System.Windows.Forms.Label();
-      this.keyMapComboBox = new System.Windows.Forms.ComboBox();
-      this.brLabel = new System.Windows.Forms.Label();
-      this.baudComboBox = new System.Windows.Forms.ComboBox();
-      this.advancedBox = new System.Windows.Forms.GroupBox();
-      this.cbtwowaydisable = new System.Windows.Forms.CheckBox();
-      this.debugBox = new System.Windows.Forms.CheckBox();
-      this.powerOnBox = new System.Windows.Forms.CheckBox();
-      this.channelSetBox = new System.Windows.Forms.CheckBox();
-      this.commandSetBox = new System.Windows.Forms.CheckBox();
-      this.communicationBox = new System.Windows.Forms.GroupBox();
-      this.timeoutLabel = new System.Windows.Forms.Label();
-      this.timeoutNumUpDown = new System.Windows.Forms.NumericUpDown();
-      this.okButton = new System.Windows.Forms.Button();
-      this.cancelButton = new System.Windows.Forms.Button();
-      this.cbHideOSD = new System.Windows.Forms.CheckBox();
-      this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-      this.globalBox.SuspendLayout();
-      this.advancedBox.SuspendLayout();
-      this.communicationBox.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.timeoutNumUpDown)).BeginInit();
-      this.SuspendLayout();
-      // 
-      // globalBox
-      // 
-      this.globalBox.Controls.Add(this.cbAdvanced);
-      this.globalBox.Controls.Add(this.typeLabel);
-      this.globalBox.Controls.Add(this.modelComboBox);
-      this.globalBox.Location = new System.Drawing.Point(17, 15);
-      this.globalBox.Margin = new System.Windows.Forms.Padding(4);
-      this.globalBox.Name = "globalBox";
-      this.globalBox.Padding = new System.Windows.Forms.Padding(4);
-      this.globalBox.Size = new System.Drawing.Size(253, 86);
-      this.globalBox.TabIndex = 0;
-      this.globalBox.TabStop = false;
-      this.globalBox.Text = "Global";
-      // 
-      // cbAdvanced
-      // 
-      this.cbAdvanced.AutoSize = true;
-      this.cbAdvanced.Location = new System.Drawing.Point(47, 58);
-      this.cbAdvanced.Margin = new System.Windows.Forms.Padding(4);
-      this.cbAdvanced.Name = "cbAdvanced";
-      this.cbAdvanced.Size = new System.Drawing.Size(190, 21);
-      this.cbAdvanced.TabIndex = 3;
-      this.cbAdvanced.Text = "Enable advanced settings";
-      this.cbAdvanced.UseVisualStyleBackColor = true;
-      this.cbAdvanced.CheckedChanged += new System.EventHandler(this.cbAdvanded_CheckedChanged);
-      // 
-      // typeLabel
-      // 
-      this.typeLabel.AutoSize = true;
-      this.typeLabel.Location = new System.Drawing.Point(8, 28);
-      this.typeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-      this.typeLabel.Name = "typeLabel";
-      this.typeLabel.Size = new System.Drawing.Size(50, 17);
-      this.typeLabel.TabIndex = 2;
-      this.typeLabel.Text = "Model:";
-      // 
-      // modelComboBox
-      // 
-      this.modelComboBox.FormattingEnabled = true;
-      this.modelComboBox.Location = new System.Drawing.Point(68, 23);
-      this.modelComboBox.Margin = new System.Windows.Forms.Padding(4);
-      this.modelComboBox.Name = "modelComboBox";
-      this.modelComboBox.Size = new System.Drawing.Size(172, 24);
-      this.modelComboBox.TabIndex = 1;
-      this.modelComboBox.SelectedIndexChanged += new System.EventHandler(this.modelComboBox_SelectedIndexChanged);
-      // 
-      // portComboBox
-      // 
-      this.portComboBox.FormattingEnabled = true;
-      this.portComboBox.Location = new System.Drawing.Point(117, 23);
-      this.portComboBox.Margin = new System.Windows.Forms.Padding(4);
-      this.portComboBox.Name = "portComboBox";
-      this.portComboBox.Size = new System.Drawing.Size(123, 24);
-      this.portComboBox.TabIndex = 3;
-      // 
-      // serialPortLabel
-      // 
-      this.serialPortLabel.AutoSize = true;
-      this.serialPortLabel.Location = new System.Drawing.Point(37, 27);
-      this.serialPortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-      this.serialPortLabel.Name = "serialPortLabel";
-      this.serialPortLabel.Size = new System.Drawing.Size(77, 17);
-      this.serialPortLabel.TabIndex = 2;
-      this.serialPortLabel.Text = "Serial port:";
-      // 
-      // keyMapLabel
-      // 
-      this.keyMapLabel.AutoSize = true;
-      this.keyMapLabel.Location = new System.Drawing.Point(9, 28);
-      this.keyMapLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-      this.keyMapLabel.Name = "keyMapLabel";
-      this.keyMapLabel.Size = new System.Drawing.Size(63, 17);
-      this.keyMapLabel.TabIndex = 0;
-      this.keyMapLabel.Text = "Keymap:";
-      // 
-      // keyMapComboBox
-      // 
-      this.keyMapComboBox.FormattingEnabled = true;
-      this.keyMapComboBox.Location = new System.Drawing.Point(73, 23);
-      this.keyMapComboBox.Margin = new System.Windows.Forms.Padding(4);
-      this.keyMapComboBox.Name = "keyMapComboBox";
-      this.keyMapComboBox.Size = new System.Drawing.Size(169, 24);
-      this.keyMapComboBox.TabIndex = 1;
-      // 
-      // brLabel
-      // 
-      this.brLabel.AutoSize = true;
-      this.brLabel.Location = new System.Drawing.Point(39, 62);
-      this.brLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-      this.brLabel.Name = "brLabel";
-      this.brLabel.Size = new System.Drawing.Size(74, 17);
-      this.brLabel.TabIndex = 2;
-      this.brLabel.Text = "Baud rate:";
-      // 
-      // baudComboBox
-      // 
-      this.baudComboBox.FormattingEnabled = true;
-      this.baudComboBox.Location = new System.Drawing.Point(117, 57);
-      this.baudComboBox.Margin = new System.Windows.Forms.Padding(4);
-      this.baudComboBox.Name = "baudComboBox";
-      this.baudComboBox.Size = new System.Drawing.Size(123, 24);
-      this.baudComboBox.TabIndex = 3;
-      // 
-      // advancedBox
-      // 
-      this.advancedBox.Controls.Add(this.cbHideOSD);
-      this.advancedBox.Controls.Add(this.cbtwowaydisable);
-      this.advancedBox.Controls.Add(this.debugBox);
-      this.advancedBox.Controls.Add(this.powerOnBox);
-      this.advancedBox.Controls.Add(this.channelSetBox);
-      this.advancedBox.Controls.Add(this.commandSetBox);
-      this.advancedBox.Controls.Add(this.keyMapComboBox);
-      this.advancedBox.Controls.Add(this.keyMapLabel);
-      this.advancedBox.Location = new System.Drawing.Point(287, 15);
-      this.advancedBox.Margin = new System.Windows.Forms.Padding(4);
-      this.advancedBox.Name = "advancedBox";
-      this.advancedBox.Padding = new System.Windows.Forms.Padding(4);
-      this.advancedBox.Size = new System.Drawing.Size(255, 247);
-      this.advancedBox.TabIndex = 1;
-      this.advancedBox.TabStop = false;
-      this.advancedBox.Text = "Advanced settings";
-      // 
-      // cbtwowaydisable
-      // 
-      this.cbtwowaydisable.AutoSize = true;
-      this.cbtwowaydisable.Location = new System.Drawing.Point(12, 183);
-      this.cbtwowaydisable.Name = "cbtwowaydisable";
-      this.cbtwowaydisable.Size = new System.Drawing.Size(226, 21);
-      this.cbtwowaydisable.TabIndex = 6;
-      this.cbtwowaydisable.Text = "Disable two-way communication";
-      this.toolTip1.SetToolTip(this.cbtwowaydisable, "For D10-100 Boxes");
-      this.cbtwowaydisable.UseVisualStyleBackColor = true;
-      // 
-      // debugBox
-      // 
-      this.debugBox.AutoSize = true;
-      this.debugBox.Location = new System.Drawing.Point(13, 155);
-      this.debugBox.Margin = new System.Windows.Forms.Padding(4);
-      this.debugBox.Name = "debugBox";
-      this.debugBox.Size = new System.Drawing.Size(184, 21);
-      this.debugBox.TabIndex = 5;
-      this.debugBox.Text = "Enable extensive logging";
-      this.debugBox.UseVisualStyleBackColor = true;
-      // 
-      // powerOnBox
-      // 
-      this.powerOnBox.AutoSize = true;
-      this.powerOnBox.Location = new System.Drawing.Point(13, 127);
-      this.powerOnBox.Margin = new System.Windows.Forms.Padding(4);
-      this.powerOnBox.Name = "powerOnBox";
-      this.powerOnBox.Size = new System.Drawing.Size(203, 21);
-      this.powerOnBox.TabIndex = 4;
-      this.powerOnBox.Text = "Use power-on before tuning";
-      this.powerOnBox.UseVisualStyleBackColor = true;
-      // 
-      // channelSetBox
-      // 
-      this.channelSetBox.AutoSize = true;
-      this.channelSetBox.Location = new System.Drawing.Point(13, 98);
-      this.channelSetBox.Margin = new System.Windows.Forms.Padding(4);
-      this.channelSetBox.Name = "channelSetBox";
-      this.channelSetBox.Size = new System.Drawing.Size(203, 21);
-      this.channelSetBox.TabIndex = 3;
-      this.channelSetBox.Text = "Use \"channel set\" for tuning";
-      this.channelSetBox.UseVisualStyleBackColor = true;
-      // 
-      // commandSetBox
-      // 
-      this.commandSetBox.AutoSize = true;
-      this.commandSetBox.Location = new System.Drawing.Point(13, 70);
-      this.commandSetBox.Margin = new System.Windows.Forms.Padding(4);
-      this.commandSetBox.Name = "commandSetBox";
-      this.commandSetBox.Size = new System.Drawing.Size(163, 21);
-      this.commandSetBox.TabIndex = 2;
-      this.commandSetBox.Text = "Use old command set";
-      this.toolTip1.SetToolTip(this.commandSetBox, "If your receiver is more than two years old, you may need to check this box");
-      this.commandSetBox.UseVisualStyleBackColor = true;
-      // 
-      // communicationBox
-      // 
-      this.communicationBox.Controls.Add(this.timeoutLabel);
-      this.communicationBox.Controls.Add(this.timeoutNumUpDown);
-      this.communicationBox.Controls.Add(this.baudComboBox);
-      this.communicationBox.Controls.Add(this.serialPortLabel);
-      this.communicationBox.Controls.Add(this.portComboBox);
-      this.communicationBox.Controls.Add(this.brLabel);
-      this.communicationBox.Location = new System.Drawing.Point(17, 108);
-      this.communicationBox.Margin = new System.Windows.Forms.Padding(4);
-      this.communicationBox.Name = "communicationBox";
-      this.communicationBox.Padding = new System.Windows.Forms.Padding(4);
-      this.communicationBox.Size = new System.Drawing.Size(253, 154);
-      this.communicationBox.TabIndex = 2;
-      this.communicationBox.TabStop = false;
-      this.communicationBox.Text = "Communication settings";
-      // 
-      // timeoutLabel
-      // 
-      this.timeoutLabel.AutoSize = true;
-      this.timeoutLabel.Location = new System.Drawing.Point(16, 95);
-      this.timeoutLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-      this.timeoutLabel.Name = "timeoutLabel";
-      this.timeoutLabel.Size = new System.Drawing.Size(96, 17);
-      this.timeoutLabel.TabIndex = 5;
-      this.timeoutLabel.Text = "Read timeout:";
-      // 
-      // timeoutNumUpDown
-      // 
-      this.timeoutNumUpDown.Location = new System.Drawing.Point(117, 91);
-      this.timeoutNumUpDown.Margin = new System.Windows.Forms.Padding(4);
-      this.timeoutNumUpDown.Maximum = new decimal(new int[] {
+       this.components = new System.ComponentModel.Container();
+       this.globalBox = new System.Windows.Forms.GroupBox();
+       this.cbAdvanced = new System.Windows.Forms.CheckBox();
+       this.typeLabel = new System.Windows.Forms.Label();
+       this.modelComboBox = new System.Windows.Forms.ComboBox();
+       this.portComboBox = new System.Windows.Forms.ComboBox();
+       this.serialPortLabel = new System.Windows.Forms.Label();
+       this.keyMapLabel = new System.Windows.Forms.Label();
+       this.keyMapComboBox = new System.Windows.Forms.ComboBox();
+       this.brLabel = new System.Windows.Forms.Label();
+       this.baudComboBox = new System.Windows.Forms.ComboBox();
+       this.advancedBox = new System.Windows.Forms.GroupBox();
+       this.cbHideOSD = new System.Windows.Forms.CheckBox();
+       this.cbtwowaydisable = new System.Windows.Forms.CheckBox();
+       this.debugBox = new System.Windows.Forms.CheckBox();
+       this.powerOnBox = new System.Windows.Forms.CheckBox();
+       this.channelSetBox = new System.Windows.Forms.CheckBox();
+       this.commandSetBox = new System.Windows.Forms.CheckBox();
+       this.communicationBox = new System.Windows.Forms.GroupBox();
+       this.timeoutLabel = new System.Windows.Forms.Label();
+       this.timeoutNumUpDown = new System.Windows.Forms.NumericUpDown();
+       this.okButton = new System.Windows.Forms.Button();
+       this.cancelButton = new System.Windows.Forms.Button();
+       this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+       this.cbAllowSubChannels = new System.Windows.Forms.CheckBox();
+       this.globalBox.SuspendLayout();
+       this.advancedBox.SuspendLayout();
+       this.communicationBox.SuspendLayout();
+       ((System.ComponentModel.ISupportInitialize)(this.timeoutNumUpDown)).BeginInit();
+       this.SuspendLayout();
+       // 
+       // globalBox
+       // 
+       this.globalBox.Controls.Add(this.cbAdvanced);
+       this.globalBox.Controls.Add(this.typeLabel);
+       this.globalBox.Controls.Add(this.modelComboBox);
+       this.globalBox.Location = new System.Drawing.Point(13, 12);
+       this.globalBox.Name = "globalBox";
+       this.globalBox.Size = new System.Drawing.Size(190, 70);
+       this.globalBox.TabIndex = 0;
+       this.globalBox.TabStop = false;
+       this.globalBox.Text = "Global";
+       // 
+       // cbAdvanced
+       // 
+       this.cbAdvanced.AutoSize = true;
+       this.cbAdvanced.Location = new System.Drawing.Point(35, 47);
+       this.cbAdvanced.Name = "cbAdvanced";
+       this.cbAdvanced.Size = new System.Drawing.Size(149, 17);
+       this.cbAdvanced.TabIndex = 3;
+       this.cbAdvanced.Text = "Enable advanced settings";
+       this.cbAdvanced.UseVisualStyleBackColor = true;
+       this.cbAdvanced.CheckedChanged += new System.EventHandler(this.cbAdvanded_CheckedChanged);
+       // 
+       // typeLabel
+       // 
+       this.typeLabel.AutoSize = true;
+       this.typeLabel.Location = new System.Drawing.Point(6, 23);
+       this.typeLabel.Name = "typeLabel";
+       this.typeLabel.Size = new System.Drawing.Size(39, 13);
+       this.typeLabel.TabIndex = 2;
+       this.typeLabel.Text = "Model:";
+       // 
+       // modelComboBox
+       // 
+       this.modelComboBox.FormattingEnabled = true;
+       this.modelComboBox.Location = new System.Drawing.Point(51, 19);
+       this.modelComboBox.Name = "modelComboBox";
+       this.modelComboBox.Size = new System.Drawing.Size(130, 21);
+       this.modelComboBox.TabIndex = 1;
+       this.modelComboBox.SelectedIndexChanged += new System.EventHandler(this.modelComboBox_SelectedIndexChanged);
+       // 
+       // portComboBox
+       // 
+       this.portComboBox.FormattingEnabled = true;
+       this.portComboBox.Location = new System.Drawing.Point(88, 19);
+       this.portComboBox.Name = "portComboBox";
+       this.portComboBox.Size = new System.Drawing.Size(93, 21);
+       this.portComboBox.TabIndex = 3;
+       // 
+       // serialPortLabel
+       // 
+       this.serialPortLabel.AutoSize = true;
+       this.serialPortLabel.Location = new System.Drawing.Point(28, 22);
+       this.serialPortLabel.Name = "serialPortLabel";
+       this.serialPortLabel.Size = new System.Drawing.Size(57, 13);
+       this.serialPortLabel.TabIndex = 2;
+       this.serialPortLabel.Text = "Serial port:";
+       // 
+       // keyMapLabel
+       // 
+       this.keyMapLabel.AutoSize = true;
+       this.keyMapLabel.Location = new System.Drawing.Point(7, 23);
+       this.keyMapLabel.Name = "keyMapLabel";
+       this.keyMapLabel.Size = new System.Drawing.Size(48, 13);
+       this.keyMapLabel.TabIndex = 0;
+       this.keyMapLabel.Text = "Keymap:";
+       // 
+       // keyMapComboBox
+       // 
+       this.keyMapComboBox.FormattingEnabled = true;
+       this.keyMapComboBox.Location = new System.Drawing.Point(55, 19);
+       this.keyMapComboBox.Name = "keyMapComboBox";
+       this.keyMapComboBox.Size = new System.Drawing.Size(128, 21);
+       this.keyMapComboBox.TabIndex = 1;
+       // 
+       // brLabel
+       // 
+       this.brLabel.AutoSize = true;
+       this.brLabel.Location = new System.Drawing.Point(29, 50);
+       this.brLabel.Name = "brLabel";
+       this.brLabel.Size = new System.Drawing.Size(56, 13);
+       this.brLabel.TabIndex = 2;
+       this.brLabel.Text = "Baud rate:";
+       // 
+       // baudComboBox
+       // 
+       this.baudComboBox.FormattingEnabled = true;
+       this.baudComboBox.Location = new System.Drawing.Point(88, 46);
+       this.baudComboBox.Name = "baudComboBox";
+       this.baudComboBox.Size = new System.Drawing.Size(93, 21);
+       this.baudComboBox.TabIndex = 3;
+       // 
+       // advancedBox
+       // 
+       this.advancedBox.Controls.Add(this.cbAllowSubChannels);
+       this.advancedBox.Controls.Add(this.cbHideOSD);
+       this.advancedBox.Controls.Add(this.cbtwowaydisable);
+       this.advancedBox.Controls.Add(this.debugBox);
+       this.advancedBox.Controls.Add(this.powerOnBox);
+       this.advancedBox.Controls.Add(this.channelSetBox);
+       this.advancedBox.Controls.Add(this.commandSetBox);
+       this.advancedBox.Controls.Add(this.keyMapComboBox);
+       this.advancedBox.Controls.Add(this.keyMapLabel);
+       this.advancedBox.Location = new System.Drawing.Point(215, 12);
+       this.advancedBox.Name = "advancedBox";
+       this.advancedBox.Size = new System.Drawing.Size(191, 201);
+       this.advancedBox.TabIndex = 1;
+       this.advancedBox.TabStop = false;
+       this.advancedBox.Text = "Advanced settings";
+       // 
+       // cbHideOSD
+       // 
+       this.cbHideOSD.AutoSize = true;
+       this.cbHideOSD.Location = new System.Drawing.Point(10, 156);
+       this.cbHideOSD.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+       this.cbHideOSD.Name = "cbHideOSD";
+       this.cbHideOSD.Size = new System.Drawing.Size(74, 17);
+       this.cbHideOSD.TabIndex = 7;
+       this.cbHideOSD.Text = "Hide OSD";
+       this.toolTip1.SetToolTip(this.cbHideOSD, "This may only work for D10-100 boxes");
+       this.cbHideOSD.UseVisualStyleBackColor = true;
+       // 
+       // cbtwowaydisable
+       // 
+       this.cbtwowaydisable.AutoSize = true;
+       this.cbtwowaydisable.Location = new System.Drawing.Point(10, 135);
+       this.cbtwowaydisable.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+       this.cbtwowaydisable.Name = "cbtwowaydisable";
+       this.cbtwowaydisable.Size = new System.Drawing.Size(177, 17);
+       this.cbtwowaydisable.TabIndex = 6;
+       this.cbtwowaydisable.Text = "Disable two-way communication";
+       this.toolTip1.SetToolTip(this.cbtwowaydisable, "For D10-100 Boxes");
+       this.cbtwowaydisable.UseVisualStyleBackColor = true;
+       // 
+       // debugBox
+       // 
+       this.debugBox.AutoSize = true;
+       this.debugBox.Location = new System.Drawing.Point(10, 113);
+       this.debugBox.Name = "debugBox";
+       this.debugBox.Size = new System.Drawing.Size(144, 17);
+       this.debugBox.TabIndex = 5;
+       this.debugBox.Text = "Enable extensive logging";
+       this.debugBox.UseVisualStyleBackColor = true;
+       // 
+       // powerOnBox
+       // 
+       this.powerOnBox.AutoSize = true;
+       this.powerOnBox.Location = new System.Drawing.Point(10, 91);
+       this.powerOnBox.Name = "powerOnBox";
+       this.powerOnBox.Size = new System.Drawing.Size(157, 17);
+       this.powerOnBox.TabIndex = 4;
+       this.powerOnBox.Text = "Use power-on before tuning";
+       this.powerOnBox.UseVisualStyleBackColor = true;
+       // 
+       // channelSetBox
+       // 
+       this.channelSetBox.AutoSize = true;
+       this.channelSetBox.Location = new System.Drawing.Point(10, 69);
+       this.channelSetBox.Name = "channelSetBox";
+       this.channelSetBox.Size = new System.Drawing.Size(160, 17);
+       this.channelSetBox.TabIndex = 3;
+       this.channelSetBox.Text = "Use \"channel set\" for tuning";
+       this.channelSetBox.UseVisualStyleBackColor = true;
+       // 
+       // commandSetBox
+       // 
+       this.commandSetBox.AutoSize = true;
+       this.commandSetBox.Location = new System.Drawing.Point(10, 47);
+       this.commandSetBox.Name = "commandSetBox";
+       this.commandSetBox.Size = new System.Drawing.Size(128, 17);
+       this.commandSetBox.TabIndex = 2;
+       this.commandSetBox.Text = "Use old command set";
+       this.toolTip1.SetToolTip(this.commandSetBox, "If your receiver is more than two years old, you may need to check this box");
+       this.commandSetBox.UseVisualStyleBackColor = true;
+       // 
+       // communicationBox
+       // 
+       this.communicationBox.Controls.Add(this.timeoutLabel);
+       this.communicationBox.Controls.Add(this.timeoutNumUpDown);
+       this.communicationBox.Controls.Add(this.baudComboBox);
+       this.communicationBox.Controls.Add(this.serialPortLabel);
+       this.communicationBox.Controls.Add(this.portComboBox);
+       this.communicationBox.Controls.Add(this.brLabel);
+       this.communicationBox.Location = new System.Drawing.Point(13, 88);
+       this.communicationBox.Name = "communicationBox";
+       this.communicationBox.Size = new System.Drawing.Size(190, 125);
+       this.communicationBox.TabIndex = 2;
+       this.communicationBox.TabStop = false;
+       this.communicationBox.Text = "Communication settings";
+       // 
+       // timeoutLabel
+       // 
+       this.timeoutLabel.AutoSize = true;
+       this.timeoutLabel.Location = new System.Drawing.Point(12, 77);
+       this.timeoutLabel.Name = "timeoutLabel";
+       this.timeoutLabel.Size = new System.Drawing.Size(73, 13);
+       this.timeoutLabel.TabIndex = 5;
+       this.timeoutLabel.Text = "Read timeout:";
+       // 
+       // timeoutNumUpDown
+       // 
+       this.timeoutNumUpDown.Location = new System.Drawing.Point(88, 74);
+       this.timeoutNumUpDown.Maximum = new decimal(new int[] {
             30000,
             0,
             0,
             0});
-      this.timeoutNumUpDown.Minimum = new decimal(new int[] {
+       this.timeoutNumUpDown.Minimum = new decimal(new int[] {
             500,
             0,
             0,
             0});
-      this.timeoutNumUpDown.Name = "timeoutNumUpDown";
-      this.timeoutNumUpDown.Size = new System.Drawing.Size(121, 22);
-      this.timeoutNumUpDown.TabIndex = 4;
-      this.toolTip1.SetToolTip(this.timeoutNumUpDown, "Lowering this number may speed up channel changing");
-      this.timeoutNumUpDown.Value = new decimal(new int[] {
+       this.timeoutNumUpDown.Name = "timeoutNumUpDown";
+       this.timeoutNumUpDown.Size = new System.Drawing.Size(91, 20);
+       this.timeoutNumUpDown.TabIndex = 4;
+       this.toolTip1.SetToolTip(this.timeoutNumUpDown, "Lowering this number may speed up channel changing");
+       this.timeoutNumUpDown.Value = new decimal(new int[] {
             500,
             0,
             0,
             0});
-      // 
-      // okButton
-      // 
-      this.okButton.Location = new System.Drawing.Point(170, 279);
-      this.okButton.Margin = new System.Windows.Forms.Padding(4);
-      this.okButton.Name = "okButton";
-      this.okButton.Size = new System.Drawing.Size(100, 28);
-      this.okButton.TabIndex = 3;
-      this.okButton.Text = "OK";
-      this.okButton.UseVisualStyleBackColor = true;
-      this.okButton.Click += new System.EventHandler(this.okButton_Click);
-      // 
-      // cancelButton
-      // 
-      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-      this.cancelButton.Location = new System.Drawing.Point(287, 279);
-      this.cancelButton.Margin = new System.Windows.Forms.Padding(4);
-      this.cancelButton.Name = "cancelButton";
-      this.cancelButton.Size = new System.Drawing.Size(100, 28);
-      this.cancelButton.TabIndex = 4;
-      this.cancelButton.Text = "Cancel";
-      this.cancelButton.UseVisualStyleBackColor = true;
-      this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-      // 
-      // cbHideOSD
-      // 
-      this.cbHideOSD.AutoSize = true;
-      this.cbHideOSD.Location = new System.Drawing.Point(13, 210);
-      this.cbHideOSD.Name = "cbHideOSD";
-      this.cbHideOSD.Size = new System.Drawing.Size(90, 21);
-      this.cbHideOSD.TabIndex = 7;
-      this.cbHideOSD.Text = "Hide OSD";
-      this.toolTip1.SetToolTip(this.cbHideOSD, "This may only work for D10-100 boxes");
-      this.cbHideOSD.UseVisualStyleBackColor = true;
-      // 
-      // SetupForm
-      // 
-      this.AcceptButton = this.okButton;
-      this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.CancelButton = this.cancelButton;
-      this.ClientSize = new System.Drawing.Size(573, 331);
-      this.Controls.Add(this.cancelButton);
-      this.Controls.Add(this.okButton);
-      this.Controls.Add(this.communicationBox);
-      this.Controls.Add(this.advancedBox);
-      this.Controls.Add(this.globalBox);
-      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-      this.Margin = new System.Windows.Forms.Padding(4);
-      this.MaximizeBox = false;
-      this.MinimizeBox = false;
-      this.Name = "SetupForm";
-      this.Text = "DirecTV Tuner Plugin Settings";
-      this.globalBox.ResumeLayout(false);
-      this.globalBox.PerformLayout();
-      this.advancedBox.ResumeLayout(false);
-      this.advancedBox.PerformLayout();
-      this.communicationBox.ResumeLayout(false);
-      this.communicationBox.PerformLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.timeoutNumUpDown)).EndInit();
-      this.ResumeLayout(false);
+       // 
+       // okButton
+       // 
+       this.okButton.Location = new System.Drawing.Point(128, 227);
+       this.okButton.Name = "okButton";
+       this.okButton.Size = new System.Drawing.Size(75, 23);
+       this.okButton.TabIndex = 3;
+       this.okButton.Text = "OK";
+       this.okButton.UseVisualStyleBackColor = true;
+       this.okButton.Click += new System.EventHandler(this.okButton_Click);
+       // 
+       // cancelButton
+       // 
+       this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+       this.cancelButton.Location = new System.Drawing.Point(215, 227);
+       this.cancelButton.Name = "cancelButton";
+       this.cancelButton.Size = new System.Drawing.Size(75, 23);
+       this.cancelButton.TabIndex = 4;
+       this.cancelButton.Text = "Cancel";
+       this.cancelButton.UseVisualStyleBackColor = true;
+       this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+       // 
+       // cbAllowSubChannels
+       // 
+       this.cbAllowSubChannels.AutoSize = true;
+       this.cbAllowSubChannels.Location = new System.Drawing.Point(10, 177);
+       this.cbAllowSubChannels.Margin = new System.Windows.Forms.Padding(2);
+       this.cbAllowSubChannels.Name = "cbAllowSubChannels";
+       this.cbAllowSubChannels.Size = new System.Drawing.Size(149, 17);
+       this.cbAllowSubChannels.TabIndex = 8;
+       this.cbAllowSubChannels.Text = "Allow Digital SubChannels";
+       this.toolTip1.SetToolTip(this.cbAllowSubChannels, "This may only work for HTL-HD boxes using the RCA New command Set.\r\nIt will allow" +
+               " tuning to digital subchannels if the external channel is in the \r\nform 9-2, 000" +
+               "902, 32-1, 003201");
+       this.cbAllowSubChannels.UseVisualStyleBackColor = true;
+       // 
+       // SetupForm
+       // 
+       this.AcceptButton = this.okButton;
+       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+       this.CancelButton = this.cancelButton;
+       this.ClientSize = new System.Drawing.Size(430, 269);
+       this.Controls.Add(this.cancelButton);
+       this.Controls.Add(this.okButton);
+       this.Controls.Add(this.communicationBox);
+       this.Controls.Add(this.advancedBox);
+       this.Controls.Add(this.globalBox);
+       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+       this.MaximizeBox = false;
+       this.MinimizeBox = false;
+       this.Name = "SetupForm";
+       this.Text = "DirecTV Tuner Plugin Settings";
+       this.globalBox.ResumeLayout(false);
+       this.globalBox.PerformLayout();
+       this.advancedBox.ResumeLayout(false);
+       this.advancedBox.PerformLayout();
+       this.communicationBox.ResumeLayout(false);
+       this.communicationBox.PerformLayout();
+       ((System.ComponentModel.ISupportInitialize)(this.timeoutNumUpDown)).EndInit();
+       this.ResumeLayout(false);
 
     }
 
@@ -375,5 +369,6 @@
     private System.Windows.Forms.CheckBox cbtwowaydisable;
     private System.Windows.Forms.CheckBox cbHideOSD;
     private System.Windows.Forms.ToolTip toolTip1;
+     private System.Windows.Forms.CheckBox cbAllowSubChannels;
   }
 }
\ No newline at end of file

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.cs
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.cs	2007-01-29 13:17:12 UTC (rev 38)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/SetupForm.cs	2007-01-29 13:18:00 UTC (rev 39)
@@ -70,6 +70,7 @@
 
       cbtwowaydisable.Checked = _settings.TwoWayDisable;
       cbHideOSD.Checked = _settings.HideOSD;
+      cbAllowSubChannels.Checked = _settings.AllowDigitalSubchannels;
 
     }
 
@@ -87,6 +88,7 @@
       _settings.PowerOn = powerOnBox.Checked;
       _settings.Debug = debugBox.Checked;
       _settings.HideOSD = cbHideOSD.Checked;
+      _settings.AllowDigitalSubchannels = cbAllowSubChannels.Checked;
       _settings.SaveSettings();
     }
 

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs	2007-01-29 13:17:12 UTC (rev 38)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs	2007-01-29 13:18:00 UTC (rev 39)
@@ -33,6 +33,8 @@
       _serialInterface.UseSetChannelForTune = _settings.UseSetChannelForTune;
       _serialInterface.TwoWayDisable = _settings.TwoWayDisable;
       _serialInterface.HideOSD = _settings.HideOSD;
+      _serialInterface.AllowDigitalSubchannels = _settings.AllowDigitalSubchannels;
+
       if (_settings.Debug)
       {
         _serialInterface.OnDebugMessage += new SerialInterface.DebugMessageHandler(Log.Debug);
@@ -57,12 +59,19 @@
     {
       if (message.Message == GUIMessage.MessageType.GUI_MSG_TUNE_EXTERNAL_CHANNEL)
       {
-        int channelNumber;
-        channelNumber = Convert.ToInt32(message.Label);
-        if (channelNumber >= 0 && channelNumber <= 65535)
+        if (_settings.AllowDigitalSubchannels)
         {
-          _serialInterface.TuneToChannel(channelNumber);
+          _serialInterface.TuneToChannel(message.Label);
         }
+        else
+        {
+          int channelNumber;
+          channelNumber = Convert.ToInt32(message.Label);
+          if (channelNumber >= 0 && channelNumber <= 65535)
+          {
+            _serialInterface.TuneToChannel(channelNumber);
+          }
+        }
       }
     }
         

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj	2007-01-29 13:17:12 UTC (rev 38)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj	2007-01-29 13:18:00 UTC (rev 39)
@@ -60,19 +60,15 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Core, Version=1.0.2579.42468, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Core, Version=1.0.2546.32606, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Desktop\Release\Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\MediaPortal-References-v0.2.2-Release\Core.DLL</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="Utils, Version=1.0.2579.42459, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Desktop\Release\Utils.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <PropertyGroup>
     <PostBuildEvent>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins: [48] trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/ TunerPlugin

[<pat...@us...>]

Revision: 48
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=48&view=rev
Author:   patrick_sf
Date:     2007-01-29 15:35:51 -0800 (Mon, 29 Jan 2007)

Log Message:
-----------
Updated the digital subchannel code again

Modified Paths:
--------------
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs	2007-01-29 21:35:54 UTC (rev 47)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs	2007-01-29 23:35:51 UTC (rev 48)
@@ -59,14 +59,18 @@
     {
       if (message.Message == GUIMessage.MessageType.GUI_MSG_TUNE_EXTERNAL_CHANNEL)
       {
+        if (message.Label == null)
+          return;
+
+        string channelString = message.Label;
+
         if (_settings.AllowDigitalSubchannels)
         {
-          _serialInterface.TuneToChannel(message.Label);
+          _serialInterface.TuneToChannel(channelString);
         }
         else
         {
-          int channelNumber;
-          channelNumber = Convert.ToInt32(message.Label);
+          int channelNumber = Convert.ToInt32(channelString);
           if (channelNumber >= 0 && channelNumber <= 65535)
           {
             _serialInterface.TuneToChannel(channelNumber);

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj	2007-01-29 21:35:54 UTC (rev 47)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj	2007-01-29 23:35:51 UTC (rev 48)
@@ -60,18 +60,18 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Core, Version=1.0.2585.19609, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Core, Version=1.0.2546.32606, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\References-MP-SVN\Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\References-MP-v0.2.2-Release\Core.DLL</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="Utils, Version=1.0.2585.19595, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Utils, Version=1.0.2546.32604, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\References-MP-SVN\Utils.dll</HintPath>
+      <HintPath>..\..\..\..\..\References-MP-v0.2.2-Release\Utils.DLL</HintPath>
     </Reference>
   </ItemGroup>
   <PropertyGroup>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins: [54] trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/ TunerPlugin

[<pat...@us...>]

Revision: 54
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=54&view=rev
Author:   patrick_sf
Date:     2007-01-29 20:17:52 -0800 (Mon, 29 Jan 2007)

Log Message:
-----------
finally think the subchannels are working

Modified Paths:
--------------
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs
    trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs	2007-01-30 03:10:57 UTC (rev 53)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.cs	2007-01-30 04:17:52 UTC (rev 54)
@@ -41,6 +41,10 @@
         Log.Debug("DirecTV tuner plugin extensive logging enabled");
         _serialInterface.DumpConfig();
       }
+      if (_settings.AllowDigitalSubchannels)
+      {
+        Log.Debug("DirecTV tuner plugin Allowing Digital Subchannels");
+      }
       _serialInterface.OpenPort();
       _settings = null;
       GUIWindowManager.Receivers += new SendMessageHandler(this.OnThreadMessage);
@@ -59,12 +63,10 @@
     {
       if (message.Message == GUIMessage.MessageType.GUI_MSG_TUNE_EXTERNAL_CHANNEL)
       {
-        if (message.Label == null)
-          return;
+        Log.Debug("DirecTV TUNE Message Recieved: {0}", message.Label);
 
         string channelString = message.Label;
-
-        if (_settings.AllowDigitalSubchannels)
+        if (_serialInterface.AllowDigitalSubchannels)
         {
           _serialInterface.TuneToChannel(channelString);
         }

Modified: trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj
===================================================================
--- trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj	2007-01-30 03:10:57 UTC (rev 53)
+++ trunk/plugins/DirectTv/TVE 2 DirecTV Plugin/TunerPlugin/TunerPlugin.csproj	2007-01-30 04:17:52 UTC (rev 54)
@@ -60,18 +60,18 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Core, Version=1.0.2546.32606, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Core, Version=1.0.2564.35646, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\References-MP-v0.2.2-Release\Core.DLL</HintPath>
+      <HintPath>..\..\..\..\..\References-MP-SVN\Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="Utils, Version=1.0.2546.32604, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Utils, Version=1.0.2564.35632, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\References-MP-v0.2.2-Release\Utils.DLL</HintPath>
+      <HintPath>..\..\..\..\..\References-MP-SVN\Utils.dll</HintPath>
     </Reference>
   </ItemGroup>
   <PropertyGroup>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.