Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [998] trunk/plugins/My MPlayer
|
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.
|
