Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [683] trunk/plugins/VideoLAN
|
From: <moi...@us...> - 2007-07-11 21:55:36
|
Revision: 683
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=683&view=rev
Author: moiristo
Date: 2007-07-11 14:55:32 -0700 (Wed, 11 Jul 2007)
Log Message:
-----------
Settings dialog update
Modified Paths:
--------------
trunk/plugins/VideoLAN/ConfigurationForm.cs
trunk/plugins/VideoLAN/VideoLAN.csproj
Modified: trunk/plugins/VideoLAN/ConfigurationForm.cs
===================================================================
--- trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-07-11 20:31:36 UTC (rev 682)
+++ trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-07-11 21:55:32 UTC (rev 683)
@@ -41,10 +41,8 @@
/// </summary>
public class ConfigurationForm : System.Windows.Forms.Form
{
- private string bufsize = "";
- private string m_deinterlace = "Disable";
private MediaPortal.UserInterface.Controls.MPButton okBtn;
- private GroupBox groupBox1;
+ private GroupBox transBox;
private TextBox bufBox;
private Label label3;
private Label label4;
@@ -84,6 +82,8 @@
private Panel audPanel;
private Panel vidPanel;
private bool isCancelled = false;
+ private ComboBox avBox;
+ private Label label1;
/// <summary>
/// Required designer variable.
/// </summary>
@@ -120,7 +120,9 @@
private void InitializeComponent()
{
this.okBtn = new MediaPortal.UserInterface.Controls.MPButton();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.transBox = new System.Windows.Forms.GroupBox();
+ this.avBox = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
this.deintBox = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
this.bufBox = new System.Windows.Forms.TextBox();
@@ -142,6 +144,7 @@
this.checkBox15 = new System.Windows.Forms.CheckBox();
this.checkBox10 = new System.Windows.Forms.CheckBox();
this.checkBox11 = new System.Windows.Forms.CheckBox();
+ this.checkBox13 = new System.Windows.Forms.CheckBox();
this.checkBox7 = new System.Windows.Forms.CheckBox();
this.checkBox8 = new System.Windows.Forms.CheckBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
@@ -151,7 +154,6 @@
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.allAudBtn = new System.Windows.Forms.Button();
this.allVidBtn = new System.Windows.Forms.Button();
- this.checkBox13 = new System.Windows.Forms.CheckBox();
this.protBox = new System.Windows.Forms.GroupBox();
this.httpOpt = new System.Windows.Forms.CheckBox();
this.udpOpt = new System.Windows.Forms.CheckBox();
@@ -159,7 +161,7 @@
this.mmsOpt = new System.Windows.Forms.CheckBox();
this.cancelBtn = new System.Windows.Forms.Button();
this.applyBtn = new System.Windows.Forms.Button();
- this.groupBox1.SuspendLayout();
+ this.transBox.SuspendLayout();
this.groupBox2.SuspendLayout();
this.audPanel.SuspendLayout();
this.vidPanel.SuspendLayout();
@@ -168,7 +170,7 @@
//
// okBtn
//
- this.okBtn.Location = new System.Drawing.Point(170, 367);
+ this.okBtn.Location = new System.Drawing.Point(191, 358);
this.okBtn.Name = "okBtn";
this.okBtn.Size = new System.Drawing.Size(75, 23);
this.okBtn.TabIndex = 3;
@@ -176,19 +178,45 @@
this.okBtn.UseVisualStyleBackColor = true;
this.okBtn.Click += new System.EventHandler(this.buttonEnable_Click);
//
- // groupBox1
+ // transBox
//
- this.groupBox1.Controls.Add(this.deintBox);
- this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Controls.Add(this.bufBox);
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Location = new System.Drawing.Point(11, 12);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(222, 89);
- this.groupBox1.TabIndex = 7;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "General settings";
+ this.transBox.Controls.Add(this.avBox);
+ this.transBox.Controls.Add(this.label1);
+ this.transBox.Controls.Add(this.deintBox);
+ this.transBox.Controls.Add(this.label4);
+ this.transBox.Controls.Add(this.bufBox);
+ this.transBox.Controls.Add(this.label3);
+ this.transBox.Location = new System.Drawing.Point(11, 4);
+ this.transBox.Name = "transBox";
+ this.transBox.Size = new System.Drawing.Size(241, 102);
+ this.transBox.TabIndex = 7;
+ this.transBox.TabStop = false;
+ this.transBox.Text = "General settings";
//
+ // avBox
+ //
+ this.avBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.avBox.FormattingEnabled = true;
+ this.avBox.Items.AddRange(new object[] {
+ "Disable",
+ "Goom",
+ "Scope",
+ "Spectrometer",
+ "Spectrum"});
+ this.avBox.Location = new System.Drawing.Point(112, 72);
+ this.avBox.Name = "avBox";
+ this.avBox.Size = new System.Drawing.Size(123, 21);
+ this.avBox.TabIndex = 13;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(4, 75);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(102, 13);
+ this.label1.TabIndex = 12;
+ this.label1.Text = "Audio visualizations:";
+ //
// deintBox
//
this.deintBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -201,15 +229,16 @@
"Linear",
"Mean",
"X"});
- this.deintBox.Location = new System.Drawing.Point(104, 50);
+ this.deintBox.Location = new System.Drawing.Point(112, 43);
this.deintBox.Name = "deintBox";
this.deintBox.Size = new System.Drawing.Size(110, 21);
this.deintBox.TabIndex = 11;
+ this.deintBox.SelectedIndexChanged += new System.EventHandler(this.deintBox_SelectedIndexChanged);
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(6, 54);
+ this.label4.Location = new System.Drawing.Point(4, 46);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(64, 13);
this.label4.TabIndex = 10;
@@ -217,7 +246,7 @@
//
// bufBox
//
- this.bufBox.Location = new System.Drawing.Point(104, 24);
+ this.bufBox.Location = new System.Drawing.Point(112, 17);
this.bufBox.Name = "bufBox";
this.bufBox.Size = new System.Drawing.Size(59, 20);
this.bufBox.TabIndex = 9;
@@ -225,7 +254,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(6, 24);
+ this.label3.Location = new System.Drawing.Point(4, 20);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(92, 13);
this.label3.TabIndex = 8;
@@ -237,9 +266,9 @@
this.groupBox2.Controls.Add(this.vidPanel);
this.groupBox2.Controls.Add(this.allAudBtn);
this.groupBox2.Controls.Add(this.allVidBtn);
- this.groupBox2.Location = new System.Drawing.Point(239, 12);
+ this.groupBox2.Location = new System.Drawing.Point(258, 2);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(169, 349);
+ this.groupBox2.Size = new System.Drawing.Size(169, 350);
this.groupBox2.TabIndex = 8;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Associated extensions";
@@ -420,6 +449,16 @@
this.checkBox11.Text = ".mp4";
this.checkBox11.UseVisualStyleBackColor = true;
//
+ // checkBox13
+ //
+ this.checkBox13.AutoSize = true;
+ this.checkBox13.Location = new System.Drawing.Point(6, 263);
+ this.checkBox13.Name = "checkBox13";
+ this.checkBox13.Size = new System.Drawing.Size(51, 17);
+ this.checkBox13.TabIndex = 9;
+ this.checkBox13.Text = ".wmv";
+ this.checkBox13.UseVisualStyleBackColor = true;
+ //
// checkBox7
//
this.checkBox7.AutoSize = true;
@@ -510,28 +549,18 @@
this.allVidBtn.UseVisualStyleBackColor = true;
this.allVidBtn.Click += new System.EventHandler(this.allVidBtn_Click);
//
- // checkBox13
- //
- this.checkBox13.AutoSize = true;
- this.checkBox13.Location = new System.Drawing.Point(6, 263);
- this.checkBox13.Name = "checkBox13";
- this.checkBox13.Size = new System.Drawing.Size(51, 17);
- this.checkBox13.TabIndex = 9;
- this.checkBox13.Text = ".wmv";
- this.checkBox13.UseVisualStyleBackColor = true;
- //
// protBox
//
this.protBox.Controls.Add(this.httpOpt);
this.protBox.Controls.Add(this.udpOpt);
this.protBox.Controls.Add(this.rtspOpt);
this.protBox.Controls.Add(this.mmsOpt);
- this.protBox.Location = new System.Drawing.Point(12, 109);
+ this.protBox.Location = new System.Drawing.Point(12, 111);
this.protBox.Name = "protBox";
- this.protBox.Size = new System.Drawing.Size(221, 84);
+ this.protBox.Size = new System.Drawing.Size(240, 73);
this.protBox.TabIndex = 24;
this.protBox.TabStop = false;
- this.protBox.Text = "Associated protocols";
+ this.protBox.Text = "Associated input protocols";
//
// httpOpt
//
@@ -575,7 +604,7 @@
//
// cancelBtn
//
- this.cancelBtn.Location = new System.Drawing.Point(251, 367);
+ this.cancelBtn.Location = new System.Drawing.Point(272, 358);
this.cancelBtn.Name = "cancelBtn";
this.cancelBtn.Size = new System.Drawing.Size(75, 23);
this.cancelBtn.TabIndex = 25;
@@ -585,7 +614,7 @@
//
// applyBtn
//
- this.applyBtn.Location = new System.Drawing.Point(333, 367);
+ this.applyBtn.Location = new System.Drawing.Point(352, 358);
this.applyBtn.Name = "applyBtn";
this.applyBtn.Size = new System.Drawing.Size(75, 23);
this.applyBtn.TabIndex = 26;
@@ -596,20 +625,20 @@
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(417, 398);
+ this.ClientSize = new System.Drawing.Size(438, 386);
this.Controls.Add(this.applyBtn);
this.Controls.Add(this.cancelBtn);
this.Controls.Add(this.protBox);
this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.transBox);
this.Controls.Add(this.okBtn);
this.Name = "ConfigurationForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "VideoLan Player Configuration";
this.Closing += new System.ComponentModel.CancelEventHandler(this.ConfigurationForm_Closing);
this.Load += new System.EventHandler(this.ConfigurationForm_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
+ this.transBox.ResumeLayout(false);
+ this.transBox.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.audPanel.ResumeLayout(false);
this.audPanel.PerformLayout();
@@ -626,10 +655,13 @@
{
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
{
+ bool transcode = xmlreader.GetValueAsBool("vlcplugin", "transcode", false);
+ string audiovisual = xmlreader.GetValueAsString("vlcplugin", "visual", "Disable");
+ string out_protocol = xmlreader.GetValueAsString("vlcplugin", "protocol", "Leave unchanged");
string m_enabledExt = xmlreader.GetValueAsString("vlcplugin", "enabledextensions", ".ts,.gary");
string m_enabledStreams = xmlreader.GetValueAsString("vlcplugin", "enabledstreams", "udp");
- bufsize = xmlreader.GetValueAsString("vlcplugin", "buffer", "5000");
- m_deinterlace = xmlreader.GetValueAsString("vlcplugin", "deinterlace", "Disable");
+ string bufsize = xmlreader.GetValueAsString("vlcplugin", "buffer", "5000");
+ string m_deinterlace = xmlreader.GetValueAsString("vlcplugin", "deinterlace", "Disable");
m_enabledExt.Replace(":", ","); // in case it was using the old plugin code where the separator was ":"
if (m_enabledExt != null && m_enabledExt.Length > 0)
{
@@ -645,9 +677,10 @@
foreach (CheckBox pbox in protBox.Controls)
if (protArrayList.Contains(pbox.Text)) pbox.Checked = true;
}
- }
this.bufBox.Text = bufsize;
this.deintBox.SelectedItem = m_deinterlace;
+ this.avBox.Text = audiovisual;
+ }
}
private void ConfigurationForm_Closing(object sender, System.ComponentModel.CancelEventArgs e)
@@ -692,6 +725,7 @@
{
using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
{
+ xmlWriter.SetValue("vlcplugin", "visual", avBox.Text);
xmlWriter.SetValue("vlcplugin", "enabledextensions", getCheckedExtensions());
xmlWriter.SetValue("vlcplugin", "enabledstreams", getCheckedProtocols());
xmlWriter.SetValue("vlcplugin", "buffer", bufBox.Text);
@@ -718,5 +752,10 @@
return result.Substring(0, result.Length - 1);
}
+
+ private void deintBox_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
}
}
Modified: trunk/plugins/VideoLAN/VideoLAN.csproj
===================================================================
--- trunk/plugins/VideoLAN/VideoLAN.csproj 2007-07-11 20:31:36 UTC (rev 682)
+++ trunk/plugins/VideoLAN/VideoLAN.csproj 2007-07-11 21:55:32 UTC (rev 683)
@@ -36,18 +36,22 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\AXVLC.dll</HintPath>
</Reference>
- <Reference Include="Core, Version=1.0.2546.32606, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=1.0.2586.6922, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\MediaPortal\Core.DLL</HintPath>
+ <HintPath>..\..\trunk\mediaportal\Dialogs\bin\Release\Core.dll</HintPath>
</Reference>
+ <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\trunk\mediaportal\Dialogs\bin\Release\Dialogs.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.2586.6921, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\MediaPortal\Utils.DLL</HintPath>
+ <HintPath>..\..\trunk\mediaportal\Dialogs\bin\Release\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
