From: <mis...@us...> - 2007-10-04 20:30:50
|
Revision: 974 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=974&view=rev Author: misterd_sf Date: 2007-10-04 13:30:23 -0700 (Thu, 04 Oct 2007) Log Message: ----------- Bugfix for volume osd handling Bugify for configuration option Audio/Subtitle delay step Modified Paths: -------------- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -67,6 +67,11 @@ // audioDelayStep // this.audioDelayStep.Location = new System.Drawing.Point(129, 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.TabIndex = 69; Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -87,6 +87,11 @@ // subtitleDelayStep // this.subtitleDelayStep.Location = new System.Drawing.Point(129, 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.TabIndex = 79; Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -65,7 +65,7 @@ public ExternalOSDLibrary(MPlayer_ExtPlayer player) { _showingCacheStatus = false; _player = player; - _internalOSDHandler = new InternalOSDHandler(player); + _internalOSDHandler = new InternalOSDHandler(player,false); using (WaitCursor cursor = new WaitCursor()) { Thread thread = new Thread(osdGetInstance); thread.Start(); Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -85,15 +85,18 @@ /// Constructor which initialises the internal osd handler /// </summary> /// <param name="player">Instance of external player</param> - public InternalOSDHandler(MPlayer_ExtPlayer player) { + /// <param name="playerUse">Indicates, if this instance will be used by the player class</param> + public InternalOSDHandler(MPlayer_ExtPlayer player, bool playerUse) { _player = player; _configManager = ConfigurationManager.getInstance(); _displayDuration = 2000; _osdVisible = false; _osdVisibleForPause = false; _mpVolumeHandler = VolumeHandler.Instance; - _mpMessageHandler = new SendMessageHandler(OnMessage); - GUIWindowManager.Receivers += _mpMessageHandler; + if (playerUse) { + _mpMessageHandler = new SendMessageHandler(OnMessage); + GUIWindowManager.Receivers += _mpMessageHandler; + } } /// <summary> Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -409,7 +409,7 @@ private void initSystem() { _playState = PlayState.Playing; if (_configManager.OsdMode == OSDMode.InternalMPlayer) { - _osdHandler = new InternalOSDHandler(this); + _osdHandler = new InternalOSDHandler(this,true); } else if (_configManager.OsdMode == OSDMode.ExternalOSDLibrary) { _osdHandler = new ExternalOSDLibrary(this); } @@ -426,7 +426,7 @@ } #endregion - #region UpdateGUI Handling + #region MPlayer process communication /// <summary> /// Occures, when the mplayer process exists /// </summary> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |