[Mp-plugins-svn] SF.net SVN: mp-plugins: [152] trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ MPlayer_ExtPlayer.cs

[<mis...@us...>]

Revision: 152
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=152&view=rev
Author:   misterd_sf
Date:     2007-03-02 13:08:07 -0800 (Fri, 02 Mar 2007)

Log Message:
-----------
Mplayer 0.61:
- Fixed localisation issue when parsing MPlayer messages
- Fixed time issue when playback starts

Modified Paths:
--------------
    trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs

Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs	2007-03-01 20:27:59 UTC (rev 151)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs	2007-03-02 21:08:07 UTC (rev 152)
@@ -26,6 +26,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading;
@@ -302,7 +303,7 @@
         /// Version number of the player
         /// </summary>
         public override string VersionNumber {
-            get { return "0.6"; }
+            get { return "0.61"; }
         }
         #endregion
 
@@ -397,10 +398,6 @@
                 mplayerProcess.OutputDataReceived += new DataReceivedEventHandler(mplayerProcess_OutputDataReceived);
                 mplayerProcess.BeginOutputReadLine();
                 input = mplayerProcess.StandardInput;
-                sendCommand("get_time_pos");
-                sendCommand("osd 0");
-                sendCommand("sub_visibility 0");
-                sendCommand("forced_subs_only 1");
                 result = true;
             } catch (Exception e) {
                 Log.Info("MPlayer Error: " + e.Message);
@@ -447,7 +444,7 @@
             mplayerInnerPanel.Size = new System.Drawing.Size(0, 0);
             mplayerInnerPanel.BackColor = Color.FromArgb(16, 16, 16);
             mplayerOuterPanel.Controls.Add(mplayerInnerPanel);
-           _playState = PlayState.Playing;
+            _playState = PlayState.Playing;
             speed = 1;
             _volume = 100;
         }
@@ -491,14 +488,17 @@
         private void mplayerProcess_OutputDataReceived(object sender, DataReceivedEventArgs e) {
             String result = e.Data;
             if (result != null) {
+                Log.Info("MPlayer: Data received: " + e.Data);
                 if (result.StartsWith("ANS_TIME_POSITION=")) {
                     additionalTime = DateTime.Now;
-                    baseTime = Double.Parse(result.Substring(18).Replace('.', ','));
+                    baseTime = Double.Parse(result.Substring(18).Replace(".",
+                        CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator));
                 } else if (result.StartsWith("ANS_PERCENT_POSITION=")) {
                     additionalTime = DateTime.Now;
                     performSeekRelativePercentage(Int32.Parse(result.Substring(21)));
                 } else if (result.StartsWith("ID_LENGTH")) {
-                    duration = Double.Parse(result.Substring(10).Replace('.', ','));
+                    duration = Double.Parse(result.Substring(10).Replace(".",
+                        CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator));
                 } else if (result.StartsWith("ID_AUDIO_ID")) {
                     int temp = Int32.Parse(result.Substring(12));
                     if (!audioNames.ContainsKey(temp)) {
@@ -528,6 +528,10 @@
                 } else if (result.StartsWith("Exiting... (End of file)")) {
                     _playState = PlayState.Ended;
                 } else if (result.StartsWith("VO: [directx] ")) {
+                    sendCommand("get_time_pos");
+                    sendCommand("osd 0");
+                    sendCommand("sub_visibility 0");
+                    sendCommand("forced_subs_only 1");
                     int pos = result.IndexOf("=> ");
                     String temp = result.Substring(pos + 3);
                     pos = temp.IndexOf('x');
@@ -539,7 +543,6 @@
                     _needUpdate = true;
                     SetVideoWindow();
                 }
-                Log.Info("MPlayer: Data received: " + e.Data);
             }
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.