Menu
▾
▴
mp-plugins-svn
|
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] |
|
From: <mis...@us...> - 2007-02-21 20:39:21
|
Revision: 130
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=130&view=rev
Author: misterd_sf
Date: 2007-02-21 12:39:12 -0800 (Wed, 21 Feb 2007)
Log Message:
-----------
MPlayer: Updated documentation
Added possibility to change the displayed name of the gui plugin
Changed behaviour of gui plugin to prevent that the plugin doesn't go back to root folder.
Modified Paths:
--------------
trunk/plugins/My MPlayer/Liesmich.pdf
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
trunk/plugins/My MPlayer/Readme.pdf
Modified: trunk/plugins/My MPlayer/Liesmich.pdf
===================================================================
(Binary files differ)
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-02-21 20:13:55 UTC (rev 129)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-02-21 20:39:12 UTC (rev 130)
@@ -58,11 +58,13 @@
this.shareList = new System.Windows.Forms.ListBox();
this.browseButton = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.pluginName = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// okButton
//
- this.okButton.Location = new System.Drawing.Point(12, 211);
+ this.okButton.Location = new System.Drawing.Point(12, 237);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 3;
@@ -73,7 +75,7 @@
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(322, 211);
+ this.cancelButton.Location = new System.Drawing.Point(322, 237);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 20;
@@ -87,7 +89,7 @@
//
// shareLocation
//
- this.shareLocation.Location = new System.Drawing.Point(90, 181);
+ this.shareLocation.Location = new System.Drawing.Point(90, 210);
this.shareLocation.Name = "shareLocation";
this.shareLocation.Size = new System.Drawing.Size(207, 20);
this.shareLocation.TabIndex = 33;
@@ -96,7 +98,7 @@
// label24
//
this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(12, 184);
+ this.label24.Location = new System.Drawing.Point(12, 213);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(48, 13);
this.label24.TabIndex = 32;
@@ -105,7 +107,7 @@
// label23
//
this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(12, 158);
+ this.label23.Location = new System.Drawing.Point(12, 187);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(38, 13);
this.label23.TabIndex = 31;
@@ -113,7 +115,7 @@
//
// shareName
//
- this.shareName.Location = new System.Drawing.Point(90, 155);
+ this.shareName.Location = new System.Drawing.Point(90, 184);
this.shareName.Name = "shareName";
this.shareName.Size = new System.Drawing.Size(207, 20);
this.shareName.TabIndex = 30;
@@ -121,7 +123,7 @@
//
// shareDelete
//
- this.shareDelete.Location = new System.Drawing.Point(90, 126);
+ this.shareDelete.Location = new System.Drawing.Point(90, 155);
this.shareDelete.Name = "shareDelete";
this.shareDelete.Size = new System.Drawing.Size(75, 23);
this.shareDelete.TabIndex = 29;
@@ -131,7 +133,7 @@
//
// shareAdd
//
- this.shareAdd.Location = new System.Drawing.Point(12, 126);
+ this.shareAdd.Location = new System.Drawing.Point(12, 155);
this.shareAdd.Name = "shareAdd";
this.shareAdd.Size = new System.Drawing.Size(75, 23);
this.shareAdd.TabIndex = 28;
@@ -142,7 +144,7 @@
// shareList
//
this.shareList.FormattingEnabled = true;
- this.shareList.Location = new System.Drawing.Point(12, 25);
+ this.shareList.Location = new System.Drawing.Point(12, 54);
this.shareList.Name = "shareList";
this.shareList.Size = new System.Drawing.Size(385, 95);
this.shareList.TabIndex = 27;
@@ -150,7 +152,7 @@
//
// browseButton
//
- this.browseButton.Location = new System.Drawing.Point(322, 179);
+ this.browseButton.Location = new System.Drawing.Point(322, 208);
this.browseButton.Name = "browseButton";
this.browseButton.Size = new System.Drawing.Size(75, 23);
this.browseButton.TabIndex = 34;
@@ -161,17 +163,35 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(9, 9);
+ this.label1.Location = new System.Drawing.Point(9, 32);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(74, 13);
this.label1.TabIndex = 35;
this.label1.Text = "List of Shares:";
//
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(9, 12);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(170, 13);
+ this.label2.TabIndex = 36;
+ this.label2.Text = "Name of plugin displayed in Home:";
+ //
+ // pluginName
+ //
+ this.pluginName.Location = new System.Drawing.Point(185, 9);
+ this.pluginName.Name = "pluginName";
+ this.pluginName.Size = new System.Drawing.Size(212, 20);
+ this.pluginName.TabIndex = 37;
+ //
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
this.CancelButton = this.cancelButton;
- this.ClientSize = new System.Drawing.Size(409, 245);
+ this.ClientSize = new System.Drawing.Size(409, 274);
+ this.Controls.Add(this.pluginName);
+ this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.browseButton);
this.Controls.Add(this.shareLocation);
@@ -215,6 +235,8 @@
private System.Windows.Forms.ListBox shareList;
private System.Windows.Forms.Button browseButton;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox pluginName;
}
}
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-02-21 20:13:55 UTC (rev 129)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-02-21 20:39:12 UTC (rev 130)
@@ -193,6 +193,9 @@
share.Path = nodeShare.Attributes["path"].Value;
shareList.Items.Add(share);
}
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
+ pluginName.Text = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer GUI");
+ }
} catch (Exception e) {
Log.Info("MPlayer GUI Error: Configuration could not be loaded: " + e.Message);
}
@@ -222,6 +225,13 @@
writer.WriteEndElement(); //</mplayer>
writer.WriteEndDocument();
writer.Close();
+ using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
+ if (pluginName.Text.Equals(String.Empty)) {
+ xmlWriter.SetValue("mplayer", "displayNameOfGUI", "My MPlayer");
+ } else {
+ xmlWriter.SetValue("mplayer", "displayNameOfGUI", pluginName.Text);
+ }
+ }
}
#endregion
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-02-21 20:13:55 UTC (rev 129)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-02-21 20:39:12 UTC (rev 130)
@@ -127,6 +127,15 @@
/// </summary>
private static PlayListPlayer playlistPlayer;
+ /// <summary>
+ /// Current virtual Path
+ /// </summary>
+ private string virtualPath;
+
+ /// <summary>
+ /// Display name of the plugin
+ /// </summary>
+ private string displayName;
#endregion
#region ctor
@@ -134,7 +143,6 @@
/// Static Constructor for the Playlistplayer instance
/// </summary>
static MPlayer_GUIPlugin() {
-
playlistPlayer = PlayListPlayer.SingletonPlayer;
}
@@ -143,6 +151,10 @@
/// </summary>
public MPlayer_GUIPlugin() {
GetID = 9533;
+ virtualPath = String.Empty;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
+ displayName = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer");
+ }
}
#endregion
@@ -177,6 +189,30 @@
/// <returns>true, if init was successful</returns>
public override bool Init() {
bool bResult = Load(GUIGraphicsContext.Skin + @"\myMPlayer.xml");
+ m_directory.SetExtensions(getExtenstions());
+ m_directory.Clear();
+ Share share = null;
+ string[] drives = Environment.GetLogicalDrives();
+ foreach (string driveElement in drives) {
+ if (Utils.getDriveType(driveElement) == 5) {
+ string driveLetter = driveElement.Substring(0, 1);
+ share = new Share();
+ share.Name = driveLetter + ":\\";
+ share.Path = driveLetter + ":\\";
+ m_directory.Add(share);
+ }
+ }
+ XmlDocument doc = new XmlDocument();
+ string path = Config.GetFile(Config.Dir.Config, "MPlayer_GUIPlugin.xml");
+ doc.Load(path);
+ XmlNodeList listShare = doc.DocumentElement.SelectNodes("/mplayergui/Share");
+ foreach (XmlNode nodeShare in listShare) {
+ share = new Share();
+ share.Name = nodeShare.Attributes["name"].Value;
+ share.Path = nodeShare.Attributes["path"].Value;
+ m_directory.Add(share);
+ }
+
return bResult;
}
@@ -400,6 +436,7 @@
if ((item.IsFolder) && (!isFolderAMovie)) {
//currentSelectedItem = -1;
+ virtualPath = path;
LoadDirectory(path);
} else {
string movieFileName = path + ".mplayer";
@@ -491,31 +528,7 @@
GUIVideoOverlay videoOverlay = (GUIVideoOverlay)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIDEO_OVERLAY);
if ((videoOverlay != null) && (videoOverlay.Focused)) videoOverlay.Focused = false;
- m_directory.SetExtensions(getExtenstions());
- m_directory.Clear();
- Share share = null;
- string[] drives = Environment.GetLogicalDrives();
- foreach (string driveElement in drives) {
- if (Utils.getDriveType(driveElement) == 5) {
- string driveLetter = driveElement.Substring(0, 1);
- share = new Share();
- share.Name = driveLetter + ":\\";
- share.Path = driveLetter + ":\\";
- m_directory.Add(share);
- }
- }
- XmlDocument doc = new XmlDocument();
- string path = Config.GetFile(Config.Dir.Config,"MPlayer_GUIPlugin.xml");
- doc.Load(path);
- XmlNodeList listShare = doc.DocumentElement.SelectNodes("/mplayergui/Share");
- foreach (XmlNode nodeShare in listShare) {
- share = new Share();
- share.Name = nodeShare.Attributes["name"].Value;
- share.Path = nodeShare.Attributes["path"].Value;
- m_directory.Add(share);
- }
-
- LoadDirectory("");
+ LoadDirectory(virtualPath);
if (btnSortBy != null) {
btnSortBy.SortChanged += new SortEventHandler(SortChanged);
}
@@ -682,7 +695,7 @@
/// <param name="strPictureImage">Hover image of the plugin</param>
/// <returns>true, if it should be display in menu</returns>
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage) {
- strButtonText = PluginName();
+ strButtonText = displayName;
strButtonImage = String.Empty;
strButtonImageFocus = String.Empty;
strPictureImage = "hover_my videos.png";
Modified: trunk/plugins/My MPlayer/Readme.pdf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-03-01 18:20:31
|
Revision: 150
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=150&view=rev
Author: misterd_sf
Date: 2007-03-01 10:20:23 -0800 (Thu, 01 Mar 2007)
Log Message:
-----------
MPlayer: Input fields will be disable in configuration if no element is selected in the corresponding list.
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-03-01 05:58:37 UTC (rev 149)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-03-01 18:20:23 UTC (rev 150)
@@ -66,6 +66,11 @@
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.general_Tab = new System.Windows.Forms.TabPage();
+ 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();
@@ -77,31 +82,27 @@
this.noiseDenoise = new System.Windows.Forms.ComboBox();
this.audioChannels = new System.Windows.Forms.ComboBox();
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();
+ 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.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.videoExtList = new System.Windows.Forms.ListBox();
+ this.videoDelete = new System.Windows.Forms.Button();
this.label24 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
this.videoExtension = new System.Windows.Forms.TextBox();
- this.videoDelete = new System.Windows.Forms.Button();
+ this.videoPlayerUse = new System.Windows.Forms.CheckBox();
this.videoAdd = new System.Windows.Forms.Button();
- this.videoExtList = new System.Windows.Forms.ListBox();
+ this.videoArgument = new System.Windows.Forms.TextBox();
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();
- this.svcdArguments = new System.Windows.Forms.TextBox();
- this.label10 = new System.Windows.Forms.Label();
- this.vcdArguments = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
- this.dvdArguments = new System.Windows.Forms.TextBox();
- 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();
@@ -120,23 +121,22 @@
this.ftpArguments = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.cueArguments = new System.Windows.Forms.TextBox();
- 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.audioCDArguments = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.svcdArguments = new System.Windows.Forms.TextBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.vcdArguments = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.dvdArguments = new System.Windows.Forms.TextBox();
+ this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.fontDialog1 = new System.Windows.Forms.FontDialog();
this.tabControl1.SuspendLayout();
this.general_Tab.SuspendLayout();
this.video_audio_Tab.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
this.dvd_vcd_svcd_streams_Tab.SuspendLayout();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// okButton
@@ -361,6 +361,58 @@
this.general_Tab.Text = "General";
this.general_Tab.UseVisualStyleBackColor = true;
//
+ // 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);
+ //
+ // 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, 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;
+ //
// label22
//
this.label22.Location = new System.Drawing.Point(3, 205);
@@ -470,31 +522,144 @@
this.video_audio_Tab.Text = "Video/Audio";
this.video_audio_Tab.UseVisualStyleBackColor = true;
//
- // label25
+ // groupBox2
//
- this.label25.AutoSize = true;
- 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;
- this.label25.Text = "External Player use:";
+ 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";
//
- // videoPlayerUse
+ // label26
//
- this.videoPlayerUse.AutoSize = true;
- 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;
- this.videoPlayerUse.UseVisualStyleBackColor = true;
+ 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:";
//
- // videoArgument
+ // audioPlayerUse
//
- this.videoArgument.Location = new System.Drawing.Point(196, 45);
- this.videoArgument.Name = "videoArgument";
- this.videoArgument.Size = new System.Drawing.Size(192, 20);
- this.videoArgument.TabIndex = 24;
+ this.audioPlayerUse.AutoSize = true;
+ this.audioPlayerUse.Enabled = false;
+ 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.Enabled = false;
+ 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.Enabled = false;
+ 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;
+ this.audioExtension.Leave += new System.EventHandler(this.audioExtension_Leave);
+ //
+ // 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;
+ this.audioDelete.Click += new System.EventHandler(this.audioDelete_Click);
+ //
+ // 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;
+ this.audioAdd.Click += new System.EventHandler(this.audioAdd_Click);
+ //
+ // 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;
+ this.audioExtList.SelectedIndexChanged += new System.EventHandler(this.audioExtList_SelectedIndexChanged);
+ //
+ // groupBox1
+ //
+ 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";
+ //
+ // videoExtList
+ //
+ 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, 173);
+ this.videoExtList.TabIndex = 18;
+ this.videoExtList.SelectedIndexChanged += new System.EventHandler(this.videoExtList_SelectedIndexChanged);
+ //
+ // videoDelete
+ //
+ 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;
+ this.videoDelete.Text = "&Delete";
+ this.videoDelete.UseVisualStyleBackColor = true;
+ this.videoDelete.Click += new System.EventHandler(this.videoDelete_Click);
+ //
// label24
//
this.label24.AutoSize = true;
@@ -513,23 +678,33 @@
this.label23.TabIndex = 22;
this.label23.Text = "Extension:";
//
+ // label25
+ //
+ this.label25.AutoSize = true;
+ 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;
+ this.label25.Text = "External Player use:";
+ //
// videoExtension
//
+ this.videoExtension.Enabled = false;
this.videoExtension.Location = new System.Drawing.Point(196, 19);
this.videoExtension.Name = "videoExtension";
this.videoExtension.Size = new System.Drawing.Size(192, 20);
this.videoExtension.TabIndex = 21;
this.videoExtension.Leave += new System.EventHandler(this.videoExtension_Leave);
//
- // videoDelete
+ // videoPlayerUse
//
- 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;
- this.videoDelete.Text = "&Delete";
- this.videoDelete.UseVisualStyleBackColor = true;
- this.videoDelete.Click += new System.EventHandler(this.videoDelete_Click);
+ this.videoPlayerUse.AutoSize = true;
+ this.videoPlayerUse.Enabled = false;
+ 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;
+ this.videoPlayerUse.UseVisualStyleBackColor = true;
//
// videoAdd
//
@@ -541,14 +716,13 @@
this.videoAdd.UseVisualStyleBackColor = true;
this.videoAdd.Click += new System.EventHandler(this.videoAdd_Click);
//
- // videoExtList
+ // videoArgument
//
- 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, 173);
- this.videoExtList.TabIndex = 18;
- this.videoExtList.SelectedIndexChanged += new System.EventHandler(this.videoExtList_SelectedIndexChanged);
+ this.videoArgument.Enabled = false;
+ this.videoArgument.Location = new System.Drawing.Point(196, 45);
+ this.videoArgument.Name = "videoArgument";
+ this.videoArgument.Size = new System.Drawing.Size(192, 20);
+ this.videoArgument.TabIndex = 24;
//
// dvd_vcd_svcd_streams_Tab
//
@@ -585,123 +759,6 @@
this.dvd_vcd_svcd_streams_Tab.Text = "DVD/VCD/SVCD/Streams";
this.dvd_vcd_svcd_streams_Tab.UseVisualStyleBackColor = true;
//
- // audioCDArguments
- //
- this.audioCDArguments.Location = new System.Drawing.Point(122, 89);
- this.audioCDArguments.Name = "audioCDArguments";
- this.audioCDArguments.Size = new System.Drawing.Size(256, 20);
- this.audioCDArguments.TabIndex = 23;
- //
- // label6
- //
- this.label6.Location = new System.Drawing.Point(3, 92);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(117, 23);
- this.label6.TabIndex = 22;
- this.label6.Text = "AudioCD Arguments:";
- //
- // label11
- //
- this.label11.Location = new System.Drawing.Point(3, 66);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(117, 23);
- this.label11.TabIndex = 20;
- this.label11.Text = "SVCD Arguments:";
- //
- // svcdArguments
- //
- this.svcdArguments.Location = new System.Drawing.Point(122, 63);
- 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.Name = "label10";
- this.label10.Size = new System.Drawing.Size(117, 23);
- this.label10.TabIndex = 18;
- this.label10.Text = "VCD Arguments:";
- //
- // vcdArguments
- //
- this.vcdArguments.Location = new System.Drawing.Point(122, 37);
- 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.Name = "label9";
- this.label9.Size = new System.Drawing.Size(117, 23);
- this.label9.TabIndex = 16;
- this.label9.Text = "DVD Arguments:";
- //
- // dvdArguments
- //
- this.dvdArguments.Location = new System.Drawing.Point(122, 11);
- this.dvdArguments.Name = "dvdArguments";
- this.dvdArguments.Size = new System.Drawing.Size(256, 20);
- this.dvdArguments.TabIndex = 17;
- //
- // openFileDialog1
- //
- 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, 326);
@@ -837,118 +894,71 @@
this.cueArguments.Size = new System.Drawing.Size(256, 20);
this.cueArguments.TabIndex = 35;
//
- // groupBox1
+ // audioCDArguments
//
- 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";
+ this.audioCDArguments.Location = new System.Drawing.Point(122, 89);
+ this.audioCDArguments.Name = "audioCDArguments";
+ this.audioCDArguments.Size = new System.Drawing.Size(256, 20);
+ this.audioCDArguments.TabIndex = 23;
//
- // groupBox2
+ // label6
//
- 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";
+ this.label6.Location = new System.Drawing.Point(3, 92);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(117, 23);
+ this.label6.TabIndex = 22;
+ this.label6.Text = "AudioCD Arguments:";
//
- // label26
+ // label11
//
- 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:";
+ this.label11.Location = new System.Drawing.Point(3, 66);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(117, 23);
+ this.label11.TabIndex = 20;
+ this.label11.Text = "SVCD Arguments:";
//
- // audioPlayerUse
+ // svcdArguments
//
- 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;
+ this.svcdArguments.Location = new System.Drawing.Point(122, 63);
+ this.svcdArguments.Name = "svcdArguments";
+ this.svcdArguments.Size = new System.Drawing.Size(256, 20);
+ this.svcdArguments.TabIndex = 21;
//
- // audioArgument
+ // label10
//
- 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;
+ this.label10.Location = new System.Drawing.Point(3, 40);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(117, 23);
+ this.label10.TabIndex = 18;
+ this.label10.Text = "VCD Arguments:";
//
- // label27
+ // vcdArguments
//
- 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:";
+ this.vcdArguments.Location = new System.Drawing.Point(122, 37);
+ this.vcdArguments.Name = "vcdArguments";
+ this.vcdArguments.Size = new System.Drawing.Size(256, 20);
+ this.vcdArguments.TabIndex = 19;
//
- // label28
+ // label9
//
- 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:";
+ this.label9.Location = new System.Drawing.Point(3, 14);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(117, 23);
+ this.label9.TabIndex = 16;
+ this.label9.Text = "DVD Arguments:";
//
- // audioExtension
+ // dvdArguments
//
- 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;
+ this.dvdArguments.Location = new System.Drawing.Point(122, 11);
+ this.dvdArguments.Name = "dvdArguments";
+ this.dvdArguments.Size = new System.Drawing.Size(256, 20);
+ this.dvdArguments.TabIndex = 17;
//
- // audioDelete
+ // openFileDialog1
//
- 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;
+ this.openFileDialog1.FileName = "openFileDialog1";
+ this.openFileDialog1.Title = "Select MPlayer:";
//
- // 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);
@@ -966,12 +976,12 @@
this.general_Tab.ResumeLayout(false);
this.general_Tab.PerformLayout();
this.video_audio_Tab.ResumeLayout(false);
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
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);
}
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-03-01 05:58:37 UTC (rev 149)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-03-01 18:20:23 UTC (rev 150)
@@ -139,10 +139,16 @@
videoExtension.Text = lastVideoSettings.Name;
videoArgument.Text = lastVideoSettings.Arguments;
videoPlayerUse.Checked = lastVideoSettings.ExtPlayerUse;
+ videoExtension.Enabled = true;
+ videoArgument.Enabled = true;
+ videoPlayerUse.Enabled = true;
} else {
videoExtension.Text = String.Empty;
videoArgument.Text = String.Empty;
videoPlayerUse.Checked = false;
+ videoExtension.Enabled = false;
+ videoArgument.Enabled = false;
+ videoPlayerUse.Enabled = false;
lastVideoSettings = null;
}
@@ -234,11 +240,17 @@
audioExtension.Text = lastAudioSettings.Name;
audioArgument.Text = lastAudioSettings.Arguments;
audioPlayerUse.Checked = lastAudioSettings.ExtPlayerUse;
+ audioExtension.Enabled = true;
+ audioArgument.Enabled = true;
+ audioPlayerUse.Enabled = true;
} else {
audioExtension.Text = String.Empty;
audioArgument.Text = String.Empty;
audioPlayerUse.Checked = false;
lastAudioSettings = null;
+ audioExtension.Enabled = false;
+ audioArgument.Enabled = false;
+ audioPlayerUse.Enabled = false;
}
}
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-03-01 05:58:37 UTC (rev 149)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-03-01 18:20:23 UTC (rev 150)
@@ -89,6 +89,7 @@
//
// shareLocation
//
+ this.shareLocation.Enabled = false;
this.shareLocation.Location = new System.Drawing.Point(90, 210);
this.shareLocation.Name = "shareLocation";
this.shareLocation.Size = new System.Drawing.Size(207, 20);
@@ -115,6 +116,7 @@
//
// shareName
//
+ this.shareName.Enabled = false;
this.shareName.Location = new System.Drawing.Point(90, 184);
this.shareName.Name = "shareName";
this.shareName.Size = new System.Drawing.Size(207, 20);
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-03-01 05:58:37 UTC (rev 149)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-03-01 18:20:23 UTC (rev 150)
@@ -129,9 +129,13 @@
lastShare = shareList.SelectedItem as MPlayer_Share;
shareName.Text = lastShare.Name;
shareLocation.Text = lastShare.Path;
+ shareName.Enabled = true;
+ shareLocation.Enabled = true;
} else {
shareName.Text = String.Empty;
shareLocation.Text = String.Empty;
+ shareName.Enabled = false;
+ shareLocation.Enabled = false;
lastShare = null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-11-03 15:21:10
|
Revision: 1020
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1020&view=rev
Author: misterd_sf
Date: 2007-11-03 08:21:08 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
Fixed external osd was displayed, even when playing music
Fixed playlist handling
Added possibility to treat playlist as folders
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -815,13 +815,51 @@
#region public methods
/// <summary>
+ /// Checks if the fileName has a video or not
+ /// </summary>
+ /// <param name="fileName">Filename to check</param>
+ /// <returns>true, when file or stream has a video</returns>
+ public bool HasFileOrStreamVideo(String fileName) {
+ bool isVideo = false;
+ if (fileName.StartsWith("dvd://")) {
+ isVideo = true;
+ } else if (fileName.StartsWith("vcd://")) {
+ isVideo = true;
+ } else if (fileName.StartsWith("svcd://")) {
+ isVideo = true;
+ } else if (fileName.StartsWith("cue://") ||
+ fileName.StartsWith("ftp://") ||
+ fileName.StartsWith("http://") ||
+ fileName.StartsWith("http_proxy://") ||
+ fileName.StartsWith("mms://") ||
+ fileName.StartsWith("mmst://") ||
+ fileName.StartsWith("mpst://") ||
+ fileName.StartsWith("rtp://") ||
+ fileName.StartsWith("rtsp://") ||
+ fileName.StartsWith("sdp://") ||
+ fileName.StartsWith("udp://") ||
+ fileName.StartsWith("unsv://")) {
+ if (_extensionSettings.ContainsKey(System.IO.Path.GetExtension(fileName))) {
+ isVideo = _extensionSettings[System.IO.Path.GetExtension(fileName)].PlayMode == PlayMode.Video;
+ } else {
+ isVideo = true;
+ }
+ } else if (fileName.EndsWith(".cda")) {
+ isVideo = false;
+ } else {
+ ExtensionSettings extSettings = _extensionSettings[System.IO.Path.GetExtension(fileName).Trim().ToLower()];
+ isVideo = (extSettings.PlayMode == PlayMode.Video);
+ }
+ return isVideo;
+ }
+
+ /// <summary>
/// Creates a process object and sets the starting arguments
/// </summary>
/// <param name="fileName">FileName that should be started</param>
/// <param name="handle">Handle of inner panel</param>
- /// <param name="isVideo">Boolean for indicating if file is video</param>
/// <returns>UpdateGUI object</returns>
- public Process createProcessForFileName(String fileName, IntPtr handle, out bool isVideo) {
+ public Process createProcessForFileName(String fileName, IntPtr handle) {
Process mplayerProcess = new Process();
mplayerProcess.StartInfo.UseShellExecute = false;
mplayerProcess.StartInfo.RedirectStandardInput = true;
@@ -840,21 +878,18 @@
arguments.Append(" -slang ");
arguments.Append(CultureInfo.CurrentCulture.TwoLetterISOLanguageName);
arguments.Append(" dvd://");
- isVideo = true;
} else if (fileName.StartsWith("vcd://")) {
String file = fileName.Substring(6);
arguments.Append(_extensionSettings["vcd://"].Arguments);
arguments.Append(" \"vcd://");
arguments.Append(file);
arguments.Append("\"");
- isVideo = true;
} else if (fileName.StartsWith("svcd://")) {
String file = fileName.Substring(7);
arguments.Append(_extensionSettings["svcd://"].Arguments);
arguments.Append(" \"vcd://");
arguments.Append(file);
arguments.Append("\"");
- isVideo = true;
} else if (fileName.StartsWith("cue://") ||
fileName.StartsWith("ftp://") ||
fileName.StartsWith("http://") ||
@@ -875,9 +910,6 @@
arguments.Append(_extensionSettings[protocol].Arguments);
if (_extensionSettings.ContainsKey(System.IO.Path.GetExtension(fileName))) {
arguments.Append(_extensionSettings[System.IO.Path.GetExtension(fileName)].Arguments);
- isVideo = _extensionSettings[System.IO.Path.GetExtension(fileName)].PlayMode == PlayMode.Video;
- } else {
- isVideo = true;
}
arguments.Append(" \"");
arguments.Append(protocol);
@@ -895,14 +927,12 @@
arguments.Append(" -cdrom-device ");
arguments.Append(drive);
arguments.Append(" ");
- isVideo = false;
} else {
ExtensionSettings extSettings = _extensionSettings[System.IO.Path.GetExtension(fileName).Trim().ToLower()];
arguments.Append(extSettings.Arguments);
arguments.Append(" \"");
arguments.Append(fileName);
arguments.Append("\" ");
- isVideo = (extSettings.PlayMode == PlayMode.Video);
}
arguments.Append(getScreenArguments());
Log.Info("MPlayer: All Arguments: " + arguments);
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -202,10 +202,10 @@
this.externalOSDLibraryBlank.CheckState = System.Windows.Forms.CheckState.Checked;
this.externalOSDLibraryBlank.Location = new System.Drawing.Point(6, 31);
this.externalOSDLibraryBlank.Name = "externalOSDLibraryBlank";
- this.externalOSDLibraryBlank.Size = new System.Drawing.Size(345, 30);
+ this.externalOSDLibraryBlank.Size = new System.Drawing.Size(354, 30);
this.externalOSDLibraryBlank.TabIndex = 0;
- this.externalOSDLibraryBlank.Text = "Blank screen in fullscreen\r\n(If you see black screen in fullscreen, you should tu" +
- "rn this option off)";
+ this.externalOSDLibraryBlank.Text = "Blank screen in fullscreen\r\n(If you see a black screen in fullscreen, you should " +
+ "turn this option off)";
this.externalOSDLibraryBlank.UseVisualStyleBackColor = true;
//
// GeneralSection
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -218,16 +218,16 @@
bool result;
bool controlAdded = false;
try {
- initSystem();
if (strFile.EndsWith(".mplayer")) {
strFile = strFile.Remove(strFile.LastIndexOf(".mplayer"));
}
if (strFile.StartsWith("ZZZZ:")) {
strFile = "rtsp:" + strFile.Remove(0, 5);
}
+ bool isVideo = _configManager.HasFileOrStreamVideo(strFile);
+ initSystem(isVideo);
_currentFile = strFile;
- bool isVideo;
- _mplayerProcess = _configManager.createProcessForFileName(strFile, _videoHandler.GetVideoHandle(), out isVideo);
+ _mplayerProcess = _configManager.createProcessForFileName(strFile, _videoHandler.GetVideoHandle());
_videoHandler.HasVideo = isVideo;
if (isVideo) {
_isVisible = true;
@@ -407,9 +407,10 @@
/// <summary>
/// Initialize the system (Objects, Controls etc.)
/// </summary>
- private void initSystem() {
+ /// <param name="isVideo">Ind\xEDcate if the file has video</param>
+ private void initSystem(bool isVideo) {
_playState = PlayState.Playing;
- if (_configManager.OsdMode == OSDMode.InternalMPlayer) {
+ if (_configManager.OsdMode == OSDMode.InternalMPlayer || !isVideo) {
_osdHandler = new InternalOSDHandler(this,true);
} else if (_configManager.OsdMode == OSDMode.ExternalOSDLibrary) {
_osdHandler = new ExternalOSDLibrary(this);
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -53,7 +53,7 @@
//
// okButton
//
- this.okButton.Location = new System.Drawing.Point(12, 307);
+ this.okButton.Location = new System.Drawing.Point(12, 330);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 3;
@@ -64,7 +64,7 @@
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(334, 307);
+ this.cancelButton.Location = new System.Drawing.Point(334, 330);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 20;
@@ -77,13 +77,13 @@
this.guiConfiguration1.BackColor = System.Drawing.Color.Transparent;
this.guiConfiguration1.Location = new System.Drawing.Point(12, 5);
this.guiConfiguration1.Name = "guiConfiguration1";
- this.guiConfiguration1.Size = new System.Drawing.Size(402, 296);
+ this.guiConfiguration1.Size = new System.Drawing.Size(402, 319);
this.guiConfiguration1.TabIndex = 21;
//
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(421, 343);
+ this.ClientSize = new System.Drawing.Size(421, 367);
this.Controls.Add(this.guiConfiguration1);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -38,6 +38,7 @@
this.pluginName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+ this.playlistFolder = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
@@ -183,18 +184,29 @@
//
this.folderBrowserDialog1.Description = "Select the recording folder:";
//
+ // playlistFolder
+ //
+ this.playlistFolder.AutoSize = true;
+ this.playlistFolder.Location = new System.Drawing.Point(7, 292);
+ this.playlistFolder.Name = "playlistFolder";
+ this.playlistFolder.Size = new System.Drawing.Size(139, 17);
+ this.playlistFolder.TabIndex = 46;
+ this.playlistFolder.Text = "Treat Playlists as folders";
+ this.playlistFolder.UseVisualStyleBackColor = true;
+ //
// GUIConfiguration
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Transparent;
+ this.Controls.Add(this.playlistFolder);
this.Controls.Add(this.myMusicShare);
this.Controls.Add(this.myVideoShare);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.pluginName);
this.Controls.Add(this.label2);
this.Name = "GUIConfiguration";
- this.Size = new System.Drawing.Size(402, 296);
+ this.Size = new System.Drawing.Size(402, 322);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
@@ -219,5 +231,6 @@
private System.Windows.Forms.TextBox pluginName;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+ private System.Windows.Forms.CheckBox playlistFolder;
}
}
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -149,6 +149,7 @@
pluginName.Text = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer GUI");
myVideoShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true);
myMusicShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true);
+ playlistFolder.Checked = xmlreader.GetValueAsBool("mplayer", "treatPlaylistAsFolders", false);
}
} catch (Exception e) {
Log.Info("MPlayer GUI Error: Configuration could not be loaded: " + e.Message);
@@ -187,6 +188,7 @@
}
xmlWriter.SetValueAsBool("mplayer", "useMyMusicShares", myMusicShare.Checked);
xmlWriter.SetValueAsBool("mplayer", "useMyVideoShares", myVideoShare.Checked);
+ xmlWriter.SetValueAsBool("mplayer", "treatPlaylistAsFolders", playlistFolder.Checked);
}
}
#endregion
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -145,18 +145,26 @@
/// Display name of the plugin
/// </summary>
private string displayName;
+
/// <summary>
/// Indicates if the my video Shares are used
/// </summary>
private bool useMyVideoShares;
+
/// <summary>
/// Indicates if the my music Shares are used
/// </summary>
private bool useMyMusicShares;
+
/// <summary>
/// List of path of all shares
/// </summary>
private List<String> sharePaths;
+
+ /// <summary>
+ /// Indicates if playlists should be treat as folders
+ /// </summary>
+ private bool treatPlaylistsAsFolders;
#endregion
#region ctor
@@ -177,6 +185,7 @@
displayName = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer");
useMyVideoShares = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true);
useMyMusicShares = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true);
+ treatPlaylistsAsFolders = xmlreader.GetValueAsBool("mplayer", "treatPlaylistAsFolders", false);
String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English");
LocalizeStrings.Load(m_strLanguage);
}
@@ -449,15 +458,15 @@
virtualPath = path;
LoadDirectory(path);
} else {
+ if (PlayListFactory.IsPlayList(path)) {
+ LoadPlayList(path);
+ return;
+ }
string movieFileName = path + ".mplayer";
if (movieFileName.StartsWith("rtsp:")) {
movieFileName = "ZZZZ:" + movieFileName.Remove(0, 5);
}
movieFileName = m_directory.GetLocalFilename(movieFileName);
- if (PlayListFactory.IsPlayList(movieFileName)) {
- LoadPlayList(movieFileName);
- return;
- }
g_Player.Play(movieFileName);
if (g_Player.IsVideo) {
GUIGraphicsContext.IsFullScreenVideo = true;
@@ -544,9 +553,9 @@
}
CurrentSortAsc = true;
OnSort();
- GUIControl.SetControlLabel(GetID, btnPlayStream.GetID,LocalizeStrings.Get((int)LocalizedMessages.PlayStream));
+ GUIControl.SetControlLabel(GetID, btnPlayStream.GetID, LocalizeStrings.Get((int)LocalizedMessages.PlayStream));
GUIControl.SetControlLabel(GetID, btnPlayDisc.GetID, LocalizeStrings.Get((int)LocalizedMessages.PlayDisc));
- GUIControl.SetControlLabel(GetID, btnDelete.GetID, LocalizeStrings.Get((int)LocalizedMessages.Delete));
+ GUIControl.SetControlLabel(GetID, btnDelete.GetID, LocalizeStrings.Get((int)LocalizedMessages.Delete));
}
/// <summary>
@@ -583,10 +592,13 @@
}
return;
}
-
if (playlist.Count == 1) {
- if (g_Player.Play(playlist[0].FileName + ".mplayer")) {
- if (MediaPortal.Util.Utils.IsVideo(playlist[0].FileName)) {
+ string movieFileName = playlist[0].FileName + ".mplayer";
+ if (movieFileName.StartsWith("rtsp:")) {
+ movieFileName = "ZZZZ:" + movieFileName.Remove(0, 5);
+ }
+ if (g_Player.Play(movieFileName)) {
+ if (g_Player.Player != null && g_Player.IsVideo) {
GUIGraphicsContext.IsFullScreenVideo = true;
GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
}
@@ -597,8 +609,13 @@
playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO).Clear();
for (int i = 0; i < playlist.Count; ++i) {
- playlist[i].FileName += ".mplayer";
+ string movieFileName = playlist[i].FileName + ".mplayer";
+ if (movieFileName.StartsWith("rtsp:")) {
+ movieFileName = "ZZZZ:" + movieFileName.Remove(0, 5);
+ }
+ playlist[i].FileName = movieFileName;
PlayListItem playListItem = playlist[i];
+ playListItem.Type = PlayListItem.PlayListItemType.Unknown;
playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO).Add(playListItem);
}
@@ -606,13 +623,13 @@
if (playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO).Count > 0) {
playlist = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO);
PlayListItem item = playlist[0];
-
playlistPlayer.CurrentPlaylistType = PlayListType.PLAYLIST_VIDEO;
playlistPlayer.Reset();
playlistPlayer.Play(0);
- if (GetID == GUIWindowManager.ActiveWindow) {
- GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_VIDEO_PLAYLIST);
+ if (g_Player.Player != null && g_Player.IsVideo) {
+ GUIGraphicsContext.IsFullScreenVideo = true;
+ GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
}
}
}
@@ -641,7 +658,7 @@
if (String.Compare(item1.Path, item2.Path, true) > 0) {
addItem = false;
// Update to reflect the stacked size
- item2.FileInfo.Length += item1.FileInfo.Length;
+ item1.FileInfo.Length += item2.FileInfo.Length;
}
}
}
@@ -654,11 +671,32 @@
MediaPortal.Util.Utils.RemoveStackEndings(ref label);
item1.Label = label;
+ if (treatPlaylistsAsFolders && PlayListFactory.IsPlayList(item1.Path)) {
+ item1.IsFolder = true;
+ Utils.SetDefaultIcons(item1);
+ }
itemfiltered.Add(item1);
}
}
itemlist = itemfiltered;
+ if (treatPlaylistsAsFolders && PlayListFactory.IsPlayList(newFolderName)) {
+ IPlayListIO loader = PlayListFactory.CreateIO(newFolderName);
+ PlayList playlist = new PlayList();
+
+ if (loader.Load(playlist, newFolderName)) {
+ GUIListItem item;
+ foreach (PlayListItem plItem in playlist) {
+ item = new GUIListItem();
+ item.Path = plItem.FileName;
+ item.Label = plItem.Description;
+ item.IsFolder = false;
+ Utils.SetDefaultIcons(item);
+ itemlist.Add(item);
+ }
+ }
+ }
+
foreach (GUIListItem item in itemlist) {
facadeView.Add(item);
}
@@ -752,6 +790,9 @@
private void initializeVirtualDirectory() {
sharePaths = new List<string>();
m_directory.SetExtensions(getExtenstions());
+ m_directory.AddExtension(".pls");
+ m_directory.AddExtension(".m3u");
+
m_directory.Clear();
if (useMyVideoShares) {
AddSection("movies");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2008-01-22 22:01:14
|
Revision: 1300
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1300&view=rev
Author: misterd_sf
Date: 2008-01-22 14:01:00 -0800 (Tue, 22 Jan 2008)
Log Message:
-----------
Better error protection
Added group element
Fixed some bugs in the OSD library
Updated copyright
Modified Paths:
--------------
trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/ExternalOSDLibrary.csproj
trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/AudioSubtitleHandler.cs
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/ConfigurationPanel/AudioSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExtensionSettings.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IMessageHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IOSDHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/SeekingHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_Share.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.cs
trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs
Added Paths:
-----------
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/GroupElement.cs
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -89,10 +89,11 @@
/// - GUIVolumeBar
/// - GUILabelControl
/// - GUIImage
+ /// - GUIGroup
/// </summary>
/// <param name="control">Control</param>
/// <returns>Elmenet based on the GUIControl</returns>
- protected BaseElement GenerateElement(GUIControl control) {
+ public static BaseElement GenerateElement(GUIControl control) {
if (control.GetType() == typeof(GUIImage)) {
return new ImageElement(control);
} else if (control.GetType() == typeof(GUILabelControl)) {
@@ -115,6 +116,8 @@
return new TextScrollUpElement(control);
} else if (control.GetType() == typeof(GUIListControl)) {
return new ListElement(control);
+ } else if (control.GetType() == typeof(GUIGroup)) {
+ return new GroupElement(control);
}
Log.Debug("VIDEOPLAYER_OSD FOUND UNEXPECTED TYPE: " + control.GetType().ToString());
return null;
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -82,11 +82,11 @@
String text = GUIPropertyManager.Parse(_label.Label);
SizeF sizeF = graph.MeasureString(text, _font);
if (alignment == GUIControl.Alignment.ALIGN_LEFT) {
- rectangle = new RectangleF((float)_label.Location.X, (float)_label.Location.Y, _label.Width, _label.Height);
+ rectangle = new RectangleF((float)_label.XPosition, (float)_label.YPosition, _label._width, Math.Max(sizeF.Height,_label._height));
} else if (alignment == GUIControl.Alignment.ALIGN_RIGHT) {
- rectangle = new RectangleF((float)_label.Location.X - sizeF.Width, (float)_label.Location.Y, _label.Width, _label.Height);
+ rectangle = new RectangleF((float)_label.Location.X - sizeF.Width, (float)_label.Location.Y, _label.Width, Math.Max(sizeF.Height, _label.Height));
} else {
- rectangle = new RectangleF((float)_label.Location.X - (sizeF.Width / 2), (float)_label.Location.Y - (sizeF.Height / 2), _label.Width, _label.Height);
+ rectangle = new RectangleF((float)_label.Location.X - (sizeF.Width / 2), (float)_label.Location.Y - (sizeF.Height / 2), _label.Width, Math.Max(sizeF.Height, _label.Height));
}
graph.DrawString(text, _font, _brush, rectangle,StringFormat.GenericTypographic);
}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/GroupElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/GroupElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/GroupElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -0,0 +1,112 @@
+#region Copyright (C) 2006-2008 MisterD
+
+/*
+ * Copyright (C) 2006-2008 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Text;
+using System.Windows;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class represents a GUIGroup
+ /// </summary>
+ public class GroupElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// GUICheckMarkControl
+ /// </summary>
+ private GUIGroup _group;
+
+ /// <summary>
+ /// List of all children elements
+ /// </summary>
+ private List<BaseElement> _childrens;
+
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element and retrieves all information from the control
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public GroupElement(GUIControl control)
+ : base(control) {
+ _group = control as GUIGroup;
+ UIElementCollection childrens = _group.Children;
+ _childrens = new List<BaseElement>();
+ GUIControl temp;
+ BaseElement element;
+ foreach (UIElement child in childrens) {
+ temp = child as GUIControl;
+ if (temp != null) {
+ element = BaseWindow.GenerateElement(temp);
+ if (element != null) {
+ _childrens.Add(element);
+ }
+ }
+ }
+ Log.Debug("VideoPlayerOSD: Found group element: " + _group.GetID);
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_group.Visible) {
+ foreach (BaseElement child in _childrens) {
+ child.DrawElement(graph);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ foreach (BaseElement child in _childrens) {
+ child.Dispose();
+ }
+ }
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ foreach (BaseElement child in _childrens) {
+ result = result | child.CheckForUpdate();
+ }
+ return result;
+ }
+ #endregion
+ }
+}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -67,9 +67,6 @@
/// <param name="graph">Graphics</param>
public override void DrawElement(Graphics graph) {
if (_image.Visible && !_image.FileName.Equals("black.bmp")) {
- if (_image.FileName.Equals("video+2x.png")) {
- Log.Debug("DISPLAYING 2X");
- }
DrawElementAlternative(graph, GetImageRectangle());
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -242,11 +242,11 @@
RectangleF rectangle;
SizeF stringSize = graph.MeasureString(_label, _font);
if (_alignment == GUIControl.Alignment.ALIGN_LEFT) {
- rectangle = new RectangleF(_xPosition, _yPosition, _width, _height);
+ rectangle = new RectangleF(_xPosition, _yPosition, _width, Math.Max(stringSize.Height,_height));
} else if (_alignment == GUIControl.Alignment.ALIGN_RIGHT) {
- rectangle = new RectangleF(_xPosition - stringSize.Width, _yPosition, _width, _height);
+ rectangle = new RectangleF(_xPosition - stringSize.Width, _yPosition, _width, Math.Max(stringSize.Height,_height));
} else {
- rectangle = new RectangleF(_xPosition - (stringSize.Width / 2), _yPosition - (stringSize.Height / 2), _width, _height);
+ rectangle = new RectangleF(_xPosition - (stringSize.Width / 2), _yPosition - (stringSize.Height / 2), _width, Math.Max(stringSize.Height,_height));
}
graph.DrawString(GUIPropertyManager.Parse(_label), _font, _brush, rectangle, StringFormat.GenericTypographic);
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -83,11 +83,11 @@
SizeF textSize = graph.MeasureString(_label, _font);
RectangleF rectangle;
if (_textScrollUp.TextAlignment == GUIControl.Alignment.ALIGN_LEFT) {
- rectangle = new RectangleF((float)_textScrollUp.Location.X, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height);
+ rectangle = new RectangleF((float)_textScrollUp.Location.X, (float)_textScrollUp.Location.Y, _textScrollUp.Width, Math.Max(textSize.Height,_textScrollUp.Height));
} else if (_textScrollUp.TextAlignment == GUIControl.Alignment.ALIGN_RIGHT) {
- rectangle = new RectangleF((float)_textScrollUp.Location.X - textSize.Width, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height);
+ rectangle = new RectangleF((float)_textScrollUp.Location.X - textSize.Width, (float)_textScrollUp.Location.Y, _textScrollUp.Width, Math.Max(textSize.Height,_textScrollUp.Height));
} else {
- rectangle = new RectangleF((float)_textScrollUp.Location.X - (textSize.Width / 2), (float)_textScrollUp.Location.Y - (textSize.Height / 2), _textScrollUp.Width, _textScrollUp.Height);
+ rectangle = new RectangleF((float)_textScrollUp.Location.X - (textSize.Width / 2), (float)_textScrollUp.Location.Y - (textSize.Height / 2), _textScrollUp.Width, Math.Max(textSize.Height,_textScrollUp.Height));
}
graph.DrawString(GUIPropertyManager.Parse(_label), _font, _brush, rectangle, StringFormat.GenericTypographic);
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/ExternalOSDLibrary.csproj
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/ExternalOSDLibrary.csproj 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/ExternalOSDLibrary.csproj 2008-01-22 22:01:00 UTC (rev 1300)
@@ -53,6 +53,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="BaseWindow.cs" />
+ <Compile Include="Elements\GroupElement.cs" />
<Compile Include="Elements\VerticalScrollbarElement.cs" />
<Compile Include="Elements\TextScrollUpElement.cs" />
<Compile Include="Elements\ListElement.cs" />
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -93,21 +93,46 @@
_controlList = _fullscreenWindow.controlList;
GenerateElements();
GUIControl temp;
+ GUIControl temp2;
+ GUIGroup help;
_cacheElements = new List<BaseElement>();
foreach (UIElement element in _controlList) {
temp = element as GUIControl;
- if (temp.GetID == LABEL_ID) {
+ if (temp != null) {
+ if (temp.GetType() == typeof(GUIGroup)) {
+ help = temp as GUIGroup;
+ foreach (UIElement uiElement in help.Children) {
+ temp2 = uiElement as GUIControl;
+ if (temp2 != null) {
+ checkElement(temp2);
+ }
+ }
+ }
+ checkElement(temp);
+ }
+ }
+ }
+ #endregion
+
+ private void checkElement(GUIControl temp) {
+ if (temp.GetID == LABEL_ID) {
+ if (temp.GetType() == typeof(GUILabelControl)) {
_label = new LabelElement(temp);
+ } else {
+ Log.Info("VIDEO OSD: TYPE LABEL NOT FOUND FOR LABEL_ID=10 IN FULLSCREEN WINDOW. FOUND: " + temp.GetType());
}
- if (temp.GetID == BACKGROUND_ID) {
+ }
+ if (temp.GetID == BACKGROUND_ID) {
+ if (temp.GetType() == typeof(GUIImage)) {
_background = new ImageElement(temp);
+ } else {
+ Log.Info("VIDEO OSD: TYPE IMAGE NOT FOUND FOR BACKGROUND_ID=0 IN FULLSCREEN WINDOW. FOUND: " + temp.GetType());
}
- if (temp.GetID == PROGRESS_ID || (temp.GetID > PANEL_START && temp.GetID < PANEL_END)) {
- _cacheElements.Add(GenerateElement(temp));
- }
}
+ if (temp.GetID == PROGRESS_ID || (temp.GetID > PANEL_START && temp.GetID < PANEL_END)) {
+ _cacheElements.Add(GenerateElement(temp));
+ }
}
- #endregion
#region implemented abstract methods
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/AudioSubtitleHandler.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/AudioSubtitleHandler.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/AudioSubtitleHandler.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExtensionSettings.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExtensionSettings.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExtensionSettings.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IMessageHandler.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IMessageHandler.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IMessageHandler.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IOSDHandler.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IOSDHandler.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IOSDHandler.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -66,11 +66,16 @@
private OnActionHandler _actionHandler;
/// <summary>
- /// Exit Handler of the MP process
+ /// Exit Handler of the MPlayer process
/// </summary>
private EventHandler _exitHandler;
/// <summary>
+ /// DataReceivedHandler of the MPlayer process to parse the output message of MPlayer
+ /// </summary>
+ private DataReceivedEventHandler _dataReceivedHandler;
+
+ /// <summary>
/// Configuration Manager
/// </summary>
private ConfigurationManager _configManager;
@@ -107,7 +112,7 @@
/// </summary>
public MPlayer_ExtPlayer() {
_configManager = ConfigurationManager.getInstance();
-
+
}
#endregion
@@ -239,7 +244,8 @@
_exitHandler = new EventHandler(mplayerProcess_Exited);
_mplayerProcess.Exited += _exitHandler;
_mplayerProcess.Start();
- _mplayerProcess.OutputDataReceived += new DataReceivedEventHandler(mplayerProcess_OutputDataReceived);
+ _dataReceivedHandler = new DataReceivedEventHandler(mplayerProcess_OutputDataReceived);
+ _mplayerProcess.OutputDataReceived += _dataReceivedHandler;
_mplayerProcess.BeginOutputReadLine();
_input = _mplayerProcess.StandardInput;
result = true;
@@ -274,6 +280,7 @@
if (_videoHandler.HasVideo) {
_videoHandler.RemoveVideoWindowToForm();
}
+ _mplayerProcess.OutputDataReceived -= _dataReceivedHandler;
_videoHandler.Dispose();
_audioSubtitleHandler.Dispose();
_playState = PlayState.Stopped;
@@ -281,6 +288,14 @@
GUIWindowManager.OnNewAction -= _actionHandler;
_mplayerProcess.Exited -= _exitHandler;
_osdHandler.Dispose();
+ int loop = 0;
+ while (!_mplayerProcess.HasExited && loop < 20) {
+ Thread.Sleep(50);
+ loop++;
+ }
+ if (!_mplayerProcess.HasExited) {
+ _mplayerProcess.Kill();
+ }
}
/// <summary>
@@ -395,13 +410,14 @@
public override void Release() {
if (_playState == PlayState.Playing || _playState == PlayState.Paused) {
SendCommand("quit");
+ _mplayerProcess.OutputDataReceived -= _dataReceivedHandler;
_videoHandler.Dispose();
_audioSubtitleHandler.Dispose();
GUIWindowManager.OnNewAction -= _actionHandler;
_mplayerProcess.Exited -= _exitHandler;
}
}
- #endregion
+ #endregion
#region InitSystem
/// <summary>
@@ -411,7 +427,7 @@
private void initSystem(bool isVideo) {
_playState = PlayState.Playing;
if (_configManager.OsdMode == OSDMode.InternalMPlayer || !isVideo) {
- _osdHandler = new InternalOSDHandler(this,true);
+ _osdHandler = new InternalOSDHandler(this, true);
} else if (_configManager.OsdMode == OSDMode.ExternalOSDLibrary) {
_osdHandler = new ExternalOSDLibrary(this);
}
@@ -464,15 +480,19 @@
/// <param name="sender">Sender object</param>
/// <param name="e">Event arguments</param>
private void mplayerProcess_OutputDataReceived(object sender, DataReceivedEventArgs e) {
- String result = e.Data;
- if (result != null) {
- Log.Info("MPlayer: Data received: " + e.Data);
- foreach (IMessageHandler messageHandler in _messageHandlers) {
- messageHandler.HandleMessage(result);
+ try {
+ String result = e.Data;
+ if (result != null) {
+ Log.Info("MPlayer: Data received: " + e.Data);
+ foreach (IMessageHandler messageHandler in _messageHandlers) {
+ messageHandler.HandleMessage(result);
+ }
+ if (result.StartsWith("Exiting... (End of file)")) {
+ _playState = PlayState.Ended;
+ }
}
- if (result.StartsWith("Exiting... (End of file)")) {
- _playState = PlayState.Ended;
- }
+ } catch (Exception ex) {
+ Log.Error("MPlayer: exception occured while handling message", ex);
}
}
#endregion
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/SeekingHandler.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/SeekingHandler.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/SeekingHandler.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_Share.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_Share.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_Share.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,7 +1,7 @@
-#region Copyright (C) 2006-2007 MisterD
+#region Copyright (C) 2006-2008 MisterD
/*
- * Copyright (C) 2006-2007 MisterD
+ * Copyright (C) 2006-2008 MisterD
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,4 +1,28 @@
-namespace MPlayer {
+#region Copyright (C) 2006-2008 MisterD
+
+/*
+ * Copyright (C) 2006-2008 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+namespace MPlayer {
partial class ConfigurationWizard {
/// <summary>
/// Erforderliche Designervariable.
Modified: trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,3 +1,27 @@
+#region Copyright (C) 2006-2008 MisterD
+
+/*
+ * Copyright (C) 2006-2008 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
using System;
using System.Collections.Generic;
using System.ComponentModel;
Modified: trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs 2008-01-22 19:32:21 UTC (rev 1299)
+++ trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs 2008-01-22 22:01:00 UTC (rev 1300)
@@ -1,3 +1,27 @@
+#region Copyright (C) 2006-2008 MisterD
+
+/*
+ * Copyright (C) 2006-2008 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
using System;
using System.Collections;
using System.Collections.Generic;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-03-09 13:23:44
|
Revision: 170
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=170&view=rev
Author: misterd_sf
Date: 2007-03-09 05:23:31 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
MPlayer: - Added option to use my video and/or my music shares
- Added option to delete items
- Documentation updated
Modified Paths:
--------------
trunk/plugins/My MPlayer/Liesmich.pdf
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 16x9/myMPlayer.xml
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 4x3/myMPlayer.xml
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/PM III/myMPlayer.xml
trunk/plugins/My MPlayer/Readme.pdf
Modified: trunk/plugins/My MPlayer/Liesmich.pdf
===================================================================
(Binary files differ)
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-03-09 07:46:47 UTC (rev 169)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-03-09 13:23:31 UTC (rev 170)
@@ -303,7 +303,7 @@
/// Version number of the player
/// </summary>
public override string VersionNumber {
- get { return "0.61"; }
+ get { return "0.65"; }
}
#endregion
@@ -437,13 +437,16 @@
mplayerBackgroundPanel = new Panel();
mplayerBackgroundPanel.BackColor = Color.Black;
mplayerBackgroundPanel.Size = new System.Drawing.Size(0, 0);
+ mplayerBackgroundPanel.Location = new Point(0, 0);
mplayerOuterPanel = new Panel();
mplayerOuterPanel.BackColor = Color.FromArgb(0, 0, 0, 0); ;
mplayerOuterPanel.Size = new System.Drawing.Size(0, 0);
+ mplayerOuterPanel.Location = new Point(0, 0);
mplayerInnerPanel = new Panel();
mplayerInnerPanel.Size = new System.Drawing.Size(0, 0);
mplayerInnerPanel.BackColor = Color.FromArgb(16, 16, 16);
mplayerOuterPanel.Controls.Add(mplayerInnerPanel);
+ mplayerInnerPanel.Location = new Point(0, 0);
_playState = PlayState.Playing;
speed = 1;
_volume = 100;
@@ -790,7 +793,7 @@
m_geometry.ARType = GUIGraphicsContext.ARType;
m_geometry.PixelRatio = GUIGraphicsContext.PixelRatio;
// Use Method with crop settings, because without it doesn't work properly. There is a bug.
- m_geometry.GetWindow(videoWith, videoHeight, out _sourceRectangle, out _videoRectangle, new CropSettings());
+ m_geometry.GetWindow(videoWith, videoHeight, out _sourceRectangle, out _videoRectangle);
_positionX += _videoRectangle.X;
_positionY += _videoRectangle.Y;
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-03-09 07:46:47 UTC (rev 169)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-03-09 13:23:31 UTC (rev 170)
@@ -60,11 +60,15 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.pluginName = new System.Windows.Forms.TextBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.myVideoShare = new System.Windows.Forms.CheckBox();
+ this.myMusicShare = new System.Windows.Forms.CheckBox();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// okButton
//
- this.okButton.Location = new System.Drawing.Point(12, 237);
+ this.okButton.Location = new System.Drawing.Point(14, 290);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 3;
@@ -75,7 +79,7 @@
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(322, 237);
+ this.cancelButton.Location = new System.Drawing.Point(322, 290);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 20;
@@ -90,7 +94,7 @@
// shareLocation
//
this.shareLocation.Enabled = false;
- this.shareLocation.Location = new System.Drawing.Point(90, 210);
+ this.shareLocation.Location = new System.Drawing.Point(87, 194);
this.shareLocation.Name = "shareLocation";
this.shareLocation.Size = new System.Drawing.Size(207, 20);
this.shareLocation.TabIndex = 33;
@@ -99,7 +103,7 @@
// label24
//
this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(12, 213);
+ this.label24.Location = new System.Drawing.Point(9, 197);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(48, 13);
this.label24.TabIndex = 32;
@@ -108,7 +112,7 @@
// label23
//
this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(12, 187);
+ this.label23.Location = new System.Drawing.Point(9, 171);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(38, 13);
this.label23.TabIndex = 31;
@@ -117,7 +121,7 @@
// shareName
//
this.shareName.Enabled = false;
- this.shareName.Location = new System.Drawing.Point(90, 184);
+ this.shareName.Location = new System.Drawing.Point(87, 168);
this.shareName.Name = "shareName";
this.shareName.Size = new System.Drawing.Size(207, 20);
this.shareName.TabIndex = 30;
@@ -125,7 +129,7 @@
//
// shareDelete
//
- this.shareDelete.Location = new System.Drawing.Point(90, 155);
+ this.shareDelete.Location = new System.Drawing.Point(87, 139);
this.shareDelete.Name = "shareDelete";
this.shareDelete.Size = new System.Drawing.Size(75, 23);
this.shareDelete.TabIndex = 29;
@@ -135,7 +139,7 @@
//
// shareAdd
//
- this.shareAdd.Location = new System.Drawing.Point(12, 155);
+ this.shareAdd.Location = new System.Drawing.Point(9, 139);
this.shareAdd.Name = "shareAdd";
this.shareAdd.Size = new System.Drawing.Size(75, 23);
this.shareAdd.TabIndex = 28;
@@ -146,15 +150,15 @@
// shareList
//
this.shareList.FormattingEnabled = true;
- this.shareList.Location = new System.Drawing.Point(12, 54);
+ this.shareList.Location = new System.Drawing.Point(9, 38);
this.shareList.Name = "shareList";
- this.shareList.Size = new System.Drawing.Size(385, 95);
+ this.shareList.Size = new System.Drawing.Size(366, 95);
this.shareList.TabIndex = 27;
this.shareList.SelectedIndexChanged += new System.EventHandler(this.shareList_SelectedIndexChanged);
//
// browseButton
//
- this.browseButton.Location = new System.Drawing.Point(322, 208);
+ this.browseButton.Location = new System.Drawing.Point(300, 192);
this.browseButton.Name = "browseButton";
this.browseButton.Size = new System.Drawing.Size(75, 23);
this.browseButton.TabIndex = 34;
@@ -165,7 +169,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(9, 32);
+ this.label1.Location = new System.Drawing.Point(6, 16);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(74, 13);
this.label1.TabIndex = 35;
@@ -187,22 +191,53 @@
this.pluginName.Size = new System.Drawing.Size(212, 20);
this.pluginName.TabIndex = 37;
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.shareList);
+ this.groupBox1.Controls.Add(this.shareAdd);
+ this.groupBox1.Controls.Add(this.shareDelete);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Controls.Add(this.shareName);
+ this.groupBox1.Controls.Add(this.browseButton);
+ this.groupBox1.Controls.Add(this.label23);
+ this.groupBox1.Controls.Add(this.shareLocation);
+ this.groupBox1.Controls.Add(this.label24);
+ this.groupBox1.Location = new System.Drawing.Point(14, 58);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(385, 226);
+ this.groupBox1.TabIndex = 38;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Additional internal shares:";
+ //
+ // myVideoShare
+ //
+ this.myVideoShare.AutoSize = true;
+ this.myVideoShare.Location = new System.Drawing.Point(12, 35);
+ this.myVideoShare.Name = "myVideoShare";
+ this.myVideoShare.Size = new System.Drawing.Size(123, 17);
+ this.myVideoShare.TabIndex = 39;
+ this.myVideoShare.Text = "Use MyVideo shares";
+ this.myVideoShare.UseVisualStyleBackColor = true;
+ //
+ // myMusicShare
+ //
+ this.myMusicShare.AutoSize = true;
+ this.myMusicShare.Location = new System.Drawing.Point(273, 35);
+ this.myMusicShare.Name = "myMusicShare";
+ this.myMusicShare.Size = new System.Drawing.Size(124, 17);
+ this.myMusicShare.TabIndex = 40;
+ this.myMusicShare.Text = "Use MyMusic shares";
+ this.myMusicShare.UseVisualStyleBackColor = true;
+ //
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.CancelButton = this.cancelButton;
- this.ClientSize = new System.Drawing.Size(409, 274);
+ this.ClientSize = new System.Drawing.Size(411, 325);
+ this.Controls.Add(this.myMusicShare);
+ this.Controls.Add(this.myVideoShare);
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.pluginName);
this.Controls.Add(this.label2);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.browseButton);
- this.Controls.Add(this.shareLocation);
- this.Controls.Add(this.label24);
- this.Controls.Add(this.label23);
- this.Controls.Add(this.shareName);
- this.Controls.Add(this.shareDelete);
- this.Controls.Add(this.shareAdd);
- this.Controls.Add(this.shareList);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
@@ -211,6 +246,8 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "MPlayer Configuration";
this.Load += new System.EventHandler(this.ConfigurationForm_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -239,6 +276,9 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox pluginName;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.CheckBox myVideoShare;
+ private System.Windows.Forms.CheckBox myMusicShare;
}
}
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-03-09 07:46:47 UTC (rev 169)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-03-09 13:23:31 UTC (rev 170)
@@ -199,6 +199,8 @@
}
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
pluginName.Text = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer GUI");
+ myVideoShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true);
+ myMusicShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true);
}
} catch (Exception e) {
Log.Info("MPlayer GUI Error: Configuration could not be loaded: " + e.Message);
@@ -230,15 +232,16 @@
writer.WriteEndDocument();
writer.Close();
using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
- if (pluginName.Text.Equals(String.Empty)) {
+ if (String.IsNullOrEmpty(pluginName.Text)) {
xmlWriter.SetValue("mplayer", "displayNameOfGUI", "My MPlayer");
} else {
xmlWriter.SetValue("mplayer", "displayNameOfGUI", pluginName.Text);
}
+ xmlWriter.SetValueAsBool("mplayer", "useMyMusicShares", myMusicShare.Checked);
+ xmlWriter.SetValueAsBool("mplayer", "useMyVideoShares", myVideoShare.Checked);
}
}
#endregion
-
}
}
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-03-09 07:46:47 UTC (rev 169)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-03-09 13:23:31 UTC (rev 170)
@@ -37,9 +37,11 @@
using MediaPortal.Player;
using MediaPortal.Dispatcher;
using MediaPortal.Video.Database;
+using MediaPortal.Music.Database;
using MediaPortal.TV.Database;
using MediaPortal.GUI.View;
using MediaPortal.GUI.Video;
+using MediaPortal.GUI.Music;
using MediaPortal.Configuration;
namespace MPlayer {
@@ -71,57 +73,63 @@
}
#endregion
- #region variables
+ #region variables
/// <summary>
/// Virutal Directory
/// </summary>
private VirtualDirectory m_directory = new VirtualDirectory();
-
+
/// <summary>
/// ViewAs Button
/// </summary>
[SkinControlAttribute(2)]
private GUIButtonControl btnViewAs = null;
-
+
/// <summary>
/// SortBy Button
/// </summary>
[SkinControlAttribute(3)]
private GUISortButtonControl btnSortBy = null;
-
+
/// <summary>
/// PlayStream Button
/// </summary>
[SkinControlAttribute(5)]
private GUIButtonControl btnPlayStream = null;
-
+
/// <summary>
- /// PlayDis Button
+ /// PlayDisc Button
/// </summary>
[SkinControlAttribute(6)]
private GUIButtonControl btnPlayDisc = null;
-
+
/// <summary>
+ /// Delete Button
+ /// </summary>
+ [SkinControlAttribute(7)]
+ private GUIButtonControl btnDelete = null;
+
+ /// <summary>
/// FacadeView
/// </summary>
[SkinControlAttribute(50)]
private GUIFacadeControl facadeView = null;
-
+
/// <summary>
/// Current view mode
/// </summary>
private View currentView;
-
+
/// <summary>
/// Current sort method
/// </summary>
private VideoSort.SortMethod currentSortMethod;
-
+
/// <summary>
/// Indicator, if ascending sort is selected
/// </summary>
private bool m_bSortAscending;
-
+
/// <summary>
/// Playlistplayer instance
/// </summary>
@@ -136,6 +144,18 @@
/// Display name of the plugin
/// </summary>
private string displayName;
+ /// <summary>
+ /// Indicates if the my video Shares are used
+ /// </summary>
+ private bool useMyVideoShares;
+ /// <summary>
+ /// Indicates if the my music Shares are used
+ /// </summary>
+ private bool useMyMusicShares;
+ /// <summary>
+ /// List of path of all shares
+ /// </summary>
+ private List<String> sharePaths;
#endregion
#region ctor
@@ -145,7 +165,7 @@
static MPlayer_GUIPlugin() {
playlistPlayer = PlayListPlayer.SingletonPlayer;
}
-
+
/// <summary>
/// Standard constructor which set the WindowID
/// </summary>
@@ -154,6 +174,8 @@
virtualPath = String.Empty;
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
displayName = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer");
+ useMyVideoShares = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true);
+ useMyMusicShares = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true);
}
}
#endregion
@@ -166,7 +188,7 @@
get { return currentView; }
set { currentView = value; }
}
-
+
/// <summary>
/// Gets/Sets the current sort method
/// </summary>
@@ -174,7 +196,7 @@
get { return currentSortMethod; }
set { currentSortMethod = value; }
}
-
+
/// <summary>
/// Gets/Sets the current sorting direction
/// </summary>
@@ -182,40 +204,17 @@
get { return m_bSortAscending; }
set { m_bSortAscending = value; }
}
-
+
/// <summary>
/// Inits the window plugin
/// </summary>
/// <returns>true, if init was successful</returns>
public override bool Init() {
bool bResult = Load(GUIGraphicsContext.Skin + @"\myMPlayer.xml");
- m_directory.SetExtensions(getExtenstions());
- m_directory.Clear();
- Share share = null;
- string[] drives = Environment.GetLogicalDrives();
- foreach (string driveElement in drives) {
- if (Utils.getDriveType(driveElement) == 5) {
- string driveLetter = driveElement.Substring(0, 1);
- share = new Share();
- share.Name = driveLetter + ":\\";
- share.Path = driveLetter + ":\\";
- m_directory.Add(share);
- }
- }
- XmlDocument doc = new XmlDocument();
- string path = Config.GetFile(Config.Dir.Config, "MPlayer_GUIPlugin.xml");
- doc.Load(path);
- XmlNodeList listShare = doc.DocumentElement.SelectNodes("/mplayergui/Share");
- foreach (XmlNode nodeShare in listShare) {
- share = new Share();
- share.Name = nodeShare.Attributes["name"].Value;
- share.Path = nodeShare.Attributes["path"].Value;
- m_directory.Add(share);
- }
-
+ initializeVirtualDirectory();
return bResult;
}
-
+
/// <summary>
/// Handler for the GUIMessage of the MP System
/// </summary>
@@ -224,11 +223,11 @@
public override bool OnMessage(GUIMessage message) {
if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT) {
bool mplayerPlayerAvailable = false;
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config,"MediaPortal.xml"))) {
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
mplayerPlayerAvailable = xmlreader.GetValueAsBool("plugins", "MPlayer", false);
}
- mplayerPlayerAvailable = (mplayerPlayerAvailable & System.IO.File.Exists(Config.GetFile(Config.Dir.Plugins,"ExternalPlayers","MPlayer_ExtPlayer.dll")));
+ mplayerPlayerAvailable = (mplayerPlayerAvailable & System.IO.File.Exists(Config.GetFile(Config.Dir.Plugins, "ExternalPlayers", "MPlayer_ExtPlayer.dll")));
if (!mplayerPlayerAvailable) {
GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlgOk.SetHeading("My MPlayer GUI");
@@ -240,7 +239,7 @@
}
return base.OnMessage(message);
}
-
+
/// <summary>
/// Tries to start the playback of an disc
/// </summary>
@@ -289,7 +288,7 @@
dlgOk.DoModal(GetID);
return false;
}
-
+
/// <summary>
/// Tries to start the playback of an internet stream
/// </summary>
@@ -305,7 +304,12 @@
if (g_Player.Playing) {
g_Player.Stop();
}
- g_Player.Play(keyboard.Text + ".mplayer");
+ String url = keyboard.Text + ".mplayer";
+ if (url.StartsWith("rtsp:")) {
+ url = "ZZZZ:" + url.Remove(0, 5);
+ }
+
+ g_Player.Play(url);
if (g_Player.Player != null && g_Player.IsVideo) {
GUIGraphicsContext.IsFullScreenVideo = true;
GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
@@ -314,7 +318,7 @@
}
return false;
}
-
+
/// <summary>
/// Handles click events of GUI controls
/// </summary>
@@ -404,8 +408,11 @@
//OnQueueItem(iItem);
}
}
+ if(control == btnDelete){
+ OnAction(new Action(Action.ActionType.ACTION_DELETE_ITEM,0,0));
+ }
}
-
+
/// <summary>
/// Handles the click in the facadeview
/// </summary>
@@ -440,8 +447,8 @@
LoadDirectory(path);
} else {
string movieFileName = path + ".mplayer";
- if(movieFileName.StartsWith("rtsp:")){
- movieFileName = "ZZZZ:"+movieFileName.Remove(0,5);
+ if (movieFileName.StartsWith("rtsp:")) {
+ movieFileName = "ZZZZ:" + movieFileName.Remove(0, 5);
}
movieFileName = m_directory.GetLocalFilename(movieFileName);
if (PlayListFactory.IsPlayList(movieFileName)) {
@@ -456,7 +463,7 @@
return;
}
}
-
+
/// <summary>
/// Selects the current selected Item of the facadeView
/// </summary>
@@ -467,7 +474,7 @@
}
UpdateButtonStates();
}
-
+
/// <summary>
/// Sorts the facadeView
/// </summary>
@@ -475,7 +482,7 @@
facadeView.Sort(new VideoSort(CurrentSortMethod, CurrentSortAsc));
UpdateButtonStates();
}
-
+
/// <summary>
/// Updates the labels of the button
/// </summary>
@@ -520,7 +527,7 @@
btnSortBy.IsAscending = CurrentSortAsc;
}
}
-
+
/// <summary>
/// Handles the page load event and initializes the plugin
/// </summary>
@@ -535,15 +542,15 @@
CurrentSortAsc = true;
OnSort();
}
-
+
/// <summary>
/// Reads all extensions from external player plugin
/// </summary>
/// <returns>Lsit of all extensions</returns>
private ArrayList getExtenstions() {
- ArrayList extensions = new ArrayList() ;
+ ArrayList extensions = new ArrayList();
XmlDocument doc = new XmlDocument();
- string path = Config.GetFile(Config.Dir.Config,"MPlayer_ExtPlayer.xml");
+ string path = Config.GetFile(Config.Dir.Config, "MPlayer_ExtPlayer.xml");
doc.Load(path);
XmlNodeList listExtensions = doc.DocumentElement.SelectNodes("/mplayer/extensions/Extension");
foreach (XmlNode nodeExtension in listExtensions) {
@@ -551,7 +558,7 @@
}
return extensions;
}
-
+
/// <summary>
/// Loads a playlist and starts the playback
/// </summary>
@@ -609,7 +616,6 @@
/// </summary>
/// <param name="newFolderName">Name of the folder</param>
private void LoadDirectory(string newFolderName) {
-
String _currentFolder = newFolderName;
string objectCount = String.Empty;
@@ -652,8 +658,23 @@
}
OnSort();
}
-
/// <summary>
+ /// Overrides on action for deleting item
+ /// </summary>
+ /// <param name="action"></param>
+ public override void OnAction(Action action) {
+ if (action.wID == Action.ActionType.ACTION_DELETE_ITEM) {
+ GUIListItem item = facadeView.SelectedListItem;
+ if (item != null) {
+ if (!item.IsFolder) {
+ OnDeleteItem(item);
+ return;
+ }
+ }
+ }
+ base.OnAction(action);
+ }
+ /// <summary>
/// Handles the event, when the Sorting method changes
/// </summary>
/// <param name="sender">Sender object</param>
@@ -665,6 +686,145 @@
GUIControl.FocusControl(GetID, ((GUIControl)sender).GetID);
}
+ /// <summary>
+ /// Deletes an item from the gui list
+ /// </summary>
+ /// <param name="item">item to delete</param>
+ private void OnDeleteItem(GUIListItem item) {
+ if (item.IsRemote) return;
+ if (!m_directory.RequestPin(item.Path)) {
+ return;
+ }
+
+ string movieFileName = System.IO.Path.GetFileName(item.Path);
+ string movieTitle = movieFileName;
+ // delete single file
+ GUIDialogYesNo dlgYesNo = (GUIDialogYesNo)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_YES_NO);
+ if (null == dlgYesNo) return;
+ dlgYesNo.SetHeading(GUILocalizeStrings.Get(925));
+ dlgYesNo.SetLine(1, movieTitle);
+ dlgYesNo.SetLine(2, String.Empty);
+ dlgYesNo.SetLine(3, String.Empty);
+ dlgYesNo.DoModal(GetID);
+
+ if (!dlgYesNo.IsConfirmed)
+ return;
+ DoDeleteItem(item);
+
+ int currentSelectedItem = facadeView.SelectedListItemIndex;
+ if (currentSelectedItem > 0) currentSelectedItem--;
+ LoadDirectory(virtualPath);
+ if (currentSelectedItem >= 0) {
+ GUIControl.SelectItemControl(GetID, facadeView.GetID, currentSelectedItem);
+ }
+ }
+ /// <summary>
+ /// Deletes the item
+ /// </summary>
+ /// <param name="item">Item to delete</param>
+ private void DoDeleteItem(GUIListItem item) {
+ if (item.IsFolder) {
+ if (item.IsRemote) return;
+ if (item.Label != "..") {
+ ArrayList items = new ArrayList();
+ items = m_directory.GetDirectoryUnProtected(item.Path, false);
+ foreach (GUIListItem subItem in items) {
+ DoDeleteItem(subItem);
+ }
+ MediaPortal.Util.Utils.DirectoryDelete(item.Path);
+ }
+ } else {
+ if (item.IsRemote) return;
+ MediaPortal.Util.Utils.FileDelete(item.Path);
+ }
+ }
+
+
+ /// <summary>
+ /// Initialize the virtual directory
+ /// </summary>
+ private void initializeVirtualDirectory() {
+ sharePaths = new List<string>();
+ m_directory.SetExtensions(getExtenstions());
+ m_directory.Clear();
+ if (useMyVideoShares) {
+ AddSection("movies");
+ }
+ if (useMyMusicShares) {
+ AddSection("music");
+ }
+ Share share = null;
+ XmlDocument doc = new XmlDocument();
+ string path = Config.GetFile(Config.Dir.Config, "MPlayer_GUIPlugin.xml");
+ doc.Load(path);
+ XmlNodeList listShare = doc.DocumentElement.SelectNodes("/mplayergui/Share");
+ foreach (XmlNode nodeShare in listShare) {
+ share = new Share();
+ share.Name = nodeShare.Attributes["name"].Value;
+ share.Path = nodeShare.Attributes["path"].Value;
+ if (!sharePaths.Contains(share.Path.ToLower())) {
+ sharePaths.Add(share.Path.ToLower());
+ m_directory.Add(share);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Adds a section of MP shares
+ /// </summary>
+ /// <param name="section">Name of the section</param>
+ private void AddSection(String section) {
+ Share defaultshare = null;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
+ string strDefault = xmlreader.GetValueAsString(section, "default", String.Empty);
+ for (int i = 0; i < 20; i++) {
+ string strShareName = String.Format("sharename{0}", i);
+ string strSharePath = String.Format("sharepath{0}", i);
+ string strPincode = String.Format("pincode{0}", i);
+
+ string shareType = String.Format("sharetype{0}", i);
+ string shareServer = String.Format("shareserver{0}", i);
+ string shareLogin = String.Format("sharelogin{0}", i);
+ string sharePwd = String.Format("sharepassword{0}", i);
+ string sharePort = String.Format("shareport{0}", i);
+ string remoteFolder = String.Format("shareremotepath{0}", i);
+ string shareViewPath = String.Format("shareview{0}", i);
+
+ Share share = new Share();
+ share.Name = xmlreader.GetValueAsString(section, strShareName, String.Empty);
+ share.Path = xmlreader.GetValueAsString(section, strSharePath, String.Empty);
+
+ string pinCode = MediaPortal.Util.Utils.DecryptPin(xmlreader.GetValueAsString(section, strPincode, string.Empty));
+ if (pinCode != string.Empty)
+ share.Pincode = Convert.ToInt32(pinCode);
+ else
+ share.Pincode = -1;
+
+ share.IsFtpShare = xmlreader.GetValueAsBool(section, shareType, false);
+ share.FtpServer = xmlreader.GetValueAsString(section, shareServer, String.Empty);
+ share.FtpLoginName = xmlreader.GetValueAsString(section, shareLogin, String.Empty);
+ share.FtpPassword = xmlreader.GetValueAsString(section, sharePwd, String.Empty);
+ share.FtpPort = xmlreader.GetValueAsInt(section, sharePort, 21);
+ share.FtpFolder = xmlreader.GetValueAsString(section, remoteFolder, "/");
+ share.DefaultView = (Share.Views)xmlreader.GetValueAsInt(section, shareViewPath, (int)Share.Views.List);
+
+ if (share.Name.Length > 0) {
+
+ if (strDefault == share.Name) {
+ share.Default = true;
+ if (defaultshare == null) {
+ defaultshare = share;
+ }
+ }
+
+ if (!sharePaths.Contains(share.Path.ToLower())) {
+ sharePaths.Add(share.Path.ToLower());
+ m_directory.Add(share);
+ }
+ } else break;
+ }
+ }
+ }
#endregion
#region IShowPlugin Member
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 16x9/myMPlayer.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 16x9/myMPlayer.xml 2007-03-09 07:46:47 UTC (rev 169)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 16x9/myMPlayer.xml 2007-03-09 13:23:31 UTC (rev 170)
@@ -40,7 +40,13 @@
<id>5</id>
<label>Play Stream</label>
</control>
- </control>
+ <control>
+ <description>Delete Item</description>
+ <type>button</type>
+ <id>5</id>
+ <label>Delete Item</label>
+ </control>
+ </control>
<import>common.facade.video.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 4x3/myMPlayer.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 4x3/myMPlayer.xml 2007-03-09 07:46:47 UTC (rev 169)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/BlueTwo 4x3/myMPlayer.xml 2007-03-09 13:23:31 UTC (rev 170)
@@ -40,7 +40,13 @@
<id>5</id>
<label>Play Stream</label>
</control>
- </control>
+ <control>
+ <description>Delete Item</description>
+ <type>button</type>
+ <id>7</id>
+ <label>Delete Item</label>
+ </control>
+ </control>
<import>common.facade.video.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/PM III/myMPlayer.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/PM III/myMPlayer.xml 2007-03-09 07:46:47 UTC (rev 169)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/SkinFiles/PM III/myMPlayer.xml 2007-03-09 13:23:31 UTC (rev 170)
@@ -117,8 +117,21 @@
<alignY>center</alignY>
</control>
+ <control>
+ <description>Delete Item</description>
- </control>
+ <type>button</type>
+
+ <id>7</id>
+
+ <label>Delete Item</label>
+
+ <textXOff>17</textXOff>
+
+ <alignY>center</alignY>
+ </control>
+
+ </control>
<control>
<type>group</type>
Modified: trunk/plugins/My MPlayer/Readme.pdf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-07-25 19:07:14
|
Revision: 766
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=766&view=rev
Author: misterd_sf
Date: 2007-07-25 12:07:12 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
Added support for video output drivers: OpenGL and OpenGL2 (DirectX is still recommend)
Added volume handling to the osd
Added feature to activate subtitles by default
Added .flv to the list of supported video formats
Modified Paths:
--------------
trunk/plugins/My MPlayer/Liesmich.pdf
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/ExtensionSettings.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/SampleConfiguration/MPlayer_ExtPlayer.xml
trunk/plugins/My MPlayer/Readme.pdf
Modified: trunk/plugins/My MPlayer/Liesmich.pdf
===================================================================
(Binary files differ)
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-07-25 14:21:17 UTC (rev 765)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-07-25 19:07:12 UTC (rev 766)
@@ -23,1041 +23,1082 @@
#endregion
namespace MPlayer {
- partial class ConfigurationForm {
+ partial class ConfigurationForm {
- #region Dispose
- /// <summary>
- /// Verwendete Ressourcen bereinigen.
- /// </summary>
- /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
- protected override void Dispose(bool disposing) {
- if (disposing && (components != null)) {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
- #endregion
+ #region Dispose
+ /// <summary>
+ /// Verwendete Ressourcen bereinigen.
+ /// </summary>
+ /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+ protected override void Dispose(bool disposing) {
+ if (disposing && (components != null)) {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+ #endregion
- #region Vom Windows Form-Designer generierter Code
+ #region Vom Windows Form-Designer generierter Code
- /// <summary>
- /// Erforderliche Methode für die Designerunterstützung.
- /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
- /// </summary>
- 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();
- this.folderSearch = new System.Windows.Forms.Button();
- this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
- this.tabControl1 = new System.Windows.Forms.TabControl();
- this.general_Tab = new System.Windows.Forms.TabPage();
- 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.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.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.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.groupBox1 = new System.Windows.Forms.GroupBox();
- this.videoExtList = new System.Windows.Forms.ListBox();
- this.videoDelete = new System.Windows.Forms.Button();
- this.label24 = new System.Windows.Forms.Label();
- this.label23 = new System.Windows.Forms.Label();
- this.label25 = new System.Windows.Forms.Label();
- this.videoExtension = new System.Windows.Forms.TextBox();
- this.videoPlayerUse = new System.Windows.Forms.CheckBox();
- this.videoAdd = new System.Windows.Forms.Button();
- this.videoArgument = new System.Windows.Forms.TextBox();
- this.dvd_vcd_svcd_streams_Tab = new System.Windows.Forms.TabPage();
- this.label20 = new System.Windows.Forms.Label();
- this.unsvArguments = new System.Windows.Forms.TextBox();
- this.label19 = new System.Windows.Forms.Label();
- this.udpArguments = new System.Windows.Forms.TextBox();
- this.label18 = new System.Windows.Forms.Label();
- this.sdpArguments = new System.Windows.Forms.TextBox();
- this.label17 = new System.Windows.Forms.Label();
- this.rtspArguments = new System.Windows.Forms.TextBox();
- this.label16 = new System.Windows.Forms.Label();
- this.mpstArguments = new System.Windows.Forms.TextBox();
- this.label15 = new System.Windows.Forms.Label();
- this.mmsArguments = new System.Windows.Forms.TextBox();
- this.label14 = new System.Windows.Forms.Label();
- this.httpArguments = new System.Windows.Forms.TextBox();
- this.label13 = new System.Windows.Forms.Label();
- this.ftpArguments = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
- this.cueArguments = new System.Windows.Forms.TextBox();
- this.label11 = new System.Windows.Forms.Label();
- this.svcdArguments = new System.Windows.Forms.TextBox();
- this.label10 = new System.Windows.Forms.Label();
- this.vcdArguments = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
- this.dvdArguments = new System.Windows.Forms.TextBox();
- this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
- this.fontDialog1 = new System.Windows.Forms.FontDialog();
- this.tabControl1.SuspendLayout();
- this.general_Tab.SuspendLayout();
- this.video_audio_Tab.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox1.SuspendLayout();
- this.dvd_vcd_svcd_streams_Tab.SuspendLayout();
- this.SuspendLayout();
- //
- // okButton
- //
- 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;
- this.okButton.Text = "&OK";
- 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, 68);
- 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, 95);
- 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, 122);
- 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, 291);
- this.rebuildIndex.Name = "rebuildIndex";
- this.rebuildIndex.Size = new System.Drawing.Size(188, 23);
- this.rebuildIndex.TabIndex = 12;
- this.rebuildIndex.Text = "Rebuild file index if necessary";
- this.rebuildIndex.UseVisualStyleBackColor = true;
- //
- // priorityBoost
- //
- 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;
- this.priorityBoost.Text = "Priority Boost";
- this.priorityBoost.UseVisualStyleBackColor = true;
- //
- // label5
- //
- 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;
- this.label5.Text = "Optional Arguments:";
- //
- // optionalArguments
- //
- 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;
- //
- // soundOutputDriver
- //
- this.soundOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.soundOutputDriver.FormattingEnabled = true;
- this.soundOutputDriver.Items.AddRange(new object[] {
+ /// <summary>
+ /// Erforderliche Methode für die Designerunterstützung.
+ /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+ /// </summary>
+ 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();
+ this.folderSearch = new System.Windows.Forms.Button();
+ 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.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.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.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.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.videoExtList = new System.Windows.Forms.ListBox();
+ this.videoDelete = new System.Windows.Forms.Button();
+ this.label24 = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.videoExtension = new System.Windows.Forms.TextBox();
+ this.videoPlayerUse = new System.Windows.Forms.CheckBox();
+ this.videoAdd = new System.Windows.Forms.Button();
+ this.videoArgument = new System.Windows.Forms.TextBox();
+ this.dvd_vcd_svcd_streams_Tab = new System.Windows.Forms.TabPage();
+ this.label20 = new System.Windows.Forms.Label();
+ this.unsvArguments = new System.Windows.Forms.TextBox();
+ this.label19 = new System.Windows.Forms.Label();
+ this.udpArguments = new System.Windows.Forms.TextBox();
+ this.label18 = new System.Windows.Forms.Label();
+ this.sdpArguments = new System.Windows.Forms.TextBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.rtspArguments = new System.Windows.Forms.TextBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.mpstArguments = new System.Windows.Forms.TextBox();
+ this.label15 = new System.Windows.Forms.Label();
+ this.mmsArguments = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.httpArguments = new System.Windows.Forms.TextBox();
+ this.label13 = new System.Windows.Forms.Label();
+ this.ftpArguments = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.cueArguments = new System.Windows.Forms.TextBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.svcdArguments = new System.Windows.Forms.TextBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.vcdArguments = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.dvdArguments = new System.Windows.Forms.TextBox();
+ this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.fontDialog1 = new System.Windows.Forms.FontDialog();
+ this.tabControl1.SuspendLayout();
+ this.general_Tab.SuspendLayout();
+ this.video_audio_Tab.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.dvd_vcd_svcd_streams_Tab.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // okButton
+ //
+ this.okButton.Location = new System.Drawing.Point(18, 511);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(75, 23);
+ this.okButton.TabIndex = 3;
+ this.okButton.Text = "&OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // 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.Name = "rebuildIndex";
+ this.rebuildIndex.Size = new System.Drawing.Size(188, 23);
+ this.rebuildIndex.TabIndex = 12;
+ this.rebuildIndex.Text = "Rebuild file index if necessary";
+ this.rebuildIndex.UseVisualStyleBackColor = true;
+ //
+ // priorityBoost
+ //
+ this.priorityBoost.Location = new System.Drawing.Point(6, 347);
+ this.priorityBoost.Name = "priorityBoost";
+ this.priorityBoost.Size = new System.Drawing.Size(188, 23);
+ this.priorityBoost.TabIndex = 13;
+ this.priorityBoost.Text = "Priority Boost";
+ this.priorityBoost.UseVisualStyleBackColor = true;
+ //
+ // label5
+ //
+ this.label5.Location = new System.Drawing.Point(3, 286);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(117, 23);
+ this.label5.TabIndex = 14;
+ this.label5.Text = "Optional Arguments:";
+ //
+ // optionalArguments
+ //
+ this.optionalArguments.Location = new System.Drawing.Point(122, 283);
+ 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[] {
+ 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, 65);
- 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[] {
+ 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, 92);
- 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[] {
+ 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, 119);
- 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, 475);
- this.cancelButton.Name = "cancelButton";
- this.cancelButton.Size = new System.Drawing.Size(75, 23);
- this.cancelButton.TabIndex = 20;
- this.cancelButton.Text = "&Cancel";
- this.cancelButton.UseVisualStyleBackColor = true;
- this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
- //
- // mplayerPath
- //
- 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;
- this.mplayerPath.Text = "C:\\Program Files\\MPlayer";
- //
- // label8
- //
- 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;
- this.label8.Text = "Path to MPlayer:";
- //
- // folderSearch
- //
- 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;
- this.folderSearch.Text = "&Browse ...";
- this.folderSearch.UseVisualStyleBackColor = true;
- this.folderSearch.Click += new System.EventHandler(this.folderSearch_Click);
- //
- // folderBrowserDialog1
- //
- this.folderBrowserDialog1.Description = "Select the folger of MPlayer:";
- //
- // tabControl1
- //
- this.tabControl1.Controls.Add(this.general_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, 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);
- 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, 431);
- this.general_Tab.TabIndex = 0;
- this.general_Tab.Text = "General";
- this.general_Tab.UseVisualStyleBackColor = true;
- //
- // 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[] {
+ 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.Name = "cancelButton";
+ this.cancelButton.Size = new System.Drawing.Size(75, 23);
+ this.cancelButton.TabIndex = 20;
+ this.cancelButton.Text = "&Cancel";
+ this.cancelButton.UseVisualStyleBackColor = true;
+ this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+ //
+ // mplayerPath
+ //
+ this.mplayerPath.Location = new System.Drawing.Point(122, 434);
+ this.mplayerPath.Name = "mplayerPath";
+ this.mplayerPath.Size = new System.Drawing.Size(174, 20);
+ this.mplayerPath.TabIndex = 21;
+ this.mplayerPath.Text = "C:\\Program Files\\MPlayer";
+ //
+ // label8
+ //
+ this.label8.Location = new System.Drawing.Point(3, 437);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(117, 23);
+ this.label8.TabIndex = 22;
+ this.label8.Text = "Path to MPlayer:";
+ //
+ // folderSearch
+ //
+ this.folderSearch.Location = new System.Drawing.Point(302, 432);
+ this.folderSearch.Name = "folderSearch";
+ this.folderSearch.Size = new System.Drawing.Size(76, 23);
+ this.folderSearch.TabIndex = 23;
+ this.folderSearch.Text = "&Browse ...";
+ this.folderSearch.UseVisualStyleBackColor = true;
+ this.folderSearch.Click += new System.EventHandler(this.folderSearch_Click);
+ //
+ // folderBrowserDialog1
+ //
+ this.folderBrowserDialog1.Description = "Select the folger of MPlayer:";
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.general_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, 493);
+ 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.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.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);
- //
- // 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[] {
+ this.cacheSize.Location = new System.Drawing.Point(122, 256);
+ 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, 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;
- //
- // label22
- //
- 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;
- this.label22.Text = "Font of OSD:";
- //
- // osdFont
- //
- this.osdFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.osdFont.FormattingEnabled = true;
- 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, 349);
- 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;
- //
- // framedrop
- //
- 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;
- this.framedrop.Text = "Framedrop";
- this.framedrop.UseVisualStyleBackColor = true;
- //
- // directRendering
- //
- 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;
- this.directRendering.Text = "Direct Rendering";
- this.directRendering.UseVisualStyleBackColor = true;
- //
- // doubleBuffering
- //
- 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;
- this.doubleBuffering.Text = "Double Buffering";
- this.doubleBuffering.UseVisualStyleBackColor = true;
- //
- // label21
- //
- 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;
- this.label21.Text = "Noise/Denoise:";
- //
- // label7
- //
- 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;
- this.label7.Text = "Audio Channels:";
- //
- // noiseDenoise
- //
- this.noiseDenoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.noiseDenoise.FormattingEnabled = true;
- this.noiseDenoise.Items.AddRange(new object[] {
+ 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.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(117, 23);
+ this.label22.TabIndex = 33;
+ this.label22.Text = "Font of OSD:";
+ //
+ // osdFont
+ //
+ this.osdFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.osdFont.FormattingEnabled = true;
+ this.osdFont.Location = new System.Drawing.Point(122, 229);
+ 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, 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;
+ //
+ // framedrop
+ //
+ this.framedrop.Location = new System.Drawing.Point(6, 376);
+ this.framedrop.Name = "framedrop";
+ this.framedrop.Size = new System.Drawing.Size(188, 23);
+ this.framedrop.TabIndex = 30;
+ this.framedrop.Text = "Framedrop";
+ this.framedrop.UseVisualStyleBackColor = true;
+ //
+ // directRendering
+ //
+ this.directRendering.Location = new System.Drawing.Point(200, 318);
+ this.directRendering.Name = "directRendering";
+ this.directRendering.Size = new System.Drawing.Size(178, 23);
+ this.directRendering.TabIndex = 29;
+ this.directRendering.Text = "Direct Rendering";
+ this.directRendering.UseVisualStyleBackColor = true;
+ //
+ // doubleBuffering
+ //
+ this.doubleBuffering.Location = new System.Drawing.Point(200, 347);
+ this.doubleBuffering.Name = "doubleBuffering";
+ this.doubleBuffering.Size = new System.Drawing.Size(178, 23);
+ this.doubleBuffering.TabIndex = 28;
+ this.doubleBuffering.Text = "Double Buffering";
+ this.doubleBuffering.UseVisualStyleBackColor = true;
+ //
+ // label21
+ //
+ this.label21.Location = new System.Drawing.Point(3, 205);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(117, 23);
+ this.label21.TabIndex = 27;
+ 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;
+ this.noiseDenoise.FormattingEnabled = true;
+ this.noiseDenoise.Items.AddRange(new object[] {
"Nothing",
"Noise",
"High Quality Denoise",
"Denoise"});
- 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;
- //
- // audioChannels
- //
- this.audioChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.audioChannels.FormattingEnabled = true;
- this.audioChannels.Items.AddRange(new object[] {
+ this.noiseDenoise.Location = new System.Drawing.Point(122, 202);
+ this.noiseDenoise.Name = "noiseDenoise";
+ this.noiseDenoise.Size = new System.Drawing.Size(260, 21);
+ this.noiseDenoise.TabIndex = 25;
+ //
+ // audioChannels
+ //
+ this.audioChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.audioChannels.FormattingEnabled = true;
+ this.audioChannels.Items.AddRange(new object[] {
"Default",
"Stereo",
"Surround",
"Full 5.1"});
- 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_audio_Tab
- //
- 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;
- //
- // 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.Enabled = false;
- 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.Enabled = false;
- 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.Enabled = false;
- 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;
- this.audioExtension.Leave += new System.EventHandler(this.audioExtension_Leave);
- //
- // 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;
- this.audioDelete.Click += new System.EventHandler(this.audioDelete_Click);
- //
- // 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;
- this.audioAdd.Click += new System.EventHandler(this.audioAdd_Click);
- //
- // 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;
- this.audioExtList.SelectedIndexChanged += new System.EventHandler(this.audioExtList_SelectedIndexChanged);
- //
- // groupBox1
- //
- 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";
- //
- // videoExtList
- //
- 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, 173);
- this.videoExtList.TabIndex = 18;
- this.videoExtList.SelectedIndexChanged += new System.EventHandler(this.videoExtList_SelectedIndexChanged);
- //
- // videoDelete
- //
- 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;
- this.videoDelete.Text = "&Delete";
- this.videoDelete.UseVisualStyleBackColor = true;
- this.videoDelete.Click += new System.EventHandler(this.videoDelete_Click);
- //
- // label24
- //
- this.label24.AutoSize = true;
- 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;
- this.label24.Text = "Arguments:";
- //
- // label23
- //
- this.label23.AutoSize = true;
- 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;
- this.label23.Text = "Extension:";
- //
- // label25
- //
- this.label25.AutoSize = true;
- 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;
- this.label25.Text = "External Player use:";
- //
- // videoExtension
- //
- this.videoExtension.Enabled = false;
- this.videoExtension.Location = new System.Drawing.Point(196, 19);
- this.videoExtension.Name = "videoExtension";
- this.videoExtension.Size = new System.Drawing.Size(192, 20);
- this.videoExtension.TabIndex = 21;
- this.videoExtension.Leave += new System.EventHandler(this.videoExtension_Leave);
- //
- // videoPlayerUse
- //
- this.videoPlayerUse.AutoSize = true;
- this.videoPlayerUse.Enabled = false;
- 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;
- this.videoPlayerUse.UseVisualStyleBackColor = true;
- //
- // videoAdd
- //
- 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;
- this.videoAdd.Text = "&Add";
- this.videoAdd.UseVisualStyleBackColor = true;
- this.videoAdd.Click += new System.EventHandler(this.videoAdd_Click);
- //
- // videoArgument
- //
- this.videoArgument.Enabled = false;
- this.videoArgument.Location = new System.Drawing.Point(196, 45);
- this.videoArgument.Name = "videoArgument";
- this.videoArgument.Size = new System.Drawing.Size(192, 20);
- this.videoArgument.TabIndex = 24;
- //
- // dvd_vcd_svcd_streams_Tab
- //
- 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.label11);
- this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.svcdArguments);
- this.dvd_vcd_sv...
[truncated message content] |
|
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] |
|
From: <mis...@us...> - 2007-09-18 21:50:14
|
Revision: 938
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=938&view=rev
Author: misterd_sf
Date: 2007-09-18 14:50:12 -0700 (Tue, 18 Sep 2007)
Log Message:
-----------
Step1 of Mplayer 0.8
- Refactored the external player plugin for further improvements
- Added osd library (MP like) - NEEDS more cpu power than MPlayer OSD - BETA !! - Can be used by other plugins
- Internal Plugin for MPI. Initial Configuration wizard
- Bugfixes for several small issues (e.g. handling of pause, audio stream handling)
- Improved seeking. Further improvements needed. Therefor seeking is disabled, when no length can be estimated.
and ......
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_ExtPlayer/Properties/AssemblyInfo.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.resx
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.csproj
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/Properties/AssemblyInfo.cs
trunk/plugins/My MPlayer/My Mplayer.sln
Added Paths:
-----------
trunk/plugins/My MPlayer/ExternalOSDLibrary/
trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/ExternalOSDLibrary.csproj
trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Properties/
trunk/plugins/My MPlayer/ExternalOSDLibrary/Properties/AssemblyInfo.cs
trunk/plugins/My MPlayer/MPlayer-License.txt
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/AudioSubtitleHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IMessageHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/IOSDHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Properties/Resources.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Properties/Resources.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/SeekingHandler.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.resx
trunk/plugins/My MPlayer/MPlayer_Installer/
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.resx
trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs
trunk/plugins/My MPlayer/MPlayer_Installer/MPlayer_Installer.csproj
trunk/plugins/My MPlayer/MPlayer_Installer/Properties/
trunk/plugins/My MPlayer/MPlayer_Installer/Properties/AssemblyInfo.cs
trunk/plugins/My MPlayer/MPlayer_Installer/config.ico
Removed Paths:
-------------
trunk/plugins/My MPlayer/License.txt
trunk/plugins/My MPlayer/Liesmich.pdf
trunk/plugins/My MPlayer/Readme.pdf
Property Changed:
----------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/
Property changes on: trunk/plugins/My MPlayer/ExternalOSDLibrary
___________________________________________________________________
Name: svn:ignore
+ bin
obj
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,136 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using MediaPortal.GUI.Library;
+using System.Windows;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// Base class for all MP windows that can be handled by this library
+ /// </summary>
+ public abstract class BaseWindow {
+ #region variables
+ /// <summary>
+ /// List of all elements of the window
+ /// </summary>
+ protected List<BaseElement> _elementList;
+ #endregion
+
+ #region protected methods
+ /// <summary>
+ /// Generates the elements of a window, which are stored in the UIElementCollection
+ /// </summary>
+ /// <param name="collection">Collection of all GUIControls</param>
+ protected void GenerateElements(UIElementCollection collection) {
+ _elementList = new List<BaseElement>();
+ GUIControl temp;
+ BaseElement element;
+ foreach (UIElement uiElement in collection) {
+ temp = uiElement as GUIControl;
+ if (temp != null) {
+ element = GenerateElement(temp);
+ if(element!=null){
+ _elementList.Add(element);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// Generates a single element based on the type of the GUIControl
+ /// Supported Types:
+ /// - GUIListControl
+ /// - GUITextScrollUpControl
+ /// - GUICheckMarkControl
+ /// - GUISliderControl
+ /// - GUIToggleButtonControl
+ /// - GUIButtonControl
+ /// - GUIFadeLabel
+ /// - GUIProgressControl
+ /// - GUIVolumeBar
+ /// - GUILabelControl
+ /// - GUIImage
+ /// </summary>
+ /// <param name="control">Control</param>
+ /// <returns>Elmenet based on the GUIControl</returns>
+ protected BaseElement GenerateElement(GUIControl control) {
+ if (control.GetType() == typeof(GUIImage)) {
+ return new ImageElement(control);
+ } else if (control.GetType() == typeof(GUILabelControl)) {
+ return new LabelElement(control);
+ } else if (control.GetType() == typeof(GUIVolumeBar)) {
+ return new VolumeBarElement(control);
+ } else if (control.GetType() == typeof(GUIProgressControl)) {
+ return new ProgressControlElement(control);
+ } else if (control.GetType() == typeof(GUIFadeLabel)) {
+ return new FadeLabelElement(control);
+ } else if (control.GetType() == typeof(GUIButtonControl)) {
+ return new ButtonElement(control);
+ } else if (control.GetType() == typeof(GUIToggleButtonControl)) {
+ return new ToggleButtonElement(control);
+ } else if (control.GetType() == typeof(GUISliderControl)) {
+ return new SliderElement(control);
+ } else if (control.GetType() == typeof(GUICheckMarkControl)) {
+ return new CheckMarkElement(control);
+ } else if (control.GetType() == typeof(GUITextScrollUpControl)) {
+ return new TextScrollUpElement(control);
+ } else if (control.GetType() == typeof(GUIListControl)) {
+ return new ListElement(control);
+ }
+ Log.Debug("VIDEOPLAYER_OSD FOUND UNEXPECTED TYPE: " + control.GetType().ToString());
+ return null;
+ }
+ #endregion
+
+ #region public methods
+ /// <summary>
+ /// Draws the window on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics of the bitmap</param>
+ public void DrawWindow(Graphics graph) {
+ try {
+ if (IsWindowVisible()) {
+ foreach (BaseElement element in _elementList) {
+ element.DrawElement(graph);
+ }
+ }
+ } catch (Exception ex) {
+ Log.Error(ex);
+ }
+ }
+ #endregion
+
+ #region abstract methods
+ /// <summary>
+ /// Indicates if the window is currently visible
+ /// </summary>
+ /// <returns>true, if window is visible; false otherwise</returns>
+ public abstract bool IsWindowVisible();
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,68 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+using MediaPortal.Dialogs;
+using MediaPortal.GUI.Library;
+using System.Windows;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class handles all related tasks for the GUIDialogMenu (Context menu) window
+ /// </summary>
+ public class DialogWindow : BaseWindow {
+ #region variables
+ /// <summary>
+ /// Dialog Menu window
+ /// </summary>
+ private GUIDialogMenu _dialogWindow;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Constructor, which creates all elements
+ /// </summary>
+ public DialogWindow() {
+ _dialogWindow = GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU) as GUIDialogMenu;
+ UIElementCollection collection = _dialogWindow.controlList;
+ GenerateElements(collection);
+ }
+ #endregion
+
+ #region implemented abstract methods
+ /// <summary>
+ /// Indicates if the window is currently visible
+ /// </summary>
+ /// <returns>true, if window is visible; false otherwise</returns>
+ public override bool IsWindowVisible() {
+ return GUIWindowManager.RoutedWindow == _dialogWindow.GetID;
+ }
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,124 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// Base class for all gui elements
+ /// </summary>
+ public abstract class BaseElement {
+ #region abstract methods
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public abstract void DrawElement(Graphics graph);
+ #endregion
+
+ #region protected methods
+ /// <summary>
+ /// Updates a bitmap. It converts the Color (0,0,0) and (1,1,1), so that they won't be drawn transparent
+ /// if the alpha value is more than 150
+ /// </summary>
+ /// <param name="bitmap">Bitmap to update</param>
+ protected void updateBitmap(Bitmap bitmap) {
+ Color temp;
+ for (int i = 0; i < bitmap.Width; i++) {
+ for (int j = 0; j < bitmap.Height; j++) {
+ temp = bitmap.GetPixel(i, j);
+ if (temp.R == 0 && temp.G == 0 && temp.B == 0 && temp.A > 150) {
+ bitmap.SetPixel(i, j, Color.FromArgb(temp.A, 5, 5, 5));
+ }
+ if (temp.R == 1 && temp.G == 1 && temp.B == 1 && temp.A > 150) {
+ bitmap.SetPixel(i, j, Color.FromArgb(temp.A, 5, 5, 5));
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// Creates a color for the given value. And guarantees that it doesn't get transparent
+ /// </summary>
+ /// <param name="colorValue">Value of the color</param>
+ /// <returns>Color struct</returns>
+ protected Color GetColor(long colorValue) {
+ Color color = Color.FromArgb((int)colorValue);
+ if (color.R == 0 && color.G == 0 && color.B == 0) {
+ color = Color.FromArgb(5, 5, 5);
+ }
+ if (color.R == 1 && color.G == 1 && color.B == 1) {
+ color = Color.FromArgb(5, 5, 5);
+ }
+ return color;
+ }
+
+ /// <summary>
+ /// Creates a font object based on the given name
+ /// </summary>
+ /// <param name="name">Name of the font</param>
+ /// <returns>Font </returns>
+ protected Font getFont(String name) {
+ GUIFont guiFont = GUIFontManager.GetFont(name);
+ Type guiFontType = typeof(GUIFont);
+ FieldInfo styleFieldInfo = guiFontType.GetField("_fontStyle",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ FontStyle style = (FontStyle)styleFieldInfo.GetValue(guiFont);
+ return new Font(guiFont.FileName, guiFont.FontSize, style);
+ }
+
+ /// <summary>
+ /// Loads the bitmap with the given filename
+ /// </summary>
+ /// <param name="fileName">Filename of the bitmap</param>
+ /// <returns>Bitmap</returns>
+ protected Bitmap loadBitmap(String fileName) {
+ Bitmap result = null;
+ String realFileName = GUIPropertyManager.Parse(fileName);
+ String location = GUIGraphicsContext.Skin + @"\media\" + realFileName;
+ if (File.Exists(location)) {
+ result = new Bitmap(location);
+ updateBitmap(result);
+ }
+ return result;
+ }
+ #endregion
+
+ #region public methods
+ /// <summary>
+ /// Draws the element for the cache status. Only implemented in some elements
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <param name="cacheFill">Status of the cache</param>
+ public virtual void DrawCacheStatus(Graphics graph, float cacheFill) {
+ }
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,180 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.Text;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class represents a GUIButtoncontrol
+ /// </summary>
+ public class ButtonElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// GUIButtonControl
+ /// </summary>
+ private GUIButtonControl _button;
+
+ /// <summary>
+ /// Focus image
+ /// </summary>
+ private Bitmap _focusBitmap;
+
+ /// <summary>
+ /// Non focus image
+ /// </summary>
+ private Bitmap _noFocusBitmap;
+
+ /// <summary>
+ /// Hover image
+ /// </summary>
+ private Bitmap _hoverBitmap;
+
+ /// <summary>
+ /// Font
+ /// </summary>
+ private Font _font;
+
+ /// <summary>
+ /// Text color
+ /// </summary>
+ private Color _textColor;
+
+ /// <summary>
+ /// Text color non focus
+ /// </summary>
+ private Color _textColorNoFocus;
+
+ /// <summary>
+ /// Disabled text color
+ /// </summary>
+ private Color _disabledColor;
+
+ /// <summary>
+ /// X-coordinate of the hover image
+ /// </summary>
+ private int _hoverX;
+
+ /// <summary>
+ /// Y-coordinate of the hover image
+ /// </summary>
+ private int _hoverY;
+
+ /// <summary>
+ /// Width of the hover image
+ /// </summary>
+ private int _hoverWidth;
+
+ /// <summary>
+ /// Height of the hover image
+ /// </summary>
+ private int _hoverHeight;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element and retrieves all information from the control
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public ButtonElement(GUIControl control) {
+ _button = control as GUIButtonControl;
+ _font = getFont(_button.FontName);
+ _focusBitmap = loadBitmap(_button.TexutureFocusName);
+ _noFocusBitmap = loadBitmap(_button.TexutureNoFocusName);
+ Type buttonType = typeof(GUIButtonControl);
+ FieldInfo hoverFileNameFieldInfo = buttonType.GetField("_hoverFilename",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _hoverBitmap = loadBitmap(hoverFileNameFieldInfo.GetValue(_button).ToString());
+ _textColor = GetColor(_button.TextColor);
+ FieldInfo textColorNoFocusFieldInfo = buttonType.GetField("_textColorNoFocus",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _textColorNoFocus = GetColor(long.Parse(textColorNoFocusFieldInfo.GetValue(_button).ToString()));
+ _disabledColor = GetColor(_button.DisabledColor);
+ FieldInfo hoverXFieldInfo = buttonType.GetField("_hoverX",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _hoverX = Int32.Parse(hoverXFieldInfo.GetValue(_button).ToString());
+ FieldInfo hoverYFieldInfo = buttonType.GetField("_hoverY",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _hoverY = Int32.Parse(hoverYFieldInfo.GetValue(_button).ToString());
+ FieldInfo hoverWidthFieldInfo = buttonType.GetField("_hoverWidth",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _hoverWidth = Int32.Parse(hoverWidthFieldInfo.GetValue(_button).ToString());
+ FieldInfo hoverHeightFieldInfo = buttonType.GetField("_hoverHeight",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _hoverHeight = Int32.Parse(hoverHeightFieldInfo.GetValue(_button).ToString());
+ Log.Debug("VideoPlayerOSD: Found button element: " + _button.GetID);
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_button.Visible) {
+ if (_button.Focus) {
+ if (_focusBitmap != null) {
+ graph.DrawImage(_focusBitmap, (float)_button.Location.X, (float)_button.Location.Y, (float)_button.Size.Width, (float)_button.Size.Height);
+ }
+ if (_hoverBitmap != null) {
+ graph.DrawImage(_hoverBitmap, _hoverX, _hoverY, _hoverWidth, _hoverHeight);
+ }
+ } else {
+ if (_noFocusBitmap != null) {
+ graph.DrawImage(_noFocusBitmap, (float)_button.Location.X, (float)_button.Location.Y, (float)_button.Size.Width, (float)_button.Size.Height);
+ }
+ }
+ int labelWidth = _button.Width - 2 * _button.TextOffsetX;
+ if (labelWidth <= 0) {
+ return;
+ }
+ SolidBrush brush = new SolidBrush(_button.Disabled ? _disabledColor : _button.Focus ? _textColor : _textColorNoFocus);
+
+ // render the text on the button
+ int x = 0;
+
+ switch (_button.TextAlignment) {
+ case GUIControl.Alignment.ALIGN_LEFT:
+ x = _button.TextOffsetX + _button.XPosition;
+ break;
+
+ case GUIControl.Alignment.ALIGN_RIGHT:
+ x = _button.XPosition + _button.Width - _button.TextOffsetX;
+ break;
+ }
+ Rectangle rectangle = new Rectangle(x, _button.YPosition + _button.TextOffsetY, labelWidth, _button.Height);
+ String label = _button.Label;
+ graph.DrawString(GUIPropertyManager.Parse(label), _font, brush, rectangle, StringFormat.GenericTypographic);
+ }
+ }
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,153 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.Text;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class represents a GUICheckMarkControl
+ /// </summary>
+ public class CheckMarkElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// GUICheckMarkControl
+ /// </summary>
+ private GUICheckMarkControl _checkMark;
+
+ /// <summary>
+ /// Check focus image
+ /// </summary>
+ private Bitmap _checkFocusBitmap;
+
+ /// <summary>
+ /// Check non focus image
+ /// </summary>
+ private Bitmap _checkNoFocusBitmap;
+
+ /// <summary>
+ /// Width of the checkMark
+ /// </summary>
+ private int _checkMarkWidth;
+
+ /// <summary>
+ /// Height of the checkMark
+ /// </summary>
+ private int _checkMarkHeight;
+
+ /// <summary>
+ /// Font
+ /// </summary>
+ private Font _font;
+
+ /// <summary>
+ /// Disabled text color
+ /// </summary>
+ private Color _disabledColor;
+
+ /// <summary>
+ /// Text color
+ /// </summary>
+ private Color _textColor;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element and retrieves all information from the control
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public CheckMarkElement(GUIControl control) {
+ _checkMark = control as GUICheckMarkControl;
+ Type buttonType = typeof(GUICheckMarkControl);
+ FieldInfo checkFocusFieldInfo = buttonType.GetField("_checkMarkFocusTextureName",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _checkFocusBitmap = loadBitmap(checkFocusFieldInfo.GetValue(_checkMark).ToString());
+ FieldInfo checkNoFocusFieldInfo = buttonType.GetField("_checkMarkNoFocusTextureName",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _checkNoFocusBitmap = loadBitmap(checkNoFocusFieldInfo.GetValue(_checkMark).ToString());
+ FieldInfo checkMarkWidthFieldInfo = buttonType.GetField("_checkMarkWidth",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _checkMarkWidth = Int32.Parse(checkMarkWidthFieldInfo.GetValue(_checkMark).ToString());
+ FieldInfo checkMarkHeightFieldInfo = buttonType.GetField("_checkMarkHeight",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _checkMarkHeight = Int32.Parse(checkMarkHeightFieldInfo.GetValue(_checkMark).ToString());
+ _font = getFont(_checkMark.FontName);
+ _disabledColor = GetColor(_checkMark.DisabledColor);
+ _textColor = GetColor(_checkMark.TextColor);
+ Log.Debug("VideoPlayerOSD: Found checkMark element: " + _checkMark.GetID);
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_checkMark.Visible) {
+ int dwTextPosX = _checkMark.XPosition;
+ int dwCheckMarkPosX = _checkMark.XPosition;
+ Rectangle _rectangle = new Rectangle() ;
+ _rectangle.X = _checkMark.YPosition;
+ _rectangle.Y = _checkMark.YPosition;
+ _rectangle.Height = _checkFocusBitmap.Height;
+ if (null != _font) {
+ SizeF sizeF ;
+ if (_checkMark.TextAlignment == GUIControl.Alignment.ALIGN_LEFT) {
+ sizeF = graph.MeasureString(_checkMark.Label, _font);
+ dwCheckMarkPosX += ((int)(sizeF.Width) + 5);
+ } else {
+ dwTextPosX = (dwCheckMarkPosX + _checkFocusBitmap.Width + 5);
+ sizeF = graph.MeasureString(_checkMark.Label, _font);
+ }
+ if (_checkMark.Disabled) {
+ SolidBrush brush = new SolidBrush(_disabledColor);
+ graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ } else {
+ if (_checkMark.Focus) {
+ SolidBrush brush = new SolidBrush(_textColor);
+ graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ }
+ else {
+ SolidBrush brush = new SolidBrush(_disabledColor);
+ graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ }
+ }
+ }
+ if (_checkMark.Selected) {
+ graph.DrawImage(_checkFocusBitmap, dwCheckMarkPosX, _checkMark.YPosition);
+ } else {
+ graph.DrawImage(_checkNoFocusBitmap, dwCheckMarkPosX, _checkMark.YPosition);
+ }
+ }
+ }
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,89 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class represents a GUIFadeLabel
+ /// </summary>
+ public class FadeLabelElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// GUIFadeLabel
+ /// </summary>
+ private GUIFadeLabel _label;
+
+ /// <summary>
+ /// Font
+ /// </summary>
+ private Font _font;
+
+ /// <summary>
+ /// Brush
+ /// </summary>
+ private Brush _brush;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element and retrieves all information from the control
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public FadeLabelElement(GUIControl control) {
+ _label = control as GUIFadeLabel;
+ _font = getFont(_label.FontName);
+ _brush = new SolidBrush(GetColor(_label.TextColor));
+ Log.Debug("VideoPlayerOSD: Found label element: " + _label.Name + "/" + _font.Name);
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_label.Visible) {
+ GUIControl.Alignment alignment = _label.TextAlignment;
+ RectangleF rectangle;
+ String text = GUIPropertyManager.Parse(_label.Label);
+ SizeF sizeF = graph.MeasureString(text, _font);
+ if (alignment == GUIControl.Alignment.ALIGN_LEFT) {
+ rectangle = new RectangleF((float)_label.Location.X, (float)_label.Location.Y, _label.Width, _label.Height);
+ } else if (alignment == GUIControl.Alignment.ALIGN_RIGHT) {
+ rectangle = new RectangleF((float)_label.Location.X - sizeF.Width, (float)_label.Location.Y, _label.Width, _label.Height);
+ } else {
+ rectangle = new RectangleF((float)_label.Location.X - (sizeF.Width / 2), (float)_label.Location.Y - (sizeF.Height / 2), _label.Width, _label.Height);
+ }
+ graph.DrawString(text, _font, _brush, rectangle,StringFormat.GenericTypographic);
+ }
+ }
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,106 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Runtime.InteropServices;
+using System.Text;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class represents a GUIImage
+ /// </summary>
+ public class ImageElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// GUIImage
+ /// </summary>
+ private GUIImage _image;
+
+ /// <summary>
+ /// Image of this element
+ /// </summary>
+ private Bitmap _bitmap;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element and retrieves all information from the control
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public ImageElement(GUIControl control) {
+ _image = control as GUIImage;
+ _bitmap = loadBitmap(_image.FileName);
+ Log.Debug("VideoPlayerOSD: Found image element: " + _image.FileName);
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_image.Visible &&!_image.FileName.Equals("black.bmp")) {
+ DrawElementAlternative(graph,GetImageRectangle());
+ }
+ }
+ #endregion
+
+ #region public methods
+ /// <summary>
+ /// Gets the rectangle of the image
+ /// </summary>
+ /// <returns>Rectangle of the image</returns>
+ public RectangleF GetImageRectangle() {
+ return new RectangleF(_image.XPosition, _image.YPosition, _image.Width, _image.Height);
+ }
+
+ /// <summary>
+ /// Draws the element for additional osd informations
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <param name="rectangle">Rectangle of the image</param>
+ public void DrawElementAlternative(Graphics graph,RectangleF rectangle) {
+ if (_bitmap != null) {
+ graph.DrawImage(_bitmap, rectangle);
+ }
+ }
+ #endregion
+
+ #region public overrides methods
+ /// <summary>
+ /// Draws the element for the cache status.
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <param name="cacheFill">Status of the cache</param>
+ public override void DrawCacheStatus(Graphics graph, float cacheFill) {
+ DrawElementAlternative(graph,GetImageRectangle());
+ }
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,140 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class represents a GUILabelControl
+ /// </summary>
+ public class LabelElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// GUILabelControl
+ /// </summary>
+ private GUILabelControl _label;
+
+ /// <summary>
+ /// Font
+ /// </summary>
+ private Font _font;
+
+ /// <summary>
+ /// Brush
+ /// </summary>
+ private Brush _brush;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element and retrieves all information from the control
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public LabelElement(GUIControl control) {
+ _label = control as GUILabelControl;
+ _font = getFont(_label.FontName);
+ _brush = new SolidBrush(GetColor(_label.TextColor));
+ Log.Debug("VideoPlayerOSD: Found label element: " + _label.Name + "/" + _font.Name);
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_label.Visible) {
+ DrawStandard(graph, _label.Label);
+ }
+ }
+ #endregion
+
+ #region public methods
+ /// <summary>
+ /// Draws the element for additional osd informations
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <param name="label">Label content</param>
+ /// <param name="strikeout">Strikeout the label, when true</param>
+ /// <param name="rectangle">Rectangle for the label</param>
+ public void DrawElementAlternative(Graphics graph, String label, bool strikeout, RectangleF rectangle) {
+ Font temp = _font;
+ if (strikeout) {
+ FontStyle style = _font.Style | FontStyle.Strikeout;
+ temp = new Font(_font.FontFamily.Name, _font.Size, style);
+ }
+ graph.DrawString(GUIPropertyManager.Parse(label), temp, _brush, rectangle, StringFormat.GenericTypographic);
+ }
+
+ /// <summary>
+ /// Returns the rectangle for the given label
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <param name="label">Label</param>
+ /// <returns>Rectangle</returns>
+ public RectangleF GetStringRectangle(Graphics graph, String label) {
+ SizeF size = graph.MeasureString(label, _font);
+ return new RectangleF((float)_label.Location.X, (float)_label.Location.Y, size.Width, _label.Height);
+ }
+ #endregion
+
+ #region public overrides methods
+ /// <summary>
+ /// Draws the element for the cache status. Only implemented in some elements
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <param name="cacheFill">Status of the cache</param>
+ public override void DrawCacheStatus(Graphics graph, float cacheFill) {
+ if(_label.Label.Contains("#currentremaining")){
+ DrawStandard(graph, String.Format("{0:00.00}", cacheFill) + " %");
+ }
+ }
+ #endregion
+
+ #region private methods
+ /// <summary>
+ /// Draws the element in its standard way
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <param name="label">Label</param>
+ private void DrawStandard(Graphics graph, String label) {
+ GUIControl.Alignment alignment = _label.TextAlignment;
+ RectangleF rectangle;
+ if (alignment == GUIControl.Alignment.ALIGN_LEFT) {
+ rectangle = new RectangleF((float)_label.Location.X, (float)_label.Location.Y, _label.Width, _label.Height);
+ } else if (alignment == GUIControl.Alignment.ALIGN_RIGHT) {
+ rectangle = new RectangleF((float)_label.Location.X - _label.TextWidth, (float)_label.Location.Y, _label.Width, _label.Height);
+ } else {
+ rectangle = new RectangleF((float)_label.Location.X - (_label.TextWidth / 2), (float)_label.Location.Y - (_label.TextHeight / 2), _label.Width, _label.Height);
+ }
+ DrawElementAlternative(graph, label, false, rectangle);
+ }
+ #endregion
+ }
+}
Added: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs (rev 0)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-09-18 21:50:12 UTC (rev 938)
@@ -0,0 +1,870 @@
+#region Copyright (C) 2006-2007 MisterD
+
+/*
+ * Copyright (C) 2006-2007 MisterD
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Reflection;
+using System.Text;
+using MediaPortal.GUI.Library;
+
+namespace ExternalOSDLibrary {
+ /// <summary>
+ /// This class represents a GUIListElement
+ /// </summary>
+ public class ListElement : BaseElement {
+ #region internal classes
+ /// <summary>
+ /// Internal class for ListButtons
+ /// </summary>
+ private class ListButtonElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// Focus
+ /// </summary>
+ private bool _focus;
+
+ /// <summary>
+ /// Image focus
+ /// </summary>
+ private Bitmap _imageFocus;
+
+ /// <summary>
+ /// Image non focus
+ /// </summary>
+ private Bitmap _imageNonFocus;
+
+ /// <summary>
+ /// X Position
+ /// </summary>
+ private int _positionX;
+
+ /// <summary>
+ /// Y Position
+ /// </summary>
+ private int _positionY;
+
+ /// <summary>
+ /// Width
+ /// </summary>
+ private float _width;
+
+ /// <summary>
+ /// Height
+ /// </summary>
+ private float _height;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the listbutton element
+ /// </summary>
+ /// <param name="positionX">X Position</param>
+ /// <param name="positionY">Y Position</param>
+ /// <param name="width">Width</param>
+ /// <param name="height">Height</param>
+ /// <param name="buttonFocusName">FileName of the focus image</param>
+ /// <param name="buttonNonFocusName">FileName of the non focus image</param>
+ public ListButtonElement(int positionX, int positionY, float width, float height, String buttonFocusName, String buttonNonFocusName) {
+ _imageFocus = loadBitmap(buttonFocusName);
+ _imageNonFocus = loadBitmap(buttonNonFocusName);
+ _positionX = positionX;
+ _positionY = positionY;
+ _width = width;
+ _height = height;
+ _focus = false;
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_focus) {
+ if (_imageFocus != null) {
+ graph.DrawImage(_imageFocus, _positionX, _positionY, _width, _height);
+ }
+ } else {
+ if (_imageNonFocus != null) {
+ graph.DrawImage(_imageNonFocus, _positionX, _positionY, _width, _height);
+ }
+ }
+ }
+ #endregion
+
+ #region properties
+ /// <summary>
+ /// Gets/Sets the focus
+ /// </summary>
+ public bool Focus {
+ get { return _focus; }
+ set { _focus = value; }
+ }
+ #endregion
+
+ #region public methods
+ /// <summary>
+ /// Sets the position
+ /// </summary>
+ /// <param name="x">X Position</param>
+ /// <param name="y">Y Position</param>
+ public void SetPosition(int x, int y) {
+ _positionX = x;
+ _positionY = y;
+ }
+ #endregion
+
+ }
+
+ /// <summary>
+ /// Internal class for ListLabels
+ /// </summary>
+ private class ListLabelElement : BaseElement {
+ #region variables
+ /// <summary>
+ /// Alignment
+ /// </summary>
+ private GUIControl.Alignment _alignment;
+
+ /// <summary>
+ /// X Position
+ /// </summary>
+ private float _xPosition;
+
+ /// <summary>
+ /// Y Position
+ /// </summary>
+ private float _yPosition;
+
+ /// <summary>
+ /// Width
+ /// </summary>
+ private float _width;
+
+ /// <summary>
+ /// Height
+ /// </summary>
+ private float _height;
+
+ /// <summary>
+ /// Font
+ /// </summary>
+ private Font _font;
+
+ /// <summary>
+ /// Brush
+ /// </summary>
+ private SolidBrush _brush;
+
+ /// <summary>
+ /// Label
+ /// </summary>
+ private String _label;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element
+ /// </summary>
+ public ListLabelElement() {
+ _xPosition = 0f;
+ _yPosition = 0f;
+ _width = 0f;
+ _height = 0f;
+ _label = String.Empty;
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ RectangleF rectangle;
+ SizeF stringSize = graph.MeasureString(_label, _font);
+ if (_alignment == GUIControl.Alignment.ALIGN_LEFT) {
+ rectangle = new RectangleF(_xPosition, _yPosition, _width, _height);
+ } else if (_alignment == GUIControl.Alignment.ALIGN_RIGHT) {
+ rectangle = new RectangleF(_xPosition - stringSize.Width, _yPosition, _width, _height);
+ } else {
+ rectangle = new RectangleF(_xPosition - (stringSize.Width / 2), _yPosition - (stringSize.Height / 2), _width, _height);
+ }
+ graph.DrawString(GUIPropertyManager.Parse(_label), _font, _brush, rectangle, StringFormat.GenericTypographic);
+ }
+ #endregion
+
+ #region properties
+ /// <summary>
+ /// Gets/Sets the alignment
+ /// </summary>
+ public GUIControl.Alignment Alignment {
+ get { return _alignment; }
+ set { _alignment = value; }
+ }
+
+ /// <summary>
+ /// Gets/Sets the x position
+ /// </summary>
+ public float XPosition {
+ get { return _xPosition; }
+ set { _xPosition = value; }
+ }
+
+ /// <summary>
+ /// Gets/Sets the y position
+ /// </summary>
+ public float YPosition {
+ get { return _yPosition; }
+ set { _yPosition = value; }
+ }
+
+ /// <summary>
+ /// Gets/Sets the width
+ /// </summary>
+ public float Width {
+ get { return _width; }
+ set { _width = value; }
+ }
+
+ /// <summary>
+ /// Gets/Sets the height
+ /// </summary>
+ public float Height {
+ get { return _height; }
+ set { _height = value; }
+ }
+
+ /// <summary>
+ /// Gets/Sets the label
+ /// </summary>
+ public String Label {
+ get { return _label; }
+ set { _label = value; }
+ }
+
+ /// <summary>
+ /// Gets/Sets the font
+ /// </summary>
+ public Font Font {
+ get { return _font; }
+ set { _font = value; }
+ }
+
+ /// <summary>
+ /// Gets/Sets the brush
+ /// </summary>
+ public SolidBrush Brush {
+ get { return _brush; }
+ set { _brush = value; }
+ }
+ #endregion
+
+ #region public methods
+ /// <summary>
+ /// Returns the size of the string of this listlabel element
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ /// <returns>Size of the label</returns>
+ public SizeF GetStringSize(Graphics graph) {
+ return graph.MeasureString(_label, _font);
+ }
+ #endregion
+ }
+ #endregion
+
+ #region variables
+ /// <summary>
+ /// GUIListControl
+ /// </summary>
+ private GUIListControl _list;
+
+ /// <summary>
+ /// Items per page
+ /// </summary>
+ private int _itemsPerPage;
+
+ /// <summary>
+ /// Offset
+ /// </summary>
+ private int _offset;
+
+ /// <summary>
+ /// Cursor position
+ /// </summary>
+ private int _cursorX;
+
+ /// <summary>
+ /// DrawFocus
+ /// </summary>
+ private bool _drawFocus;
+
+ /// <summary>
+ /// ListType
+ /// </summary>
+ private GUIListControl.ListType _listType;
+
+ /// <summary>
+ /// Alignment of the elements
+ /// </summary>
+ private GUIControl.Alignment _alignment;
+
+ /// <summary>
+ /// List of the buttons
+ /// </summary>
+ private List<ListButtonElement> _listButtons;
+
+ /// <summary>
+ /// List of the items
+ /// </summary>
+ private List<GUIListItem> _listItems;
+
+ /// <summary>
+ /// List of the Label1's
+ /// </summary>
+ private List<ListLabelElement> _labelControls1;
+
+ /// <summary>
+ /// List of the Label2's
+ /// </summary>
+ private List<ListLabelElement> _labelControls2;
+
+ /// <summary>
+ /// List of the Label3's
+ /// </summary>
+ private List<ListLabelElement> _labelControls3;
+
+ /// <summary>
+ /// Cached Images
+ /// </summary>
+ private Dictionary<String, Bitmap> _cachedBitmaps;
+
+ /// <summary>
+ /// Reflection field info for listItems
+ /// </summary>
+ private FieldInfo _listItemsFieldInfo;
+
+ /// <summary>
+ /// Reflection field info for the offset
+ /// </summary>
+ private FieldInfo _offsetFieldInfo;
+
+ /// <summary>
+ /// Reflection field info for the cursor position
+ /// </summary>
+ private FieldInfo _cursorXFieldInfo;
+
+ /// <summary>
+ /// Played Color
+ /// </summary>
+ private long _playedColor;
+
+ /// <summary>
+ /// Remote Color
+ /// </summary>
+ private long _remoteColor;
+
+ /// <summary>
+ /// Download Color
+ /// </summary>
+ private long _downloadColor;
+
+ /// <summary>
+ /// Text line
+ /// </summary>
+ private String _textLine;
+
+ /// <summary>
+ /// VerticalScrollbarElement
+ /// </summary>
+ private VerticalScrollBarElement _verticalScrollBarElement;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Creates the element and retrieves all information from the control
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public ListElement(GUIControl control) {
+ _list = control as GUIListControl;
+ Type listType = typeof(GUIListControl);
+ FieldInfo alignmentFieldInfo = listType.GetField("_textAlignment",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_list);
+
+ FieldInfo listTypeFieldInfo = listType.GetField("_listType",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _listType = (GUIListControl.ListType)listTypeFieldInfo.GetValue(_list);
+
+ FieldInfo drawFocusFieldInfo = listType.GetField("_drawFocus",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _drawFocus = (bool)drawFocusFieldInfo.GetValue(_list);
+
+ _cursorXFieldInfo = listType.GetField("_cursorX",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _cursorX = (int)_cursorXFieldInfo.GetValue(_list);
+
+ _offsetFieldInfo = listType.GetField("_offset",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _offset = (int)_offsetFieldInfo.GetValue(_list);
+
+ FieldInfo itemsPerPageFieldInfo = listType.GetField("_itemsPerPage",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _itemsPerPage = (int)itemsPerPageFieldInfo.GetValue(_list);
+
+ FieldInfo playedColorFieldInfo = listType.GetField("_playedColor",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _playedColor = (int)itemsPerPageFieldInfo.GetValue(_list);
+
+ FieldInfo remoteColorFieldInfo = listType.GetField("_remoteColor",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _remoteColor = (long)remoteColorFieldInfo.GetValue(_list);
+
+ FieldInfo downloadColorFieldInfo = listType.GetField("_downloadColor",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ _downloadColor = (long)downloadColorFieldInfo.GetValue(_list);
+
+ FieldInfo spinControlPositionXFieldInfo = listType.GetField("_spinControlPositionX",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ int spinControlPositionX = (int)spinControlPositionXFieldInfo.GetValue(_list);
+ FieldInfo spinControlPositionYFieldInfo = listType.GetField("_spinControlPositionY",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ int spinControlPositionY = (int)spinControlPositionYFieldInfo.GetValue(_list);
+ _listButtons = new List<ListButtonElement>();
+ _labelControls1 = new List<ListLabelElement>();
+ _labelControls2 = new List<ListLabelElement>();
+ _labelControls3 = new List<ListLabelElement>();
+ _cachedBitmaps = new Dictionary<String, Bitmap>();
+ AllocButtons(spinControlPositionX, spinControlPositionY);
+ _listItemsFieldInfo = listType.GetField("_listItems",
+ BindingFlags.NonPublic | BindingFlags.Instance);
+ initializeLabels();
+ _verticalScrollBarElement = new VerticalScrollBarElement(_list.Scrollbar);
+ Log.Debug("VideoPlayerOSD: Found list element: ");
+ }
+ #endregion
+
+ #region implmenented abstract method
+ /// <summary>
+ /// Draws the element on the given graphics
+ /// </summary>
+ /// <param name="graph">Graphics</param>
+ public override void DrawElement(Graphics graph) {
+ if (_list.Visible) {
+ _listItems = _listItemsFieldInfo.GetValue(_list) as List<GUIListItem>;
+ _offset = (int)_offsetFieldInfo.GetValue(_list);
+ _cursorX = (int)_cursorXFieldInfo.GetValue(_list);
+ int dwPosY = _list.YPosition;
+ // Render the buttons first.
+ for (int i = 0; i < _itemsPerPage; i++) {
+ if (i + _offset < _listItems.Count) {
+ // render item
+ bool gotFocus = false;
+ if (_drawFocus && i == _cursorX && _list.IsFocused && _listType == GUIListControl.ListType.CONTROL_LIST)
+ gotFocus = true;
+ RenderButton(graph, i, _list.XPosition, dwPosY, gotFocus);
+ }
+ dwPosY += _list.ItemHeight + _list.Space;
+ }
+
+ // Render new item list
+ dwPosY = _list.YPosition;
+ for (int i = 0; i < _itemsPerPage; i++) {
+ int dwPosX = _list.XPosition;
+ if (i + _offset < _listItems.Count) {
+ int iconX;
+ int labelX;
+ int pinX;
+
+ int ten = 10;
+ GUIGraphicsContext.ScaleHorizontal(ref ten);
+ switch (_alignment) {
+ case GUIControl.Alignm...
[truncated message content] |
|
From: <mis...@us...> - 2007-09-21 21:36:45
|
Revision: 946
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=946&view=rev
Author: misterd_sf
Date: 2007-09-21 14:36:43 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
Step 2 of Mplayer 0.8:
- Added MPI script
- Minor layout changes in external player configuration panels
- Completed initial ConfigurationWizard
- Fixed ExternalPlayer - ISetupForm wasn't recognized by MP
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.cs
trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs
Added Paths:
-----------
trunk/plugins/My MPlayer/My MPlayer.xmp
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-09-21 21:07:49 UTC (rev 945)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.cs 2007-09-21 21:36:43 UTC (rev 946)
@@ -91,7 +91,7 @@
subtitleSection1.LoadConfiguration();
audioSection1.LoadConfiguration();
extensionSection1.LoadConfiguration();
- streamSection1.SaveConfiguration();
+ streamSection1.LoadConfiguration();
}
/// <summary>
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-09-21 21:07:49 UTC (rev 945)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-09-21 21:36:43 UTC (rev 946)
@@ -1,1949 +1,974 @@
-\xFF\xFE# |
|
From: <mis...@us...> - 2007-09-30 11:15:39
|
Revision: 964
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=964&view=rev
Author: misterd_sf
Date: 2007-09-30 04:15:36 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Step 3 of Mplayer 0.8:
- Fixed Installer
- Added initialising message to the list of localizable messages
- Added Dispose() to the osd library.
Modified Paths:
--------------
trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs
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_ExtPlayer/MPlayer_ExtPlayer.csproj
trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs
trunk/plugins/My MPlayer/My MPlayer.xmp
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -33,7 +33,7 @@
/// <summary>
/// Base class for all MP windows that can be handled by this library
/// </summary>
- public abstract class BaseWindow {
+ public abstract class BaseWindow : IDisposable {
#region variables
/// <summary>
/// List of all elements of the window
@@ -54,7 +54,7 @@
temp = uiElement as GUIControl;
if (temp != null) {
element = GenerateElement(temp);
- if(element!=null){
+ if (element != null) {
_elementList.Add(element);
}
}
@@ -132,5 +132,16 @@
/// <returns>true, if window is visible; false otherwise</returns>
public abstract bool IsWindowVisible();
#endregion
+
+ #region IDisposable Member
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public virtual void Dispose() {
+ foreach (BaseElement element in _elementList) {
+ element.Dispose();
+ }
+ }
+ #endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -34,7 +34,7 @@
/// <summary>
/// Base class for all gui elements
/// </summary>
- public abstract class BaseElement {
+ public abstract class BaseElement : IDisposable{
#region abstract methods
/// <summary>
/// Draws the element on the given graphics
@@ -120,5 +120,14 @@
public virtual void DrawCacheStatus(Graphics graph, float cacheFill) {
}
#endregion
+
+ #region IDisposable Member
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public abstract void Dispose();
+
+ #endregion
+
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -173,8 +173,19 @@
Rectangle rectangle = new Rectangle(x, _button.YPosition + _button.TextOffsetY, labelWidth, _button.Height);
String label = _button.Label;
graph.DrawString(GUIPropertyManager.Parse(label), _font, brush, rectangle, StringFormat.GenericTypographic);
+ brush.Dispose();
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _focusBitmap.Dispose();
+ _noFocusBitmap.Dispose();
+ _hoverBitmap.Dispose();
+ _font.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -130,14 +130,17 @@
if (_checkMark.Disabled) {
SolidBrush brush = new SolidBrush(_disabledColor);
graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ brush.Dispose();
} else {
if (_checkMark.Focus) {
SolidBrush brush = new SolidBrush(_textColor);
graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ brush.Dispose();
}
else {
SolidBrush brush = new SolidBrush(_disabledColor);
graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ brush.Dispose();
}
}
}
@@ -148,6 +151,14 @@
}
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _checkFocusBitmap.Dispose();
+ _checkNoFocusBitmap.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -84,6 +84,14 @@
graph.DrawString(text, _font, _brush, rectangle,StringFormat.GenericTypographic);
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _font.Dispose();
+ _brush.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -69,6 +69,13 @@
DrawElementAlternative(graph,GetImageRectangle());
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _bitmap.Dispose();
+ }
#endregion
#region public methods
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -73,6 +73,13 @@
DrawStandard(graph, _label.Label);
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _font.Dispose();
+ }
#endregion
#region public methods
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -113,6 +113,14 @@
}
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _imageFocus.Dispose();
+ _imageNonFocus.Dispose();
+ }
#endregion
#region properties
@@ -215,6 +223,14 @@
}
graph.DrawString(GUIPropertyManager.Parse(_label), _font, _brush, rectangle, StringFormat.GenericTypographic);
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _brush.Dispose();
+ _font.Dispose();
+ }
#endregion
#region properties
@@ -530,6 +546,27 @@
RenderScrollbar(graph, dwPosY);
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ foreach (ListButtonElement element in _listButtons) {
+ element.Dispose();
+ }
+ foreach (ListLabelElement element in _labelControls1) {
+ element.Dispose();
+ }
+ foreach (ListLabelElement element in _labelControls2) {
+ element.Dispose();
+ }
+ foreach (ListLabelElement element in _labelControls3) {
+ element.Dispose();
+ }
+ foreach (Bitmap element in _cachedBitmaps.Values) {
+ element.Dispose();
+ }
+ }
#endregion
#region private methods
@@ -567,7 +604,7 @@
_labelControls3.Add(cntl3);
}
}
-
+
/// <summary>
/// Renders the label
/// </summary>
@@ -724,7 +761,7 @@
}
pItem = null;
}
-
+
/// <summary>
/// Renders the text
/// </summary>
@@ -762,7 +799,7 @@
label.Font = getFont(_list.FontName);
label.DrawElement(graph);
}
-
+
/// <summary>
/// Render the button
/// </summary>
@@ -784,7 +821,7 @@
}
}
}
-
+
/// <summary>
/// Render icon
/// </summary>
@@ -852,7 +889,7 @@
}
pItem = null;
}
-
+
/// <summary>
/// Render the scroll bar
/// </summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -90,6 +90,16 @@
DrawProgressBar(graph,fWidth,percent);
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _leftBitmap.Dispose();
+ _midBitmap.Dispose();
+ _rightBitmap.Dispose();
+ _backgroundBitmap.Dispose();
+ }
#endregion
#region public overrides methods
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -98,6 +98,7 @@
if (null != font) {
SolidBrush brush = new SolidBrush(Color.FromArgb(255,255,255,255));
graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition);
+ brush.Dispose();
}
backgroundPositionX += 60;
break;
@@ -108,6 +109,7 @@
if (null != font) {
SolidBrush brush = new SolidBrush(Color.FromArgb(255, 255, 255, 255));
graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition);
+ brush.Dispose();
}
backgroundPositionX += 60;
break;
@@ -134,6 +136,15 @@
}
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _backgroundBitmap.Dispose();
+ _sliderBitmap.Dispose();
+ _sliderFocusBitmap.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -97,6 +97,14 @@
graph.DrawString(GUIPropertyManager.Parse(label), _font, _brush, rectangle, StringFormat.GenericTypographic);
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _font.Dispose();
+ _brush.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -162,9 +162,20 @@
Rectangle rectangle = new Rectangle(x, _button.YPosition + _button.TextOffsetY, labelWidth, _button.Height);
String label = _button.Label;
graph.DrawString(GUIPropertyManager.Parse(label), _font, brush, rectangle, StringFormat.GenericTypographic);
-
+ brush.Dispose();
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _focusBitmap.Dispose();
+ _noFocusBitmap.Dispose();
+ _altFocusBitmap.Dispose();
+ _altNoFocusBitmap.Dispose();
+ _font.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -111,6 +111,15 @@
}
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _scrollBarBackground.Dispose();
+ _scrollBarTop.Dispose();
+ _scrollBarBottom.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -118,6 +118,13 @@
}
}
}
+
+ /// <summary>
+ /// Disposes the object
+ /// </summary>
+ public override void Dispose() {
+ _bitmap.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -162,6 +162,18 @@
element.DrawCacheStatus(graph, cacheFill);
}
}
+
+ /// <summary>
+ /// Dispose the object
+ /// </summary>
+ public override void Dispose() {
+ _label.Dispose();
+ _background.Dispose();
+ foreach (BaseElement element in _cacheElements) {
+ element.Dispose();
+ }
+ base.Dispose();
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -30,10 +30,11 @@
using MediaPortal.GUI.Library;
namespace ExternalOSDLibrary {
+
/// <summary>
/// Controller for the ExternalOSDLibrary. This is the main entry point for usage in an external player
/// </summary>
- public class OSDController {
+ public class OSDController : IDisposable{
#region variables
/// <summary>
/// Singleton instance
@@ -69,7 +70,7 @@
/// Indicates, if additional osd information is displayed
/// </summary>
private bool _showAdditionalOSD;
-
+
/// <summary>
/// Label of the additional osd
/// </summary>
@@ -173,7 +174,7 @@
_osdForm2.Image = image;
_osdForm2.Refresh();
}
-
+
/// <summary>
/// Deactivates the osd. Nothing will be displayed until it will be reactivated.
/// </summary>
@@ -238,5 +239,19 @@
_showInit = false;
}
#endregion
+
+ #region IDisposable Member
+ /// <summary>
+ /// Disposes the osd controller
+ /// </summary>
+ public void Dispose() {
+ _fullscreenWindow.Dispose();
+ _dialogWindow.Dispose();
+ _videoOSDWindow.Dispose();
+ _osdForm.Dispose();
+ _osdForm2.Dispose();
+ singleton = null;
+ }
+ #endregion
}
}
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -75,7 +75,7 @@
}
}
_osd.Activate();
- _osd.ShowInit("Initiliazing");
+ _osd.ShowInit(LocalizeStrings.Get((int)LocalizedMessages.Initializing));
}
private void osdGetInstance() {
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_de.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_de.xml 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_de.xml 2007-09-30 11:15:36 UTC (rev 964)
@@ -18,5 +18,6 @@
<String id="14">Wiedergabe Stream</String>
<String id="15">Disc-Wiedergabe</String>
<String id="16">Lösche Element</String>
+ <String id="17">Initialisiere</String>
</Section>
</Language>
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_en.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_en.xml 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_en.xml 2007-09-30 11:15:36 UTC (rev 964)
@@ -18,5 +18,6 @@
<String id="14">Play Stream</String>
<String id="15">Play Disc</String>
<String id="16">Delete Item</String>
+ <String id="17">Initializing</String>
</Section>
</Language>
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/LocalizeStrings.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/LocalizeStrings.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/LocalizeStrings.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -109,7 +109,11 @@
/// <summary>
/// Delete button
/// </summary>
- Delete=16
+ Delete=16,
+ /// <summary>
+ /// Initializing message
+ /// </summary>
+ Initializing=17
}
/// <summary>
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.csproj
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.csproj 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.csproj 2007-09-30 11:15:36 UTC (rev 964)
@@ -145,6 +145,8 @@
<Content Include="config.ico" />
<Content Include="Language\strings_de.xml" />
<Content Include="Language\strings_en.xml" />
+ <Content Include="Language\strings_es.xml" />
+ <Content Include="Language\strings_fr.xml" />
<Content Include="SampleConfiguration\MPlayer_ExtPlayer.xml" />
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/MPlayer_Installer/Installer.cs 2007-09-30 11:15:36 UTC (rev 964)
@@ -68,6 +68,16 @@
LoadPlugins(configPath + @"\Windows\MPlayer_GUIPlugin.dll");
ConfigurationWizard wizard = new ConfigurationWizard();
wizard.ShowDialog();
+ using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
+ xmlWriter.SetValueAsBool("plugins", "My MPlayer GUI",true);
+ xmlWriter.SetValueAsBool("plugins", "MPlayer", true);
+ xmlWriter.SetValueAsBool("pluginsdlls", "MPlayer_GUIPlugin.dll", true);
+ xmlWriter.SetValueAsBool("pluginsdlls", "MPlayer_ExtPlayer.dll", true);
+ xmlWriter.SetValueAsBool("home", "My MPlayer GUI", true);
+ xmlWriter.SetValueAsBool("myplugins", "My MPlayer GUI", false);
+ xmlWriter.SetValueAsBool("pluginswindows", "MPlayer.MPlayer_GUIPlugin", true);
+ }
+ MediaPortal.Profile.Settings.SaveCache();
return true;
}
Modified: trunk/plugins/My MPlayer/My MPlayer.xmp
===================================================================
--- trunk/plugins/My MPlayer/My MPlayer.xmp 2007-09-29 15:26:22 UTC (rev 963)
+++ trunk/plugins/My MPlayer/My MPlayer.xmp 2007-09-30 11:15:36 UTC (rev 964)
@@ -8,7 +8,7 @@
<Source>ExternalOSDLibrary\bin\Release\ExternalOSDLibrary.dll</Source>
<Id>04010</Id>
<Option />
- <Guid>686795da-9902-43d1-83d9-14eae062befc</Guid>
+ <Guid>208539bd-cb3d-4403-936b-cc2ac5f9086b</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.dll</FileName>
@@ -17,7 +17,7 @@
<Source>MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll</Source>
<Id>01050</Id>
<Option />
- <Guid>796c1748-3b7e-4f77-b2d0-f745c8fd66a4</Guid>
+ <Guid>129d0b43-6858-40ec-89ca-533818efa0cc</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.xml</FileName>
@@ -26,7 +26,7 @@
<Source>MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>57701aeb-bdf6-484a-a7a8-ce2b3d061a43</Guid>
+ <Guid>e8372d2f-64ea-44ac-9a08-02c357a3fcca</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.dll</FileName>
@@ -35,7 +35,7 @@
<Source>MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll</Source>
<Id>01010</Id>
<Option />
- <Guid>6288386c-0e13-41ba-b267-0ee0ef6fcb2c</Guid>
+ <Guid>d35cb71e-87ba-4840-b18a-d8fc57f6830d</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.xml</FileName>
@@ -44,7 +44,7 @@
<Source>MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>28c6436c-59e7-49a8-813c-c569047400f4</Guid>
+ <Guid>a9bc8f02-b1d8-4aca-a9f9-0eb3875e05be</Guid>
</File>
<File>
<FileName>MPlayer_Installer.dll</FileName>
@@ -62,7 +62,7 @@
<Source>z:\Source-MediaPortal\MP-Plugins\My MPlayer\MPlayer-License.txt</Source>
<Id>03010</Id>
<Option />
- <Guid>d34086ec-93b3-4756-b10e-abc94975e542</Guid>
+ <Guid>63740cb8-9f67-4d7e-b4ca-4b95779a8539</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -71,7 +71,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml</Source>
<Id>02010</Id>
<Option>OutputFileName=|DefaultFile=True|</Option>
- <Guid>dae94e3d-2ebe-4aec-9d8b-107ca2b74415</Guid>
+ <Guid>526a6e68-e375-4d75-9d1c-47e6728b12db</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -80,7 +80,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>d4a573ff-5d88-4c68-a165-ecfdc1b0672a</Guid>
+ <Guid>40d8ee5d-6ad2-4fa0-b51b-aff4990060d2</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -89,7 +89,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>2cd41f49-101f-4f99-8290-62151c942590</Guid>
+ <Guid>ef453824-7cd5-4df6-823f-3bd53b6c0d77</Guid>
</File>
<File>
<FileName>strings_de.xml</FileName>
@@ -98,7 +98,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_de.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>5f4076a7-55b8-46c3-ba7a-b58e636bc844</Guid>
+ <Guid>5f064f77-ceb3-481d-8345-b1efcf57763a</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -107,7 +107,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_en.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>8b52a34e-e2e4-4b04-988e-3eb997e4cf04</Guid>
+ <Guid>4c978042-6d29-4466-ae50-b8a7a3b491c6</Guid>
</File>
<File>
<FileName>strings_es.xml</FileName>
@@ -116,7 +116,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_es.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>26b782b5-80fc-43f2-8f47-afb8ccf2b41a</Guid>
+ <Guid>1fbbcd8a-2046-477a-ac65-4ff5148fe942</Guid>
</File>
<File>
<FileName>strings_fr.xml</FileName>
@@ -125,7 +125,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_fr.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>325b0645-8dc8-4e40-b83b-0f79917fe9ca</Guid>
+ <Guid>687d49d5-d1cb-43b9-b347-910666909884</Guid>
</File>
</FileList>
<StringList />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-10-06 22:11:53
|
Revision: 979
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=979&view=rev
Author: misterd_sf
Date: 2007-10-06 15:11:51 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
- Improved performance of the external osd library. Now only an update occures, if it is needed.
- Fixed Labels in external osd library
- Suspend and resume layout of MP form while adding/removing elements
Modified Paths:
--------------
trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -39,6 +39,16 @@
/// List of all elements of the window
/// </summary>
protected List<BaseElement> _elementList;
+
+ /// <summary>
+ /// Indicates, if the window is visible
+ /// </summary>
+ private bool _visible;
+
+ /// <summary>
+ /// Indicates, if the visibility of the window has changed
+ /// </summary>
+ protected bool _visibleChanged;
#endregion
#region protected methods
@@ -114,7 +124,7 @@
/// <param name="graph">Graphics of the bitmap</param>
public void DrawWindow(Graphics graph) {
try {
- if (IsWindowVisible()) {
+ if (_visible) {
foreach (BaseElement element in _elementList) {
element.DrawElement(graph);
}
@@ -123,6 +133,38 @@
Log.Error(ex);
}
}
+
+ /// <summary>
+ /// Indicates if the window is currently visible
+ /// </summary>
+ /// <returns>true, if window is visible; false otherwise</returns>
+ public bool CheckVisibility() {
+ bool result = CheckSpecificVisibility();
+ if (result != _visible) {
+ _visible = result;
+ _visibleChanged = true;
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// Checks, if an update is needed for this window
+ /// </summary>
+ /// <returns>true, if an update is needed; false otherwise</returns>
+ public bool CheckForUpdate() {
+ CheckVisibility();
+ bool result = false;
+ if (_visibleChanged) {
+ _visibleChanged = false;
+ result = true;
+ }
+ if (_visible) {
+ foreach (BaseElement element in _elementList) {
+ result = result | element.CheckForUpdate();
+ }
+ }
+ return result;
+ }
#endregion
#region abstract methods
@@ -130,7 +172,7 @@
/// Indicates if the window is currently visible
/// </summary>
/// <returns>true, if window is visible; false otherwise</returns>
- public abstract bool IsWindowVisible();
+ protected abstract bool CheckSpecificVisibility();
#endregion
#region IDisposable Member
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -60,7 +60,7 @@
/// Indicates if the window is currently visible
/// </summary>
/// <returns>true, if window is visible; false otherwise</returns>
- public override bool IsWindowVisible() {
+ protected override bool CheckSpecificVisibility() {
return GUIWindowManager.RoutedWindow == _dialogWindow.GetID;
}
#endregion
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -34,13 +34,41 @@
/// <summary>
/// Base class for all gui elements
/// </summary>
- public abstract class BaseElement : IDisposable{
+ public abstract class BaseElement : IDisposable {
+ #region variables
+ /// <summary>
+ /// Indicates, if the element was visible
+ /// </summary>
+ protected bool _wasVisible;
+
+ /// <summary>
+ /// Control of the base element
+ /// </summary>
+ protected GUIControl _control;
+ #endregion
+
+ #region ctor
+ /// <summary>
+ /// Initialize the base element
+ /// </summary>
+ /// <param name="control">GUIControl</param>
+ public BaseElement(GUIControl control) {
+ _control = control;
+ }
+ #endregion
+
#region abstract methods
/// <summary>
/// Draws the element on the given graphics
/// </summary>
/// <param name="graph">Graphics</param>
public abstract void DrawElement(Graphics graph);
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected abstract bool CheckElementSpecificForUpdate();
#endregion
#region protected methods
@@ -119,6 +147,22 @@
/// <param name="cacheFill">Status of the cache</param>
public virtual void DrawCacheStatus(Graphics graph, float cacheFill) {
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ public bool CheckForUpdate() {
+ bool newVisible = _control.Visible;
+ if (newVisible == _wasVisible) {
+ return CheckElementSpecificForUpdate();
+ }
+ _wasVisible = newVisible;
+ if (newVisible) {
+ CheckElementSpecificForUpdate();
+ }
+ return true;
+ }
#endregion
#region IDisposable Member
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -96,6 +96,16 @@
/// Height of the hover image
/// </summary>
private int _hoverHeight;
+
+ /// <summary>
+ /// Indicates, if the button is focused
+ /// </summary>
+ private bool _focus;
+
+ /// <summary>
+ /// Label of the button
+ /// </summary>
+ private String _label;
#endregion
#region ctor
@@ -103,7 +113,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public ButtonElement(GUIControl control) {
+ public ButtonElement(GUIControl control)
+ : base(control) {
_button = control as GUIButtonControl;
_font = getFont(_button.FontName);
_focusBitmap = loadBitmap(_button.TexutureFocusName);
@@ -129,6 +140,8 @@
FieldInfo hoverHeightFieldInfo = buttonType.GetField("_hoverHeight",
BindingFlags.NonPublic | BindingFlags.Instance);
_hoverHeight = Int32.Parse(hoverHeightFieldInfo.GetValue(_button).ToString());
+ _label = _button.Label;
+ _focus = _button.Focus;
Log.Debug("VideoPlayerOSD: Found button element: " + _button.GetID);
}
#endregion
@@ -140,7 +153,7 @@
/// <param name="graph">Graphics</param>
public override void DrawElement(Graphics graph) {
if (_button.Visible) {
- if (_button.Focus) {
+ if (_focus) {
if (_focusBitmap != null) {
graph.DrawImage(_focusBitmap, (float)_button.Location.X, (float)_button.Location.Y, (float)_button.Size.Width, (float)_button.Size.Height);
}
@@ -171,8 +184,7 @@
break;
}
Rectangle rectangle = new Rectangle(x, _button.YPosition + _button.TextOffsetY, labelWidth, _button.Height);
- String label = _button.Label;
- graph.DrawString(GUIPropertyManager.Parse(label), _font, brush, rectangle, StringFormat.GenericTypographic);
+ graph.DrawString(_label, _font, brush, rectangle, StringFormat.GenericTypographic);
brush.Dispose();
}
}
@@ -186,6 +198,24 @@
_hoverBitmap.Dispose();
_font.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ String newLabel = GUIPropertyManager.Parse(_button.Label);
+ if (!newLabel.Equals(_label)) {
+ _label = newLabel;
+ result = true;
+ }
+ if (_button.Focus != _focus) {
+ _focus = _button.Focus;
+ result = true;
+ }
+ return result;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -76,6 +76,26 @@
/// Text color
/// </summary>
private Color _textColor;
+
+ /// <summary>
+ /// Indicates, if the checkmark is focused
+ /// </summary>
+ private bool _focus;
+
+ /// <summary>
+ /// Indicates, if the checkmark is selected
+ /// </summary>
+ private bool _selected;
+
+ /// <summary>
+ /// Indicates, if the checkmark is disabled
+ /// </summary>
+ private bool _disabled;
+
+ /// <summary>
+ /// Label of the button
+ /// </summary>
+ private String _label;
#endregion
#region ctor
@@ -83,7 +103,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public CheckMarkElement(GUIControl control) {
+ public CheckMarkElement(GUIControl control)
+ : base(control) {
_checkMark = control as GUICheckMarkControl;
Type buttonType = typeof(GUICheckMarkControl);
FieldInfo checkFocusFieldInfo = buttonType.GetField("_checkMarkFocusTextureName",
@@ -101,6 +122,10 @@
_font = getFont(_checkMark.FontName);
_disabledColor = GetColor(_checkMark.DisabledColor);
_textColor = GetColor(_checkMark.TextColor);
+ _focus = _checkMark.Focus;
+ _selected = _checkMark.Selected;
+ _disabled = _checkMark.Disabled;
+ _label = _checkMark.Label;
Log.Debug("VideoPlayerOSD: Found checkMark element: " + _checkMark.GetID);
}
#endregion
@@ -114,37 +139,36 @@
if (_checkMark.Visible) {
int dwTextPosX = _checkMark.XPosition;
int dwCheckMarkPosX = _checkMark.XPosition;
- Rectangle _rectangle = new Rectangle() ;
+ Rectangle _rectangle = new Rectangle();
_rectangle.X = _checkMark.YPosition;
_rectangle.Y = _checkMark.YPosition;
_rectangle.Height = _checkFocusBitmap.Height;
if (null != _font) {
- SizeF sizeF ;
+ SizeF sizeF;
if (_checkMark.TextAlignment == GUIControl.Alignment.ALIGN_LEFT) {
- sizeF = graph.MeasureString(_checkMark.Label, _font);
+ sizeF = graph.MeasureString(GUIPropertyManager.Parse(_label), _font);
dwCheckMarkPosX += ((int)(sizeF.Width) + 5);
} else {
dwTextPosX = (dwCheckMarkPosX + _checkFocusBitmap.Width + 5);
- sizeF = graph.MeasureString(_checkMark.Label, _font);
+ sizeF = graph.MeasureString(GUIPropertyManager.Parse(_label), _font);
}
- if (_checkMark.Disabled) {
+ if (_disabled) {
SolidBrush brush = new SolidBrush(_disabledColor);
- graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, dwTextPosX, _checkMark.YPosition);
brush.Dispose();
} else {
- if (_checkMark.Focus) {
+ if (_focus) {
SolidBrush brush = new SolidBrush(_textColor);
- graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, dwTextPosX, _checkMark.YPosition);
brush.Dispose();
- }
- else {
+ } else {
SolidBrush brush = new SolidBrush(_disabledColor);
- graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition);
+ graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, dwTextPosX, _checkMark.YPosition);
brush.Dispose();
}
}
}
- if (_checkMark.Selected) {
+ if (_selected) {
graph.DrawImage(_checkFocusBitmap, dwCheckMarkPosX, _checkMark.YPosition);
} else {
graph.DrawImage(_checkNoFocusBitmap, dwCheckMarkPosX, _checkMark.YPosition);
@@ -159,6 +183,32 @@
_checkFocusBitmap.Dispose();
_checkNoFocusBitmap.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ String newLabel = GUIPropertyManager.Parse(_checkMark.Label);
+ if (!newLabel.Equals(_label)) {
+ _label = newLabel;
+ result = true;
+ }
+ if (_checkMark.Focus != _focus) {
+ _focus = _checkMark.Focus;
+ result = true;
+ }
+ if (_checkMark.Disabled != _disabled) {
+ _disabled = _checkMark.Disabled;
+ result = true;
+ }
+ if (_checkMark.Selected != _selected) {
+ _selected = _checkMark.Selected;
+ result = true;
+ }
+ return result;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -48,6 +48,11 @@
/// Brush
/// </summary>
private Brush _brush;
+
+ /// <summary>
+ /// Label of the fade label
+ /// </summary>
+ private String _labelString;
#endregion
#region ctor
@@ -55,10 +60,12 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public FadeLabelElement(GUIControl control) {
+ public FadeLabelElement(GUIControl control)
+ : base(control) {
_label = control as GUIFadeLabel;
_font = getFont(_label.FontName);
_brush = new SolidBrush(GetColor(_label.TextColor));
+ _labelString = _label.Label;
Log.Debug("VideoPlayerOSD: Found label element: " + _label.Name + "/" + _font.Name);
}
#endregion
@@ -92,6 +99,20 @@
_font.Dispose();
_brush.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ String newLabel = GUIPropertyManager.Parse(_label.Label);
+ if (!newLabel.Equals(_labelString)) {
+ _labelString = newLabel;
+ result = true;
+ }
+ return result;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -52,7 +52,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public ImageElement(GUIControl control) {
+ public ImageElement(GUIControl control)
+ : base(control) {
_image = control as GUIImage;
_bitmap = loadBitmap(_image.FileName);
Log.Debug("VideoPlayerOSD: Found image element: " + _image.FileName);
@@ -76,6 +77,15 @@
public override void Dispose() {
_bitmap.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ return false;
+ }
+
#endregion
#region public methods
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -48,6 +48,11 @@
/// Brush
/// </summary>
private Brush _brush;
+
+ /// <summary>
+ /// Label String
+ /// </summary>
+ private String _labelString;
#endregion
#region ctor
@@ -55,10 +60,12 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public LabelElement(GUIControl control) {
+ public LabelElement(GUIControl control)
+ : base(control) {
_label = control as GUILabelControl;
_font = getFont(_label.FontName);
_brush = new SolidBrush(GetColor(_label.TextColor));
+ _labelString = _label.Label;
Log.Debug("VideoPlayerOSD: Found label element: " + _label.Name + "/" + _font.Name);
}
#endregion
@@ -70,7 +77,7 @@
/// <param name="graph">Graphics</param>
public override void DrawElement(Graphics graph) {
if (_label.Visible) {
- DrawStandard(graph, _label.Label);
+ DrawStandard(graph, _labelString);
}
}
@@ -80,6 +87,20 @@
public override void Dispose() {
_font.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ String newLabel = GUIPropertyManager.Parse(_label.Label);
+ if (!newLabel.Equals(_labelString)) {
+ _labelString = newLabel;
+ result = true;
+ }
+ return result;
+ }
#endregion
#region public methods
@@ -96,7 +117,7 @@
FontStyle style = _font.Style | FontStyle.Strikeout;
temp = new Font(_font.FontFamily.Name, _font.Size, style);
}
- graph.DrawString(GUIPropertyManager.Parse(label), temp, _brush, rectangle, StringFormat.GenericTypographic);
+ graph.DrawString(label, temp, _brush, rectangle, StringFormat.GenericTypographic);
}
/// <summary>
@@ -106,7 +127,7 @@
/// <param name="label">Label</param>
/// <returns>Rectangle</returns>
public RectangleF GetStringRectangle(Graphics graph, String label) {
- SizeF size = graph.MeasureString(label, _font);
+ SizeF size = graph.MeasureString(label, _font);
return new RectangleF((float)_label.Location.X, (float)_label.Location.Y, size.Width, _label.Height);
}
#endregion
@@ -118,7 +139,7 @@
/// <param name="graph">Graphics</param>
/// <param name="cacheFill">Status of the cache</param>
public override void DrawCacheStatus(Graphics graph, float cacheFill) {
- if(_label.Label.Contains("#currentremaining")){
+ if (_label.Label.Contains("#currentremaining")) {
DrawStandard(graph, String.Format("{0:00.00}", cacheFill) + " %");
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -74,6 +74,11 @@
/// Height
/// </summary>
private float _height;
+
+ /// <summary>
+ /// Indicates if an update is needed
+ /// </summary>
+ private bool needUpdate;
#endregion
#region ctor
@@ -86,7 +91,8 @@
/// <param name="height">Height</param>
/// <param name="buttonFocusName">FileName of the focus image</param>
/// <param name="buttonNonFocusName">FileName of the non focus image</param>
- public ListButtonElement(int positionX, int positionY, float width, float height, String buttonFocusName, String buttonNonFocusName) {
+ public ListButtonElement(int positionX, int positionY, float width, float height, String buttonFocusName, String buttonNonFocusName)
+ : base(null) {
_imageFocus = loadBitmap(buttonFocusName);
_imageNonFocus = loadBitmap(buttonNonFocusName);
_positionX = positionX;
@@ -121,6 +127,18 @@
_imageFocus.Dispose();
_imageNonFocus.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = needUpdate;
+ if (needUpdate) {
+ needUpdate = false;
+ }
+ return result;
+ }
#endregion
#region properties
@@ -129,7 +147,12 @@
/// </summary>
public bool Focus {
get { return _focus; }
- set { _focus = value; }
+ set {
+ if (_focus != value) {
+ needUpdate = true;
+ }
+ _focus = value;
+ }
}
#endregion
@@ -197,7 +220,8 @@
/// <summary>
/// Creates the element
/// </summary>
- public ListLabelElement() {
+ public ListLabelElement()
+ : base(null) {
_xPosition = 0f;
_yPosition = 0f;
_width = 0f;
@@ -231,6 +255,14 @@
_brush.Dispose();
_font.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ return false;
+ }
#endregion
#region properties
@@ -417,6 +449,11 @@
/// VerticalScrollbarElement
/// </summary>
private VerticalScrollBarElement _verticalScrollBarElement;
+
+ /// <summary>
+ /// Indicates, if the list is focused
+ /// </summary>
+ private bool _focus;
#endregion
#region ctor
@@ -424,7 +461,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public ListElement(GUIControl control) {
+ public ListElement(GUIControl control)
+ : base(control) {
_list = control as GUIListControl;
Type listType = typeof(GUIListControl);
FieldInfo alignmentFieldInfo = listType.GetField("_textAlignment",
@@ -479,6 +517,9 @@
BindingFlags.NonPublic | BindingFlags.Instance);
initializeLabels();
_verticalScrollBarElement = new VerticalScrollBarElement(_list.Scrollbar);
+ _offset = (int)_offsetFieldInfo.GetValue(_list);
+ _cursorX = (int)_cursorXFieldInfo.GetValue(_list);
+ _focus = _list.IsFocused;
Log.Debug("VideoPlayerOSD: Found list element: ");
}
#endregion
@@ -491,8 +532,6 @@
public override void DrawElement(Graphics graph) {
if (_list.Visible) {
_listItems = _listItemsFieldInfo.GetValue(_list) as List<GUIListItem>;
- _offset = (int)_offsetFieldInfo.GetValue(_list);
- _cursorX = (int)_cursorXFieldInfo.GetValue(_list);
int dwPosY = _list.YPosition;
// Render the buttons first.
for (int i = 0; i < _itemsPerPage; i++) {
@@ -567,6 +606,29 @@
element.Dispose();
}
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ int newOffset = (int)_offsetFieldInfo.GetValue(_list);
+ int newCursorX = (int)_cursorXFieldInfo.GetValue(_list);
+ if (_offset!=newOffset) {
+ _offset = newOffset;
+ result = true;
+ }
+ if (newCursorX !=_cursorX) {
+ _cursorX = newCursorX;
+ result = true;
+ }
+ if (_list.IsFocused != _focus) {
+ _focus = _list.IsFocused;
+ result = true;
+ }
+ return result;
+ }
#endregion
#region private methods
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -59,6 +59,11 @@
/// Background image
/// </summary>
private Bitmap _backgroundBitmap;
+
+ /// <summary>
+ /// Percentage of the progress control
+ /// </summary>
+ private int _percentage;
#endregion
#region ctor
@@ -66,12 +71,14 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public ProgressControlElement(GUIControl control) {
+ public ProgressControlElement(GUIControl control)
+ : base(control) {
_progressControl = control as GUIProgressControl;
_leftBitmap = loadBitmap(_progressControl.BackTextureLeftName);
_midBitmap = loadBitmap(_progressControl.BackTextureMidName);
_rightBitmap = loadBitmap(_progressControl.BackTextureRightName);
_backgroundBitmap = loadBitmap(_progressControl.BackGroundTextureName);
+ _percentage = GetPercentage();
Log.Debug("VideoPlayerOSD: Found progess control");
}
#endregion
@@ -83,11 +90,8 @@
/// <param name="graph">Graphics</param>
public override void DrawElement(Graphics graph) {
if (_progressControl.Visible) {
- int percent = 0;
- Int32.TryParse(GUIPropertyManager.Parse(_progressControl.Property), out percent);
- if (percent > 100) percent = 100;
- float fWidth = (float)percent;
- DrawProgressBar(graph,fWidth,percent);
+ float fWidth = (float)_percentage;
+ DrawProgressBar(graph,fWidth,_percentage);
}
}
@@ -100,6 +104,20 @@
_rightBitmap.Dispose();
_backgroundBitmap.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ int newPercentage = GetPercentage();
+ if (newPercentage != _percentage) {
+ _percentage = newPercentage;
+ result = true;
+ }
+ return result;
+ }
#endregion
#region public overrides methods
@@ -152,6 +170,17 @@
graph.DrawImage(_rightBitmap, iXPos, iYPos, iWidthRight, iHeightRight);
}
}
+
+ /// <summary>
+ /// Calculates the percentage of the control
+ /// </summary>
+ /// <returns></returns>
+ private int GetPercentage() {
+ int percent = 0;
+ Int32.TryParse(GUIPropertyManager.Parse(_progressControl.Property), out percent);
+ if (percent > 100) percent = 100;
+ return percent;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -41,21 +41,36 @@
/// GUISliderControl
/// </summary>
private GUISliderControl _slider;
-
+
/// <summary>
/// Background image
/// </summary>
private Bitmap _backgroundBitmap;
-
+
/// <summary>
/// Slider image
/// </summary>
private Bitmap _sliderBitmap;
-
+
/// <summary>
/// Slider focus image
/// </summary>
private Bitmap _sliderFocusBitmap;
+
+ /// <summary>
+ /// String value of the slider element
+ /// </summary>
+ private String _strValue;
+
+ /// <summary>
+ /// Percentage of the slider element
+ /// </summary>
+ private int _percentage;
+
+ /// <summary>
+ /// Indicates, if the element is focused
+ /// </summary>
+ private bool _focus;
#endregion
#region ctor
@@ -63,7 +78,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public SliderElement(GUIControl control) {
+ public SliderElement(GUIControl control)
+ : base(control) {
_slider = control as GUISliderControl;
Type buttonType = typeof(GUISliderControl);
FieldInfo backgroundBitmapFieldInfo = buttonType.GetField("_backgroundTextureName",
@@ -75,6 +91,9 @@
FieldInfo sliderFocusBitmapFieldInfo = buttonType.GetField("_sliderFocusTextureName",
BindingFlags.NonPublic | BindingFlags.Instance);
_sliderFocusBitmap = loadBitmap(sliderFocusBitmapFieldInfo.GetValue(_slider).ToString());
+ _focus = _slider.Focus;
+ _percentage = _slider.Percentage;
+ _strValue = getStringValue();
Log.Debug("VideoPlayerOSD: Found slider element: " + _slider.GetID);
}
#endregion
@@ -89,31 +108,14 @@
string strValue = "";
float fPos = 0.0f;
Font font = getFont("font13");
- float backgroundPositionX = (float) _slider.XPosition;
+ float backgroundPositionX = (float)_slider.XPosition;
float backgroundPositionY = (float)_slider.YPosition;
- switch (_slider.SpinType) {
- // Float based slider
- case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_FLOAT:
- strValue = String.Format("{0}", _slider.FloatValue);
- if (null != font) {
- SolidBrush brush = new SolidBrush(Color.FromArgb(255,255,255,255));
- graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition);
- brush.Dispose();
- }
- backgroundPositionX += 60;
- break;
-
- // Integer based slider
- case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_INT:
- strValue = String.Format("{0}/{1}", _slider.IntValue, 100);
- if (null != font) {
- SolidBrush brush = new SolidBrush(Color.FromArgb(255, 255, 255, 255));
- graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition);
- brush.Dispose();
- }
- backgroundPositionX += 60;
- break;
+ if (null != font) {
+ SolidBrush brush = new SolidBrush(Color.FromArgb(255, 255, 255, 255));
+ graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition);
+ brush.Dispose();
}
+ backgroundPositionX += 60;
//int iHeight=25;
graph.DrawImage(_backgroundBitmap, backgroundPositionX, backgroundPositionY, _backgroundBitmap.Width, _backgroundBitmap.Height);
@@ -122,7 +124,7 @@
float _width = _backgroundBitmap.Width + 60;
float fWidth = (float)(_backgroundBitmap.Width - _sliderBitmap.Width); //-20.0f;
- fPos = (float)_slider.Percentage;
+ fPos = (float)_percentage;
fPos /= 100.0f;
fPos *= fWidth;
fPos += backgroundPositionX;
@@ -145,6 +147,45 @@
_sliderBitmap.Dispose();
_sliderFocusBitmap.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ if (_slider.Percentage != _percentage) {
+ _percentage = _slider.Percentage;
+ result = true;
+ }
+ if (_slider.Focus != _focus) {
+ _focus = _slider.Focus;
+ result = true;
+ }
+ String newStrValue = getStringValue();
+ if (newStrValue != _strValue) {
+ _strValue = newStrValue;
+ result = true;
+ }
+ return result;
+ }
#endregion
+
+ #region private methods
+ private String getStringValue() {
+ String strValue = String.Empty;
+ switch (_slider.SpinType) {
+ // Float based slider
+ case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_FLOAT:
+ strValue = String.Format("{0}", _slider.FloatValue);
+ break;
+ // Integer based slider
+ case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_INT:
+ strValue = String.Format("{0}/{1}", _slider.IntValue, 100);
+ break;
+ }
+ return strValue;
+ }
+ #endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -56,6 +56,11 @@
/// Alignment of the message
/// </summary>
private GUIControl.Alignment _alignment;
+
+ /// <summary>
+ /// Label of the text scrollup element
+ /// </summary>
+ private String _label;
#endregion
#region ctor
@@ -63,7 +68,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public TextScrollUpElement(GUIControl control) {
+ public TextScrollUpElement(GUIControl control)
+ : base(control) {
_textScrollUp = control as GUITextScrollUpControl;
Type textScrollUpType = typeof(GUITextScrollUpControl);
FieldInfo fontNameFieldInfo = textScrollUpType.GetField("_fontName",
@@ -73,6 +79,7 @@
FieldInfo alignmentFieldInfo = textScrollUpType.GetField("_textAlignment",
BindingFlags.NonPublic | BindingFlags.Instance);
_alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_textScrollUp);
+ _label = _textScrollUp.Property;
Log.Debug("VideoPlayerOSD: Found textScrollUp element: " + _textScrollUp.GetID);
}
#endregion
@@ -84,8 +91,7 @@
/// <param name="graph">Graphics</param>
public override void DrawElement(Graphics graph) {
if (_textScrollUp.Visible) {
- String label = _textScrollUp.Property;
- SizeF textSize = graph.MeasureString(label, _font);
+ SizeF textSize = graph.MeasureString(_label, _font);
RectangleF rectangle;
if (_alignment == GUIControl.Alignment.ALIGN_LEFT) {
rectangle = new RectangleF((float)_textScrollUp.Location.X, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height);
@@ -94,7 +100,7 @@
} else {
rectangle = new RectangleF((float)_textScrollUp.Location.X - (textSize.Width / 2), (float)_textScrollUp.Location.Y - (textSize.Height / 2), _textScrollUp.Width, _textScrollUp.Height);
}
- graph.DrawString(GUIPropertyManager.Parse(label), _font, _brush, rectangle, StringFormat.GenericTypographic);
+ graph.DrawString(GUIPropertyManager.Parse(_label), _font, _brush, rectangle, StringFormat.GenericTypographic);
}
}
@@ -105,6 +111,20 @@
_font.Dispose();
_brush.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ String newLabel = GUIPropertyManager.Parse(_textScrollUp.Property);
+ if (!newLabel.Equals(_label)) {
+ _label = _textScrollUp.Property;
+ result = true;
+ }
+ return result;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -81,6 +81,21 @@
/// Disabled color
/// </summary>
private Color _disabledColor;
+
+ /// <summary>
+ /// Indicates, if the toogle button is focused
+ /// </summary>
+ private bool _focus;
+
+ /// <summary>
+ /// Indicates, if the toogle button is selected
+ /// </summary>
+ private bool _selected;
+
+ /// <summary>
+ /// Label of the toggle button
+ /// </summary>
+ private String _label;
#endregion
#region ctor
@@ -88,7 +103,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public ToggleButtonElement(GUIControl control) {
+ public ToggleButtonElement(GUIControl control)
+ : base(control) {
_button = control as GUIToggleButtonControl;
_font = getFont(_button.FontName);
Type buttonType = typeof(GUIToggleButtonControl);
@@ -109,6 +125,9 @@
_alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_button);
_textColor = GetColor(_button.TextColor);
_disabledColor = GetColor(_button.DisabledColor);
+ _focus = _button.Focus;
+ _selected = _button.Selected;
+ _label = _button.Label;
Log.Debug("VideoPlayerOSD: Found toggle button element: " + _button.GetID);
}
#endregion
@@ -160,8 +179,7 @@
}
Rectangle rectangle = new Rectangle(x, _button.YPosition + _button.TextOffsetY, labelWidth, _button.Height);
- String label = _button.Label;
- graph.DrawString(GUIPropertyManager.Parse(label), _font, brush, rectangle, StringFormat.GenericTypographic);
+ graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, rectangle, StringFormat.GenericTypographic);
brush.Dispose();
}
}
@@ -176,6 +194,28 @@
_altNoFocusBitmap.Dispose();
_font.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ String newLabel = GUIPropertyManager.Parse(_button.Label);
+ if (!newLabel.Equals(_label)) {
+ _label = newLabel;
+ result = true;
+ }
+ if (_button.Focus != _focus) {
+ _focus = _button.Focus;
+ result = true;
+ }
+ if (_button.Selected != _selected) {
+ _selected = _button.Selected;
+ result = true;
+ }
+ return result;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -39,21 +39,26 @@
/// GUIVerticalScrollbar
/// </summary>
private GUIVerticalScrollbar _verticalScrollBar;
-
+
/// <summary>
/// Background image of the scrollbar
/// </summary>
private Bitmap _scrollBarBackground;
-
+
/// <summary>
/// Top image of the scrollbar
/// </summary>
private Bitmap _scrollBarTop;
-
+
/// <summary>
/// Bottom image of the scrollbar
/// </summary>
private Bitmap _scrollBarBottom;
+
+ /// <summary>
+ /// Percentage
+ /// </summary>
+ private float _percentage;
#endregion
#region ctor
@@ -61,7 +66,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public VerticalScrollBarElement(GUIControl control) {
+ public VerticalScrollBarElement(GUIControl control)
+ : base(control) {
_verticalScrollBar = control as GUIVerticalScrollbar;
Type verticalScrollBarType = typeof(GUIVerticalScrollbar);
FieldInfo scrollBarBgFieldInfo = verticalScrollBarType.GetField("_scrollbarBackgroundName",
@@ -75,7 +81,7 @@
FieldInfo scrollBarBottomFieldInfo = verticalScrollBarType.GetField("_scrollbarBottomTextureName",
BindingFlags.NonPublic | BindingFlags.Instance);
_scrollBarBottom = loadBitmap(scrollBarBottomFieldInfo.GetValue(_verticalScrollBar).ToString()); ;
-
+ _percentage = _verticalScrollBar.Percentage;
Log.Debug("VideoPlayerOSD: Found vertical scroll bar element ");
}
#endregion
@@ -92,7 +98,7 @@
graph.DrawImage(_scrollBarBackground, _verticalScrollBar.XPosition, _verticalScrollBar.YPosition, _verticalScrollBar.Width, iHeight);
- float fPercent = (float)_verticalScrollBar.Percentage;
+ float fPercent = _percentage;
float fPosYOff = (fPercent / 100.0f);
int _startPositionY = _verticalScrollBar.YPosition;
@@ -120,6 +126,21 @@
_scrollBarTop.Dispose();
_scrollBarBottom.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ int oldPercentage = (int)_percentage;
+ int newPercentage = (int)_verticalScrollBar.Percentage;
+ if (oldPercentage != newPercentage) {
+ _percentage = _verticalScrollBar.Percentage;
+ result = true;
+ }
+ return result;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -51,6 +51,26 @@
/// Alignment of the volume bar
/// </summary>
private GUIControl.Alignment _alignment;
+
+ /// <summary>
+ /// Index of the first image
+ /// </summary>
+ private int _image1;
+
+ /// <summary>
+ /// Index of the second image
+ /// </summary>
+ private int _image2;
+
+ /// <summary>
+ /// Maximum value of the volume
+ /// </summary>
+ private int _maximum;
+
+ /// <summary>
+ /// Current value of the volume
+ /// </summary>
+ private int _current;
#endregion
#region ctor
@@ -58,7 +78,8 @@
/// Creates the element and retrieves all information from the control
/// </summary>
/// <param name="control">GUIControl</param>
- public VolumeBarElement(GUIControl control) {
+ public VolumeBarElement(GUIControl control)
+ : base(control) {
_volumeBar = control as GUIVolumeBar;
Type volumeBarType = typeof(GUIVolumeBar);
FieldInfo textureNameFieldInfo = volumeBarType.GetField("_textureName",
@@ -68,6 +89,10 @@
String textureFileName = textureNameFieldInfo.GetValue(_volumeBar).ToString();
_alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_volumeBar);
_bitmap = loadBitmap(textureFileName);
+ _image1 = _volumeBar.Image1;
+ _image2 = _volumeBar.Image2;
+ _maximum = _volumeBar.Maximum;
+ _current = _volumeBar.Current;
Log.Debug("VideoPlayerOSD: Found volume bar element: " + textureFileName);
}
#endregion
@@ -125,6 +150,31 @@
public override void Dispose() {
_bitmap.Dispose();
}
+
+ /// <summary>
+ /// Checks, if an update for the element is needed
+ /// </summary>
+ /// <returns>true, if an update is needed</returns>
+ protected override bool CheckElementSpecificForUpdate() {
+ bool result = false;
+ if (_volumeBar.Image1 != _image1) {
+ _image1 = _volumeBar.Image1;
+ result = true;
+ }
+ if (_volumeBar.Image2 != _image2) {
+ _image2 = _volumeBar.Image2;
+ result = true;
+ }
+ if (_volumeBar.Current != _current) {
+ _current = _volumeBar.Current;
+ result = true;
+ }
+ if (_volumeBar.Maximum!= _maximum) {
+ _maximum= _volumeBar.Maximum;
+ result = true;
+ }
+ return result;
+ }
#endregion
}
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -114,7 +114,7 @@
/// Indicates if the window is currently visible
/// </summary>
/// <returns>true, if window is visible; false otherwise</returns>
- public override bool IsWindowVisible() {
+ protected override bool CheckSpecificVisibility() {
return GUIWindowManager.ActiveWindow == _fullscreenWindow.GetID;
}
#endregion
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -26,6 +26,7 @@
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
+using System.Drawing.Text;
using System.Threading;
using MediaPortal.GUI.Library;
@@ -100,6 +101,11 @@
/// Indicates, if the init label should be displayed
/// </summary>
private bool _showInit;
+
+ /// <summary>
+ /// Indicates, if an update is needed
+ /// </summary>
+ private bool _needUpdate;
#endregion
#region ctor
@@ -140,39 +146,43 @@
/// Performs an update on the osd, should be called from the process method of the player
/// </summary>
public void UpdateGUI() {
- Bitmap image = new Bitmap(_osdForm.Width, _osdForm.Height);
- Graphics graph = Graphics.FromImage(image);
- if (GUIGraphicsContext.Fullscreen) {
- graph.FillRectangle(new SolidBrush(Color.FromArgb(0, 0, 0)), new Rectangle(0, 0, _osdForm.Width, _osdForm.Height));
+ bool update = _needUpdate | _videoOSDWindow.CheckForUpdate() | _dialogWindow.CheckForUpdate() | _fullscreenWindow.CheckForUpdate();
+ if(_needUpdate){
+ _needUpdate=false;
+ }else{
+ if (_showAdditionalOSD) {
+ TimeSpan ts = DateTime.Now - _lastUpdate;
+ if (ts.Seconds >= 3){
+ _showAdditionalOSD = false;
+ update = true;
+ }
+ }
}
- graph.SmoothingMode = SmoothingMode.AntiAlias;
- if (_showAdditionalOSD) {
- TimeSpan ts = DateTime.Now - _lastUpdate;
- if (ts.Seconds < 3) {
- _fullscreenWindow.DrawAlternativeOSD(graph, _label, _strikeOut);
- } else {
- _showAdditionalOSD = false;
+ if (update) {
+ Bitmap image = new Bitmap(_osdForm.Width, _osdForm.Height);
+ Graphics graph = Graphics.FromImage(image);
+ if (GUIGraphicsContext.Fullscreen) {
+ graph.FillRectangle(new SolidBrush(Color.FromArgb(0, 0, 0)), new Rectangle(0,0,_osdForm.Size.Width,_osdForm.Size.Height));
}
- }
- if (_showInit) {
- _fullscreenWindow.DrawAlternativeOSD(graph, _label, false);
- }
- if (_showCacheStatus) {
- _fullscreenWindow.DrawCacheStatus(graph, _cacheFill);
- }
- if (_fullscreenWindow.IsWindowVisible()) {
+ graph.TextRenderingHint = TextRenderingHint.AntiAlias;
+ graph.SmoothingMode = SmoothingMode.AntiAlias;
+ if (_showAdditionalOSD) {
+ _fullscreenWindow.DrawAlternativeOSD(graph, _label, _strikeOut);
+ }
+ if (_showInit) {
+ _fullscreenWindow.DrawAlternativeOSD(graph, _label, false);
+ }
+ if (_showCacheStatus) {
+ _fullscreenWindow.DrawCacheStatus(graph, _cacheFill);
+ }
_fullscreenWindow.DrawWindow(graph);
- }
- if (_videoOSDWindow.IsWindowVisible()) {
_videoOSDWindow.DrawWindow(graph);
- }
- if (_dialogWindow.IsWindowVisible()) {
_dialogWindow.DrawWindow(graph);
+ _osdForm.Image = image;
+ _osdForm.Refresh();
+ _osdForm2.Image = image;
+ _osdForm2.Refresh();
}
- _osdForm.Image = image;
- _osdForm.Refresh();
- _osdForm2.Image = image;
- _osdForm2.Refresh();
}
/// <summary>
@@ -188,7 +198,7 @@
/// </summary>
/// <returns></returns>
public bool IsOSDVisible() {
- return _videoOSDWindow.IsWindowVisible();
+ return _videoOSDWindow.CheckVisibility();
}
/// <summary>
@@ -202,6 +212,7 @@
_lastUpdate = DateTime.Now;
_showAdditionalOSD = true;
_showCacheStatus = false;
+ _needUpdate = true;
}
/// <summary>
@@ -212,6 +223,7 @@
_cacheFill = cacheFill;
_showAdditionalOSD = false;
_showCacheStatus = true;
+ _needUpdate = true;
}
/// <summary>
@@ -219,6 +231,7 @@
/// </summary>
public void HideCacheStatus() {
_showCacheStatus = false;
+ _needUpdate = true;
}
/// <summary>
@@ -230,6 +243,7 @@
_showInit = true;
_showCacheStatus = false;
_showAdditionalOSD = false;
+ _needUpdate = true;
}
/// <summary>
@@ -237,6 +251,7 @@
/// </summary>
public void HideInit() {
_showInit = false;
+ _needUpdate = true;
}
#endregion
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -73,6 +73,7 @@
this.Opacity = 1;
this.GotFocus += new EventHandler(OSDForm_GotFocus);
_parent.LocationChanged += _posLocChanged;
+ _parent.ClientSizeChanged += _posLocChanged;
_parent.SizeChanged += _posLocChanged;
}
#endregion
@@ -105,6 +106,7 @@
private void parent_PositionSizeChanged(Object sender, EventArgs args) {
this.Location = _parent.PointToScreen(new Point(0, 0));
this.Size = _parent.ClientSize;
+ this.BringToFront();
}
#endregion
@@ -117,8 +119,6 @@
try {
_parent.LocationChanged -= _posLocChanged;
_parent.SizeChanged -= _posLocChanged;
- this.BringToFront();
- this.Refresh();
} catch (Exception ex) {
Log.Error(ex);
}
@@ -149,8 +149,8 @@
public void ShowForm() {
this.Enabled = true;
this.Show(_parent);
+ parent_PositionSizeChanged(null, null);
this.BringToFront();
- parent_PositionSizeChanged(null, null);
_parent.Focus();
this.Enabled = false;
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -59,7 +59,7 @@
/// Indicates if the window is currently visible
/// </summary>
/// <returns>true, if window is visible; false otherwise</returns>
- public override bool IsWindowVisible() {
+ protected override bool CheckSpecificVisibility() {
return GUIWindowManager.VisibleOsd == GUIWindow.Window.WINDOW_OSD;
}
#endregion
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs 2007-10-05 16:35:46 UTC (rev 978)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs 2007-10-06 22:11:51 UTC (rev 979)
@@ -451,16 +451,20 @@
/// Adss the video window to the mediaportal form
/// </summary>
public void AddVideoWindowToForm() {
+ GUIGraphicsContext.form.SuspendLayout();
GUIGraphicsContext.form.Controls.Add(_mplayerBackgroundPanel);
GUIGraphicsContext.form.Controls.Add(_mplayerOuterPanel);
+ GUIGraphicsContext.form.ResumeLayout();
}
/// <summary>
/// Removes the video window from the mediaportal form
/// </summary>
public void RemoveVideoWindowToForm() {
+ GUIGraphicsContext.form.SuspendLayout();
GUIGraphicsContext.form.Controls.Remove(_mplayerBackgroundPanel);
GUIGraphicsContext.form.Controls.Remove(_mplayerOuterPanel);
+ GUIGraphicsContext.form.ResumeLayout();
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-10-13 22:45:00
|
Revision: 998
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=998&view=rev
Author: misterd_sf
Date: 2007-10-13 15:44:58 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
Fixed a typo
Fixed osd libary - Not working after resize
Fixed Dispose of osd library
Modified Paths:
--------------
trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
trunk/plugins/My MPlayer/My MPlayer.xmp
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -49,18 +49,22 @@
/// Indicates, if the visibility of the window has changed
/// </summary>
protected bool _visibleChanged;
+
+ /// <summary>
+ /// List of all elements of the window
+ /// </summary>
+ protected UIElementCollection _controlList;
#endregion
#region protected methods
/// <summary>
/// Generates the elements of a window, which are stored in the UIElementCollection
/// </summary>
- /// <param name="collection">Collection of all GUIControls</param>
- protected void GenerateElements(UIElementCollection collection) {
+ protected void GenerateElements() {
_elementList = new List<BaseElement>();
GUIControl temp;
BaseElement element;
- foreach (UIElement uiElement in collection) {
+ foreach (UIElement uiElement in _controlList) {
temp = uiElement as GUIControl;
if (temp != null) {
element = GenerateElement(temp);
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -50,8 +50,8 @@
/// </summary>
public DialogWindow() {
_dialogWindow = GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU) as GUIDialogMenu;
- UIElementCollection collection = _dialogWindow.controlList;
- GenerateElements(collection);
+ _controlList = _dialogWindow.controlList;
+ GenerateElements();
}
#endregion
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -155,7 +155,10 @@
public bool CheckForUpdate() {
bool newVisible = _control.Visible;
if (newVisible == _wasVisible) {
- return CheckElementSpecificForUpdate();
+ if (newVisible) {
+ return CheckElementSpecificForUpdate();
+ }
+ return false;
}
_wasVisible = newVisible;
if (newVisible) {
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -193,9 +193,15 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _focusBitmap.Dispose();
- _noFocusBitmap.Dispose();
- _hoverBitmap.Dispose();
+ if (_focusBitmap != null) {
+ _focusBitmap.Dispose();
+ }
+ if (_noFocusBitmap != null) {
+ _noFocusBitmap.Dispose();
+ }
+ if (_hoverBitmap != null) {
+ _hoverBitmap.Dispose();
+ }
_font.Dispose();
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -180,8 +180,12 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _checkFocusBitmap.Dispose();
- _checkNoFocusBitmap.Dispose();
+ if (_checkFocusBitmap != null) {
+ _checkFocusBitmap.Dispose();
+ }
+ if (_checkNoFocusBitmap != null) {
+ _checkNoFocusBitmap.Dispose();
+ }
}
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -66,8 +66,11 @@
/// </summary>
/// <param name="graph">Graphics</param>
public override void DrawElement(Graphics graph) {
- if (_image.Visible &&!_image.FileName.Equals("black.bmp")) {
- DrawElementAlternative(graph,GetImageRectangle());
+ if (_image.Visible && !_image.FileName.Equals("black.bmp")) {
+ if (_image.FileName.Equals("video+2x.png")) {
+ Log.Debug("DISPLAYING 2X");
+ }
+ DrawElementAlternative(graph, GetImageRectangle());
}
}
@@ -75,7 +78,9 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _bitmap.Dispose();
+ if (_bitmap != null) {
+ _bitmap.Dispose();
+ }
}
/// <summary>
@@ -102,7 +107,7 @@
/// </summary>
/// <param name="graph">Graphics</param>
/// <param name="rectangle">Rectangle of the image</param>
- public void DrawElementAlternative(Graphics graph,RectangleF rectangle) {
+ public void DrawElementAlternative(Graphics graph, RectangleF rectangle) {
if (_bitmap != null) {
graph.DrawImage(_bitmap, rectangle);
}
@@ -116,7 +121,7 @@
/// <param name="graph">Graphics</param>
/// <param name="cacheFill">Status of the cache</param>
public override void DrawCacheStatus(Graphics graph, float cacheFill) {
- DrawElementAlternative(graph,GetImageRectangle());
+ DrawElementAlternative(graph, GetImageRectangle());
}
#endregion
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -124,8 +124,12 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _imageFocus.Dispose();
- _imageNonFocus.Dispose();
+ if (_imageFocus != null) {
+ _imageFocus.Dispose();
+ }
+ if (_imageNonFocus != null) {
+ _imageNonFocus.Dispose();
+ }
}
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -99,10 +99,18 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _leftBitmap.Dispose();
- _midBitmap.Dispose();
- _rightBitmap.Dispose();
- _backgroundBitmap.Dispose();
+ if (_leftBitmap != null) {
+ _leftBitmap.Dispose();
+ }
+ if (_midBitmap != null) {
+ _midBitmap.Dispose();
+ }
+ if (_rightBitmap != null) {
+ _rightBitmap.Dispose();
+ }
+ if (_backgroundBitmap != null) {
+ _backgroundBitmap.Dispose();
+ }
}
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -143,9 +143,15 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _backgroundBitmap.Dispose();
- _sliderBitmap.Dispose();
- _sliderFocusBitmap.Dispose();
+ if (_backgroundBitmap != null) {
+ _backgroundBitmap.Dispose();
+ }
+ if (_sliderBitmap != null) {
+ _sliderBitmap.Dispose();
+ }
+ if (_sliderFocusBitmap != null) {
+ _sliderFocusBitmap.Dispose();
+ }
}
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -188,10 +188,18 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _focusBitmap.Dispose();
- _noFocusBitmap.Dispose();
- _altFocusBitmap.Dispose();
- _altNoFocusBitmap.Dispose();
+ if (_focusBitmap != null) {
+ _focusBitmap.Dispose();
+ }
+ if (_noFocusBitmap != null) {
+ _noFocusBitmap.Dispose();
+ }
+ if (_altFocusBitmap != null) {
+ _altFocusBitmap.Dispose();
+ }
+ if (_altNoFocusBitmap != null) {
+ _altNoFocusBitmap.Dispose();
+ }
_font.Dispose();
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -122,9 +122,15 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _scrollBarBackground.Dispose();
- _scrollBarTop.Dispose();
- _scrollBarBottom.Dispose();
+ if (_scrollBarBackground != null) {
+ _scrollBarBackground.Dispose();
+ }
+ if (_scrollBarTop != null) {
+ _scrollBarTop.Dispose();
+ }
+ if (_scrollBarBottom != null) {
+ _scrollBarBottom.Dispose();
+ }
}
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -148,7 +148,9 @@
/// Disposes the object
/// </summary>
public override void Dispose() {
- _bitmap.Dispose();
+ if (_bitmap != null) {
+ _bitmap.Dispose();
+ }
}
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -90,11 +90,11 @@
/// </summary>
public FullscreenWindow() {
_fullscreenWindow = GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO) as GUIVideoFullscreen;
- UIElementCollection collection = _fullscreenWindow.controlList;
- GenerateElements(collection);
+ _controlList = _fullscreenWindow.controlList;
+ GenerateElements();
GUIControl temp;
_cacheElements = new List<BaseElement>();
- foreach (UIElement element in collection) {
+ foreach (UIElement element in _controlList) {
temp = element as GUIControl;
if (temp.GetID == LABEL_ID) {
_label = new LabelElement(temp);
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -28,7 +28,9 @@
using System.Drawing.Drawing2D;
using System.Drawing.Text;
using System.Threading;
+using System.Windows.Forms;
using MediaPortal.GUI.Library;
+using MediaPortal.Player;
namespace ExternalOSDLibrary {
@@ -106,6 +108,21 @@
/// Indicates, if an update is needed
/// </summary>
private bool _needUpdate;
+
+ /// <summary>
+ /// Event handler for the size changed event
+ /// </summary>
+ private EventHandler _sizeChanged;
+
+ /// <summary>
+ /// MP parent form
+ /// </summary>
+ private Form _parentForm;
+
+ /// <summary>
+ /// Indicates if MP is minimized
+ /// </summary>
+ private bool _minimized;
#endregion
#region ctor
@@ -129,6 +146,10 @@
_dialogWindow = new DialogWindow();
_osdForm = new OSDForm();
_osdForm2 = new OSDForm();
+ _parentForm = GUIGraphicsContext.form;
+ _sizeChanged = new EventHandler(parent_SizeChanged);
+ _parentForm.SizeChanged += _sizeChanged;
+ _minimized = false;
}
#endregion
@@ -255,6 +276,27 @@
}
#endregion
+ #region private methods
+ /// <summary>
+ /// Event handler to adjust this form to the new location/size of the parent
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="args"></param>
+ private void parent_SizeChanged(Object sender, EventArgs args) {
+ if (_parentForm.WindowState == FormWindowState.Minimized) {
+ Log.Debug("MINIMIZING");
+ _minimized = true;
+ return;
+ }
+ if (!_minimized ) {
+ Log.Debug("NOT MINIMIZED. DIPOSING");
+ singleton.Dispose();
+ }
+ Log.Debug("RESET MINIMIZED");
+ _minimized = false;
+ }
+ #endregion
+
#region IDisposable Member
/// <summary>
/// Disposes the osd controller
@@ -265,6 +307,7 @@
_videoOSDWindow.Dispose();
_osdForm.Dispose();
_osdForm2.Dispose();
+ _parentForm.SizeChanged -= _sizeChanged;
singleton = null;
}
#endregion
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -39,13 +39,15 @@
public class OSDForm : Form {
#region variables
/// <summary>
- /// Event handler for the position/location changed event
+ /// Event handler for the position changed event
/// </summary>
- private EventHandler _posLocChanged;
+ private EventHandler _positionChanged;
+
/// <summary>
/// Parent form (MP)
/// </summary>
private Form _parent;
+
/// <summary>
/// Image to be displayed
/// </summary>
@@ -58,7 +60,7 @@
/// </summary>
public OSDForm() {
this.SuspendLayout();
- _posLocChanged = new EventHandler(parent_PositionSizeChanged);
+ _positionChanged = new EventHandler(parent_PositionChanged);
_parent = GUIGraphicsContext.form;
this.BackColor = System.Drawing.Color.FromArgb(1, 1, 1);
this.TransparencyKey = this.BackColor;
@@ -72,9 +74,7 @@
this.ResumeLayout();
this.Opacity = 1;
this.GotFocus += new EventHandler(OSDForm_GotFocus);
- _parent.LocationChanged += _posLocChanged;
- _parent.ClientSizeChanged += _posLocChanged;
- _parent.SizeChanged += _posLocChanged;
+ _parent.LocationChanged += _positionChanged;
}
#endregion
@@ -103,7 +103,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="args"></param>
- private void parent_PositionSizeChanged(Object sender, EventArgs args) {
+ private void parent_PositionChanged(Object sender, EventArgs args) {
this.Location = _parent.PointToScreen(new Point(0, 0));
this.Size = _parent.ClientSize;
this.BringToFront();
@@ -117,8 +117,8 @@
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) {
try {
- _parent.LocationChanged -= _posLocChanged;
- _parent.SizeChanged -= _posLocChanged;
+ _parent.LocationChanged -= _positionChanged;
+ _parent.SizeChanged -= _positionChanged;
} catch (Exception ex) {
Log.Error(ex);
}
@@ -149,7 +149,7 @@
public void ShowForm() {
this.Enabled = true;
this.Show(_parent);
- parent_PositionSizeChanged(null, null);
+ parent_PositionChanged(null, null);
this.BringToFront();
_parent.Focus();
this.Enabled = false;
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -50,7 +50,8 @@
/// </summary>
public VideoOSDWindow() {
_osdWindow = GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_OSD) as GUIVideoOSD;
- GenerateElements(_osdWindow.controlList);
+ _controlList = _osdWindow.controlList;
+ GenerateElements();
}
#endregion
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -607,6 +607,9 @@
_seekStepTimeout = 1500;
else
_seekStepTimeout = Convert.ToInt16(timeout);
+
+ String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English");
+ LocalizeStrings.Load(m_strLanguage);
}
try {
loadXMLData();
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx 2007-10-13 22:44:58 UTC (rev 998)
@@ -123,8 +123,8 @@
<data name="actionInfoLabel.Text" xml:space="preserve">
<value>For controlling the audio delay during playback. You have to assign the following
actions of video fullscreen window (id=2005) to a key and/or a remote key:
-- ACTION_AUDIO_DELAY_PLUS: Increases the subtitle delay
-- ACTION_AUDIO_DELAY_MINUS: Decreases the subtitle delay
+- ACTION_AUDIO_DELAY_PLUS: Increases the audio delay
+- ACTION_AUDIO_DELAY_MINUS: Decreases the audio delay
</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -107,6 +107,7 @@
/// </summary>
public MPlayer_ExtPlayer() {
_configManager = ConfigurationManager.getInstance();
+
}
#endregion
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-10-13 22:44:58 UTC (rev 998)
@@ -177,6 +177,8 @@
displayName = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer");
useMyVideoShares = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true);
useMyMusicShares = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true);
+ String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English");
+ LocalizeStrings.Load(m_strLanguage);
}
}
#endregion
Modified: trunk/plugins/My MPlayer/My MPlayer.xmp
===================================================================
--- trunk/plugins/My MPlayer/My MPlayer.xmp 2007-10-13 07:17:48 UTC (rev 997)
+++ trunk/plugins/My MPlayer/My MPlayer.xmp 2007-10-13 22:44:58 UTC (rev 998)
@@ -8,7 +8,7 @@
<Source>ExternalOSDLibrary\bin\Release\ExternalOSDLibrary.dll</Source>
<Id>04010</Id>
<Option />
- <Guid>208539bd-cb3d-4403-936b-cc2ac5f9086b</Guid>
+ <Guid>6795e0e2-9a33-490e-abbd-d4b2ad280480</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.dll</FileName>
@@ -17,7 +17,7 @@
<Source>MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll</Source>
<Id>01050</Id>
<Option />
- <Guid>129d0b43-6858-40ec-89ca-533818efa0cc</Guid>
+ <Guid>5dc5bf23-4fa7-4f7a-b6f0-4b8710d568d6</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.xml</FileName>
@@ -26,7 +26,7 @@
<Source>MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>e8372d2f-64ea-44ac-9a08-02c357a3fcca</Guid>
+ <Guid>7ee7969e-9050-42e7-a303-8095710a44b8</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.dll</FileName>
@@ -35,7 +35,7 @@
<Source>MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll</Source>
<Id>01010</Id>
<Option />
- <Guid>d35cb71e-87ba-4840-b18a-d8fc57f6830d</Guid>
+ <Guid>245d5e37-1414-4fb2-817a-13231dd16f36</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.xml</FileName>
@@ -44,7 +44,7 @@
<Source>MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>a9bc8f02-b1d8-4aca-a9f9-0eb3875e05be</Guid>
+ <Guid>6dcc5696-13fe-4e2a-a758-49bbef2884bc</Guid>
</File>
<File>
<FileName>MPlayer_Installer.dll</FileName>
@@ -62,7 +62,7 @@
<Source>z:\Source-MediaPortal\MP-Plugins\My MPlayer\MPlayer-License.txt</Source>
<Id>03010</Id>
<Option />
- <Guid>63740cb8-9f67-4d7e-b4ca-4b95779a8539</Guid>
+ <Guid>924a2496-d3a2-4a81-b833-12d5a3949b5c</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -71,7 +71,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml</Source>
<Id>02010</Id>
<Option>OutputFileName=|DefaultFile=True|</Option>
- <Guid>526a6e68-e375-4d75-9d1c-47e6728b12db</Guid>
+ <Guid>5a0d8c57-11ce-4b3d-9db1-714737cc2430</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -80,7 +80,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>40d8ee5d-6ad2-4fa0-b51b-aff4990060d2</Guid>
+ <Guid>714afd17-fa2b-48fa-8b66-77c0bd763bae</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -89,7 +89,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>ef453824-7cd5-4df6-823f-3bd53b6c0d77</Guid>
+ <Guid>22050ce2-3ad7-435a-9571-060e2e6fb70e</Guid>
</File>
<File>
<FileName>strings_de.xml</FileName>
@@ -98,7 +98,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_de.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>5f064f77-ceb3-481d-8345-b1efcf57763a</Guid>
+ <Guid>d306c631-541e-4715-b038-3386d45c93fe</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -107,7 +107,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_en.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>4c978042-6d29-4466-ae50-b8a7a3b491c6</Guid>
+ <Guid>ad78ebba-3a89-4f30-8ff5-19cd4e6a3a0d</Guid>
</File>
<File>
<FileName>strings_es.xml</FileName>
@@ -116,7 +116,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_es.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>1fbbcd8a-2046-477a-ac65-4ff5148fe942</Guid>
+ <Guid>c0b77982-fb75-4b1e-97f2-a9aaa916d3e4</Guid>
</File>
<File>
<FileName>strings_fr.xml</FileName>
@@ -125,7 +125,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_fr.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>687d49d5-d1cb-43b9-b347-910666909884</Guid>
+ <Guid>c05f5fe3-df29-4868-a2e4-5272181c03e8</Guid>
</File>
</FileList>
<StringList />
@@ -143,7 +143,7 @@
With the window plugin the user can play more medias like rtsp streams etc. than with the standard plugins of MP. It always uses MPlayer even if normally the internal players or an other external player is used by the other Plugins.
-This version also includes a new OSD, which is simulates the OSD of MP.</Description>
+This version also includes a new OSD, which simulates the OSD of MP.</Description>
<Group>Video/Movies</Group>
<Release>Stable </Release>
</Option>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-10-15 20:29:05
|
Revision: 1001
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1001&view=rev
Author: misterd_sf
Date: 2007-10-15 13:28:59 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Added blank screen option to osd library. It seems that it is needed on XP, but on Vista it must be deactivated.
Modified Paths:
--------------
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-15 13:10:06 UTC (rev 1000)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-15 20:28:59 UTC (rev 1001)
@@ -31,6 +31,7 @@
using System.Windows.Forms;
using MediaPortal.GUI.Library;
using MediaPortal.Player;
+using MediaPortal.Configuration;
namespace ExternalOSDLibrary {
@@ -123,6 +124,11 @@
/// Indicates if MP is minimized
/// </summary>
private bool _minimized;
+
+ /// <summary>
+ /// Indicates if the screen should be blanked in fullscreen
+ /// </summary>
+ private bool _blankScreen;
#endregion
#region ctor
@@ -150,6 +156,9 @@
_sizeChanged = new EventHandler(parent_SizeChanged);
_parentForm.SizeChanged += _sizeChanged;
_minimized = false;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
+ _blankScreen = xmlreader.GetValueAsBool("externalOSDLibrary", "blankScreen", true);
+ }
}
#endregion
@@ -182,7 +191,7 @@
if (update) {
Bitmap image = new Bitmap(_osdForm.Width, _osdForm.Height);
Graphics graph = Graphics.FromImage(image);
- if (GUIGraphicsContext.Fullscreen) {
+ if (_blankScreen && GUIGraphicsContext.Fullscreen) {
graph.FillRectangle(new SolidBrush(Color.FromArgb(0, 0, 0)), new Rectangle(0,0,_osdForm.Size.Width,_osdForm.Size.Height));
}
graph.TextRenderingHint = TextRenderingHint.AntiAlias;
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-10-15 13:10:06 UTC (rev 1000)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-10-15 20:28:59 UTC (rev 1001)
@@ -62,6 +62,9 @@
this.optionalArguments = new System.Windows.Forms.TextBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.externalLibGroup = new System.Windows.Forms.GroupBox();
+ this.externalOSDLibraryBlank = new System.Windows.Forms.CheckBox();
+ this.externalLibGroup.SuspendLayout();
this.SuspendLayout();
//
// label35
@@ -182,11 +185,35 @@
this.openFileDialog1.FileName = "openFileDialog1";
this.openFileDialog1.Title = "Select MPlayer:";
//
+ // externalLibGroup
+ //
+ this.externalLibGroup.Controls.Add(this.externalOSDLibraryBlank);
+ this.externalLibGroup.Location = new System.Drawing.Point(9, 202);
+ this.externalLibGroup.Name = "externalLibGroup";
+ this.externalLibGroup.Size = new System.Drawing.Size(380, 105);
+ this.externalLibGroup.TabIndex = 77;
+ this.externalLibGroup.TabStop = false;
+ this.externalLibGroup.Text = "External OSD Library";
+ //
+ // externalOSDLibraryBlank
+ //
+ this.externalOSDLibraryBlank.AutoSize = true;
+ this.externalOSDLibraryBlank.Checked = true;
+ this.externalOSDLibraryBlank.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.externalOSDLibraryBlank.Location = new System.Drawing.Point(6, 31);
+ this.externalOSDLibraryBlank.Name = "externalOSDLibraryBlank";
+ this.externalOSDLibraryBlank.Size = new System.Drawing.Size(345, 30);
+ this.externalOSDLibraryBlank.TabIndex = 0;
+ this.externalOSDLibraryBlank.Text = "Blank screen in fullscreen\r\n(If you see black screen in fullscreen, you should tu" +
+ "rn this option off)";
+ this.externalOSDLibraryBlank.UseVisualStyleBackColor = true;
+ //
// GeneralSection
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Transparent;
+ this.Controls.Add(this.externalLibGroup);
this.Controls.Add(this.label35);
this.Controls.Add(this.osdSelect);
this.Controls.Add(this.label30);
@@ -200,6 +227,8 @@
this.Controls.Add(this.optionalArguments);
this.Name = "GeneralSection";
this.Size = new System.Drawing.Size(403, 405);
+ this.externalLibGroup.ResumeLayout(false);
+ this.externalLibGroup.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -220,5 +249,7 @@
private System.Windows.Forms.TextBox optionalArguments;
private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
+ private System.Windows.Forms.GroupBox externalLibGroup;
+ private System.Windows.Forms.CheckBox externalOSDLibraryBlank;
}
}
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs 2007-10-15 13:10:06 UTC (rev 1000)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs 2007-10-15 20:28:59 UTC (rev 1001)
@@ -63,6 +63,7 @@
cacheSize.Text = String.Empty;
}
mplayerPath.Text = xmlreader.GetValueAsString("mplayer", "mplayerPath", "C:\\Program Files\\MPlayer\\MPlayer.exe");
+ externalOSDLibraryBlank.Checked = xmlreader.GetValueAsBool("externalOSDLibrary", "blankScreen", true);
}
}
@@ -81,6 +82,7 @@
xmlWriter.SetValue("mplayer", "cacheSize", cacheSize.Text);
}
xmlWriter.SetValue("mplayer", "mplayerPath", mplayerPath.Text);
+ xmlWriter.SetValueAsBool("externalOSDLibrary", "blankScreen", externalOSDLibraryBlank.Checked);
}
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-11-19 17:43:32
|
Revision: 1077
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1077&view=rev
Author: misterd_sf
Date: 2007-11-19 09:42:47 -0800 (Mon, 19 Nov 2007)
Log Message:
-----------
Removed Reflection from external osd library, since it isn't needed anymore. thx rtv for adding the needed properties to MP.
Modified Paths:
--------------
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
trunk/plugins/My MPlayer/My MPlayer.xmp
Added Paths:
-----------
trunk/plugins/My MPlayer/My MPlayer-License.txt
Removed Paths:
-------------
trunk/plugins/My MPlayer/MPlayer-License.txt
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -26,7 +26,6 @@
using System.Collections.Generic;
using System.Drawing;
using System.IO;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -115,11 +114,7 @@
/// <returns>Font </returns>
protected Font getFont(String name) {
GUIFont guiFont = GUIFontManager.GetFont(name);
- Type guiFontType = typeof(GUIFont);
- FieldInfo styleFieldInfo = guiFontType.GetField("_fontStyle",
- BindingFlags.NonPublic | BindingFlags.Instance);
- FontStyle style = (FontStyle)styleFieldInfo.GetValue(guiFont);
- return new Font(guiFont.FileName, guiFont.FontSize, style);
+ return new Font(guiFont.FileName, guiFont.FontSize, guiFont.FontStyle);
}
/// <summary>
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -27,7 +27,6 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -78,26 +77,6 @@
private Color _disabledColor;
/// <summary>
- /// X-coordinate of the hover image
- /// </summary>
- private int _hoverX;
-
- /// <summary>
- /// Y-coordinate of the hover image
- /// </summary>
- private int _hoverY;
-
- /// <summary>
- /// Width of the hover image
- /// </summary>
- private int _hoverWidth;
-
- /// <summary>
- /// Height of the hover image
- /// </summary>
- private int _hoverHeight;
-
- /// <summary>
/// Indicates, if the button is focused
/// </summary>
private bool _focus;
@@ -119,27 +98,10 @@
_font = getFont(_button.FontName);
_focusBitmap = loadBitmap(_button.TexutureFocusName);
_noFocusBitmap = loadBitmap(_button.TexutureNoFocusName);
- Type buttonType = typeof(GUIButtonControl);
- FieldInfo hoverFileNameFieldInfo = buttonType.GetField("_hoverFilename",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _hoverBitmap = loadBitmap(hoverFileNameFieldInfo.GetValue(_button).ToString());
+ _hoverBitmap = loadBitmap(_button.HoverFilename);
_textColor = GetColor(_button.TextColor);
- FieldInfo textColorNoFocusFieldInfo = buttonType.GetField("_textColorNoFocus",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _textColorNoFocus = GetColor(long.Parse(textColorNoFocusFieldInfo.GetValue(_button).ToString()));
+ _textColorNoFocus = GetColor(_button.TextColorNoFocus);
_disabledColor = GetColor(_button.DisabledColor);
- FieldInfo hoverXFieldInfo = buttonType.GetField("_hoverX",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _hoverX = Int32.Parse(hoverXFieldInfo.GetValue(_button).ToString());
- FieldInfo hoverYFieldInfo = buttonType.GetField("_hoverY",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _hoverY = Int32.Parse(hoverYFieldInfo.GetValue(_button).ToString());
- FieldInfo hoverWidthFieldInfo = buttonType.GetField("_hoverWidth",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _hoverWidth = Int32.Parse(hoverWidthFieldInfo.GetValue(_button).ToString());
- FieldInfo hoverHeightFieldInfo = buttonType.GetField("_hoverHeight",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _hoverHeight = Int32.Parse(hoverHeightFieldInfo.GetValue(_button).ToString());
_label = _button.Label;
_focus = _button.Focus;
Log.Debug("VideoPlayerOSD: Found button element: " + _button.GetID);
@@ -158,7 +120,7 @@
graph.DrawImage(_focusBitmap, (float)_button.Location.X, (float)_button.Location.Y, (float)_button.Size.Width, (float)_button.Size.Height);
}
if (_hoverBitmap != null) {
- graph.DrawImage(_hoverBitmap, _hoverX, _hoverY, _hoverWidth, _hoverHeight);
+ graph.DrawImage(_hoverBitmap, _button.HoverX, _button.HoverY, _button.HoverWidth, _button.HoverHeight);
}
} else {
if (_noFocusBitmap != null) {
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -27,7 +27,6 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -53,16 +52,6 @@
private Bitmap _checkNoFocusBitmap;
/// <summary>
- /// Width of the checkMark
- /// </summary>
- private int _checkMarkWidth;
-
- /// <summary>
- /// Height of the checkMark
- /// </summary>
- private int _checkMarkHeight;
-
- /// <summary>
/// Font
/// </summary>
private Font _font;
@@ -106,19 +95,8 @@
public CheckMarkElement(GUIControl control)
: base(control) {
_checkMark = control as GUICheckMarkControl;
- Type buttonType = typeof(GUICheckMarkControl);
- FieldInfo checkFocusFieldInfo = buttonType.GetField("_checkMarkFocusTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _checkFocusBitmap = loadBitmap(checkFocusFieldInfo.GetValue(_checkMark).ToString());
- FieldInfo checkNoFocusFieldInfo = buttonType.GetField("_checkMarkNoFocusTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _checkNoFocusBitmap = loadBitmap(checkNoFocusFieldInfo.GetValue(_checkMark).ToString());
- FieldInfo checkMarkWidthFieldInfo = buttonType.GetField("_checkMarkWidth",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _checkMarkWidth = Int32.Parse(checkMarkWidthFieldInfo.GetValue(_checkMark).ToString());
- FieldInfo checkMarkHeightFieldInfo = buttonType.GetField("_checkMarkHeight",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _checkMarkHeight = Int32.Parse(checkMarkHeightFieldInfo.GetValue(_checkMark).ToString());
+ _checkFocusBitmap = loadBitmap(_checkMark.CheckMarkTextureName);
+ _checkNoFocusBitmap = loadBitmap(_checkMark.CheckMarkTextureNameNF);
_font = getFont(_checkMark.FontName);
_disabledColor = GetColor(_checkMark.DisabledColor);
_textColor = GetColor(_checkMark.TextColor);
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -25,7 +25,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -355,11 +354,6 @@
private GUIListControl _list;
/// <summary>
- /// Items per page
- /// </summary>
- private int _itemsPerPage;
-
- /// <summary>
/// Offset
/// </summary>
private int _offset;
@@ -370,21 +364,6 @@
private int _cursorX;
/// <summary>
- /// DrawFocus
- /// </summary>
- private bool _drawFocus;
-
- /// <summary>
- /// ListType
- /// </summary>
- private GUIListControl.ListType _listType;
-
- /// <summary>
- /// Alignment of the elements
- /// </summary>
- private GUIControl.Alignment _alignment;
-
- /// <summary>
/// List of the buttons
/// </summary>
private List<ListButtonElement> _listButtons;
@@ -415,36 +394,6 @@
private Dictionary<String, Bitmap> _cachedBitmaps;
/// <summary>
- /// Reflection field info for listItems
- /// </summary>
- private FieldInfo _listItemsFieldInfo;
-
- /// <summary>
- /// Reflection field info for the offset
- /// </summary>
- private FieldInfo _offsetFieldInfo;
-
- /// <summary>
- /// Reflection field info for the cursor position
- /// </summary>
- private FieldInfo _cursorXFieldInfo;
-
- /// <summary>
- /// Played Color
- /// </summary>
- private long _playedColor;
-
- /// <summary>
- /// Remote Color
- /// </summary>
- private long _remoteColor;
-
- /// <summary>
- /// Download Color
- /// </summary>
- private long _downloadColor;
-
- /// <summary>
/// Text line
/// </summary>
private String _textLine;
@@ -468,61 +417,16 @@
public ListElement(GUIControl control)
: base(control) {
_list = control as GUIListControl;
- Type listType = typeof(GUIListControl);
- FieldInfo alignmentFieldInfo = listType.GetField("_textAlignment",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_list);
-
- FieldInfo listTypeFieldInfo = listType.GetField("_listType",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _listType = (GUIListControl.ListType)listTypeFieldInfo.GetValue(_list);
-
- FieldInfo drawFocusFieldInfo = listType.GetField("_drawFocus",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _drawFocus = (bool)drawFocusFieldInfo.GetValue(_list);
-
- _cursorXFieldInfo = listType.GetField("_cursorX",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _cursorX = (int)_cursorXFieldInfo.GetValue(_list);
-
- _offsetFieldInfo = listType.GetField("_offset",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _offset = (int)_offsetFieldInfo.GetValue(_list);
-
- FieldInfo itemsPerPageFieldInfo = listType.GetField("_itemsPerPage",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _itemsPerPage = (int)itemsPerPageFieldInfo.GetValue(_list);
-
- FieldInfo playedColorFieldInfo = listType.GetField("_playedColor",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _playedColor = (int)itemsPerPageFieldInfo.GetValue(_list);
-
- FieldInfo remoteColorFieldInfo = listType.GetField("_remoteColor",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _remoteColor = (long)remoteColorFieldInfo.GetValue(_list);
-
- FieldInfo downloadColorFieldInfo = listType.GetField("_downloadColor",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _downloadColor = (long)downloadColorFieldInfo.GetValue(_list);
-
- FieldInfo spinControlPositionXFieldInfo = listType.GetField("_spinControlPositionX",
- BindingFlags.NonPublic | BindingFlags.Instance);
- int spinControlPositionX = (int)spinControlPositionXFieldInfo.GetValue(_list);
- FieldInfo spinControlPositionYFieldInfo = listType.GetField("_spinControlPositionY",
- BindingFlags.NonPublic | BindingFlags.Instance);
- int spinControlPositionY = (int)spinControlPositionYFieldInfo.GetValue(_list);
+ _cursorX = _list.CursorX;
+ _offset = _list.Offset;
_listButtons = new List<ListButtonElement>();
_labelControls1 = new List<ListLabelElement>();
_labelControls2 = new List<ListLabelElement>();
_labelControls3 = new List<ListLabelElement>();
_cachedBitmaps = new Dictionary<String, Bitmap>();
- AllocButtons(spinControlPositionX, spinControlPositionY);
- _listItemsFieldInfo = listType.GetField("_listItems",
- BindingFlags.NonPublic | BindingFlags.Instance);
+ AllocButtons(_list.SpinX, _list.SpinY);
initializeLabels();
_verticalScrollBarElement = new VerticalScrollBarElement(_list.Scrollbar);
- _offset = (int)_offsetFieldInfo.GetValue(_list);
- _cursorX = (int)_cursorXFieldInfo.GetValue(_list);
_focus = _list.IsFocused;
Log.Debug("VideoPlayerOSD: Found list element: ");
}
@@ -535,14 +439,14 @@
/// <param name="graph">Graphics</param>
public override void DrawElement(Graphics graph) {
if (_list.Visible) {
- _listItems = _listItemsFieldInfo.GetValue(_list) as List<GUIListItem>;
+ _listItems = _list.ListItems;
int dwPosY = _list.YPosition;
// Render the buttons first.
- for (int i = 0; i < _itemsPerPage; i++) {
+ for (int i = 0; i < _list.ItemsPerPage; i++) {
if (i + _offset < _listItems.Count) {
// render item
bool gotFocus = false;
- if (_drawFocus && i == _cursorX && _list.IsFocused && _listType == GUIListControl.ListType.CONTROL_LIST)
+ if (_list.DrawFocus && i == _cursorX && _list.IsFocused && _list.TypeOfList == GUIListControl.ListType.CONTROL_LIST)
gotFocus = true;
RenderButton(graph, i, _list.XPosition, dwPosY, gotFocus);
}
@@ -551,7 +455,7 @@
// Render new item list
dwPosY = _list.YPosition;
- for (int i = 0; i < _itemsPerPage; i++) {
+ for (int i = 0; i < _list.ItemsPerPage; i++) {
int dwPosX = _list.XPosition;
if (i + _offset < _listItems.Count) {
int iconX;
@@ -560,7 +464,7 @@
int ten = 10;
GUIGraphicsContext.ScaleHorizontal(ref ten);
- switch (_alignment) {
+ switch (_list.TextAlignment) {
case GUIControl.Alignment.ALIGN_RIGHT:
iconX = dwPosX + _list.Width - _list.IconOffsetX - _list.ImageWidth;
labelX = dwPosX;
@@ -617,8 +521,8 @@
/// <returns>true, if an update is needed</returns>
protected override bool CheckElementSpecificForUpdate() {
bool result = false;
- int newOffset = (int)_offsetFieldInfo.GetValue(_list);
- int newCursorX = (int)_cursorXFieldInfo.GetValue(_list);
+ int newOffset = _list.Offset;
+ int newCursorX = _list.CursorX;
if (_offset!=newOffset) {
_offset = newOffset;
result = true;
@@ -642,7 +546,7 @@
/// <param name="spinControlPositionX">X Position</param>
/// <param name="spinControlPositionY">Y Position</param>
private void AllocButtons(int spinControlPositionX, int spinControlPositionY) {
- for (int i = 0; i < _itemsPerPage; ++i) {
+ for (int i = 0; i < _list.ItemsPerPage; ++i) {
ListButtonElement cntl = new ListButtonElement(spinControlPositionX, spinControlPositionY, _list.Width, _list.ItemHeight, _list.ButtonFocusName, _list.ButtonNoFocusName);
_listButtons.Add(cntl);
}
@@ -652,7 +556,7 @@
/// Initialize the labels
/// </summary>
private void initializeLabels() {
- for (int i = 0; i < _itemsPerPage; ++i) {
+ for (int i = 0; i < _list.ItemsPerPage; ++i) {
ListLabelElement cntl1 = new ListLabelElement();
cntl1.Font = getFont(_list.FontName);
cntl1.Brush = new SolidBrush(GetColor(_list.TextColor));
@@ -697,11 +601,11 @@
dwColor = _list.SelectedColor2;
if (pItem.IsPlayed)
- dwColor = _playedColor;
+ dwColor = _list.PlayedColor;
if (pItem.IsRemote) {
- dwColor = _remoteColor;
- if (pItem.IsDownloading) dwColor = _downloadColor;
+ dwColor = _list.RemoteColor;
+ if (pItem.IsDownloading) dwColor = _list.DownloadColor;
}
int xpos = dwPosX;
@@ -736,11 +640,11 @@
dwColor = _list.SelectedColor;
if (pItem.IsPlayed)
- dwColor = _playedColor;
+ dwColor = _list.PlayedColor;
if (pItem.IsRemote) {
- dwColor = _remoteColor;
- if (pItem.IsDownloading) dwColor = _downloadColor;
+ dwColor = _list.RemoteColor;
+ if (pItem.IsDownloading) dwColor = _list.DownloadColor;
}
RenderText(graph, buttonNr, (float)dwPosX, (float)dwPosY + GUIGraphicsContext.ScaleVertical(2) + _list.TextOffsetY, (float)dMaxWidth, dwColor, _textLine);
@@ -753,11 +657,11 @@
dwColor = _list.SelectedColor2;
if (pItem.IsPlayed)
- dwColor = _playedColor;
+ dwColor = _list.PlayedColor;
if (pItem.IsRemote) {
- dwColor = _remoteColor;
- if (pItem.IsDownloading) dwColor = _downloadColor;
+ dwColor = _list.RemoteColor;
+ if (pItem.IsDownloading) dwColor = _list.DownloadColor;
}
if (0 == _list.TextOffsetX2)
dwPosX = _list.XPosition + _list.Width - GUIGraphicsContext.ScaleHorizontal(16);
@@ -789,11 +693,11 @@
dwColor = _list.SelectedColor3;
if (pItem.IsPlayed)
- dwColor = _playedColor;
+ dwColor = _list.PlayedColor;
if (pItem.IsRemote) {
- dwColor = _remoteColor;
- if (pItem.IsDownloading) dwColor = _downloadColor;
+ dwColor = _list.RemoteColor;
+ if (pItem.IsDownloading) dwColor = _list.DownloadColor;
}
if (0 == _list.TextColor3)
@@ -848,7 +752,7 @@
if (label == null) return;
SizeF stringSize = label.GetStringSize(graph);
- if (_alignment == GUIControl.Alignment.ALIGN_RIGHT && stringSize.Width < fMaxWidth) {
+ if (_list.TextAlignment == GUIControl.Alignment.ALIGN_RIGHT && stringSize.Width < fMaxWidth) {
label.XPosition = fPosX + fMaxWidth;
label.YPosition = fPosY;
} else {
@@ -859,7 +763,7 @@
label.Label = strTextToRender;
label.Width = fMaxWidth;
if (stringSize.Width < fMaxWidth)
- label.Alignment = _alignment;
+ label.Alignment = _list.TextAlignment;
else
label.Alignment = GUIControl.Alignment.ALIGN_LEFT;
label.Font = getFont(_list.FontName);
@@ -962,7 +866,7 @@
/// <param name="graph">Graphics</param>
/// <param name="y">Y Position</param>
private void RenderScrollbar(Graphics graph, int y) {
- if (_listItems.Count > _itemsPerPage) {
+ if (_listItems.Count > _list.ItemsPerPage) {
if (_verticalScrollBarElement != null) {
_verticalScrollBarElement.DrawElement(graph);
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -27,7 +27,6 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -82,15 +81,9 @@
: base(control) {
_slider = control as GUISliderControl;
Type buttonType = typeof(GUISliderControl);
- FieldInfo backgroundBitmapFieldInfo = buttonType.GetField("_backgroundTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _backgroundBitmap = loadBitmap(backgroundBitmapFieldInfo.GetValue(_slider).ToString());
- FieldInfo sliderBitmapFieldInfo = buttonType.GetField("_sliderTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _sliderBitmap = loadBitmap(sliderBitmapFieldInfo.GetValue(_slider).ToString());
- FieldInfo sliderFocusBitmapFieldInfo = buttonType.GetField("_sliderFocusTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _sliderFocusBitmap = loadBitmap(sliderFocusBitmapFieldInfo.GetValue(_slider).ToString());
+ _backgroundBitmap = loadBitmap(_slider.BackGroundTextureName);
+ _sliderBitmap = loadBitmap(_slider.BackTextureMidName);
+ _sliderFocusBitmap = loadBitmap(_slider.BackTextureMidNameFocus);
_focus = _slider.Focus;
_percentage = _slider.Percentage;
_strValue = getStringValue();
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -27,7 +27,6 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -53,11 +52,6 @@
private Brush _brush;
/// <summary>
- /// Alignment of the message
- /// </summary>
- private GUIControl.Alignment _alignment;
-
- /// <summary>
/// Label of the text scrollup element
/// </summary>
private String _label;
@@ -72,13 +66,8 @@
: base(control) {
_textScrollUp = control as GUITextScrollUpControl;
Type textScrollUpType = typeof(GUITextScrollUpControl);
- FieldInfo fontNameFieldInfo = textScrollUpType.GetField("_fontName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _font = getFont(fontNameFieldInfo.GetValue(_textScrollUp).ToString());
+ _font = getFont(_textScrollUp.FontName);
_brush = new SolidBrush(GetColor(_textScrollUp.TextColor));
- FieldInfo alignmentFieldInfo = textScrollUpType.GetField("_textAlignment",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_textScrollUp);
_label = _textScrollUp.Property;
Log.Debug("VideoPlayerOSD: Found textScrollUp element: " + _textScrollUp.GetID);
}
@@ -93,9 +82,9 @@
if (_textScrollUp.Visible) {
SizeF textSize = graph.MeasureString(_label, _font);
RectangleF rectangle;
- if (_alignment == GUIControl.Alignment.ALIGN_LEFT) {
+ if (_textScrollUp.TextAlignment == GUIControl.Alignment.ALIGN_LEFT) {
rectangle = new RectangleF((float)_textScrollUp.Location.X, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height);
- } else if (_alignment == GUIControl.Alignment.ALIGN_RIGHT) {
+ } else if (_textScrollUp.TextAlignment == GUIControl.Alignment.ALIGN_RIGHT) {
rectangle = new RectangleF((float)_textScrollUp.Location.X - textSize.Width, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height);
} else {
rectangle = new RectangleF((float)_textScrollUp.Location.X - (textSize.Width / 2), (float)_textScrollUp.Location.Y - (textSize.Height / 2), _textScrollUp.Width, _textScrollUp.Height);
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -27,7 +27,6 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -63,11 +62,6 @@
private Bitmap _altNoFocusBitmap;
/// <summary>
- /// Alignment of the message
- /// </summary>
- private GUIControl.Alignment _alignment;
-
- /// <summary>
/// Font
/// </summary>
private Font _font;
@@ -107,22 +101,10 @@
: base(control) {
_button = control as GUIToggleButtonControl;
_font = getFont(_button.FontName);
- Type buttonType = typeof(GUIToggleButtonControl);
- FieldInfo focusBitmapFieldInfo = buttonType.GetField("_focusedTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _focusBitmap = loadBitmap(focusBitmapFieldInfo.GetValue(_button).ToString());
- FieldInfo noFocusBitmapFieldInfo = buttonType.GetField("_nonFocusedTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _noFocusBitmap = loadBitmap(noFocusBitmapFieldInfo.GetValue(_button).ToString());
- FieldInfo altFocusBitmapFieldInfo = buttonType.GetField("_alternativeFocusTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _altFocusBitmap = loadBitmap(altFocusBitmapFieldInfo.GetValue(_button).ToString());
- FieldInfo altNoFocusBitmapFieldInfo = buttonType.GetField("_alternativeNonFocusTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _altNoFocusBitmap = loadBitmap(altNoFocusBitmapFieldInfo.GetValue(_button).ToString());
- FieldInfo alignmentFieldInfo = buttonType.GetField("_textAlignment",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_button);
+ _focusBitmap = loadBitmap(_button.TexutureFocusName);
+ _noFocusBitmap = loadBitmap(_button.TexutureNoFocusName);
+ _altFocusBitmap = loadBitmap(_button.AltTexutureFocusName);
+ _altNoFocusBitmap = loadBitmap(_button.AltTexutureNoFocusName);
_textColor = GetColor(_button.TextColor);
_disabledColor = GetColor(_button.DisabledColor);
_focus = _button.Focus;
@@ -168,7 +150,7 @@
// render the text on the button
int x = 0;
- switch (_alignment) {
+ switch (_button.TextAlignment) {
case GUIControl.Alignment.ALIGN_LEFT:
x = _button.TextOffsetX + _button.XPosition;
break;
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -25,7 +25,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -69,18 +68,9 @@
public VerticalScrollBarElement(GUIControl control)
: base(control) {
_verticalScrollBar = control as GUIVerticalScrollbar;
- Type verticalScrollBarType = typeof(GUIVerticalScrollbar);
- FieldInfo scrollBarBgFieldInfo = verticalScrollBarType.GetField("_scrollbarBackgroundName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _scrollBarBackground = loadBitmap(scrollBarBgFieldInfo.GetValue(_verticalScrollBar).ToString()); ;
-
- FieldInfo scrollBarTopFieldInfo = verticalScrollBarType.GetField("_scrollbarTopTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _scrollBarTop = loadBitmap(scrollBarTopFieldInfo.GetValue(_verticalScrollBar).ToString()); ;
-
- FieldInfo scrollBarBottomFieldInfo = verticalScrollBarType.GetField("_scrollbarBottomTextureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- _scrollBarBottom = loadBitmap(scrollBarBottomFieldInfo.GetValue(_verticalScrollBar).ToString()); ;
+ _scrollBarBackground = loadBitmap(_verticalScrollBar.BackGroundTextureName); ;
+ _scrollBarTop = loadBitmap(_verticalScrollBar.BackTextureTopName); ;
+ _scrollBarBottom = loadBitmap(_verticalScrollBar.BackTextureBottomName); ;
_percentage = _verticalScrollBar.Percentage;
Log.Debug("VideoPlayerOSD: Found vertical scroll bar element ");
}
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-11-19 17:42:47 UTC (rev 1077)
@@ -27,7 +27,6 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
-using System.Reflection;
using System.Text;
using MediaPortal.GUI.Library;
@@ -81,19 +80,13 @@
public VolumeBarElement(GUIControl control)
: base(control) {
_volumeBar = control as GUIVolumeBar;
- Type volumeBarType = typeof(GUIVolumeBar);
- FieldInfo textureNameFieldInfo = volumeBarType.GetField("_textureName",
- BindingFlags.NonPublic | BindingFlags.Instance);
- FieldInfo alignmentFieldInfo = volumeBarType.GetField("_alignment",
- BindingFlags.NonPublic | BindingFlags.Instance);
- String textureFileName = textureNameFieldInfo.GetValue(_volumeBar).ToString();
- _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_volumeBar);
- _bitmap = loadBitmap(textureFileName);
+ _alignment = _volumeBar.TextAlignment;
+ _bitmap = loadBitmap(_volumeBar.TextureName);
_image1 = _volumeBar.Image1;
_image2 = _volumeBar.Image2;
_maximum = _volumeBar.Maximum;
_current = _volumeBar.Current;
- Log.Debug("VideoPlayerOSD: Found volume bar element: " + textureFileName);
+ Log.Debug("VideoPlayerOSD: Found volume bar element: " + _volumeBar.TextureName);
}
#endregion
Deleted: trunk/plugins/My MPlayer/MPlayer-License.txt
===================================================================
--- trunk/plugins/My MPlayer/MPlayer-License.txt 2007-11-19 13:25:08 UTC (rev 1076)
+++ trunk/plugins/My MPlayer/MPlayer-License.txt 2007-11-19 17:42:47 UTC (rev 1077)
@@ -1,96 +0,0 @@
-The plugin is licensed under the terms of the terms of the GNU General Public License as published by the Free Software Foundation, which is displayed below. You are only allowed to use this plugin if your with this plugin used version of MPlayer does not violate the laws of your country!
-
------------------------------------------------------------
-
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-
- Preamble
-
- The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
-
- When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
- We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
- Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
Copied: trunk/plugins/My MPlayer/My MPlayer-License.txt (from rev 1017, trunk/plugins/My MPlayer/MPlayer-License.txt)
===================================================================
--- trunk/plugins/My MPlayer/My MPlayer-License.txt (rev 0)
+++ trunk/plugins/My MPlayer/My MPlayer-License.txt 2007-11-19 17:42:47 UTC (rev 1077)
@@ -0,0 +1,96 @@
+The plugin is licensed under the terms of the terms of the GNU General Public License as published by the Free Software Foundation, which is displayed below. You are only allowed to use this plugin if your with this plugin used version of MPlayer does not violate the laws of your country!
+
+-----------------------------------------------------------
+
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+
+ Preamble
+
+ The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+ When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundati...
[truncated message content] |
|
From: <mis...@us...> - 2007-11-27 21:02:35
|
Revision: 1096
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1096&view=rev
Author: misterd_sf
Date: 2007-11-27 13:02:33 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
Updated italian language file by ettore. Thx
Made the configuration forms resizable. Added anchors, autosize etc.
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.resx
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_it.xml
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096)
@@ -52,19 +52,19 @@
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.general_Tab = new System.Windows.Forms.TabPage();
- this.generalSection1 = new MPlayer.ConfigurationPanel.GeneralSection();
this.video_Tab = new System.Windows.Forms.TabPage();
- this.videoSection1 = new MPlayer.ConfigurationPanel.VideoSection();
this.subtitles_Tab = new System.Windows.Forms.TabPage();
- this.subtitleSection1 = new MPlayer.ConfigurationPanel.SubtitleSection();
this.audio_Tab = new System.Windows.Forms.TabPage();
- this.audioSection1 = new MPlayer.ConfigurationPanel.AudioSection();
this.extension_Tab = new System.Windows.Forms.TabPage();
this.dvd_vcd_svcd_streams_Tab = new System.Windows.Forms.TabPage();
- this.streamSection1 = new MPlayer.ConfigurationPanel.StreamSection();
this.fontDialog1 = new System.Windows.Forms.FontDialog();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+ this.generalSection1 = new MPlayer.ConfigurationPanel.GeneralSection();
+ this.videoSection1 = new MPlayer.ConfigurationPanel.VideoSection();
+ this.subtitleSection1 = new MPlayer.ConfigurationPanel.SubtitleSection();
+ this.audioSection1 = new MPlayer.ConfigurationPanel.AudioSection();
this.extensionSection1 = new MPlayer.ConfigurationPanel.ExtensionSection();
+ this.streamSection1 = new MPlayer.ConfigurationPanel.StreamSection();
this.tabControl1.SuspendLayout();
this.general_Tab.SuspendLayout();
this.video_Tab.SuspendLayout();
@@ -76,7 +76,9 @@
//
// okButton
//
- this.okButton.Location = new System.Drawing.Point(25, 460);
+ this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.okButton.AutoSize = true;
+ this.okButton.Location = new System.Drawing.Point(25, 453);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 3;
@@ -86,8 +88,10 @@
//
// cancelButton
//
+ this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.cancelButton.AutoSize = true;
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(327, 460);
+ this.cancelButton.Location = new System.Drawing.Point(332, 453);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 20;
@@ -101,6 +105,9 @@
//
// tabControl1
//
+ this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.general_Tab);
this.tabControl1.Controls.Add(this.video_Tab);
this.tabControl1.Controls.Add(this.subtitles_Tab);
@@ -110,7 +117,7 @@
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, 431);
+ this.tabControl1.Size = new System.Drawing.Size(412, 424);
this.tabControl1.TabIndex = 24;
//
// general_Tab
@@ -119,81 +126,49 @@
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, 405);
+ this.general_Tab.Size = new System.Drawing.Size(404, 398);
this.general_Tab.TabIndex = 0;
this.general_Tab.Text = "General";
this.general_Tab.UseVisualStyleBackColor = true;
//
- // generalSection1
- //
- this.generalSection1.BackColor = System.Drawing.Color.Transparent;
- this.generalSection1.Location = new System.Drawing.Point(0, 0);
- this.generalSection1.Name = "generalSection1";
- this.generalSection1.Size = new System.Drawing.Size(403, 405);
- this.generalSection1.TabIndex = 0;
- //
// video_Tab
//
this.video_Tab.Controls.Add(this.videoSection1);
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.Size = new System.Drawing.Size(404, 398);
this.video_Tab.TabIndex = 4;
this.video_Tab.Text = "Video";
this.video_Tab.UseVisualStyleBackColor = true;
//
- // videoSection1
- //
- this.videoSection1.BackColor = System.Drawing.Color.Transparent;
- this.videoSection1.Location = new System.Drawing.Point(0, 0);
- this.videoSection1.Name = "videoSection1";
- this.videoSection1.Size = new System.Drawing.Size(403, 405);
- this.videoSection1.TabIndex = 0;
- //
// subtitles_Tab
//
this.subtitles_Tab.Controls.Add(this.subtitleSection1);
this.subtitles_Tab.Location = new System.Drawing.Point(4, 22);
this.subtitles_Tab.Name = "subtitles_Tab";
- this.subtitles_Tab.Size = new System.Drawing.Size(403, 405);
+ this.subtitles_Tab.Size = new System.Drawing.Size(404, 398);
this.subtitles_Tab.TabIndex = 6;
this.subtitles_Tab.Text = "Subtitles";
this.subtitles_Tab.UseVisualStyleBackColor = true;
//
- // subtitleSection1
- //
- this.subtitleSection1.BackColor = System.Drawing.Color.Transparent;
- this.subtitleSection1.Location = new System.Drawing.Point(0, 0);
- this.subtitleSection1.Name = "subtitleSection1";
- this.subtitleSection1.Size = new System.Drawing.Size(403, 405);
- this.subtitleSection1.TabIndex = 0;
- //
// audio_Tab
//
this.audio_Tab.Controls.Add(this.audioSection1);
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.Size = new System.Drawing.Size(404, 398);
this.audio_Tab.TabIndex = 5;
this.audio_Tab.Text = "Audio";
this.audio_Tab.UseVisualStyleBackColor = true;
//
- // audioSection1
- //
- this.audioSection1.BackColor = System.Drawing.Color.Transparent;
- this.audioSection1.Location = new System.Drawing.Point(0, 0);
- this.audioSection1.Name = "audioSection1";
- this.audioSection1.Size = new System.Drawing.Size(403, 405);
- this.audioSection1.TabIndex = 0;
- //
// extension_Tab
//
this.extension_Tab.Controls.Add(this.extensionSection1);
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.Size = new System.Drawing.Size(404, 398);
this.extension_Tab.TabIndex = 1;
this.extension_Tab.Text = "Extensions";
this.extension_Tab.UseVisualStyleBackColor = true;
@@ -203,36 +178,86 @@
this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.streamSection1);
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, 405);
+ this.dvd_vcd_svcd_streams_Tab.Size = new System.Drawing.Size(404, 398);
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;
//
- // streamSection1
+ // generalSection1
//
- this.streamSection1.BackColor = System.Drawing.Color.Transparent;
- this.streamSection1.Location = new System.Drawing.Point(0, 0);
- this.streamSection1.Name = "streamSection1";
- this.streamSection1.Size = new System.Drawing.Size(403, 405);
- this.streamSection1.TabIndex = 0;
+ this.generalSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.generalSection1.BackColor = System.Drawing.Color.Transparent;
+ this.generalSection1.Location = new System.Drawing.Point(0, 0);
+ this.generalSection1.Name = "generalSection1";
+ this.generalSection1.Size = new System.Drawing.Size(404, 398);
+ this.generalSection1.TabIndex = 0;
//
+ // videoSection1
+ //
+ this.videoSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.videoSection1.BackColor = System.Drawing.Color.Transparent;
+ this.videoSection1.Location = new System.Drawing.Point(0, 0);
+ this.videoSection1.Name = "videoSection1";
+ this.videoSection1.Size = new System.Drawing.Size(395, 397);
+ this.videoSection1.TabIndex = 0;
+ //
+ // subtitleSection1
+ //
+ this.subtitleSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.subtitleSection1.BackColor = System.Drawing.Color.Transparent;
+ this.subtitleSection1.Location = new System.Drawing.Point(0, 0);
+ this.subtitleSection1.Name = "subtitleSection1";
+ this.subtitleSection1.Size = new System.Drawing.Size(395, 397);
+ this.subtitleSection1.TabIndex = 0;
+ //
+ // audioSection1
+ //
+ this.audioSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.audioSection1.BackColor = System.Drawing.Color.Transparent;
+ this.audioSection1.Location = new System.Drawing.Point(0, 0);
+ this.audioSection1.Name = "audioSection1";
+ this.audioSection1.Size = new System.Drawing.Size(395, 397);
+ this.audioSection1.TabIndex = 0;
+ //
// extensionSection1
//
+ this.extensionSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.extensionSection1.BackColor = System.Drawing.Color.Transparent;
this.extensionSection1.Location = new System.Drawing.Point(0, 0);
this.extensionSection1.Name = "extensionSection1";
- this.extensionSection1.Size = new System.Drawing.Size(403, 405);
+ this.extensionSection1.Size = new System.Drawing.Size(395, 397);
this.extensionSection1.TabIndex = 0;
//
+ // streamSection1
+ //
+ this.streamSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.streamSection1.BackColor = System.Drawing.Color.Transparent;
+ this.streamSection1.Location = new System.Drawing.Point(0, 0);
+ this.streamSection1.Name = "streamSection1";
+ this.streamSection1.Size = new System.Drawing.Size(395, 397);
+ this.streamSection1.TabIndex = 0;
+ //
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(435, 492);
+ this.ClientSize = new System.Drawing.Size(440, 485);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MinimizeBox = false;
this.Name = "ConfigurationForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "MPlayer Configuration";
@@ -245,6 +270,7 @@
this.extension_Tab.ResumeLayout(false);
this.dvd_vcd_svcd_streams_Tab.ResumeLayout(false);
this.ResumeLayout(false);
+ this.PerformLayout();
}
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-27 20:39:23 UTC (rev 1095)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-27 21:02:33 UTC (rev 1096)
@@ -609,7 +609,7 @@
_seekStepTimeout = Convert.ToInt16(timeout);
String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English");
- LocalizeStrings.Load(m_strLanguage);
+ //LocalizeStrings.Load(m_strLanguage);
}
try {
loadXMLData();
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096)
@@ -66,14 +66,16 @@
//
// audioDelayStep
//
- this.audioDelayStep.Location = new System.Drawing.Point(129, 96);
+ this.audioDelayStep.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.audioDelayStep.Location = new System.Drawing.Point(138, 96);
this.audioDelayStep.Maximum = new decimal(new int[] {
10000,
0,
0,
0});
this.audioDelayStep.Name = "audioDelayStep";
- this.audioDelayStep.Size = new System.Drawing.Size(260, 20);
+ this.audioDelayStep.Size = new System.Drawing.Size(251, 20);
this.audioDelayStep.TabIndex = 69;
this.toolTip.SetToolTip(this.audioDelayStep, "With this option you could define in which steps\r\nthe audio delay will be changed" +
" during playback");
@@ -85,9 +87,10 @@
//
// label32
//
+ this.label32.AutoSize = true;
this.label32.Location = new System.Drawing.Point(6, 98);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(117, 31);
+ this.label32.Size = new System.Drawing.Size(126, 13);
this.label32.TabIndex = 68;
this.label32.Text = "Audio Delay Step (msec):";
this.toolTip.SetToolTip(this.label32, "With this option you could define in which steps\r\nthe audio delay will be changed" +
@@ -95,9 +98,10 @@
//
// label29
//
+ this.label29.AutoSize = true;
this.label29.Location = new System.Drawing.Point(6, 45);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(117, 23);
+ this.label29.Size = new System.Drawing.Size(109, 13);
this.label29.TabIndex = 67;
this.label29.Text = "Sound output device:";
this.toolTip.SetToolTip(this.label29, "Defines the selected output device.\r\nThis can only be choosen, if the direct soun" +
@@ -105,6 +109,8 @@
//
// soundOutputDevice
//
+ this.soundOutputDevice.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.soundOutputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.soundOutputDevice.FormattingEnabled = true;
this.soundOutputDevice.Items.AddRange(new object[] {
@@ -112,18 +118,19 @@
"(don\'t play sound)",
"Win32",
"DirectSound"});
- this.soundOutputDevice.Location = new System.Drawing.Point(129, 42);
+ this.soundOutputDevice.Location = new System.Drawing.Point(138, 42);
this.soundOutputDevice.Name = "soundOutputDevice";
- this.soundOutputDevice.Size = new System.Drawing.Size(260, 21);
+ this.soundOutputDevice.Size = new System.Drawing.Size(251, 21);
this.soundOutputDevice.TabIndex = 66;
this.toolTip.SetToolTip(this.soundOutputDevice, "Defines the selected output device.\r\nThis can only be choosen, if the direct soun" +
"d output\r\ndriver is selected.");
//
// passthroughAC3_DTS
//
+ this.passthroughAC3_DTS.AutoSize = true;
this.passthroughAC3_DTS.Location = new System.Drawing.Point(9, 132);
this.passthroughAC3_DTS.Name = "passthroughAC3_DTS";
- this.passthroughAC3_DTS.Size = new System.Drawing.Size(178, 23);
+ this.passthroughAC3_DTS.Size = new System.Drawing.Size(135, 17);
this.passthroughAC3_DTS.TabIndex = 65;
this.passthroughAC3_DTS.Text = "Passthrough AC3/DTS";
this.toolTip.SetToolTip(this.passthroughAC3_DTS, "Indicates, if AC3/DTS should be passed through.\r\nIf you select this option and");
@@ -131,9 +138,10 @@
//
// audioNormalize
//
+ this.audioNormalize.AutoSize = true;
this.audioNormalize.Location = new System.Drawing.Point(9, 161);
this.audioNormalize.Name = "audioNormalize";
- this.audioNormalize.Size = new System.Drawing.Size(178, 23);
+ this.audioNormalize.Size = new System.Drawing.Size(108, 17);
this.audioNormalize.TabIndex = 64;
this.audioNormalize.Text = "Volume normalize";
this.toolTip.SetToolTip(this.audioNormalize, "Indicates, if the volume should be normalized during playback.");
@@ -141,15 +149,18 @@
//
// label7
//
+ this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(6, 72);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(117, 23);
+ this.label7.Size = new System.Drawing.Size(84, 13);
this.label7.TabIndex = 63;
this.label7.Text = "Audio Channels:";
this.toolTip.SetToolTip(this.label7, "Defines how many audio channels will be decoded");
//
// audioChannels
//
+ this.audioChannels.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.audioChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.audioChannels.FormattingEnabled = true;
this.audioChannels.Items.AddRange(new object[] {
@@ -157,23 +168,26 @@
"Stereo",
"Surround",
"Full 5.1"});
- this.audioChannels.Location = new System.Drawing.Point(129, 69);
+ this.audioChannels.Location = new System.Drawing.Point(138, 69);
this.audioChannels.Name = "audioChannels";
- this.audioChannels.Size = new System.Drawing.Size(260, 21);
+ this.audioChannels.Size = new System.Drawing.Size(251, 21);
this.audioChannels.TabIndex = 62;
this.toolTip.SetToolTip(this.audioChannels, "Defines how many audio channels will be decoded");
//
// label1
//
+ this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 18);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(117, 23);
+ this.label1.Size = new System.Drawing.Size(103, 13);
this.label1.TabIndex = 60;
this.label1.Text = "Sound output driver:";
this.toolTip.SetToolTip(this.label1, "Defines the sound output driver.\r\nThe direct sound output driver is recommend\r\n");
//
// soundOutputDriver
//
+ this.soundOutputDriver.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.soundOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.soundOutputDriver.FormattingEnabled = true;
this.soundOutputDriver.Items.AddRange(new object[] {
@@ -181,9 +195,9 @@
"(don\'t play sound)",
"Win32",
"DirectSound"});
- this.soundOutputDriver.Location = new System.Drawing.Point(129, 15);
+ this.soundOutputDriver.Location = new System.Drawing.Point(138, 15);
this.soundOutputDriver.Name = "soundOutputDriver";
- this.soundOutputDriver.Size = new System.Drawing.Size(260, 21);
+ this.soundOutputDriver.Size = new System.Drawing.Size(251, 21);
this.soundOutputDriver.TabIndex = 61;
this.toolTip.SetToolTip(this.soundOutputDriver, "Defines the sound output driver.\r\nThe direct sound output driver is recommend");
this.soundOutputDriver.SelectedIndexChanged += new System.EventHandler(this.soundOutputDriver_SelectedIndexChanged);
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096)
@@ -26,50 +26,35 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ExtensionSection));
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
- this.groupBox1 = new System.Windows.Forms.GroupBox();
this.videoExtList = new System.Windows.Forms.ListBox();
this.videoDelete = new System.Windows.Forms.Button();
- this.label24 = new System.Windows.Forms.Label();
- this.label23 = new System.Windows.Forms.Label();
- this.label25 = new System.Windows.Forms.Label();
this.videoExtension = new System.Windows.Forms.TextBox();
this.videoPlayerUse = new System.Windows.Forms.CheckBox();
this.videoAdd = new System.Windows.Forms.Button();
this.videoArgument = new System.Windows.Forms.TextBox();
- 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.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label24 = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.label26 = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.label28 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
- // groupBox1
- //
- 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, 189);
- this.groupBox1.TabIndex = 30;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Video";
- //
// videoExtList
//
+ this.videoExtList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.videoExtList.FormattingEnabled = true;
this.videoExtList.Location = new System.Drawing.Point(6, 19);
this.videoExtList.Name = "videoExtList";
@@ -80,6 +65,8 @@
//
// videoDelete
//
+ this.videoDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.videoDelete.AutoSize = true;
this.videoDelete.Location = new System.Drawing.Point(174, 156);
this.videoDelete.Name = "videoDelete";
this.videoDelete.Size = new System.Drawing.Size(75, 23);
@@ -89,35 +76,9 @@
this.videoDelete.UseVisualStyleBackColor = true;
this.videoDelete.Click += new System.EventHandler(this.videoDelete_Click);
//
- // label24
- //
- this.label24.AutoSize = true;
- 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;
- this.label24.Text = "Arguments:";
- //
- // label23
- //
- this.label23.AutoSize = true;
- 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;
- this.label23.Text = "Extension:";
- //
- // label25
- //
- this.label25.AutoSize = true;
- 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;
- this.label25.Text = "External Player use:";
- //
// videoExtension
//
+ this.videoExtension.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.videoExtension.Enabled = false;
this.videoExtension.Location = new System.Drawing.Point(196, 19);
this.videoExtension.Name = "videoExtension";
@@ -128,6 +89,7 @@
//
// videoPlayerUse
//
+ this.videoPlayerUse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.videoPlayerUse.AutoSize = true;
this.videoPlayerUse.Enabled = false;
this.videoPlayerUse.Location = new System.Drawing.Point(196, 71);
@@ -139,6 +101,8 @@
//
// videoAdd
//
+ this.videoAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.videoAdd.AutoSize = true;
this.videoAdd.Location = new System.Drawing.Point(93, 156);
this.videoAdd.Name = "videoAdd";
this.videoAdd.Size = new System.Drawing.Size(75, 23);
@@ -150,6 +114,7 @@
//
// videoArgument
//
+ this.videoArgument.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.videoArgument.Enabled = false;
this.videoArgument.Location = new System.Drawing.Point(196, 45);
this.videoArgument.Name = "videoArgument";
@@ -157,35 +122,9 @@
this.videoArgument.TabIndex = 24;
this.toolTip.SetToolTip(this.videoArgument, "Arguments which will be used, when the selected extension is played");
//
- // 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, 201);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(394, 189);
- this.groupBox2.TabIndex = 31;
- 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.audioPlayerUse.AutoSize = true;
this.audioPlayerUse.Enabled = false;
this.audioPlayerUse.Location = new System.Drawing.Point(196, 71);
@@ -197,6 +136,7 @@
//
// audioArgument
//
+ this.audioArgument.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.audioArgument.Enabled = false;
this.audioArgument.Location = new System.Drawing.Point(196, 45);
this.audioArgument.Name = "audioArgument";
@@ -204,26 +144,9 @@
this.audioArgument.TabIndex = 42;
this.toolTip.SetToolTip(this.audioArgument, "Arguments which will be used, when the selected extension is played\r\n");
//
- // 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.audioExtension.Enabled = false;
this.audioExtension.Location = new System.Drawing.Point(196, 19);
this.audioExtension.Name = "audioExtension";
@@ -234,6 +157,8 @@
//
// audioDelete
//
+ this.audioDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.audioDelete.AutoSize = true;
this.audioDelete.Location = new System.Drawing.Point(174, 156);
this.audioDelete.Name = "audioDelete";
this.audioDelete.Size = new System.Drawing.Size(75, 23);
@@ -245,6 +170,8 @@
//
// audioAdd
//
+ this.audioAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.audioAdd.AutoSize = true;
this.audioAdd.Location = new System.Drawing.Point(93, 156);
this.audioAdd.Name = "audioAdd";
this.audioAdd.Size = new System.Drawing.Size(75, 23);
@@ -256,6 +183,9 @@
//
// audioExtList
//
+ this.audioExtList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.audioExtList.FormattingEnabled = true;
this.audioExtList.Location = new System.Drawing.Point(6, 19);
this.audioExtList.Name = "audioExtList";
@@ -264,6 +194,106 @@
this.toolTip.SetToolTip(this.audioExtList, "List of supported audio extensions");
this.audioExtList.SelectedIndexChanged += new System.EventHandler(this.audioExtList_SelectedIndexChanged);
//
+ // groupBox1
+ //
+ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ 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, 189);
+ this.groupBox1.TabIndex = 30;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Video";
+ //
+ // label24
+ //
+ this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label24.AutoSize = true;
+ 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;
+ this.label24.Text = "Arguments:";
+ //
+ // label23
+ //
+ this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label23.AutoSize = true;
+ 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;
+ this.label23.Text = "Extension:";
+ //
+ // label25
+ //
+ this.label25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label25.AutoSize = true;
+ 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;
+ this.label25.Text = "External Player use:";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ 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, 201);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(394, 189);
+ this.groupBox2.TabIndex = 31;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Audio";
+ //
+ // label26
+ //
+ this.label26.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ 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:";
+ //
+ // label27
+ //
+ this.label27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ 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:";
+ //
// ExtensionSection
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096)
@@ -69,15 +69,18 @@
//
// label35
//
+ this.label35.AutoSize = true;
this.label35.Location = new System.Drawing.Point(6, 18);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(117, 23);
+ this.label35.Size = new System.Drawing.Size(33, 13);
this.label35.TabIndex = 76;
this.label35.Text = "OSD:";
this.toolTip.SetToolTip(this.label35, resources.GetString("label35.ToolTip"));
//
// osdSelect
//
+ this.osdSelect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.osdSelect.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.osdSelect.FormattingEnabled = true;
this.osdSelect.Items.AddRange(new object[] {
@@ -91,9 +94,10 @@
//
// label30
//
+ this.label30.AutoSize = true;
this.label30.Location = new System.Drawing.Point(3, 45);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(117, 23);
+ this.label30.Size = new System.Drawing.Size(59, 13);
this.label30.TabIndex = 74;
this.label30.Text = "Cachesize:";
this.toolTip.SetToolTip(this.label30, "The size of cache that MPlayer will be used in KB (Kilobytes).\r\nFor streaming a v" +
@@ -101,6 +105,8 @@
//
// cacheSize
//
+ this.cacheSize.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cacheSize.FormattingEnabled = true;
this.cacheSize.Items.AddRange(new object[] {
"2048",
@@ -116,6 +122,8 @@
//
// folderSearch
//
+ this.folderSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.folderSearch.AutoSize = true;
this.folderSearch.Location = new System.Drawing.Point(313, 154);
this.folderSearch.Name = "folderSearch";
this.folderSearch.Size = new System.Drawing.Size(76, 23);
@@ -127,15 +135,18 @@
//
// label8
//
+ this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(3, 159);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(117, 23);
+ this.label8.Size = new System.Drawing.Size(85, 13);
this.label8.TabIndex = 71;
this.label8.Text = "Path to MPlayer:";
this.toolTip.SetToolTip(this.label8, "Path to the executable of MPlayer\r\n");
//
// mplayerPath
//
+ this.mplayerPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.mplayerPath.Location = new System.Drawing.Point(129, 156);
this.mplayerPath.Name = "mplayerPath";
this.mplayerPath.Size = new System.Drawing.Size(174, 20);
@@ -145,9 +156,10 @@
//
// rebuildIndex
//
+ this.rebuildIndex.AutoSize = true;
this.rebuildIndex.Location = new System.Drawing.Point(6, 98);
this.rebuildIndex.Name = "rebuildIndex";
- this.rebuildIndex.Size = new System.Drawing.Size(188, 23);
+ this.rebuildIndex.Size = new System.Drawing.Size(165, 17);
this.rebuildIndex.TabIndex = 66;
this.rebuildIndex.Text = "Rebuild file index if necessary";
this.toolTip.SetToolTip(this.rebuildIndex, "Indicates, if the index of the file should be rebuild if necessary\r\n");
@@ -155,9 +167,10 @@
//
// priorityBoost
//
+ this.priorityBoost.AutoSize = true;
this.priorityBoost.Location = new System.Drawing.Point(6, 127);
this.priorityBoost.Name = "priorityBoost";
- this.priorityBoost.Size = new System.Drawing.Size(188, 23);
+ this.priorityBoost.Size = new System.Drawing.Size(87, 17);
this.priorityBoost.TabIndex = 67;
this.priorityBoost.Text = "Priority Boost";
this.toolTip.SetToolTip(this.priorityBoost, "Increases the process priority of MPlayer to above normal.\r\n");
@@ -165,15 +178,18 @@
//
// label5
//
+ this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(3, 72);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(117, 23);
+ this.label5.Size = new System.Drawing.Size(102, 13);
this.label5.TabIndex = 68;
this.label5.Text = "Optional Arguments:";
this.toolTip.SetToolTip(this.label5, "Specify the optional arguments that\r\nshould be used for every playback.\r\n");
//
// optionalArguments
//
+ this.optionalArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.optionalArguments.Location = new System.Drawing.Point(129, 69);
this.optionalArguments.Name = "optionalArguments";
this.optionalArguments.Size = new System.Drawing.Size(260, 20);
@@ -187,6 +203,9 @@
//
// externalLibGroup
//
+ this.externalLibGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.externalLibGroup.AutoSize = true;
this.externalLibGroup.Controls.Add(this.externalOSDLibraryBlank);
this.externalLibGroup.Location = new System.Drawing.Point(9, 202);
this.externalLibGroup.Name = "externalLibGroup";
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096)
@@ -77,14 +77,17 @@
//
// label20
//
+ this.label20.AutoSize = true;
this.label20.Location = new System.Drawing.Point(6, 304);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(117, 23);
+ this.label20.Size = new System.Drawing.Size(93, 13);
this.label20.TabIndex = 74;
this.label20.Text = "UNSV Arguments:";
//
// unsvArguments
//
+ this.unsvArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.unsvArguments.Location = new System.Drawing.Point(129, 301);
this.unsvArguments.Name = "unsvArguments";
this.unsvArguments.Size = new System.Drawing.Size(256, 20);
@@ -92,14 +95,17 @@
//
// label19
//
+ this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(6, 278);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(117, 23);
+ this.label19.Size = new System.Drawing.Size(86, 13);
this.label19.TabIndex = 72;
this.label19.Text = "UDP Arguments:";
//
// udpArguments
//
+ this.udpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.udpArguments.Location = new System.Drawing.Point(129, 275);
this.udpArguments.Name = "udpArguments";
this.udpArguments.Size = new System.Drawing.Size(256, 20);
@@ -107,14 +113,17 @@
//
// label18
//
+ this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(6, 252);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(117, 23);
+ this.label18.Size = new System.Drawing.Size(85, 13);
this.label18.TabIndex = 70;
this.label18.Text = "SDP Arguments:";
//
// sdpArguments
//
+ this.sdpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.sdpArguments.Location = new System.Drawing.Point(129, 249);
this.sdpArguments.Name = "sdpArguments";
this.sdpArguments.Size = new System.Drawing.Size(256, 20);
@@ -122,14 +131,17 @@
//
// label17
//
+ this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(6, 226);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(117, 23);
+ this.label17.Size = new System.Drawing.Size(98, 13);
this.label17.TabIndex = 68;
this.label17.Text = "RT(S)P Arguments:";
//
// rtspArguments
//
+ this.rtspArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.rtspArguments.Location = new System.Drawing.Point(129, 223);
this.rtspArguments.Name = "rtspArguments";
this.rtspArguments.Size = new System.Drawing.Size(256, 20);
@@ -137,14 +149,17 @@
//
// label16
//
+ this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(6, 200);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(117, 23);
+ this.label16.Size = new System.Drawing.Size(93, 13);
this.label16.TabIndex = 66;
this.label16.Text = "MPST Arguments:";
//
// mpstArguments
//
+ this.mpstArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.mpstArguments.Location = new System.Drawing.Point(129, 197);
this.mpstArguments.Name = "mpstArguments";
this.mpstArguments.Size = new System.Drawing.Size(256, 20);
@@ -152,14 +167,17 @@
//
// label15
//
+ this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(6, 174);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(117, 23);
+ this.label15.Size = new System.Drawing.Size(101, 13);
this.label15.TabIndex = 64;
this.label15.Text = "MMS(T) Arguments:";
//
// mmsArguments
//
+ this.mmsArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.mmsArguments.Location = new System.Drawing.Point(129, 171);
this.mmsArguments.Name = "mmsArguments";
this.mmsArguments.Size = new System.Drawing.Size(256, 20);
@@ -167,14 +185,17 @@
//
// label14
//
+ this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(6, 148);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(117, 23);
+ this.label14.Size = new System.Drawing.Size(92, 13);
this.label14.TabIndex = 62;
this.label14.Text = "HTTP Arguments:";
//
// httpArguments
//
+ this.httpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.httpArguments.Location = new System.Drawing.Point(129, 145);
this.httpArguments.Name = "httpArguments";
this.httpArguments.Size = new System.Drawing.Size(256, 20);
@@ -182,14 +203,17 @@
//
// label13
//
+ this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(6, 122);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(117, 23);
+ this.label13.Size = new System.Drawing.Size(83, 13);
this.label13.TabIndex = 60;
this.label13.Text = "FTP Arguments:";
//
// ftpArguments
//
+ this.ftpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.ftpArguments.Location = new System.Drawing.Point(129, 119);
this.ftpArguments.Name = "ftpArguments";
this.ftpArguments.Size = new System.Drawing.Size(256, 20);
@@ -197,14 +221,17 @@
//
// label12
//
+ this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(6, 96);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(117, 23);
+ this.label12.Size = new System.Drawing.Size(85, 13);
this.label12.TabIndex = 58;
this.label12.Text = "CUE Arguments:";
//
// cueArguments
//
+ this.cueArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cueArguments.Location = new System.Drawing.Point(129, 93);
this.cueArguments.Name = "cueArguments";
this.cueArguments.Size = new System.Drawing.Size(256, 20);
@@ -212,14 +239,17 @@
//
// label11
//
+ this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(6, 70);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(117, 23);
+ this.label11.Size = new System.Drawing.Size(92, 13);
this.label11.TabIndex = 56;
this.label11.Text = "SVCD Arguments:";
//
// svcdArguments
//
+ this.svcdArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.svcdArguments.Location = new System.Drawing.Point(129, 67);
this.svcdArguments.Name = "svcdArguments";
this.svcdArguments.Size = new System.Drawing.Size(256, 20);
@@ -227,14 +257,17 @@
//
// label10
//
+ this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(6, 44);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(117, 23);
+ this.label10.Size = new System.Drawing.Size(85, 13);
this.label10.TabIndex = 54;
this.label10.Text = "VCD Arguments:";
//
// vcdArguments
//
+ this.vcdArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.vcdArguments.Location = new System.Drawing.Point(129, 41);
this.vcdArguments.Name = "vcdArguments";
this.vcdArguments.Size = new System.Drawing.Size(256, 20);
@@ -242,14 +275,17 @@
//
// label9
//
+ this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(6, 18);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(117, 23);
+ this.label9.Size = new System.Drawing.Size(86, 13);
this.label9.TabIndex = 52;
this.label9.Text = "DVD Arguments:";
//
// dvdArguments
//
+ this.dvdArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.dvdArguments.Location = new System.Drawing.Point(129, 15);
this.dvdArguments.Name = "dvdArguments";
this.dvdArguments.Size = new System.Drawing.Size(256, 20);
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096)
@@ -67,33 +67,38 @@
//
// label22
//
+ this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(6, 18);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(117, 23);
+ this.label22.Size = new System.Drawing.Size(66, 13);
this.label22.TabIndex = 81;
this.label22.Text = "Subtitle font:";
this.toolTip.SetToolTip(this.label22, "Defines the subtitle font, which will also\r\nbe used for the internal OSD.\r\n");
//
// subtitleFont
//
+ this.subtitleFont.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.subtitleFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.subtitleFont.FormattingEnabled = true;
- this.subtitleFont.Location = new System.Drawing.Point(129, 15);
+ this.subtitleFont.Location = new System.Drawing.Point(146, 15);
this.subtitleFont.Name = "subtitleFont";
- this.subtitleFont.Size = new System.Drawing.Size(260, 21);
+ this.subtitleFont.Size = new System.Drawing.Size(243, 21);
this.subtitleFont.TabIndex = 80;
this.toolTip.SetToolTip(this.subtitleFont, "Defines the subtitle font, which will also\r\nbe used for the internal OSD.");
//
// subtitleDelayStep
//
- this.subtitleDelayStep.Location = new System.Drawing.Point(129, 94);
+ this.subtitleDelayStep.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.subtitleDelayStep.Location = new System.Drawing.Point(146, 94);
this.subtitleDelayStep.Maximum = new decimal(new int[] {
10000,
0,
0,
0});
this.subtitleDelayStep.Name = "subtitleDelayStep";
- this.subtitleDelayStep.Size = new System.Drawing.Size(260, 20);
+ this.subtitleDelayStep.Size = new System.Drawing.Size(243, 20);
this.subtitleDelayStep.TabIndex = 79;
this.toolTip....
[truncated message content] |
|
From: <mis...@us...> - 2007-11-28 19:19:44
|
Revision: 1099
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1099&view=rev
Author: misterd_sf
Date: 2007-11-28 11:18:54 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Latest Updates for 0.85
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/My MPlayer.xmp
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-11-28 18:27:44 UTC (rev 1098)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-11-28 19:18:54 UTC (rev 1099)
@@ -146,7 +146,7 @@
/// Version number of the player
/// </summary>
public override string VersionNumber {
- get { return "0.80"; }
+ get { return "0.85"; }
}
#endregion
Modified: trunk/plugins/My MPlayer/My MPlayer.xmp
===================================================================
--- trunk/plugins/My MPlayer/My MPlayer.xmp 2007-11-28 18:27:44 UTC (rev 1098)
+++ trunk/plugins/My MPlayer/My MPlayer.xmp 2007-11-28 19:18:54 UTC (rev 1099)
@@ -8,16 +8,25 @@
<Source>ExternalOSDLibrary\bin\Release\ExternalOSDLibrary.dll</Source>
<Id>04010</Id>
<Option />
- <Guid>f7cfb759-87c1-4086-a870-b8430412b763</Guid>
+ <Guid>2e3578a6-d941-44ef-b43b-43ca8ed79293</Guid>
</File>
<File>
+ <FileName>ExternalOSDLibrary.dll</FileName>
+ <Type>Other</Type>
+ <SubType />
+ <Source>ExternalOSDLibrary.dll</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>77d43a6b-0b26-41ab-b400-2144de51d96d</Guid>
+ </File>
+ <File>
<FileName>MPlayer_ExtPlayer.dll</FileName>
<Type>Plugin</Type>
<SubType>External Player</SubType>
<Source>MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll</Source>
<Id>01050</Id>
<Option />
- <Guid>e56f3a8e-c05d-457f-8362-b0e6c24574c3</Guid>
+ <Guid>f313c8da-4c90-41b4-a08c-52713ef5a482</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.xml</FileName>
@@ -26,7 +35,7 @@
<Source>MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>a093d017-d1a4-456d-8a47-d7eef60bc90d</Guid>
+ <Guid>f1e23962-66fc-4a9e-a2e9-5d9ab6c2f1e3</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.dll</FileName>
@@ -35,7 +44,7 @@
<Source>MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll</Source>
<Id>01010</Id>
<Option />
- <Guid>f2b92dda-e649-4e7d-ab5f-f7477e712ecd</Guid>
+ <Guid>c640f476-f15d-4001-9c15-7a28b465881d</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.xml</FileName>
@@ -44,7 +53,7 @@
<Source>MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>c82a734c-f90d-4451-8f9b-e19fefa0530e</Guid>
+ <Guid>79ba5599-bddb-4272-b73a-926492cf19fd</Guid>
</File>
<File>
<FileName>MPlayer_Installer.dll</FileName>
@@ -62,7 +71,7 @@
<Source>My MPlayer-License.txt</Source>
<Id>03010</Id>
<Option />
- <Guid>ebb338f0-f043-4f8f-8090-af4d117658f3</Guid>
+ <Guid>458f3e12-32f3-491d-941f-1e7d4f1210a1</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -71,7 +80,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml</Source>
<Id>02010</Id>
<Option>OutputFileName=|DefaultFile=True|</Option>
- <Guid>414009ba-856a-4524-9bca-2d89ef3be17b</Guid>
+ <Guid>5615292c-ff47-4cb9-a44a-de71fada7a98</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -80,7 +89,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>9d1c9539-2a87-4a31-ab16-ea611bf00211</Guid>
+ <Guid>d331a4dd-aa42-4e68-b6c8-9e43bdf4f728</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -89,7 +98,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>2b71bb99-8c5d-4cf7-9024-0bfe195d348c</Guid>
+ <Guid>81bba257-542d-4214-9e6a-9335d20bb82b</Guid>
</File>
<File>
<FileName>strings_de.xml</FileName>
@@ -98,7 +107,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_de.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>82f87327-14e6-45fc-88d3-f198cb5f6c51</Guid>
+ <Guid>cfca23a1-94bb-43a2-9210-2354236a9222</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -107,7 +116,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_en.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>5d24b6de-22e5-463f-b35d-ae7cbb8e2b03</Guid>
+ <Guid>afd267ec-a504-4bb7-a11c-6857feb52ac5</Guid>
</File>
<File>
<FileName>strings_es.xml</FileName>
@@ -116,7 +125,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_es.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>3b698937-513f-42b6-a99a-9796c1a26078</Guid>
+ <Guid>0246ab87-40c0-46ab-9774-2ff68d0846fe</Guid>
</File>
<File>
<FileName>strings_fr.xml</FileName>
@@ -125,13 +134,56 @@
<Source>MPlayer_ExtPlayer\Language\strings_fr.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>71299188-5f11-4a50-9877-7a2be29dc187</Guid>
+ <Guid>f2872a33-e545-468f-8a03-4db6c4e28ff4</Guid>
</File>
+ <File>
+ <FileName>strings_it.xml</FileName>
+ <Type>Other</Type>
+ <SubType>%Language%\MPlayer</SubType>
+ <Source>MPlayer_ExtPlayer\Language\strings_it.xml</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>6d7c9987-0b38-481c-a14c-104a9cade59e</Guid>
+ </File>
</FileList>
<StringList />
<Actions />
- <SetupGroups />
- <SetupGroupMappings />
+ <SetupGroups>
+ <SetupGroup Id="1" Name="MP 0.2.3" />
+ <SetupGroup Id="2" Name="MP 0.2.3 + SVN 16546 or higher (Improved performance)" />
+ </SetupGroups>
+ <SetupGroupMappings>
+ <SetupGroupMapping Id="1" FileName="ExternalOSDLibrary.dll" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_ExtPlayer\Language\strings_de.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_ExtPlayer\Language\strings_en.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_ExtPlayer\Language\strings_es.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_ExtPlayer\Language\strings_fr.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_ExtPlayer\Language\strings_it.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml" />
+ <SetupGroupMapping Id="1" FileName="MPlayer_Installer\bin\Release\MPlayer_Installer.dll" />
+ <SetupGroupMapping Id="1" FileName="My MPlayer-License.txt" />
+ <SetupGroupMapping Id="2" FileName="ExternalOSDLibrary\bin\Release\ExternalOSDLibrary.dll" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_ExtPlayer\Language\strings_de.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_ExtPlayer\Language\strings_en.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_ExtPlayer\Language\strings_es.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_ExtPlayer\Language\strings_fr.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_ExtPlayer\Language\strings_it.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml" />
+ <SetupGroupMapping Id="2" FileName="MPlayer_Installer\bin\Release\MPlayer_Installer.dll" />
+ <SetupGroupMapping Id="2" FileName="My MPlayer-License.txt" />
+ </SetupGroupMappings>
<Option>
<BuildFileName>Z:\Source-MediaPortal\MP-Plugins\My MPlayer\My Mplayer.mpi</BuildFileName>
<ProiectFileName>Z:\Source-MediaPortal\MP-Plugins\My MPlayer\My MPlayer.xmp</ProiectFileName>
@@ -149,12 +201,12 @@
</Option>
<Properties>
<MPMaxVersion />
- <MPMinVersion>0.2.3 RC3</MPMinVersion>
+ <MPMinVersion>0.2.3</MPMinVersion>
<MinExtensionVersion />
<MaxExtensionVersion />
<ForumURL />
<WebURL />
<CreationDate>Monday, August 13, 2007 12:00:00 AM</CreationDate>
- <SingleGroupSelect>False</SingleGroupSelect>
+ <SingleGroupSelect>True</SingleGroupSelect>
</Properties>
</MPinstaler>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-11-28 19:34:15
|
Revision: 1100
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1100&view=rev
Author: misterd_sf
Date: 2007-11-28 11:34:14 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Additional small fixes for 0.85
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs
trunk/plugins/My MPlayer/My MPlayer.xmp
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-28 19:18:54 UTC (rev 1099)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-28 19:34:14 UTC (rev 1100)
@@ -609,7 +609,7 @@
_seekStepTimeout = Convert.ToInt16(timeout);
String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English");
- //LocalizeStrings.Load(m_strLanguage);
+ LocalizeStrings.Load(m_strLanguage);
}
try {
loadXMLData();
Modified: trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs 2007-11-28 19:18:54 UTC (rev 1099)
+++ trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs 2007-11-28 19:34:14 UTC (rev 1100)
@@ -58,7 +58,8 @@
//
// infoGroup
//
- this.infoGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.infoGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.infoGroup.Controls.Add(this.infoBox);
this.infoGroup.Location = new System.Drawing.Point(433, 83);
this.infoGroup.Name = "infoGroup";
@@ -71,11 +72,10 @@
//
this.infoBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.infoBox.AutoSize = true;
this.infoBox.BackColor = System.Drawing.SystemColors.Control;
this.infoBox.Location = new System.Drawing.Point(6, 19);
this.infoBox.Name = "infoBox";
- this.infoBox.Size = new System.Drawing.Size(166, 26);
+ this.infoBox.Size = new System.Drawing.Size(234, 415);
this.infoBox.TabIndex = 0;
this.infoBox.Text = "Informations Richtext box element\nAdditional informations\n";
//
@@ -105,6 +105,7 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.guiConfiguration1.AutoSize = true;
+ this.guiConfiguration1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.guiConfiguration1.BackColor = System.Drawing.Color.Transparent;
this.guiConfiguration1.Location = new System.Drawing.Point(6, 16);
this.guiConfiguration1.Name = "guiConfiguration1";
@@ -245,7 +246,6 @@
this.Text = "My MPlayer Configuration Wizard (1/7)";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ConfigurationWizard_FormClosing);
this.infoGroup.ResumeLayout(false);
- this.infoGroup.PerformLayout();
this.optionsGroup.ResumeLayout(false);
this.optionsGroup.PerformLayout();
this.mainGroup.ResumeLayout(false);
Modified: trunk/plugins/My MPlayer/My MPlayer.xmp
===================================================================
--- trunk/plugins/My MPlayer/My MPlayer.xmp 2007-11-28 19:18:54 UTC (rev 1099)
+++ trunk/plugins/My MPlayer/My MPlayer.xmp 2007-11-28 19:34:14 UTC (rev 1100)
@@ -8,7 +8,7 @@
<Source>ExternalOSDLibrary\bin\Release\ExternalOSDLibrary.dll</Source>
<Id>04010</Id>
<Option />
- <Guid>2e3578a6-d941-44ef-b43b-43ca8ed79293</Guid>
+ <Guid>45585f54-1c90-48aa-aa4e-268d9e750d63</Guid>
</File>
<File>
<FileName>ExternalOSDLibrary.dll</FileName>
@@ -17,7 +17,7 @@
<Source>ExternalOSDLibrary.dll</Source>
<Id>04010</Id>
<Option />
- <Guid>77d43a6b-0b26-41ab-b400-2144de51d96d</Guid>
+ <Guid>e5bc2bd2-abfe-4f49-be86-42ba30810454</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.dll</FileName>
@@ -26,7 +26,7 @@
<Source>MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll</Source>
<Id>01050</Id>
<Option />
- <Guid>f313c8da-4c90-41b4-a08c-52713ef5a482</Guid>
+ <Guid>1c9818d7-6dd9-4719-876e-96501e2cebce</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.xml</FileName>
@@ -35,7 +35,7 @@
<Source>MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>f1e23962-66fc-4a9e-a2e9-5d9ab6c2f1e3</Guid>
+ <Guid>4ee61cc9-c9c4-4d8f-b956-940041c3da6b</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.dll</FileName>
@@ -44,7 +44,7 @@
<Source>MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll</Source>
<Id>01010</Id>
<Option />
- <Guid>c640f476-f15d-4001-9c15-7a28b465881d</Guid>
+ <Guid>3e4a397a-7f77-4399-aef1-618de8f44eb5</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.xml</FileName>
@@ -53,7 +53,7 @@
<Source>MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>79ba5599-bddb-4272-b73a-926492cf19fd</Guid>
+ <Guid>53aa43b0-8f91-4bb3-bdf3-c56f8654b1fd</Guid>
</File>
<File>
<FileName>MPlayer_Installer.dll</FileName>
@@ -71,7 +71,7 @@
<Source>My MPlayer-License.txt</Source>
<Id>03010</Id>
<Option />
- <Guid>458f3e12-32f3-491d-941f-1e7d4f1210a1</Guid>
+ <Guid>2fe338f7-6bef-47a7-8812-f15943f507bb</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -80,7 +80,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml</Source>
<Id>02010</Id>
<Option>OutputFileName=|DefaultFile=True|</Option>
- <Guid>5615292c-ff47-4cb9-a44a-de71fada7a98</Guid>
+ <Guid>fd0e587b-b0be-41ab-9db8-b9c7aa324c12</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -89,7 +89,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>d331a4dd-aa42-4e68-b6c8-9e43bdf4f728</Guid>
+ <Guid>a8686eee-0f8d-460b-8c7f-442164aa528b</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -98,7 +98,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>81bba257-542d-4214-9e6a-9335d20bb82b</Guid>
+ <Guid>bcaaf33e-756f-42c0-bfb6-6b3598fa234f</Guid>
</File>
<File>
<FileName>strings_de.xml</FileName>
@@ -107,7 +107,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_de.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>cfca23a1-94bb-43a2-9210-2354236a9222</Guid>
+ <Guid>56fd6dcc-7724-4f87-8dca-96618845e824</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -116,7 +116,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_en.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>afd267ec-a504-4bb7-a11c-6857feb52ac5</Guid>
+ <Guid>f5a9208d-ab59-47b9-b4e1-9264ff3e54b6</Guid>
</File>
<File>
<FileName>strings_es.xml</FileName>
@@ -125,7 +125,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_es.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>0246ab87-40c0-46ab-9774-2ff68d0846fe</Guid>
+ <Guid>86988713-7b8b-4a9e-82a8-f99b01cc85b2</Guid>
</File>
<File>
<FileName>strings_fr.xml</FileName>
@@ -134,7 +134,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_fr.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>f2872a33-e545-468f-8a03-4db6c4e28ff4</Guid>
+ <Guid>3ec5dd28-a650-4c34-adcd-93f39848c007</Guid>
</File>
<File>
<FileName>strings_it.xml</FileName>
@@ -143,7 +143,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_it.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>6d7c9987-0b38-481c-a14c-104a9cade59e</Guid>
+ <Guid>3a5dfa4f-89dd-423e-8262-c23c0439d2e9</Guid>
</File>
</FileList>
<StringList />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2008-01-26 15:54:19
|
Revision: 1315
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1315&view=rev
Author: misterd_sf
Date: 2008-01-26 07:53:53 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
Fixed several small bugs in external player
Playlist aren't sorted anymore when treated as folder
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2008-01-26 15:41:27 UTC (rev 1314)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2008-01-26 15:53:53 UTC (rev 1315)
@@ -809,7 +809,7 @@
}
Log.Debug("MPlayer: Detected different screen. Number: " + i);
i++;
- return "-adapter " + i;
+ return " -adapter " + i;
}
#endregion
@@ -883,13 +883,13 @@
arguments.Append(_extensionSettings["vcd://"].Arguments);
arguments.Append(" \"vcd://");
arguments.Append(file);
- arguments.Append("\"");
+ arguments.Append("\" ");
} else if (fileName.StartsWith("svcd://")) {
String file = fileName.Substring(7);
arguments.Append(_extensionSettings["svcd://"].Arguments);
arguments.Append(" \"vcd://");
arguments.Append(file);
- arguments.Append("\"");
+ arguments.Append("\" ");
} else if (fileName.StartsWith("cue://") ||
fileName.StartsWith("ftp://") ||
fileName.StartsWith("http://") ||
@@ -914,7 +914,7 @@
arguments.Append(" \"");
arguments.Append(protocol);
arguments.Append(file);
- arguments.Append("\"");
+ arguments.Append("\" ");
} else if (fileName.EndsWith(".cda")) {
String drive = System.IO.Path.GetDirectoryName(fileName);
if (drive.EndsWith("\\")) {
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2008-01-26 15:41:27 UTC (rev 1314)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2008-01-26 15:53:53 UTC (rev 1315)
@@ -165,6 +165,11 @@
/// Indicates if playlists should be treat as folders
/// </summary>
private bool treatPlaylistsAsFolders;
+
+ /// <summary>
+ /// Disable sorting of elements. Onl\xF6y needed for playlists.
+ /// </summary>
+ private bool disableSorting;
#endregion
#region ctor
@@ -491,8 +496,13 @@
/// Sorts the facadeView
/// </summary>
protected virtual void OnSort() {
- facadeView.Sort(new VideoSort(CurrentSortMethod, CurrentSortAsc));
- UpdateButtonStates();
+ if (!disableSorting) {
+ btnSortBy.Disabled = false;
+ facadeView.Sort(new VideoSort(CurrentSortMethod, CurrentSortAsc));
+ UpdateButtonStates();
+ } else {
+ btnSortBy.Disabled = true;
+ }
}
/// <summary>
@@ -639,6 +649,7 @@
/// </summary>
/// <param name="newFolderName">Name of the folder</param>
private void LoadDirectory(string newFolderName) {
+ disableSorting = false;
String _currentFolder = newFolderName;
string objectCount = String.Empty;
@@ -683,7 +694,7 @@
if (treatPlaylistsAsFolders && PlayListFactory.IsPlayList(newFolderName)) {
IPlayListIO loader = PlayListFactory.CreateIO(newFolderName);
PlayList playlist = new PlayList();
-
+ disableSorting = true;
if (loader.Load(playlist, newFolderName)) {
GUIListItem item;
foreach (PlayListItem plItem in playlist) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2008-02-02 16:01:13
|
Revision: 1337
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1337&view=rev
Author: misterd_sf
Date: 2008-02-02 08:01:03 -0800 (Sat, 02 Feb 2008)
Log Message:
-----------
Last modifications of 0.86
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/My MPlayer.xmp
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2008-02-02 11:02:12 UTC (rev 1336)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2008-02-02 16:01:03 UTC (rev 1337)
@@ -151,7 +151,7 @@
/// Version number of the player
/// </summary>
public override string VersionNumber {
- get { return "0.85"; }
+ get { return "0.86"; }
}
#endregion
Modified: trunk/plugins/My MPlayer/My MPlayer.xmp
===================================================================
--- trunk/plugins/My MPlayer/My MPlayer.xmp 2008-02-02 11:02:12 UTC (rev 1336)
+++ trunk/plugins/My MPlayer/My MPlayer.xmp 2008-02-02 16:01:03 UTC (rev 1337)
@@ -8,7 +8,7 @@
<Source>ExternalOSDLibrary\bin\Release\ExternalOSDLibrary.dll</Source>
<Id>04010</Id>
<Option />
- <Guid>45585f54-1c90-48aa-aa4e-268d9e750d63</Guid>
+ <Guid>27bda5fd-3d23-47a0-a61f-fe4b74a666ef</Guid>
</File>
<File>
<FileName>ExternalOSDLibrary.dll</FileName>
@@ -17,7 +17,7 @@
<Source>ExternalOSDLibrary.dll</Source>
<Id>04010</Id>
<Option />
- <Guid>e5bc2bd2-abfe-4f49-be86-42ba30810454</Guid>
+ <Guid>32781bff-ef5a-491d-a9ba-d7a6e06aaef2</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.dll</FileName>
@@ -26,7 +26,7 @@
<Source>MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll</Source>
<Id>01050</Id>
<Option />
- <Guid>1c9818d7-6dd9-4719-876e-96501e2cebce</Guid>
+ <Guid>1d322825-c79f-432f-9f96-39aceb300cbe</Guid>
</File>
<File>
<FileName>MPlayer_ExtPlayer.xml</FileName>
@@ -35,7 +35,7 @@
<Source>MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>4ee61cc9-c9c4-4d8f-b956-940041c3da6b</Guid>
+ <Guid>b9f36476-387d-4179-8e68-ddd2c66f62fe</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.dll</FileName>
@@ -44,7 +44,7 @@
<Source>MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll</Source>
<Id>01010</Id>
<Option />
- <Guid>3e4a397a-7f77-4399-aef1-618de8f44eb5</Guid>
+ <Guid>844ca32f-7462-44f8-b5ba-a49d0f05480a</Guid>
</File>
<File>
<FileName>MPlayer_GUIPlugin.xml</FileName>
@@ -53,7 +53,7 @@
<Source>MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>53aa43b0-8f91-4bb3-bdf3-c56f8654b1fd</Guid>
+ <Guid>24ce8fc9-20c1-471b-9a33-bc928f431956</Guid>
</File>
<File>
<FileName>MPlayer_Installer.dll</FileName>
@@ -71,7 +71,7 @@
<Source>My MPlayer-License.txt</Source>
<Id>03010</Id>
<Option />
- <Guid>2fe338f7-6bef-47a7-8812-f15943f507bb</Guid>
+ <Guid>472d538b-55a9-43e7-9c79-009c2d1233e4</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -80,7 +80,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml</Source>
<Id>02010</Id>
<Option>OutputFileName=|DefaultFile=True|</Option>
- <Guid>fd0e587b-b0be-41ab-9db8-b9c7aa324c12</Guid>
+ <Guid>275210a5-e10f-481f-985c-2b7e127bc798</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -89,7 +89,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>a8686eee-0f8d-460b-8c7f-442164aa528b</Guid>
+ <Guid>d5d4eb55-25b2-4180-b683-677be3e26f66</Guid>
</File>
<File>
<FileName>myMPlayer.xml</FileName>
@@ -98,7 +98,7 @@
<Source>MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml</Source>
<Id>02010</Id>
<Option />
- <Guid>bcaaf33e-756f-42c0-bfb6-6b3598fa234f</Guid>
+ <Guid>98c7e40a-21e5-4b8a-8a2b-a200ed35ae40</Guid>
</File>
<File>
<FileName>strings_de.xml</FileName>
@@ -107,7 +107,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_de.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>56fd6dcc-7724-4f87-8dca-96618845e824</Guid>
+ <Guid>d8ce7cb4-c0c5-4e68-ad1f-fd0debde6d2a</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -116,7 +116,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_en.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>f5a9208d-ab59-47b9-b4e1-9264ff3e54b6</Guid>
+ <Guid>7b4b9b76-e9b7-4992-9a19-f7d91ba2e1a3</Guid>
</File>
<File>
<FileName>strings_es.xml</FileName>
@@ -125,7 +125,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_es.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>86988713-7b8b-4a9e-82a8-f99b01cc85b2</Guid>
+ <Guid>c64828fc-4eb0-406f-b3a6-a80e03bbb9d3</Guid>
</File>
<File>
<FileName>strings_fr.xml</FileName>
@@ -134,7 +134,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_fr.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>3ec5dd28-a650-4c34-adcd-93f39848c007</Guid>
+ <Guid>d25b5af7-155e-40eb-9b68-4941adee9bac</Guid>
</File>
<File>
<FileName>strings_it.xml</FileName>
@@ -143,7 +143,7 @@
<Source>MPlayer_ExtPlayer\Language\strings_it.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>3a5dfa4f-89dd-423e-8262-c23c0439d2e9</Guid>
+ <Guid>e6b322b4-6ac5-42e9-b15d-76c316b243b9</Guid>
</File>
</FileList>
<StringList />
@@ -190,7 +190,7 @@
<ProiectName>My MPlayer</ProiectName>
<Author>MisterD</Author>
<UpdateURL>http://mpi.team-mediaportal.com</UpdateURL>
- <Version>0.85</Version>
+ <Version>0.86</Version>
<Description>My MPlayer is an external player and window plugin that gives the user the ability to use MPlayer in MediaPortal.
With the window plugin the user can play more medias like rtsp streams etc. than with the standard plugins of MP. It always uses MPlayer even if normally the internal players or an other external player is used by the other Plugins.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X