Commit ee40e8a7 authored by hartman's avatar hartman

* 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
parent 674dd615
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* asf.c : ASFv01 file input module for vlc * asf.c : ASFv01 file input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -264,7 +264,7 @@ static int Activate( vlc_object_t * p_this ) ...@@ -264,7 +264,7 @@ static int Activate( vlc_object_t * p_this )
p_wf->nChannels = GetWLE( p_data + 2 ); p_wf->nChannels = GetWLE( p_data + 2 );
input_AddInfo( p_cat, _("Channels"), "%d", p_wf->nChannels ); input_AddInfo( p_cat, _("Channels"), "%d", p_wf->nChannels );
p_wf->nSamplesPerSec = GetDWLE( p_data + 4 ); 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 ); p_wf->nAvgBytesPerSec = GetDWLE( p_data + 8 );
input_AddInfo( p_cat, _("Avg. byterate"), "%d", p_wf->nAvgBytesPerSec ); input_AddInfo( p_cat, _("Avg. byterate"), "%d", p_wf->nAvgBytesPerSec );
p_wf->nBlockAlign = GetWLE( p_data + 12 ); p_wf->nBlockAlign = GetWLE( p_data + 12 );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc * open.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -808,7 +808,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) ...@@ -808,7 +808,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
{ {
intf_thread_t * p_intf = [NSApp getIntf]; intf_thread_t * p_intf = [NSApp getIntf];
config_PutPsz( p_intf, "sout", NULL ); 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];
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* playlist.m: MacOS X interface plugin * playlist.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <thedj@users.sourceforge.net> * Derk-Jan Hartman <thedj@users.sourceforge.net>
...@@ -446,8 +446,8 @@ ...@@ -446,8 +446,8 @@
if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) 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]; [self appendArray: o_values atPos: i_proposed_row enqueue:YES];
return( YES ); return( YES );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment