From: Derk-Jan Hartman <hartman@videolan.org>
Date: Wed, 9 Apr 2003 14:12:49 +0000 (+0000)
Subject: * modules/gui/macosx/*:
X-Git-Tag: 0.6.0~623
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ee40e8a760706fec19803191b3143534b9a3a14b;p=vlc

* modules/gui/macosx/*:
  - when adding multiple files, we sort them alphabetically before adding them.
    stupid finder ;)

* modules/demux/asf/asf.c:
  - avoid a duplicate translation of a string
---

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index e2a2805cf7..bcf752cf1e 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -2,7 +2,7 @@
  * asf.c : ASFv01 file input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: asf.c,v 1.25 2003/03/31 23:32:44 sigmunau Exp $
+ * $Id: asf.c,v 1.26 2003/04/09 14:12:49 hartman Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -264,7 +264,7 @@ static int Activate( vlc_object_t * p_this )
                 p_wf->nChannels         = GetWLE( p_data + 2 );
                 input_AddInfo( p_cat, _("Channels"), "%d", p_wf->nChannels );
                 p_wf->nSamplesPerSec    = GetDWLE( p_data + 4 );
-                input_AddInfo( p_cat, _("Sample rate"), "%d", p_wf->nSamplesPerSec );
+                input_AddInfo( p_cat, _("Sample Rate"), "%d", p_wf->nSamplesPerSec );
                 p_wf->nAvgBytesPerSec   = GetDWLE( p_data + 8 );
                 input_AddInfo( p_cat, _("Avg. byterate"), "%d", p_wf->nAvgBytesPerSec );
                 p_wf->nBlockAlign       = GetWLE( p_data + 12 );
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 75dcabd98d..4d52030259 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -2,7 +2,7 @@
  * open.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: open.m,v 1.27 2003/04/01 22:29:41 massiot Exp $
+ * $Id: open.m,v 1.28 2003/04/09 14:12:49 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -808,7 +808,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     {
         intf_thread_t * p_intf = [NSApp getIntf];
         config_PutPsz( p_intf, "sout", NULL );
-        [o_playlist appendArray: [o_open_panel filenames] atPos: -1 enqueue:NO];
+        
+        NSArray *o_values = [[o_open_panel filenames]
+                sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+        
+        [o_playlist appendArray: o_values atPos: -1 enqueue:NO];
     }
 }
 
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index abf2c2bc7f..6546ed3173 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -2,7 +2,7 @@
  * playlist.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.m,v 1.17 2003/03/17 23:13:06 hartman Exp $
+ * $Id: playlist.m,v 1.18 2003/04/09 14:12:49 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -446,8 +446,8 @@
         
         if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
         {
-            o_values = [o_pasteboard propertyListForType: NSFilenamesPboardType];
-        
+            o_values = [[o_pasteboard propertyListForType: NSFilenamesPboardType]
+                        sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
             [self appendArray: o_values atPos: i_proposed_row enqueue:YES];
         
             return( YES );