From: <mis...@us...> - 2007-02-20 22:45:01
|
Revision: 128 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=128&view=rev Author: misterd_sf Date: 2007-02-20 14:44:49 -0800 (Tue, 20 Feb 2007) Log Message: ----------- MPlayer: Bugfixes for options "Volume normalize" and "Noise/Denoise->High Quality Denoise". Small other bugfixes. Added additional Options for "cacheSize", "passthrough AC3 and DTS" and "sound output device" Videostreams will be played in fullscreen at startup 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/ConfigurationForm.resx 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 Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-02-20 19:41:57 UTC (rev 127) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-02-20 22:44:49 UTC (rev 128) @@ -76,7 +76,7 @@ this.label7 = new System.Windows.Forms.Label(); this.noiseDenoise = new System.Windows.Forms.ComboBox(); this.audioChannels = new System.Windows.Forms.ComboBox(); - this.video_Tab = new System.Windows.Forms.TabPage(); + this.video_audio_Tab = new System.Windows.Forms.TabPage(); this.label25 = new System.Windows.Forms.Label(); this.videoPlayerUse = new System.Windows.Forms.CheckBox(); this.videoArgument = new System.Windows.Forms.TextBox(); @@ -86,17 +86,7 @@ this.videoDelete = new System.Windows.Forms.Button(); this.videoAdd = new System.Windows.Forms.Button(); this.videoExtList = new System.Windows.Forms.ListBox(); - this.audio_Tab = new System.Windows.Forms.TabPage(); - this.label26 = new System.Windows.Forms.Label(); - this.audioPlayerUse = new System.Windows.Forms.CheckBox(); - this.audioArgument = new System.Windows.Forms.TextBox(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.audioExtension = new System.Windows.Forms.TextBox(); - this.audioDelete = new System.Windows.Forms.Button(); - this.audioAdd = new System.Windows.Forms.Button(); - this.audioExtList = new System.Windows.Forms.ListBox(); - this.dvd_vcd_svcd_Tab = new System.Windows.Forms.TabPage(); + this.dvd_vcd_svcd_streams_Tab = new System.Windows.Forms.TabPage(); this.audioCDArguments = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); @@ -105,7 +95,13 @@ this.vcdArguments = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); this.dvdArguments = new System.Windows.Forms.TextBox(); - this.streaming_cue_Tab = new System.Windows.Forms.TabPage(); + this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); + this.fontDialog1 = new System.Windows.Forms.FontDialog(); + this.passthroughAC3_DTS = new System.Windows.Forms.CheckBox(); + this.soundOutputDevice = new System.Windows.Forms.ComboBox(); + this.label29 = new System.Windows.Forms.Label(); + this.label30 = new System.Windows.Forms.Label(); + this.cacheSize = new System.Windows.Forms.ComboBox(); this.label20 = new System.Windows.Forms.Label(); this.unsvArguments = new System.Windows.Forms.TextBox(); this.label19 = new System.Windows.Forms.Label(); @@ -124,19 +120,28 @@ this.ftpArguments = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); this.cueArguments = new System.Windows.Forms.TextBox(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.fontDialog1 = new System.Windows.Forms.FontDialog(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label26 = new System.Windows.Forms.Label(); + this.audioPlayerUse = new System.Windows.Forms.CheckBox(); + this.audioArgument = new System.Windows.Forms.TextBox(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.audioExtension = new System.Windows.Forms.TextBox(); + this.audioDelete = new System.Windows.Forms.Button(); + this.audioAdd = new System.Windows.Forms.Button(); + this.audioExtList = new System.Windows.Forms.ListBox(); this.tabControl1.SuspendLayout(); this.general_Tab.SuspendLayout(); - this.video_Tab.SuspendLayout(); - this.audio_Tab.SuspendLayout(); - this.dvd_vcd_svcd_Tab.SuspendLayout(); - this.streaming_cue_Tab.SuspendLayout(); + this.video_audio_Tab.SuspendLayout(); + this.dvd_vcd_svcd_streams_Tab.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // okButton // - this.okButton.Location = new System.Drawing.Point(16, 396); + this.okButton.Location = new System.Drawing.Point(16, 475); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); this.okButton.TabIndex = 3; @@ -154,7 +159,7 @@ // // label2 // - this.label2.Location = new System.Drawing.Point(3, 41); + this.label2.Location = new System.Drawing.Point(3, 68); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(117, 23); this.label2.TabIndex = 9; @@ -162,7 +167,7 @@ // // label3 // - this.label3.Location = new System.Drawing.Point(3, 68); + this.label3.Location = new System.Drawing.Point(3, 95); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(117, 23); this.label3.TabIndex = 10; @@ -170,7 +175,7 @@ // // label4 // - this.label4.Location = new System.Drawing.Point(3, 95); + this.label4.Location = new System.Drawing.Point(3, 122); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(117, 23); this.label4.TabIndex = 11; @@ -178,7 +183,7 @@ // // rebuildIndex // - this.rebuildIndex.Location = new System.Drawing.Point(6, 228); + this.rebuildIndex.Location = new System.Drawing.Point(6, 291); this.rebuildIndex.Name = "rebuildIndex"; this.rebuildIndex.Size = new System.Drawing.Size(188, 23); this.rebuildIndex.TabIndex = 12; @@ -187,7 +192,7 @@ // // priorityBoost // - this.priorityBoost.Location = new System.Drawing.Point(6, 257); + this.priorityBoost.Location = new System.Drawing.Point(6, 320); this.priorityBoost.Name = "priorityBoost"; this.priorityBoost.Size = new System.Drawing.Size(188, 23); this.priorityBoost.TabIndex = 13; @@ -196,7 +201,7 @@ // // label5 // - this.label5.Location = new System.Drawing.Point(3, 205); + this.label5.Location = new System.Drawing.Point(3, 259); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(117, 23); this.label5.TabIndex = 14; @@ -204,7 +209,7 @@ // // optionalArguments // - this.optionalArguments.Location = new System.Drawing.Point(122, 202); + this.optionalArguments.Location = new System.Drawing.Point(122, 256); this.optionalArguments.Name = "optionalArguments"; this.optionalArguments.Size = new System.Drawing.Size(260, 20); this.optionalArguments.TabIndex = 15; @@ -222,6 +227,7 @@ 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 // @@ -231,7 +237,7 @@ "Off", "Automatic", "Maximum quality"}); - this.postProcessing.Location = new System.Drawing.Point(122, 38); + this.postProcessing.Location = new System.Drawing.Point(122, 65); this.postProcessing.Name = "postProcessing"; this.postProcessing.Size = new System.Drawing.Size(260, 21); this.postProcessing.TabIndex = 17; @@ -245,7 +251,7 @@ "4:3", "16:9", "2,35"}); - this.aspectRatio.Location = new System.Drawing.Point(122, 65); + this.aspectRatio.Location = new System.Drawing.Point(122, 92); this.aspectRatio.Name = "aspectRatio"; this.aspectRatio.Size = new System.Drawing.Size(260, 21); this.aspectRatio.TabIndex = 18; @@ -258,7 +264,7 @@ "Off", "Simple", "Adaptive"}); - this.deinterlace.Location = new System.Drawing.Point(122, 92); + this.deinterlace.Location = new System.Drawing.Point(122, 119); this.deinterlace.Name = "deinterlace"; this.deinterlace.Size = new System.Drawing.Size(260, 21); this.deinterlace.TabIndex = 19; @@ -266,7 +272,7 @@ // cancelButton // this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(344, 396); + this.cancelButton.Location = new System.Drawing.Point(348, 475); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); this.cancelButton.TabIndex = 20; @@ -276,7 +282,7 @@ // // mplayerPath // - this.mplayerPath.Location = new System.Drawing.Point(126, 315); + this.mplayerPath.Location = new System.Drawing.Point(126, 401); this.mplayerPath.Name = "mplayerPath"; this.mplayerPath.Size = new System.Drawing.Size(174, 20); this.mplayerPath.TabIndex = 21; @@ -284,7 +290,7 @@ // // label8 // - this.label8.Location = new System.Drawing.Point(3, 318); + this.label8.Location = new System.Drawing.Point(3, 404); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(117, 23); this.label8.TabIndex = 22; @@ -292,7 +298,7 @@ // // folderSearch // - this.folderSearch.Location = new System.Drawing.Point(306, 313); + this.folderSearch.Location = new System.Drawing.Point(306, 399); this.folderSearch.Name = "folderSearch"; this.folderSearch.Size = new System.Drawing.Size(76, 23); this.folderSearch.TabIndex = 23; @@ -307,18 +313,21 @@ // tabControl1 // this.tabControl1.Controls.Add(this.general_Tab); - this.tabControl1.Controls.Add(this.video_Tab); - this.tabControl1.Controls.Add(this.audio_Tab); - this.tabControl1.Controls.Add(this.dvd_vcd_svcd_Tab); - this.tabControl1.Controls.Add(this.streaming_cue_Tab); + this.tabControl1.Controls.Add(this.video_audio_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, 378); + this.tabControl1.Size = new System.Drawing.Size(411, 457); this.tabControl1.TabIndex = 24; // // general_Tab // + 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); @@ -347,14 +356,14 @@ 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, 352); + this.general_Tab.Size = new System.Drawing.Size(403, 431); this.general_Tab.TabIndex = 0; this.general_Tab.Text = "General"; this.general_Tab.UseVisualStyleBackColor = true; // // label22 // - this.label22.Location = new System.Drawing.Point(3, 178); + this.label22.Location = new System.Drawing.Point(3, 205); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(117, 23); this.label22.TabIndex = 33; @@ -364,14 +373,14 @@ // this.osdFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.osdFont.FormattingEnabled = true; - this.osdFont.Location = new System.Drawing.Point(122, 175); + this.osdFont.Location = new System.Drawing.Point(122, 202); this.osdFont.Name = "osdFont"; this.osdFont.Size = new System.Drawing.Size(260, 21); this.osdFont.TabIndex = 32; // // audioNormalize // - this.audioNormalize.Location = new System.Drawing.Point(200, 286); + this.audioNormalize.Location = new System.Drawing.Point(200, 349); this.audioNormalize.Name = "audioNormalize"; this.audioNormalize.Size = new System.Drawing.Size(178, 23); this.audioNormalize.TabIndex = 31; @@ -380,7 +389,7 @@ // // framedrop // - this.framedrop.Location = new System.Drawing.Point(6, 286); + this.framedrop.Location = new System.Drawing.Point(6, 349); this.framedrop.Name = "framedrop"; this.framedrop.Size = new System.Drawing.Size(188, 23); this.framedrop.TabIndex = 30; @@ -389,7 +398,7 @@ // // directRendering // - this.directRendering.Location = new System.Drawing.Point(200, 228); + this.directRendering.Location = new System.Drawing.Point(200, 291); this.directRendering.Name = "directRendering"; this.directRendering.Size = new System.Drawing.Size(178, 23); this.directRendering.TabIndex = 29; @@ -398,7 +407,7 @@ // // doubleBuffering // - this.doubleBuffering.Location = new System.Drawing.Point(200, 257); + this.doubleBuffering.Location = new System.Drawing.Point(200, 320); this.doubleBuffering.Name = "doubleBuffering"; this.doubleBuffering.Size = new System.Drawing.Size(178, 23); this.doubleBuffering.TabIndex = 28; @@ -407,7 +416,7 @@ // // label21 // - this.label21.Location = new System.Drawing.Point(3, 151); + this.label21.Location = new System.Drawing.Point(3, 178); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(117, 23); this.label21.TabIndex = 27; @@ -415,7 +424,7 @@ // // label7 // - this.label7.Location = new System.Drawing.Point(3, 122); + this.label7.Location = new System.Drawing.Point(3, 149); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(117, 23); this.label7.TabIndex = 26; @@ -430,7 +439,7 @@ "Noise", "High Quality Denoise", "Denoise"}); - this.noiseDenoise.Location = new System.Drawing.Point(122, 148); + this.noiseDenoise.Location = new System.Drawing.Point(122, 175); this.noiseDenoise.Name = "noiseDenoise"; this.noiseDenoise.Size = new System.Drawing.Size(260, 21); this.noiseDenoise.TabIndex = 25; @@ -444,34 +453,27 @@ "Stereo", "Surround", "Full 5.1"}); - this.audioChannels.Location = new System.Drawing.Point(122, 119); + this.audioChannels.Location = new System.Drawing.Point(122, 146); this.audioChannels.Name = "audioChannels"; this.audioChannels.Size = new System.Drawing.Size(260, 21); this.audioChannels.TabIndex = 24; // - // video_Tab + // video_audio_Tab // - this.video_Tab.Controls.Add(this.label25); - this.video_Tab.Controls.Add(this.videoPlayerUse); - this.video_Tab.Controls.Add(this.videoArgument); - this.video_Tab.Controls.Add(this.label24); - this.video_Tab.Controls.Add(this.label23); - this.video_Tab.Controls.Add(this.videoExtension); - this.video_Tab.Controls.Add(this.videoDelete); - this.video_Tab.Controls.Add(this.videoAdd); - this.video_Tab.Controls.Add(this.videoExtList); - 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, 352); - this.video_Tab.TabIndex = 1; - this.video_Tab.Text = "Video"; - this.video_Tab.UseVisualStyleBackColor = true; + 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, 431); + this.video_audio_Tab.TabIndex = 1; + this.video_audio_Tab.Text = "Video/Audio"; + this.video_audio_Tab.UseVisualStyleBackColor = true; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(87, 64); + this.label25.Location = new System.Drawing.Point(90, 72); this.label25.Name = "label25"; this.label25.Size = new System.Drawing.Size(100, 13); this.label25.TabIndex = 26; @@ -480,7 +482,7 @@ // videoPlayerUse // this.videoPlayerUse.AutoSize = true; - this.videoPlayerUse.Location = new System.Drawing.Point(193, 63); + this.videoPlayerUse.Location = new System.Drawing.Point(196, 71); this.videoPlayerUse.Name = "videoPlayerUse"; this.videoPlayerUse.Size = new System.Drawing.Size(15, 14); this.videoPlayerUse.TabIndex = 25; @@ -488,15 +490,15 @@ // // videoArgument // - this.videoArgument.Location = new System.Drawing.Point(193, 37); + this.videoArgument.Location = new System.Drawing.Point(196, 45); this.videoArgument.Name = "videoArgument"; - this.videoArgument.Size = new System.Drawing.Size(202, 20); + this.videoArgument.Size = new System.Drawing.Size(192, 20); this.videoArgument.TabIndex = 24; // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(87, 40); + this.label24.Location = new System.Drawing.Point(90, 48); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(60, 13); this.label24.TabIndex = 23; @@ -505,7 +507,7 @@ // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(87, 14); + this.label23.Location = new System.Drawing.Point(90, 22); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(56, 13); this.label23.TabIndex = 22; @@ -513,15 +515,15 @@ // // videoExtension // - this.videoExtension.Location = new System.Drawing.Point(193, 11); + this.videoExtension.Location = new System.Drawing.Point(196, 19); this.videoExtension.Name = "videoExtension"; - this.videoExtension.Size = new System.Drawing.Size(202, 20); + this.videoExtension.Size = new System.Drawing.Size(192, 20); this.videoExtension.TabIndex = 21; this.videoExtension.Leave += new System.EventHandler(this.videoExtension_Leave); // // videoDelete // - this.videoDelete.Location = new System.Drawing.Point(171, 317); + this.videoDelete.Location = new System.Drawing.Point(174, 169); this.videoDelete.Name = "videoDelete"; this.videoDelete.Size = new System.Drawing.Size(75, 23); this.videoDelete.TabIndex = 20; @@ -531,7 +533,7 @@ // // videoAdd // - this.videoAdd.Location = new System.Drawing.Point(90, 317); + this.videoAdd.Location = new System.Drawing.Point(93, 169); this.videoAdd.Name = "videoAdd"; this.videoAdd.Size = new System.Drawing.Size(75, 23); this.videoAdd.TabIndex = 19; @@ -542,127 +544,47 @@ // videoExtList // this.videoExtList.FormattingEnabled = true; - this.videoExtList.Location = new System.Drawing.Point(3, 11); + this.videoExtList.Location = new System.Drawing.Point(6, 19); this.videoExtList.Name = "videoExtList"; - this.videoExtList.Size = new System.Drawing.Size(78, 329); + this.videoExtList.Size = new System.Drawing.Size(78, 173); this.videoExtList.TabIndex = 18; this.videoExtList.SelectedIndexChanged += new System.EventHandler(this.videoExtList_SelectedIndexChanged); // - // audio_Tab + // dvd_vcd_svcd_streams_Tab // - this.audio_Tab.Controls.Add(this.label26); - this.audio_Tab.Controls.Add(this.audioPlayerUse); - this.audio_Tab.Controls.Add(this.audioArgument); - this.audio_Tab.Controls.Add(this.label27); - this.audio_Tab.Controls.Add(this.label28); - this.audio_Tab.Controls.Add(this.audioExtension); - this.audio_Tab.Controls.Add(this.audioDelete); - this.audio_Tab.Controls.Add(this.audioAdd); - this.audio_Tab.Controls.Add(this.audioExtList); - 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, 352); - this.audio_Tab.TabIndex = 2; - this.audio_Tab.Text = "Audio"; - this.audio_Tab.UseVisualStyleBackColor = true; + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label20); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.unsvArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label19); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.udpArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label18); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.sdpArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label17); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.rtspArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label16); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.mpstArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label15); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.mmsArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label14); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.httpArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label13); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.ftpArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label12); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.cueArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.audioCDArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label6); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label11); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.svcdArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label10); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.vcdArguments); + this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.label9); + 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, 431); + 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; // - // label26 - // - this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(87, 64); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(100, 13); - this.label26.TabIndex = 35; - this.label26.Text = "External Player use:"; - // - // audioPlayerUse - // - this.audioPlayerUse.AutoSize = true; - this.audioPlayerUse.Location = new System.Drawing.Point(193, 63); - this.audioPlayerUse.Name = "audioPlayerUse"; - this.audioPlayerUse.Size = new System.Drawing.Size(15, 14); - this.audioPlayerUse.TabIndex = 34; - this.audioPlayerUse.UseVisualStyleBackColor = true; - // - // audioArgument - // - this.audioArgument.Location = new System.Drawing.Point(193, 37); - this.audioArgument.Name = "audioArgument"; - this.audioArgument.Size = new System.Drawing.Size(202, 20); - this.audioArgument.TabIndex = 33; - // - // label27 - // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(87, 40); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(60, 13); - this.label27.TabIndex = 32; - this.label27.Text = "Arguments:"; - // - // label28 - // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(87, 14); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(56, 13); - this.label28.TabIndex = 31; - this.label28.Text = "Extension:"; - // - // audioExtension - // - this.audioExtension.Location = new System.Drawing.Point(193, 11); - this.audioExtension.Name = "audioExtension"; - this.audioExtension.Size = new System.Drawing.Size(202, 20); - this.audioExtension.TabIndex = 30; - this.audioExtension.Leave += new System.EventHandler(this.audioExtension_Leave); - // - // audioDelete - // - this.audioDelete.Location = new System.Drawing.Point(171, 317); - this.audioDelete.Name = "audioDelete"; - this.audioDelete.Size = new System.Drawing.Size(75, 23); - this.audioDelete.TabIndex = 29; - this.audioDelete.Text = "&Delete"; - this.audioDelete.UseVisualStyleBackColor = true; - this.audioDelete.Click += new System.EventHandler(this.audioDelete_Click); - // - // audioAdd - // - this.audioAdd.Location = new System.Drawing.Point(90, 317); - this.audioAdd.Name = "audioAdd"; - this.audioAdd.Size = new System.Drawing.Size(75, 23); - this.audioAdd.TabIndex = 28; - this.audioAdd.Text = "&Add"; - this.audioAdd.UseVisualStyleBackColor = true; - this.audioAdd.Click += new System.EventHandler(this.audioAdd_Click); - // - // audioExtList - // - this.audioExtList.FormattingEnabled = true; - this.audioExtList.Location = new System.Drawing.Point(3, 11); - this.audioExtList.Name = "audioExtList"; - this.audioExtList.Size = new System.Drawing.Size(78, 329); - this.audioExtList.TabIndex = 27; - this.audioExtList.SelectedIndexChanged += new System.EventHandler(this.audioExtList_SelectedIndexChanged); - // - // dvd_vcd_svcd_Tab - // - this.dvd_vcd_svcd_Tab.Controls.Add(this.audioCDArguments); - this.dvd_vcd_svcd_Tab.Controls.Add(this.label6); - this.dvd_vcd_svcd_Tab.Controls.Add(this.label11); - this.dvd_vcd_svcd_Tab.Controls.Add(this.svcdArguments); - this.dvd_vcd_svcd_Tab.Controls.Add(this.label10); - this.dvd_vcd_svcd_Tab.Controls.Add(this.vcdArguments); - this.dvd_vcd_svcd_Tab.Controls.Add(this.label9); - this.dvd_vcd_svcd_Tab.Controls.Add(this.dvdArguments); - this.dvd_vcd_svcd_Tab.Location = new System.Drawing.Point(4, 22); - this.dvd_vcd_svcd_Tab.Name = "dvd_vcd_svcd_Tab"; - this.dvd_vcd_svcd_Tab.Size = new System.Drawing.Size(403, 352); - this.dvd_vcd_svcd_Tab.TabIndex = 3; - this.dvd_vcd_svcd_Tab.Text = "DVD/VCD/SVCD"; - this.dvd_vcd_svcd_Tab.UseVisualStyleBackColor = true; - // // audioCDArguments // this.audioCDArguments.Location = new System.Drawing.Point(122, 89); @@ -723,177 +645,314 @@ this.dvdArguments.Size = new System.Drawing.Size(256, 20); this.dvdArguments.TabIndex = 17; // - // streaming_cue_Tab + // openFileDialog1 // - this.streaming_cue_Tab.Controls.Add(this.label20); - this.streaming_cue_Tab.Controls.Add(this.unsvArguments); - this.streaming_cue_Tab.Controls.Add(this.label19); - this.streaming_cue_Tab.Controls.Add(this.udpArguments); - this.streaming_cue_Tab.Controls.Add(this.label18); - this.streaming_cue_Tab.Controls.Add(this.sdpArguments); - this.streaming_cue_Tab.Controls.Add(this.label17); - this.streaming_cue_Tab.Controls.Add(this.rtspArguments); - this.streaming_cue_Tab.Controls.Add(this.label16); - this.streaming_cue_Tab.Controls.Add(this.mpstArguments); - this.streaming_cue_Tab.Controls.Add(this.label15); - this.streaming_cue_Tab.Controls.Add(this.mmsArguments); - this.streaming_cue_Tab.Controls.Add(this.label14); - this.streaming_cue_Tab.Controls.Add(this.httpArguments); - this.streaming_cue_Tab.Controls.Add(this.label13); - this.streaming_cue_Tab.Controls.Add(this.ftpArguments); - this.streaming_cue_Tab.Controls.Add(this.label12); - this.streaming_cue_Tab.Controls.Add(this.cueArguments); - this.streaming_cue_Tab.Location = new System.Drawing.Point(4, 22); - this.streaming_cue_Tab.Name = "streaming_cue_Tab"; - this.streaming_cue_Tab.Size = new System.Drawing.Size(403, 352); - this.streaming_cue_Tab.TabIndex = 5; - this.streaming_cue_Tab.Text = "Other"; - this.streaming_cue_Tab.UseVisualStyleBackColor = true; + this.openFileDialog1.FileName = "openFileDialog1"; + this.openFileDialog1.Title = "Select MPlayer:"; // + // passthroughAC3_DTS + // + this.passthroughAC3_DTS.Location = new System.Drawing.Point(6, 378); + 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; + // + // 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; + // + // 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:"; + // + // label30 + // + this.label30.Location = new System.Drawing.Point(3, 232); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(117, 23); + this.label30.TabIndex = 38; + this.label30.Text = "Cachesize:"; + // + // cacheSize + // + this.cacheSize.FormattingEnabled = true; + this.cacheSize.Items.AddRange(new object[] { + "2048", + "4096", + "8192"}); + this.cacheSize.Location = new System.Drawing.Point(122, 229); + 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); + // // label20 // - this.label20.Location = new System.Drawing.Point(3, 222); + this.label20.Location = new System.Drawing.Point(3, 326); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(117, 23); - this.label20.TabIndex = 32; + this.label20.TabIndex = 50; this.label20.Text = "UNSV Arguments:"; // // unsvArguments // - this.unsvArguments.Location = new System.Drawing.Point(122, 219); + this.unsvArguments.Location = new System.Drawing.Point(122, 323); this.unsvArguments.Name = "unsvArguments"; this.unsvArguments.Size = new System.Drawing.Size(256, 20); - this.unsvArguments.TabIndex = 33; + this.unsvArguments.TabIndex = 51; // // label19 // - this.label19.Location = new System.Drawing.Point(3, 196); + this.label19.Location = new System.Drawing.Point(3, 300); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(117, 23); - this.label19.TabIndex = 30; + this.label19.TabIndex = 48; this.label19.Text = "UDP Arguments:"; // // udpArguments // - this.udpArguments.Location = new System.Drawing.Point(122, 193); + this.udpArguments.Location = new System.Drawing.Point(122, 297); this.udpArguments.Name = "udpArguments"; this.udpArguments.Size = new System.Drawing.Size(256, 20); - this.udpArguments.TabIndex = 31; + this.udpArguments.TabIndex = 49; // // label18 // - this.label18.Location = new System.Drawing.Point(3, 170); + this.label18.Location = new System.Drawing.Point(3, 274); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(117, 23); - this.label18.TabIndex = 28; + this.label18.TabIndex = 46; this.label18.Text = "SDP Arguments:"; // // sdpArguments // - this.sdpArguments.Location = new System.Drawing.Point(122, 167); + this.sdpArguments.Location = new System.Drawing.Point(122, 271); this.sdpArguments.Name = "sdpArguments"; this.sdpArguments.Size = new System.Drawing.Size(256, 20); - this.sdpArguments.TabIndex = 29; + this.sdpArguments.TabIndex = 47; // // label17 // - this.label17.Location = new System.Drawing.Point(3, 144); + this.label17.Location = new System.Drawing.Point(3, 248); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(117, 23); - this.label17.TabIndex = 26; + this.label17.TabIndex = 44; this.label17.Text = "RT(S)P Arguments:"; // // rtspArguments // - this.rtspArguments.Location = new System.Drawing.Point(122, 141); + this.rtspArguments.Location = new System.Drawing.Point(122, 245); this.rtspArguments.Name = "rtspArguments"; this.rtspArguments.Size = new System.Drawing.Size(256, 20); - this.rtspArguments.TabIndex = 27; + this.rtspArguments.TabIndex = 45; // // label16 // - this.label16.Location = new System.Drawing.Point(3, 118); + this.label16.Location = new System.Drawing.Point(3, 222); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(117, 23); - this.label16.TabIndex = 24; + this.label16.TabIndex = 42; this.label16.Text = "MPST Arguments:"; // // mpstArguments // - this.mpstArguments.Location = new System.Drawing.Point(122, 115); + this.mpstArguments.Location = new System.Drawing.Point(122, 219); this.mpstArguments.Name = "mpstArguments"; this.mpstArguments.Size = new System.Drawing.Size(256, 20); - this.mpstArguments.TabIndex = 25; + this.mpstArguments.TabIndex = 43; // // label15 // - this.label15.Location = new System.Drawing.Point(3, 92); + this.label15.Location = new System.Drawing.Point(3, 196); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(117, 23); - this.label15.TabIndex = 22; + this.label15.TabIndex = 40; this.label15.Text = "MMS(T) Arguments:"; // // mmsArguments // - this.mmsArguments.Location = new System.Drawing.Point(122, 89); + this.mmsArguments.Location = new System.Drawing.Point(122, 193); this.mmsArguments.Name = "mmsArguments"; this.mmsArguments.Size = new System.Drawing.Size(256, 20); - this.mmsArguments.TabIndex = 23; + this.mmsArguments.TabIndex = 41; // // label14 // - this.label14.Location = new System.Drawing.Point(3, 66); + this.label14.Location = new System.Drawing.Point(3, 170); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(117, 23); - this.label14.TabIndex = 20; + this.label14.TabIndex = 38; this.label14.Text = "HTTP Arguments:"; // // httpArguments // - this.httpArguments.Location = new System.Drawing.Point(122, 63); + this.httpArguments.Location = new System.Drawing.Point(122, 167); this.httpArguments.Name = "httpArguments"; this.httpArguments.Size = new System.Drawing.Size(256, 20); - this.httpArguments.TabIndex = 21; + this.httpArguments.TabIndex = 39; // // label13 // - this.label13.Location = new System.Drawing.Point(3, 40); + this.label13.Location = new System.Drawing.Point(3, 144); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(117, 23); - this.label13.TabIndex = 18; + this.label13.TabIndex = 36; this.label13.Text = "FTP Arguments:"; // // ftpArguments // - this.ftpArguments.Location = new System.Drawing.Point(122, 37); + this.ftpArguments.Location = new System.Drawing.Point(122, 141); this.ftpArguments.Name = "ftpArguments"; this.ftpArguments.Size = new System.Drawing.Size(256, 20); - this.ftpArguments.TabIndex = 19; + this.ftpArguments.TabIndex = 37; // // label12 // - this.label12.Location = new System.Drawing.Point(3, 14); + this.label12.Location = new System.Drawing.Point(3, 118); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(117, 23); - this.label12.TabIndex = 16; + this.label12.TabIndex = 34; this.label12.Text = "CUE Arguments:"; // // cueArguments // - this.cueArguments.Location = new System.Drawing.Point(122, 11); + this.cueArguments.Location = new System.Drawing.Point(122, 115); this.cueArguments.Name = "cueArguments"; this.cueArguments.Size = new System.Drawing.Size(256, 20); - this.cueArguments.TabIndex = 17; + this.cueArguments.TabIndex = 35; // - // openFileDialog1 + // groupBox1 // - this.openFileDialog1.FileName = "openFileDialog1"; - this.openFileDialog1.Title = "Select MPlayer:"; + this.groupBox1.Controls.Add(this.videoExtList); + this.groupBox1.Controls.Add(this.videoDelete); + this.groupBox1.Controls.Add(this.label24); + this.groupBox1.Controls.Add(this.label23); + this.groupBox1.Controls.Add(this.label25); + this.groupBox1.Controls.Add(this.videoExtension); + this.groupBox1.Controls.Add(this.videoPlayerUse); + this.groupBox1.Controls.Add(this.videoAdd); + 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, 201); + this.groupBox1.TabIndex = 29; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Video"; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label26); + this.groupBox2.Controls.Add(this.audioPlayerUse); + this.groupBox2.Controls.Add(this.audioArgument); + this.groupBox2.Controls.Add(this.label27); + this.groupBox2.Controls.Add(this.label28); + this.groupBox2.Controls.Add(this.audioExtension); + 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, 224); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(394, 201); + this.groupBox2.TabIndex = 30; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Audio"; + // + // label26 + // + this.label26.AutoSize = true; + this.label26.Location = new System.Drawing.Point(90, 72); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(100, 13); + this.label26.TabIndex = 44; + this.label26.Text = "External Player use:"; + // + // audioPlayerUse + // + this.audioPlayerUse.AutoSize = true; + this.audioPlayerUse.Location = new System.Drawing.Point(196, 71); + this.audioPlayerUse.Name = "audioPlayerUse"; + this.audioPlayerUse.Size = new System.Drawing.Size(15, 14); + this.audioPlayerUse.TabIndex = 43; + this.audioPlayerUse.UseVisualStyleBackColor = true; + // + // audioArgument + // + this.audioArgument.Location = new System.Drawing.Point(196, 45); + this.audioArgument.Name = "audioArgument"; + this.audioArgument.Size = new System.Drawing.Size(192, 20); + this.audioArgument.TabIndex = 42; + // + // label27 + // + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(90, 48); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(60, 13); + this.label27.TabIndex = 41; + this.label27.Text = "Arguments:"; + // + // label28 + // + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(90, 22); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(56, 13); + this.label28.TabIndex = 40; + this.label28.Text = "Extension:"; + // + // audioExtension + // + this.audioExtension.Location = new System.Drawing.Point(196, 19); + this.audioExtension.Name = "audioExtension"; + this.audioExtension.Size = new System.Drawing.Size(192, 20); + this.audioExtension.TabIndex = 39; + // + // audioDelete + // + this.audioDelete.Location = new System.Drawing.Point(174, 169); + this.audioDelete.Name = "audioDelete"; + this.audioDelete.Size = new System.Drawing.Size(75, 23); + this.audioDelete.TabIndex = 38; + this.audioDelete.Text = "&Delete"; + this.audioDelete.UseVisualStyleBackColor = true; + // + // audioAdd + // + this.audioAdd.Location = new System.Drawing.Point(93, 169); + this.audioAdd.Name = "audioAdd"; + this.audioAdd.Size = new System.Drawing.Size(75, 23); + this.audioAdd.TabIndex = 37; + this.audioAdd.Text = "&Add"; + this.audioAdd.UseVisualStyleBackColor = true; + // + // audioExtList + // + 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, 173); + this.audioExtList.TabIndex = 36; + // // ConfigurationForm // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(435, 434); + this.ClientSize = new System.Drawing.Size(435, 508); this.Controls.Add(this.tabControl1); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); @@ -906,14 +965,13 @@ this.tabControl1.ResumeLayout(false); this.general_Tab.ResumeLayout(false); this.general_Tab.PerformLayout(); - this.video_Tab.ResumeLayout(false); - this.video_Tab.PerformLayout(); - this.audio_Tab.ResumeLayout(false); - this.audio_Tab.PerformLayout(); - this.dvd_vcd_svcd_Tab.ResumeLayout(false); - this.dvd_vcd_svcd_Tab.PerformLayout(); - this.streaming_cue_Tab.ResumeLayout(false); - this.streaming_cue_Tab.PerformLayout(); + this.video_audio_Tab.ResumeLayout(false); + this.dvd_vcd_svcd_streams_Tab.ResumeLayout(false); + this.dvd_vcd_svcd_streams_Tab.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); } @@ -946,16 +1004,42 @@ 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_Tab; - private System.Windows.Forms.TabPage audio_Tab; - private System.Windows.Forms.TabPage dvd_vcd_svcd_Tab; + private System.Windows.Forms.TabPage video_audio_Tab; + private System.Windows.Forms.TabPage dvd_vcd_svcd_streams_Tab; private System.Windows.Forms.Label label11; private System.Windows.Forms.TextBox svcdArguments; private System.Windows.Forms.Label label10; private System.Windows.Forms.TextBox vcdArguments; private System.Windows.Forms.Label label9; private System.Windows.Forms.TextBox dvdArguments; - private System.Windows.Forms.TabPage streaming_cue_Tab; + private System.Windows.Forms.Label label25; + private System.Windows.Forms.CheckBox videoPlayerUse; + private System.Windows.Forms.TextBox videoArgument; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.TextBox videoExtension; + private System.Windows.Forms.Button videoDelete; + private System.Windows.Forms.Button videoAdd; + private System.Windows.Forms.ListBox videoExtList; + private System.Windows.Forms.TextBox audioCDArguments; + private System.Windows.Forms.Label label6; + 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; @@ -974,15 +1058,8 @@ private System.Windows.Forms.TextBox ftpArguments; private System.Windows.Forms.Label label12; private System.Windows.Forms.TextBox cueArguments; - private System.Windows.Forms.Label label25; - private System.Windows.Forms.CheckBox videoPlayerUse; - private System.Windows.Forms.TextBox videoArgument; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.TextBox videoExtension; - private System.Windows.Forms.Button videoDelete; - private System.Windows.Forms.Button videoAdd; - private System.Windows.Forms.ListBox videoExtList; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label26; private System.Windows.Forms.CheckBox audioPlayerUse; private System.Windows.Forms.TextBox audioArgument; @@ -992,20 +1069,6 @@ private System.Windows.Forms.Button audioDelete; private System.Windows.Forms.Button audioAdd; private System.Windows.Forms.ListBox audioExtList; - private System.Windows.Forms.TextBox audioCDArguments; - private System.Windows.Forms.Label label6; - 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; } } \ No newline at end of file Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-02-20 19:41:57 UTC (rev 127) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-02-20 22:44:49 UTC (rev 128) @@ -33,7 +33,9 @@ using MediaPortal.GUI.Library; using MediaPortal.Util; using MediaPortal.Configuration; +using Un4seen.Bass; + namespace MPlayer { /// <summary> /// Configuration Form for the External player plugin @@ -45,7 +47,7 @@ /// Last video extension setting /// </summary> private ExtensionSettings lastVideoSettings; - + /// <summary> /// Last audio extension setting /// </summary> @@ -61,6 +63,12 @@ ConfigurationManager manager = ConfigurationManager.getInstance(); osdFont.Items.Clear(); osdFont.Items.AddRange(manager.PossibleFonts); + soundOutputDevice.Items.Clear(); + soundOutputDevice.Items.Add("Default DirectSound Device"); + string[] soundDevices = Bass.BASS_GetDeviceDescriptions(); + for (int i = 1; i < soundDevices.Length; i++) { + soundOutputDevice.Items.Add(soundDevices[i]); + } } #endregion @@ -83,7 +91,7 @@ saveConfiguration(); this.Close(); } - + /// <summary> /// Handles the Cancel-Button click event /// </summary> @@ -92,7 +100,7 @@ private void cancelButton_Click(object sender, EventArgs e) { this.Close(); } - + /// <summary> /// Handles the Browse-Button click event /// </summary> @@ -102,15 +110,15 @@ openFileDialog1.Filter = "MPlayer commandline version (mplayer.exe)|mplayer.exe|MPlayer GUI version (gmplayer.exe)|gmplayer.exe"; openFileDialog1.InitialDirectory = System.IO.Path.GetDirectoryName(mplayerPath.Text); openFileDialog1.FileName = System.IO.Path.GetFileName(mplayerPath.Text); - if(openFileDialog1.FileName.Equals("mplayer.exe")){ + if (openFileDialog1.FileName.Equals("mplayer.exe")) { openFileDialog1.FilterIndex = 1; - }else{ + } else { openFileDialog1.FilterIndex = 2; } openFileDialog1.ShowDialog(); mplayerPath.Text = openFileDialog1.FileName; } - + /// <summary> /// Handles the Selected index change on the video Extension List /// </summary> @@ -137,7 +145,7 @@ } /// <summary> - /// Handles the Add-Button click event on the video tab + /// Handles the Add-Button click event on the video_audio tab /// </summary> /// <param name="sender">Sender object</param> /// <param name="e">Event Arguments</param> @@ -148,7 +156,7 @@ } /// <summary> - /// Handles the Delete-Button click event on the audio tab + /// Handles the Delete-Button click event on the video_audio tab /// </summary> /// <param name="sender">Sender object</param> /// <param name="e">Event Arguments</param> @@ -164,7 +172,7 @@ } /// <summary> - /// Handles the Leave event on the extension Textfield on the video tab + /// Handles the Leave event on the extension Textfield on the video_audio tab /// </summary> /// <param name="sender">Sender object</param> /// <param name="e">Event Arguments</param> @@ -177,7 +185,7 @@ } /// <summary> - /// Handles the Add-Button click event on the audio tab + /// Handles the Add-Button click event on the video_audio tab /// </summary> /// <param name="sender">Sender object</param> /// <param name="e">Event Arguments</param> @@ -188,7 +196,7 @@ } /// <summary> - /// Handles the Delete-Button click event on the audio tab + /// Handles the Delete-Button click event on the video_audio tab /// </summary> /// <param name="sender">Sender object</param> /// <param name="e">Event Arguments</param> @@ -232,7 +240,7 @@ } /// <summary> - /// Handles the Leave event on the extension textfield on the audio tab + /// Handles the Leave event on the exte... [truncated message content] |