Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [829] trunk/plugins/My MPlayer
|
From: <mis...@us...> - 2007-08-13 11:14:55
|
Revision: 829
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=829&view=rev
Author: misterd_sf
Date: 2007-08-13 04:14:54 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
- Redesign Configuration form of External Player
- Added new features: Audio Delay, Subtitle Delay, Subtitle position, Subtitle/OSD size can now be changed during playback
- Added localization support for GUI and external player
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.csproj
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.csproj
Added Paths:
-----------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_de.xml
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_en.xml
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/LocalizeStrings.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/LocalizeStrings.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-08-13 08:55:30 UTC (rev 828)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-08-13 11:14:54 UTC (rev 829)
@@ -47,18 +47,10 @@
private void InitializeComponent() {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigurationForm));
this.okButton = new System.Windows.Forms.Button();
- this.label1 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
this.rebuildIndex = new System.Windows.Forms.CheckBox();
this.priorityBoost = new System.Windows.Forms.CheckBox();
this.label5 = new System.Windows.Forms.Label();
this.optionalArguments = new System.Windows.Forms.TextBox();
- this.soundOutputDriver = new System.Windows.Forms.ComboBox();
- this.postProcessing = new System.Windows.Forms.ComboBox();
- this.aspectRatio = new System.Windows.Forms.ComboBox();
- this.deinterlace = new System.Windows.Forms.ComboBox();
this.cancelButton = new System.Windows.Forms.Button();
this.mplayerPath = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
@@ -66,25 +58,39 @@
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.general_Tab = new System.Windows.Forms.TabPage();
- this.label6 = new System.Windows.Forms.Label();
- this.videoOutputDriver = new System.Windows.Forms.ComboBox();
- this.subtitles = new System.Windows.Forms.CheckBox();
this.label30 = new System.Windows.Forms.Label();
this.cacheSize = new System.Windows.Forms.ComboBox();
- this.label29 = new System.Windows.Forms.Label();
- this.soundOutputDevice = new System.Windows.Forms.ComboBox();
- this.passthroughAC3_DTS = new System.Windows.Forms.CheckBox();
this.label22 = new System.Windows.Forms.Label();
this.osdFont = new System.Windows.Forms.ComboBox();
- this.audioNormalize = new System.Windows.Forms.CheckBox();
+ this.video_Tab = new System.Windows.Forms.TabPage();
+ this.subtitleDelayStep = new System.Windows.Forms.NumericUpDown();
+ this.label31 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.videoOutputDriver = new System.Windows.Forms.ComboBox();
+ this.subtitles = new System.Windows.Forms.CheckBox();
this.framedrop = new System.Windows.Forms.CheckBox();
this.directRendering = new System.Windows.Forms.CheckBox();
this.doubleBuffering = new System.Windows.Forms.CheckBox();
this.label21 = new System.Windows.Forms.Label();
+ this.noiseDenoise = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.deinterlace = new System.Windows.Forms.ComboBox();
+ this.aspectRatio = new System.Windows.Forms.ComboBox();
+ this.postProcessing = new System.Windows.Forms.ComboBox();
+ this.audio_Tab = new System.Windows.Forms.TabPage();
+ this.audioDelayStep = new System.Windows.Forms.NumericUpDown();
+ this.label32 = new System.Windows.Forms.Label();
+ this.label29 = new System.Windows.Forms.Label();
+ this.soundOutputDevice = new System.Windows.Forms.ComboBox();
+ this.passthroughAC3_DTS = new System.Windows.Forms.CheckBox();
+ this.audioNormalize = new System.Windows.Forms.CheckBox();
this.label7 = new System.Windows.Forms.Label();
- this.noiseDenoise = new System.Windows.Forms.ComboBox();
this.audioChannels = new System.Windows.Forms.ComboBox();
- this.video_audio_Tab = new System.Windows.Forms.TabPage();
+ this.label1 = new System.Windows.Forms.Label();
+ this.soundOutputDriver = new System.Windows.Forms.ComboBox();
+ this.extension_Tab = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label26 = new System.Windows.Forms.Label();
this.audioPlayerUse = new System.Windows.Forms.CheckBox();
@@ -134,7 +140,11 @@
this.fontDialog1 = new System.Windows.Forms.FontDialog();
this.tabControl1.SuspendLayout();
this.general_Tab.SuspendLayout();
- this.video_audio_Tab.SuspendLayout();
+ this.video_Tab.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.subtitleDelayStep)).BeginInit();
+ this.audio_Tab.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.audioDelayStep)).BeginInit();
+ this.extension_Tab.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.dvd_vcd_svcd_streams_Tab.SuspendLayout();
@@ -142,7 +152,7 @@
//
// okButton
//
- this.okButton.Location = new System.Drawing.Point(18, 511);
+ this.okButton.Location = new System.Drawing.Point(25, 460);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 3;
@@ -150,41 +160,9 @@
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
- // label1
- //
- this.label1.Location = new System.Drawing.Point(3, 14);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(117, 23);
- this.label1.TabIndex = 8;
- this.label1.Text = "Sound output driver:";
- //
- // label2
- //
- this.label2.Location = new System.Drawing.Point(3, 95);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(117, 23);
- this.label2.TabIndex = 9;
- this.label2.Text = "Postprocessing:";
- //
- // label3
- //
- this.label3.Location = new System.Drawing.Point(3, 122);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(117, 23);
- this.label3.TabIndex = 10;
- this.label3.Text = "Aspect Ratio:";
- //
- // label4
- //
- this.label4.Location = new System.Drawing.Point(3, 149);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(117, 23);
- this.label4.TabIndex = 11;
- this.label4.Text = "Deinterlace:";
- //
// rebuildIndex
//
- this.rebuildIndex.Location = new System.Drawing.Point(6, 318);
+ this.rebuildIndex.Location = new System.Drawing.Point(9, 98);
this.rebuildIndex.Name = "rebuildIndex";
this.rebuildIndex.Size = new System.Drawing.Size(188, 23);
this.rebuildIndex.TabIndex = 12;
@@ -193,7 +171,7 @@
//
// priorityBoost
//
- this.priorityBoost.Location = new System.Drawing.Point(6, 347);
+ this.priorityBoost.Location = new System.Drawing.Point(9, 127);
this.priorityBoost.Name = "priorityBoost";
this.priorityBoost.Size = new System.Drawing.Size(188, 23);
this.priorityBoost.TabIndex = 13;
@@ -202,7 +180,7 @@
//
// label5
//
- this.label5.Location = new System.Drawing.Point(3, 286);
+ this.label5.Location = new System.Drawing.Point(6, 72);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(117, 23);
this.label5.TabIndex = 14;
@@ -210,70 +188,15 @@
//
// optionalArguments
//
- this.optionalArguments.Location = new System.Drawing.Point(122, 283);
+ this.optionalArguments.Location = new System.Drawing.Point(125, 69);
this.optionalArguments.Name = "optionalArguments";
this.optionalArguments.Size = new System.Drawing.Size(260, 20);
this.optionalArguments.TabIndex = 15;
//
- // soundOutputDriver
- //
- this.soundOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.soundOutputDriver.FormattingEnabled = true;
- this.soundOutputDriver.Items.AddRange(new object[] {
- "(don\'t decode sound)",
- "(don\'t play sound)",
- "Win32",
- "DirectSound"});
- this.soundOutputDriver.Location = new System.Drawing.Point(122, 11);
- this.soundOutputDriver.Name = "soundOutputDriver";
- this.soundOutputDriver.Size = new System.Drawing.Size(260, 21);
- this.soundOutputDriver.TabIndex = 16;
- this.soundOutputDriver.SelectedIndexChanged += new System.EventHandler(this.soundOutputDriver_SelectedIndexChanged);
- //
- // postProcessing
- //
- this.postProcessing.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.postProcessing.FormattingEnabled = true;
- this.postProcessing.Items.AddRange(new object[] {
- "Off",
- "Automatic",
- "Maximum quality"});
- this.postProcessing.Location = new System.Drawing.Point(122, 92);
- this.postProcessing.Name = "postProcessing";
- this.postProcessing.Size = new System.Drawing.Size(260, 21);
- this.postProcessing.TabIndex = 17;
- //
- // aspectRatio
- //
- this.aspectRatio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.aspectRatio.FormattingEnabled = true;
- this.aspectRatio.Items.AddRange(new object[] {
- "Autodetect",
- "4:3",
- "16:9",
- "2,35"});
- this.aspectRatio.Location = new System.Drawing.Point(122, 119);
- this.aspectRatio.Name = "aspectRatio";
- this.aspectRatio.Size = new System.Drawing.Size(260, 21);
- this.aspectRatio.TabIndex = 18;
- //
- // deinterlace
- //
- this.deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.deinterlace.FormattingEnabled = true;
- this.deinterlace.Items.AddRange(new object[] {
- "Off",
- "Simple",
- "Adaptive"});
- this.deinterlace.Location = new System.Drawing.Point(122, 146);
- this.deinterlace.Name = "deinterlace";
- this.deinterlace.Size = new System.Drawing.Size(260, 21);
- this.deinterlace.TabIndex = 19;
- //
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(348, 511);
+ this.cancelButton.Location = new System.Drawing.Point(327, 460);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 20;
@@ -283,7 +206,7 @@
//
// mplayerPath
//
- this.mplayerPath.Location = new System.Drawing.Point(122, 434);
+ this.mplayerPath.Location = new System.Drawing.Point(125, 156);
this.mplayerPath.Name = "mplayerPath";
this.mplayerPath.Size = new System.Drawing.Size(174, 20);
this.mplayerPath.TabIndex = 21;
@@ -291,7 +214,7 @@
//
// label8
//
- this.label8.Location = new System.Drawing.Point(3, 437);
+ this.label8.Location = new System.Drawing.Point(6, 159);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(117, 23);
this.label8.TabIndex = 22;
@@ -299,7 +222,7 @@
//
// folderSearch
//
- this.folderSearch.Location = new System.Drawing.Point(302, 432);
+ this.folderSearch.Location = new System.Drawing.Point(309, 154);
this.folderSearch.Name = "folderSearch";
this.folderSearch.Size = new System.Drawing.Size(76, 23);
this.folderSearch.TabIndex = 23;
@@ -314,92 +237,40 @@
// tabControl1
//
this.tabControl1.Controls.Add(this.general_Tab);
- this.tabControl1.Controls.Add(this.video_audio_Tab);
+ this.tabControl1.Controls.Add(this.video_Tab);
+ this.tabControl1.Controls.Add(this.audio_Tab);
+ this.tabControl1.Controls.Add(this.extension_Tab);
this.tabControl1.Controls.Add(this.dvd_vcd_svcd_streams_Tab);
this.tabControl1.Location = new System.Drawing.Point(12, 12);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(411, 493);
+ this.tabControl1.Size = new System.Drawing.Size(411, 431);
this.tabControl1.TabIndex = 24;
//
// general_Tab
//
- this.general_Tab.Controls.Add(this.label6);
- this.general_Tab.Controls.Add(this.videoOutputDriver);
- this.general_Tab.Controls.Add(this.subtitles);
this.general_Tab.Controls.Add(this.label30);
this.general_Tab.Controls.Add(this.cacheSize);
- this.general_Tab.Controls.Add(this.label29);
- this.general_Tab.Controls.Add(this.soundOutputDevice);
- this.general_Tab.Controls.Add(this.passthroughAC3_DTS);
this.general_Tab.Controls.Add(this.label22);
this.general_Tab.Controls.Add(this.osdFont);
- this.general_Tab.Controls.Add(this.audioNormalize);
- this.general_Tab.Controls.Add(this.framedrop);
- this.general_Tab.Controls.Add(this.directRendering);
- this.general_Tab.Controls.Add(this.doubleBuffering);
- this.general_Tab.Controls.Add(this.label21);
- this.general_Tab.Controls.Add(this.label7);
- this.general_Tab.Controls.Add(this.noiseDenoise);
- this.general_Tab.Controls.Add(this.audioChannels);
- this.general_Tab.Controls.Add(this.label1);
this.general_Tab.Controls.Add(this.folderSearch);
- this.general_Tab.Controls.Add(this.label2);
this.general_Tab.Controls.Add(this.label8);
this.general_Tab.Controls.Add(this.mplayerPath);
- this.general_Tab.Controls.Add(this.label3);
- this.general_Tab.Controls.Add(this.label4);
this.general_Tab.Controls.Add(this.rebuildIndex);
- this.general_Tab.Controls.Add(this.deinterlace);
this.general_Tab.Controls.Add(this.priorityBoost);
- this.general_Tab.Controls.Add(this.aspectRatio);
this.general_Tab.Controls.Add(this.label5);
- this.general_Tab.Controls.Add(this.postProcessing);
this.general_Tab.Controls.Add(this.optionalArguments);
- this.general_Tab.Controls.Add(this.soundOutputDriver);
this.general_Tab.Location = new System.Drawing.Point(4, 22);
this.general_Tab.Name = "general_Tab";
this.general_Tab.Padding = new System.Windows.Forms.Padding(3);
- this.general_Tab.Size = new System.Drawing.Size(403, 467);
+ this.general_Tab.Size = new System.Drawing.Size(403, 405);
this.general_Tab.TabIndex = 0;
this.general_Tab.Text = "General";
this.general_Tab.UseVisualStyleBackColor = true;
//
- // label6
- //
- this.label6.Location = new System.Drawing.Point(3, 68);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(117, 23);
- this.label6.TabIndex = 41;
- this.label6.Text = "Video output driver:";
- //
- // videoOutputDriver
- //
- this.videoOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.videoOutputDriver.FormattingEnabled = true;
- this.videoOutputDriver.Items.AddRange(new object[] {
- "DirectX",
- "DirectX - No Acceleration",
- "OpenGL",
- "OpenGL2"});
- this.videoOutputDriver.Location = new System.Drawing.Point(122, 65);
- this.videoOutputDriver.Name = "videoOutputDriver";
- this.videoOutputDriver.Size = new System.Drawing.Size(260, 21);
- this.videoOutputDriver.TabIndex = 40;
- this.videoOutputDriver.SelectedIndexChanged += new System.EventHandler(this.videoOutputDriver_SelectedIndexChanged);
- //
- // subtitles
- //
- this.subtitles.Location = new System.Drawing.Point(200, 405);
- this.subtitles.Name = "subtitles";
- this.subtitles.Size = new System.Drawing.Size(178, 23);
- this.subtitles.TabIndex = 39;
- this.subtitles.Text = "Enable subtitles";
- this.subtitles.UseVisualStyleBackColor = true;
- //
// label30
//
- this.label30.Location = new System.Drawing.Point(3, 259);
+ this.label30.Location = new System.Drawing.Point(6, 45);
this.label30.Name = "label30";
this.label30.Size = new System.Drawing.Size(117, 23);
this.label30.TabIndex = 38;
@@ -412,46 +283,15 @@
"2048",
"4096",
"8192"});
- this.cacheSize.Location = new System.Drawing.Point(122, 256);
+ this.cacheSize.Location = new System.Drawing.Point(126, 42);
this.cacheSize.Name = "cacheSize";
this.cacheSize.Size = new System.Drawing.Size(260, 21);
this.cacheSize.TabIndex = 37;
this.cacheSize.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cacheSize_KeyPress);
//
- // label29
- //
- this.label29.Location = new System.Drawing.Point(3, 41);
- this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(117, 23);
- this.label29.TabIndex = 36;
- this.label29.Text = "Sound output device:";
- //
- // soundOutputDevice
- //
- this.soundOutputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.soundOutputDevice.FormattingEnabled = true;
- this.soundOutputDevice.Items.AddRange(new object[] {
- "(don\'t decode sound)",
- "(don\'t play sound)",
- "Win32",
- "DirectSound"});
- this.soundOutputDevice.Location = new System.Drawing.Point(122, 38);
- this.soundOutputDevice.Name = "soundOutputDevice";
- this.soundOutputDevice.Size = new System.Drawing.Size(260, 21);
- this.soundOutputDevice.TabIndex = 35;
- //
- // passthroughAC3_DTS
- //
- this.passthroughAC3_DTS.Location = new System.Drawing.Point(6, 405);
- this.passthroughAC3_DTS.Name = "passthroughAC3_DTS";
- this.passthroughAC3_DTS.Size = new System.Drawing.Size(178, 23);
- this.passthroughAC3_DTS.TabIndex = 34;
- this.passthroughAC3_DTS.Text = "Passthrough AC3/DTS";
- this.passthroughAC3_DTS.UseVisualStyleBackColor = true;
- //
// label22
//
- this.label22.Location = new System.Drawing.Point(3, 232);
+ this.label22.Location = new System.Drawing.Point(6, 18);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(117, 23);
this.label22.TabIndex = 33;
@@ -461,63 +301,123 @@
//
this.osdFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.osdFont.FormattingEnabled = true;
- this.osdFont.Location = new System.Drawing.Point(122, 229);
+ this.osdFont.Location = new System.Drawing.Point(125, 15);
this.osdFont.Name = "osdFont";
this.osdFont.Size = new System.Drawing.Size(260, 21);
this.osdFont.TabIndex = 32;
//
- // audioNormalize
+ // video_Tab
//
- this.audioNormalize.Location = new System.Drawing.Point(200, 376);
- this.audioNormalize.Name = "audioNormalize";
- this.audioNormalize.Size = new System.Drawing.Size(178, 23);
- this.audioNormalize.TabIndex = 31;
- this.audioNormalize.Text = "Volume normalize";
- this.audioNormalize.UseVisualStyleBackColor = true;
+ this.video_Tab.Controls.Add(this.subtitleDelayStep);
+ this.video_Tab.Controls.Add(this.label31);
+ this.video_Tab.Controls.Add(this.label6);
+ this.video_Tab.Controls.Add(this.videoOutputDriver);
+ this.video_Tab.Controls.Add(this.subtitles);
+ this.video_Tab.Controls.Add(this.framedrop);
+ this.video_Tab.Controls.Add(this.directRendering);
+ this.video_Tab.Controls.Add(this.doubleBuffering);
+ this.video_Tab.Controls.Add(this.label21);
+ this.video_Tab.Controls.Add(this.noiseDenoise);
+ this.video_Tab.Controls.Add(this.label2);
+ this.video_Tab.Controls.Add(this.label3);
+ this.video_Tab.Controls.Add(this.label4);
+ this.video_Tab.Controls.Add(this.deinterlace);
+ this.video_Tab.Controls.Add(this.aspectRatio);
+ this.video_Tab.Controls.Add(this.postProcessing);
+ this.video_Tab.Location = new System.Drawing.Point(4, 22);
+ this.video_Tab.Name = "video_Tab";
+ this.video_Tab.Padding = new System.Windows.Forms.Padding(3);
+ this.video_Tab.Size = new System.Drawing.Size(403, 405);
+ this.video_Tab.TabIndex = 4;
+ this.video_Tab.Text = "Video";
+ this.video_Tab.UseVisualStyleBackColor = true;
//
+ // subtitleDelayStep
+ //
+ this.subtitleDelayStep.Location = new System.Drawing.Point(125, 150);
+ this.subtitleDelayStep.Name = "subtitleDelayStep";
+ this.subtitleDelayStep.Size = new System.Drawing.Size(260, 20);
+ this.subtitleDelayStep.TabIndex = 57;
+ this.subtitleDelayStep.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // label31
+ //
+ this.label31.Location = new System.Drawing.Point(6, 152);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(117, 30);
+ this.label31.TabIndex = 56;
+ this.label31.Text = "Subtitle Delay Step (msec):";
+ //
+ // label6
+ //
+ this.label6.Location = new System.Drawing.Point(6, 18);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(117, 23);
+ this.label6.TabIndex = 55;
+ this.label6.Text = "Video output driver:";
+ //
+ // videoOutputDriver
+ //
+ this.videoOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.videoOutputDriver.FormattingEnabled = true;
+ this.videoOutputDriver.Items.AddRange(new object[] {
+ "DirectX",
+ "DirectX - No Acceleration",
+ "OpenGL",
+ "OpenGL2"});
+ this.videoOutputDriver.Location = new System.Drawing.Point(125, 15);
+ this.videoOutputDriver.Name = "videoOutputDriver";
+ this.videoOutputDriver.Size = new System.Drawing.Size(260, 21);
+ this.videoOutputDriver.TabIndex = 54;
+ //
+ // subtitles
+ //
+ this.subtitles.Location = new System.Drawing.Point(9, 272);
+ this.subtitles.Name = "subtitles";
+ this.subtitles.Size = new System.Drawing.Size(178, 23);
+ this.subtitles.TabIndex = 53;
+ this.subtitles.Text = "Enable subtitles";
+ this.subtitles.UseVisualStyleBackColor = true;
+ //
// framedrop
//
- this.framedrop.Location = new System.Drawing.Point(6, 376);
+ this.framedrop.Location = new System.Drawing.Point(9, 185);
this.framedrop.Name = "framedrop";
this.framedrop.Size = new System.Drawing.Size(188, 23);
- this.framedrop.TabIndex = 30;
+ this.framedrop.TabIndex = 52;
this.framedrop.Text = "Framedrop";
this.framedrop.UseVisualStyleBackColor = true;
//
// directRendering
//
- this.directRendering.Location = new System.Drawing.Point(200, 318);
+ this.directRendering.Location = new System.Drawing.Point(9, 214);
this.directRendering.Name = "directRendering";
this.directRendering.Size = new System.Drawing.Size(178, 23);
- this.directRendering.TabIndex = 29;
+ this.directRendering.TabIndex = 51;
this.directRendering.Text = "Direct Rendering";
this.directRendering.UseVisualStyleBackColor = true;
//
// doubleBuffering
//
- this.doubleBuffering.Location = new System.Drawing.Point(200, 347);
+ this.doubleBuffering.Location = new System.Drawing.Point(9, 243);
this.doubleBuffering.Name = "doubleBuffering";
this.doubleBuffering.Size = new System.Drawing.Size(178, 23);
- this.doubleBuffering.TabIndex = 28;
+ this.doubleBuffering.TabIndex = 50;
this.doubleBuffering.Text = "Double Buffering";
this.doubleBuffering.UseVisualStyleBackColor = true;
//
// label21
//
- this.label21.Location = new System.Drawing.Point(3, 205);
+ this.label21.Location = new System.Drawing.Point(6, 126);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(117, 23);
- this.label21.TabIndex = 27;
+ this.label21.TabIndex = 49;
this.label21.Text = "Noise/Denoise:";
//
- // label7
- //
- this.label7.Location = new System.Drawing.Point(3, 176);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(117, 23);
- this.label7.TabIndex = 26;
- this.label7.Text = "Audio Channels:";
- //
// noiseDenoise
//
this.noiseDenoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -527,11 +427,162 @@
"Noise",
"High Quality Denoise",
"Denoise"});
- this.noiseDenoise.Location = new System.Drawing.Point(122, 202);
+ this.noiseDenoise.Location = new System.Drawing.Point(125, 123);
this.noiseDenoise.Name = "noiseDenoise";
this.noiseDenoise.Size = new System.Drawing.Size(260, 21);
- this.noiseDenoise.TabIndex = 25;
+ this.noiseDenoise.TabIndex = 48;
//
+ // label2
+ //
+ this.label2.Location = new System.Drawing.Point(6, 45);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(117, 23);
+ this.label2.TabIndex = 42;
+ this.label2.Text = "Postprocessing:";
+ //
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(6, 72);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(117, 23);
+ this.label3.TabIndex = 43;
+ this.label3.Text = "Aspect Ratio:";
+ //
+ // label4
+ //
+ this.label4.Location = new System.Drawing.Point(6, 99);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(117, 23);
+ this.label4.TabIndex = 44;
+ this.label4.Text = "Deinterlace:";
+ //
+ // deinterlace
+ //
+ this.deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.deinterlace.FormattingEnabled = true;
+ this.deinterlace.Items.AddRange(new object[] {
+ "Off",
+ "Simple",
+ "Adaptive"});
+ this.deinterlace.Location = new System.Drawing.Point(125, 96);
+ this.deinterlace.Name = "deinterlace";
+ this.deinterlace.Size = new System.Drawing.Size(260, 21);
+ this.deinterlace.TabIndex = 47;
+ //
+ // aspectRatio
+ //
+ this.aspectRatio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.aspectRatio.FormattingEnabled = true;
+ this.aspectRatio.Items.AddRange(new object[] {
+ "Autodetect",
+ "4:3",
+ "16:9",
+ "2,35"});
+ this.aspectRatio.Location = new System.Drawing.Point(125, 69);
+ this.aspectRatio.Name = "aspectRatio";
+ this.aspectRatio.Size = new System.Drawing.Size(260, 21);
+ this.aspectRatio.TabIndex = 46;
+ //
+ // postProcessing
+ //
+ this.postProcessing.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.postProcessing.FormattingEnabled = true;
+ this.postProcessing.Items.AddRange(new object[] {
+ "Off",
+ "Automatic",
+ "Maximum quality"});
+ this.postProcessing.Location = new System.Drawing.Point(125, 42);
+ this.postProcessing.Name = "postProcessing";
+ this.postProcessing.Size = new System.Drawing.Size(260, 21);
+ this.postProcessing.TabIndex = 45;
+ //
+ // audio_Tab
+ //
+ this.audio_Tab.Controls.Add(this.audioDelayStep);
+ this.audio_Tab.Controls.Add(this.label32);
+ this.audio_Tab.Controls.Add(this.label29);
+ this.audio_Tab.Controls.Add(this.soundOutputDevice);
+ this.audio_Tab.Controls.Add(this.passthroughAC3_DTS);
+ this.audio_Tab.Controls.Add(this.audioNormalize);
+ this.audio_Tab.Controls.Add(this.label7);
+ this.audio_Tab.Controls.Add(this.audioChannels);
+ this.audio_Tab.Controls.Add(this.label1);
+ this.audio_Tab.Controls.Add(this.soundOutputDriver);
+ this.audio_Tab.Location = new System.Drawing.Point(4, 22);
+ this.audio_Tab.Name = "audio_Tab";
+ this.audio_Tab.Size = new System.Drawing.Size(403, 405);
+ this.audio_Tab.TabIndex = 5;
+ this.audio_Tab.Text = "Audio";
+ this.audio_Tab.UseVisualStyleBackColor = true;
+ //
+ // audioDelayStep
+ //
+ this.audioDelayStep.Location = new System.Drawing.Point(125, 96);
+ this.audioDelayStep.Name = "audioDelayStep";
+ this.audioDelayStep.Size = new System.Drawing.Size(260, 20);
+ this.audioDelayStep.TabIndex = 59;
+ this.audioDelayStep.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // label32
+ //
+ this.label32.Location = new System.Drawing.Point(3, 98);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(117, 31);
+ this.label32.TabIndex = 58;
+ this.label32.Text = "Audio Delay Step (msec):";
+ //
+ // label29
+ //
+ this.label29.Location = new System.Drawing.Point(3, 42);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(117, 23);
+ this.label29.TabIndex = 44;
+ this.label29.Text = "Sound output device:";
+ //
+ // soundOutputDevice
+ //
+ this.soundOutputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.soundOutputDevice.FormattingEnabled = true;
+ this.soundOutputDevice.Items.AddRange(new object[] {
+ "(don\'t decode sound)",
+ "(don\'t play sound)",
+ "Win32",
+ "DirectSound"});
+ this.soundOutputDevice.Location = new System.Drawing.Point(125, 42);
+ this.soundOutputDevice.Name = "soundOutputDevice";
+ this.soundOutputDevice.Size = new System.Drawing.Size(260, 21);
+ this.soundOutputDevice.TabIndex = 43;
+ //
+ // passthroughAC3_DTS
+ //
+ this.passthroughAC3_DTS.Location = new System.Drawing.Point(6, 132);
+ this.passthroughAC3_DTS.Name = "passthroughAC3_DTS";
+ this.passthroughAC3_DTS.Size = new System.Drawing.Size(178, 23);
+ this.passthroughAC3_DTS.TabIndex = 42;
+ this.passthroughAC3_DTS.Text = "Passthrough AC3/DTS";
+ this.passthroughAC3_DTS.UseVisualStyleBackColor = true;
+ //
+ // audioNormalize
+ //
+ this.audioNormalize.Location = new System.Drawing.Point(6, 161);
+ this.audioNormalize.Name = "audioNormalize";
+ this.audioNormalize.Size = new System.Drawing.Size(178, 23);
+ this.audioNormalize.TabIndex = 41;
+ this.audioNormalize.Text = "Volume normalize";
+ this.audioNormalize.UseVisualStyleBackColor = true;
+ //
+ // label7
+ //
+ this.label7.Location = new System.Drawing.Point(3, 69);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(117, 23);
+ this.label7.TabIndex = 40;
+ this.label7.Text = "Audio Channels:";
+ //
// audioChannels
//
this.audioChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -541,23 +592,45 @@
"Stereo",
"Surround",
"Full 5.1"});
- this.audioChannels.Location = new System.Drawing.Point(122, 173);
+ this.audioChannels.Location = new System.Drawing.Point(125, 69);
this.audioChannels.Name = "audioChannels";
this.audioChannels.Size = new System.Drawing.Size(260, 21);
- this.audioChannels.TabIndex = 24;
+ this.audioChannels.TabIndex = 39;
//
- // video_audio_Tab
+ // label1
//
- this.video_audio_Tab.Controls.Add(this.groupBox2);
- this.video_audio_Tab.Controls.Add(this.groupBox1);
- this.video_audio_Tab.Location = new System.Drawing.Point(4, 22);
- this.video_audio_Tab.Name = "video_audio_Tab";
- this.video_audio_Tab.Padding = new System.Windows.Forms.Padding(3);
- this.video_audio_Tab.Size = new System.Drawing.Size(403, 467);
- this.video_audio_Tab.TabIndex = 1;
- this.video_audio_Tab.Text = "Video/Audio";
- this.video_audio_Tab.UseVisualStyleBackColor = true;
+ this.label1.Location = new System.Drawing.Point(3, 15);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(117, 23);
+ this.label1.TabIndex = 37;
+ this.label1.Text = "Sound output driver:";
//
+ // soundOutputDriver
+ //
+ this.soundOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.soundOutputDriver.FormattingEnabled = true;
+ this.soundOutputDriver.Items.AddRange(new object[] {
+ "(don\'t decode sound)",
+ "(don\'t play sound)",
+ "Win32",
+ "DirectSound"});
+ this.soundOutputDriver.Location = new System.Drawing.Point(125, 15);
+ this.soundOutputDriver.Name = "soundOutputDriver";
+ this.soundOutputDriver.Size = new System.Drawing.Size(260, 21);
+ this.soundOutputDriver.TabIndex = 38;
+ //
+ // extension_Tab
+ //
+ this.extension_Tab.Controls.Add(this.groupBox2);
+ this.extension_Tab.Controls.Add(this.groupBox1);
+ this.extension_Tab.Location = new System.Drawing.Point(4, 22);
+ this.extension_Tab.Name = "extension_Tab";
+ this.extension_Tab.Padding = new System.Windows.Forms.Padding(3);
+ this.extension_Tab.Size = new System.Drawing.Size(403, 405);
+ this.extension_Tab.TabIndex = 1;
+ this.extension_Tab.Text = "Extensions";
+ this.extension_Tab.UseVisualStyleBackColor = true;
+ //
// groupBox2
//
this.groupBox2.Controls.Add(this.label26);
@@ -569,9 +642,9 @@
this.groupBox2.Controls.Add(this.audioDelete);
this.groupBox2.Controls.Add(this.audioAdd);
this.groupBox2.Controls.Add(this.audioExtList);
- this.groupBox2.Location = new System.Drawing.Point(3, 242);
+ this.groupBox2.Location = new System.Drawing.Point(3, 201);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(394, 219);
+ this.groupBox2.Size = new System.Drawing.Size(394, 189);
this.groupBox2.TabIndex = 30;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Audio";
@@ -632,7 +705,7 @@
//
// audioDelete
//
- this.audioDelete.Location = new System.Drawing.Point(174, 182);
+ this.audioDelete.Location = new System.Drawing.Point(174, 156);
this.audioDelete.Name = "audioDelete";
this.audioDelete.Size = new System.Drawing.Size(75, 23);
this.audioDelete.TabIndex = 38;
@@ -642,7 +715,7 @@
//
// audioAdd
//
- this.audioAdd.Location = new System.Drawing.Point(93, 182);
+ this.audioAdd.Location = new System.Drawing.Point(93, 156);
this.audioAdd.Name = "audioAdd";
this.audioAdd.Size = new System.Drawing.Size(75, 23);
this.audioAdd.TabIndex = 37;
@@ -655,7 +728,7 @@
this.audioExtList.FormattingEnabled = true;
this.audioExtList.Location = new System.Drawing.Point(6, 19);
this.audioExtList.Name = "audioExtList";
- this.audioExtList.Size = new System.Drawing.Size(78, 186);
+ this.audioExtList.Size = new System.Drawing.Size(78, 160);
this.audioExtList.TabIndex = 36;
this.audioExtList.SelectedIndexChanged += new System.EventHandler(this.audioExtList_SelectedIndexChanged);
//
@@ -672,7 +745,7 @@
this.groupBox1.Controls.Add(this.videoArgument);
this.groupBox1.Location = new System.Drawing.Point(3, 6);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(394, 222);
+ this.groupBox1.Size = new System.Drawing.Size(394, 189);
this.groupBox1.TabIndex = 29;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Video";
@@ -682,13 +755,13 @@
this.videoExtList.FormattingEnabled = true;
this.videoExtList.Location = new System.Drawing.Point(6, 19);
this.videoExtList.Name = "videoExtList";
- this.videoExtList.Size = new System.Drawing.Size(78, 186);
+ this.videoExtList.Size = new System.Drawing.Size(78, 160);
this.videoExtList.TabIndex = 18;
this.videoExtList.SelectedIndexChanged += new System.EventHandler(this.videoExtList_SelectedIndexChanged);
//
// videoDelete
//
- this.videoDelete.Location = new System.Drawing.Point(174, 182);
+ this.videoDelete.Location = new System.Drawing.Point(174, 156);
this.videoDelete.Name = "videoDelete";
this.videoDelete.Size = new System.Drawing.Size(75, 23);
this.videoDelete.TabIndex = 20;
@@ -744,7 +817,7 @@
//
// videoAdd
//
- this.videoAdd.Location = new System.Drawing.Point(93, 182);
+ this.videoAdd.Location = new System.Drawing.Point(93, 156);
this.videoAdd.Name = "videoAdd";
this.videoAdd.Size = new System.Drawing.Size(75, 23);
this.videoAdd.TabIndex = 19;
@@ -788,14 +861,14 @@
this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.dvdArguments);
this.dvd_vcd_svcd_streams_Tab.Location = new System.Drawing.Point(4, 22);
this.dvd_vcd_svcd_streams_Tab.Name = "dvd_vcd_svcd_streams_Tab";
- this.dvd_vcd_svcd_streams_Tab.Size = new System.Drawing.Size(403, 467);
+ this.dvd_vcd_svcd_streams_Tab.Size = new System.Drawing.Size(403, 405);
this.dvd_vcd_svcd_streams_Tab.TabIndex = 3;
this.dvd_vcd_svcd_streams_Tab.Text = "DVD/VCD/SVCD/Streams";
this.dvd_vcd_svcd_streams_Tab.UseVisualStyleBackColor = true;
//
// label20
//
- this.label20.Location = new System.Drawing.Point(3, 300);
+ this.label20.Location = new System.Drawing.Point(3, 304);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(117, 23);
this.label20.TabIndex = 50;
@@ -803,14 +876,14 @@
//
// unsvArguments
//
- this.unsvArguments.Location = new System.Drawing.Point(122, 297);
+ this.unsvArguments.Location = new System.Drawing.Point(126, 301);
this.unsvArguments.Name = "unsvArguments";
this.unsvArguments.Size = new System.Drawing.Size(256, 20);
this.unsvArguments.TabIndex = 51;
//
// label19
//
- this.label19.Location = new System.Drawing.Point(3, 274);
+ this.label19.Location = new System.Drawing.Point(3, 278);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(117, 23);
this.label19.TabIndex = 48;
@@ -818,14 +891,14 @@
//
// udpArguments
//
- this.udpArguments.Location = new System.Drawing.Point(122, 271);
+ this.udpArguments.Location = new System.Drawing.Point(126, 275);
this.udpArguments.Name = "udpArguments";
this.udpArguments.Size = new System.Drawing.Size(256, 20);
this.udpArguments.TabIndex = 49;
//
// label18
//
- this.label18.Location = new System.Drawing.Point(3, 248);
+ this.label18.Location = new System.Drawing.Point(3, 252);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(117, 23);
this.label18.TabIndex = 46;
@@ -833,14 +906,14 @@
//
// sdpArguments
//
- this.sdpArguments.Location = new System.Drawing.Point(122, 245);
+ this.sdpArguments.Location = new System.Drawing.Point(126, 249);
this.sdpArguments.Name = "sdpArguments";
this.sdpArguments.Size = new System.Drawing.Size(256, 20);
this.sdpArguments.TabIndex = 47;
//
// label17
//
- this.label17.Location = new System.Drawing.Point(3, 222);
+ this.label17.Location = new System.Drawing.Point(3, 226);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(117, 23);
this.label17.TabIndex = 44;
@@ -848,14 +921,14 @@
//
// rtspArguments
//
- this.rtspArguments.Location = new System.Drawing.Point(122, 219);
+ this.rtspArguments.Location = new System.Drawing.Point(126, 223);
this.rtspArguments.Name = "rtspArguments";
this.rtspArguments.Size = new System.Drawing.Size(256, 20);
this.rtspArguments.TabIndex = 45;
//
// label16
//
- this.label16.Location = new System.Drawing.Point(3, 196);
+ this.label16.Location = new System.Drawing.Point(3, 200);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(117, 23);
this.label16.TabIndex = 42;
@@ -863,14 +936,14 @@
//
// mpstArguments
//
- this.mpstArguments.Location = new System.Drawing.Point(122, 193);
+ this.mpstArguments.Location = new System.Drawing.Point(125, 197);
this.mpstArguments.Name = "mpstArguments";
this.mpstArguments.Size = new System.Drawing.Size(256, 20);
this.mpstArguments.TabIndex = 43;
//
// label15
//
- this.label15.Location = new System.Drawing.Point(3, 170);
+ this.label15.Location = new System.Drawing.Point(3, 174);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(117, 23);
this.label15.TabIndex = 40;
@@ -878,14 +951,14 @@
//
// mmsArguments
//
- this.mmsArguments.Location = new System.Drawing.Point(122, 167);
+ this.mmsArguments.Location = new System.Drawing.Point(125, 171);
this.mmsArguments.Name = "mmsArguments";
this.mmsArguments.Size = new System.Drawing.Size(256, 20);
this.mmsArguments.TabIndex = 41;
//
// label14
//
- this.label14.Location = new System.Drawing.Point(3, 144);
+ this.label14.Location = new System.Drawing.Point(3, 148);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(117, 23);
this.label14.TabIndex = 38;
@@ -893,14 +966,14 @@
//
// httpArguments
//
- this.httpArguments.Location = new System.Drawing.Point(122, 141);
+ this.httpArguments.Location = new System.Drawing.Point(126, 145);
this.httpArguments.Name = "httpArguments";
this.httpArguments.Size = new System.Drawing.Size(256, 20);
this.httpArguments.TabIndex = 39;
//
// label13
//
- this.label13.Location = new System.Drawing.Point(3, 118);
+ this.label13.Location = new System.Drawing.Point(3, 122);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(117, 23);
this.label13.TabIndex = 36;
@@ -908,14 +981,14 @@
//
// ftpArguments
//
- this.ftpArguments.Location = new System.Drawing.Point(122, 115);
+ this.ftpArguments.Location = new System.Drawing.Point(126, 119);
this.ftpArguments.Name = "ftpArguments";
this.ftpArguments.Size = new System.Drawing.Size(256, 20);
this.ftpArguments.TabIndex = 37;
//
// label12
//
- this.label12.Location = new System.Drawing.Point(3, 92);
+ this.label12.Location = new System.Drawing.Point(3, 96);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(117, 23);
this.label12.TabIndex = 34;
@@ -923,14 +996,14 @@
//
// cueArguments
//
- this.cueArguments.Location = new System.Drawing.Point(122, 89);
+ this.cueArguments.Location = new System.Drawing.Point(126, 93);
this.cueArguments.Name = "cueArguments";
this.cueArguments.Size = new System.Drawing.Size(256, 20);
this.cueArguments.TabIndex = 35;
//
// label11
//
- this.label11.Location = new System.Drawing.Point(3, 66);
+ this.label11.Location = new System.Drawing.Point(3, 70);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(117, 23);
this.label11.TabIndex = 20;
@@ -938,14 +1011,14 @@
//
// svcdArguments
//
- this.svcdArguments.Location = new System.Drawing.Point(122, 63);
+ this.svcdArguments.Location = new System.Drawing.Point(126, 67);
this.svcdArguments.Name = "svcdArguments";
this.svcdArguments.Size = new System.Drawing.Size(256, 20);
this.svcdArguments.TabIndex = 21;
//
// label10
//
- this.label10.Location = new System.Drawing.Point(3, 40);
+ this.label10.Location = new System.Drawing.Point(3, 44);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(117, 23);
this.label10.TabIndex = 18;
@@ -953,14 +1026,14 @@
//
// vcdArguments
//
- this.vcdArguments.Location = new System.Drawing.Point(122, 37);
+ this.vcdArguments.Location = new System.Drawing.Point(126, 41);
this.vcdArguments.Name = "vcdArguments";
this.vcdArguments.Size = new System.Drawing.Size(256, 20);
this.vcdArguments.TabIndex = 19;
//
// label9
//
- this.label9.Location = new System.Drawing.Point(3, 14);
+ this.label9.Location = new System.Drawing.Point(3, 18);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(117, 23);
this.label9.TabIndex = 16;
@@ -968,7 +1041,7 @@
//
// dvdArguments
//
- this.dvdArguments.Location = new System.Drawing.Point(122, 11);
+ this.dvdArguments.Location = new System.Drawing.Point(125, 15);
this.dvdArguments.Name = "dvdArguments";
this.dvdArguments.Size = new System.Drawing.Size(256, 20);
this.dvdArguments.TabIndex = 17;
@@ -981,7 +1054,7 @@
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(435, 545);
+ this.ClientSize = new System.Drawing.Size(435, 492);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
@@ -994,7 +1067,11 @@
this.tabControl1.ResumeLayout(false);
this.general_Tab.ResumeLayout(false);
this.general_Tab.PerformLayout();
- this.video_audio_Tab.ResumeLayout(false);
+ this.video_Tab.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.subtitleDelayStep)).EndInit();
+ this.audio_Tab.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.audioDelayStep)).EndInit();
+ this.extension_Tab.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
@@ -1013,18 +1090,10 @@
/// </summary>
private System.ComponentModel.IContainer components = null;
private System.Windows.Forms.Button okButton;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Label label4;
private System.Windows.Forms.CheckBox rebuildIndex;
private System.Windows.Forms.CheckBox priorityBoost;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox optionalArguments;
- private System.Windows.Forms.ComboBox soundOutputDriver;
- private System.Windows.Forms.ComboBox postProcessing;
- private System.Windows.Forms.ComboBox aspectRatio;
- private System.Windows.Forms.ComboBox deinterlace;
private System.Windows.Forms.Button cancelButton;
#endregion
private System.Windows.Forms.TextBox mplayerPath;
@@ -1033,7 +1102,7 @@
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage general_Tab;
- private System.Windows.Forms.TabPage video_audio_Tab;
+ private System.Windows.Forms.TabPage extension_Tab;
private System.Windows.Forms.TabPage dvd_vcd_svcd_streams_Tab;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox svcdArguments;
@@ -1051,22 +1120,11 @@
private System.Windows.Forms.Button videoAdd;
private System.Windows.Forms.ListBox videoExtList;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.ComboBox noiseDenoise;
- private System.Windows.Forms.ComboBox audioChannels;
- private System.Windows.Forms.CheckBox audioNormalize;
- private System.Windows.Forms.CheckBox framedrop;
- private System.Windows.Forms.CheckBox directRendering;
- private System.Windows.Forms.CheckBox doubleBuffering;
- private System.Windows.Forms.Label label21;
private System.Windows.Forms.FontDialog fontDialog1;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.ComboBox osdFont;
- private System.Windows.Forms.CheckBox passthroughAC3_DTS;
private System.Windows.Forms.Label label30;
private System.Windows.Forms.ComboBox cacheSize;
- private System.Windows.Forms.Label label29;
- private System.Windows.Forms.ComboBox soundOutputDevice;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.TextBox unsvArguments;
private System.Windows.Forms.Label label19;
@@ -1096,9 +1154,34 @@
private System.Windows.Forms.Button audioDelete;
private System.Windows.Forms.Button audioAdd;
private System.Windows.Forms.ListBox audioExtList;
- private System.Windows.Forms.CheckBox subtitles;
+ private System.Windows.Forms.TabPage video_Tab;
+ private System.Windows.Forms.NumericUpDown subtitleDelayStep;
+ private System.Windows.Forms.Label label31;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.ComboBox videoOutputDriver;
+ private System.Windows.Forms.CheckBox subtitles;
+ private System.Windows.Forms.CheckBox framedrop;
+ private System.Windows.Forms.CheckBox directRendering;
+ private System.Windows.Forms.CheckBox doubleBuffering;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.ComboBox noiseDenoise;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.ComboBox deinterlace;
+ private System.Windows.Forms.ComboBox aspectRatio;
+ private System.Windows.Forms.ComboBox postProcessing;
+ private System.Windows.Forms.TabPage audio_Tab;
+ private System.Windows.Forms.NumericUpDown audioDelayStep;
+ private System.Windows.Forms.Label label32;
+ private System.Windows.Forms.Label label29;
+ private System.Windows.Forms.ComboBox soundOutputDevice;
+ private System.Windows.Forms.CheckBox passthroughAC3_DTS;
+ private System.Windows.Forms.CheckBox audioNormalize;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.ComboBox audioChannels;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ComboBox soundOutputDriver;
}
}
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-08-13 08:55:30 UTC (rev 828)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-08-13 11:14:54 UTC (rev 829)
@@ -339,6 +339,8 @@
noiseDenoise.SelectedIndex = xmlreader.GetValueAsInt("mplayer", "noise", (int)NoiseDenoise.Nothing);
subtitles.Checked = xmlreader.GetValueAsBool("mplayer", "enableSubtitles", false);
videoOutputDriver.SelectedIndex = xmlreader.GetValueAsInt("mplayer", "videoOutputDriver", (int)VideoOutputDriver.DirectX);
+ audioDelayStep.Value = xmlreader.GetValueAsInt("mplayer", "audioDelayStep", 100);
+ subtitleDelayStep.Value = xmlreader.GetValueAsInt("mplayer", "subtitleDelayStep", 100);
int tempCacheSize = xmlreader.GetValueAsInt("mplayer", "cacheSize", 0);
if (tempCacheSize > 0) {
cacheSize.Text = tempCacheSize.ToString();
@@ -424,6 +426,8 @@
xmlWriter.SetValue("mplayer", "audioChannels", audioChannels.SelectedIndex);
xmlWriter.SetValueAsBool("mplayer", "enableSubtitles", subtitles.Checked);
xmlWriter.SetValue("mplayer", "videoOutputDriver", videoOutputDriver.SelectedIndex);
+ xmlWriter.SetValue("mplayer", "audioDelayStep", audioDelayStep.Value);
+ xmlWriter.SetValue("mplayer", "subtitleDelayStep", subtitleDelayStep.Value);
if (cacheSize.Text.Equals(String.Empty)) {
xmlWriter.SetValue("mplayer", "cacheSize", 0);
} else {
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-08-13 08:55:30 UTC (rev 828)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-08-13 11:14:54 UTC (rev 829)
@@ -29,6 +29,7 @@
using System.Drawing.Text;
using System.Globalization;
using System.Text;
+using System.Windows.Forms;
using System.Xml;
using MediaPortal.GUI.Library;
using MediaPortal.Util;
@@ -171,7 +172,7 @@
/// </summary>
public enum NoiseDenoise {
/// <summary>
- /// No noiseDenoise
+ /// No _noiseDenoise
/// </summary>
Nothing,
/// <summary>
@@ -220,107 +221,107 @@
/// <summary>
/// Singleton instance
/// </summary>
- private static ConfigurationManager singletonInstance;
+ private static ConfigurationManager _singletonInstance;
/// <summary>
/// List of installed fonts
/// </summary>
- private List<String> fontsCollection;
+ private List<String> _fontsCollection;
/// <summary>
/// Supported Extension of the external Player
/// </summary>
- private static string[] m_supportedExtensions = new string[0];
+ private static string[] _supportedExtensions = new string[0];
/// <summary>
/// Dicitionary with all extension Settings
/// </summary>
- private static Dictionary<String, ExtensionSettings> extensionSettings = new Dictionary<String, ExtensionSettings>();
+ private static Dictionary<String, ExtensionSettings> _extensionSettings = new Dictionary<String, ExtensionSettings>();
/// <summary>
/// Dictionary with all extension Setting for external Player
/// </summary>
- private static Dictionary<String, ExtensionSettings> extensionSettingsExtPlayer = new Dictionary<String, ExtensionSettings>();
+ private static Dictionary<String, ExtensionSettings> _extensionSettingsExtPlayer = new Dictionary<String, ExtensionSettings>();
/// <summary>
/// Rebuild Index of the file
/// </summary>
- private bool rebuildIndex;
+ private bool _rebuildIndex;
/// <summary>
/// Prioritey Boost of the process
/// </summary>
- private bool priorityBoost;
+ private bool _priorityBoost;
/// <summary>
/// Framedrop
/// </summary>
- private bool framedrop;
+ private bool _framedrop;
/// <summary>
/// Double buffering
/// </summary>
- private bool doubleBuffering;
+ private bool _doubleBuffering;
/// <summary>
/// Direct rendering
/// </summary>
- private bool directRendering;
+ private bool _directRendering;
/// <summary>
/// Normalize audio
/// </summary>
- private bool audioNormalize;
+ private bool _audioNormalize;
/// <summary>
/// Passthrough AC3 and DTS
/// </summary>
- private bool passthroughAC3_DTS;
+ private bool _passthroughAC3_DTS;
/// <summary>
/// Deinterlace mode
/// </summary>
- private Deinterlace deinterlace;
+ private Deinterlace _deinterlace;
/// <summary>
/// Selected SoundOutput Driver
/// </summary>
- private SoundOutputDriver soundOutputDriver;
+ private SoundOutputDriver _soundOutputDriver;
/// <summary>
/// Sound output device
/// </summary>
- private int soundOutputDevice;
+ private int _soundOutputDevice;
/// <summary>
/// Selected AsprectRatio
/// </summary>
- private AspectRatio aspectRatio;
+ private AspectRatio _aspectRatio;
/// <summary>
/// Selected Postprocessing mode
/// </summary>
- private PostProcessing postProcessing;
+ private PostProcessing _postProcessing;
/// <summary>
/// Audio channel mode
/// </summary>
- private AudioChannels audioChannels;
+ private AudioChannels _audioChannels;
/// <summary>
/// NoiseDenoise mode
/// </summary>
- private NoiseDenoise noiseDenoise;
+ private NoiseDenoise _noiseDenoise;
/// <summary>
/// Cache size
/// </summary>
- private int cacheSize;
+ private int _cacheSize;
/// <summary>
/// Indicate if the font of the osd is set
/// </summary>
- private bool osdFontSet;
+ private bool _osdFontSet;
/// <summary>
/// Filename of the osd font
@@ -330,22 +331,32 @@
/// <summary>
/// Path to mplayer.exe
/// </summary>
- private String mplayerPath;
+ private String _mplayerPath;
/// <summary>
/// Timeout before a seek step is performed
/// </summary>
- private int seekStepTimeout;
+ private int _seekStepTimeout;
/// <summary>
/// Enable subtitles by default
/// </summary>
- private bool enableSubtitles;
+ private bool _enableSubtitles;
/// <summary>
/// Video output driver
/// </summary>
- private VideoOutputDriver videoOutputDriver;
+ private VideoOutputDriver _videoOutputDriver;
+
+ /// <summary>
+ /// Step to change the audio delay in milliseconds
+ /// </summary>
+ private int _audioDelayStep;
+
+ /// <summary>
+ /// Step to change the subtitle delay in millisceonds
+ /// </summary>
+ private int _subtitleDelayStep;
#endregion
#region ctor
@@ -362,24 +373,47 @@
/// </summary>
/// <returns>Singleton instance</returns>
public static ConfigurationManager getInstance() {
- if (singletonInstance == null) {
- singletonInstance = new ConfigurationManager();
+ if (_singletonInstance == null) {
+ _singletonInstance = new ConfigurationManager();
}
- return si...
[truncated message content] |
