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

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

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.