* modules/visualization/visual/visual.c: fixed strings

* src/playlist/playlist.c: fixed sorting

modules/visualization/visual/visual.c

@@ -2,7 +2,7 @@
  * visual.c : Visualisation system
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: visual.c,v 1.9 2003/09/20 00:37:53 fenrir Exp $
+ * $Id: visual.c,v 1.10 2003/09/24 10:21:32 zorglub Exp $
  *
  * Authors: Clment Stenac <zorglub@via.ecp.fr>
  *
@@ -41,13 +41,13 @@
       "Current effects include: dummy, random, scope, spectrum" )
 
 #define WIDTH_TEXT N_( "Video width" )
-#define HEIGHT_LONGTEXT N_( \
-      "The width of the effects video window, in pixels." )
-
-#define HEIGHT_TEXT N_( "Video width" )
 #define WIDTH_LONGTEXT N_( \
       "The width of the effects video window, in pixels." )
 
+#define HEIGHT_TEXT N_( "Video height" )
+#define HEIGHT_LONGTEXT N_( \
+      "The height of the effects video window, in pixels." )
+
 #define NBBANDS_TEXT N_( "Number of bands" )
 #define NBBANDS_LONGTEXT N_( \
       "Number of bands used by spectrum analizer, should be 20 or 80" )

src/playlist/playlist.c

@@ -2,7 +2,7 @@
  * playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.55 2003/09/22 14:40:12 zorglub Exp $
+ * $Id: playlist.c,v 1.56 2003/09/24 10:21:32 zorglub Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -73,7 +73,7 @@ playlist_t * __playlist_Create ( vlc_object_t *p_parent )
     var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
     val.b_bool = VLC_TRUE;
     var_Set( p_playlist, "intf-show", val );
-    
+
     var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_playlist, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_playlist, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
@@ -380,7 +380,7 @@ int playlist_Sort( playlist_t * p_playlist , int i_type )
 
     vlc_mutex_lock( &p_playlist->object_lock );
 
-    for( i_position = 0; i_position <= p_playlist->i_size -1 ; i_position ++ )
+    for( i_position = 0; i_position < p_playlist->i_size -1 ; i_position ++ )
     {
         i_small  = i_position;
         for( i = i_position + 1 ; i<  p_playlist->i_size ; i++)
@@ -395,11 +395,10 @@ int playlist_Sort( playlist_t * p_playlist , int i_type )
             {
                 i_small = i;
             }
-
-            p_temp = p_playlist->pp_items[i_position];
-            p_playlist->pp_items[i_position] = p_playlist->pp_items[i_small];
-            p_playlist->pp_items[i_small] = p_temp;
         }
+        p_temp = p_playlist->pp_items[i_position];
+        p_playlist->pp_items[i_position] = p_playlist->pp_items[i_small];
+        p_playlist->pp_items[i_small] = p_temp;
     }
     vlc_mutex_unlock( &p_playlist->object_lock );