added search function to the playlist

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index 3030b65728f1cac6fa3b1b446be0d83eab0baa2e..fdf85b00bec3b17ffbdc126420367c375acc7143 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -324,6 +324,7 @@
                 deleteItems = id; 
                 playItem = id; 
                 savePlaylist = id; 
+                searchItem = id; 
                 selectAll = id; 
                 toggleWindow = id; 
             }; 
@@ -338,6 +339,7 @@
                 "o_mi_selectall" = id; 
                 "o_random_ckb" = id; 
                 "o_repeat_ckb" = id; 
+                "o_search_keyword" = id; 
                 "o_status_field" = id; 
                 "o_table_view" = id; 
                 "o_tc_author" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 74ec9284d6ff96b080f55e0ea50572918753aa80..5f136dc514869517e8635d91b2f8ddcc0b1043e3 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>502 132 505 541 0 0 1024 746 </string>
+       <string>31 168 505 541 0 0 1024 746 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
@@ -19,10 +19,11 @@
        <array/>
        <key>IBOpenObjects</key>
        <array>
-               <integer>915</integer>
                <integer>29</integer>
                <integer>21</integer>
                <integer>1647</integer>
+               <integer>636</integer>
+               <integer>915</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7C107</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 2182239addd5483fbfd618bcac481c435e32e7ce..e0b59900aac50c77c57812d8803f746c348da01b 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index cba2a3ec5840e6ace0310435df7887a588b0bed8..1a2bbd919064b978d76bfba565fcb2b272ce5db6 100644 (file)
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -2,7 +2,7 @@
  * playlist.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.h,v 1.13 2003/11/16 11:21:48 bigben Exp $
+ * $Id: playlist.h,v 1.14 2003/11/17 13:05:17 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -54,6 +54,9 @@
     IBOutlet id o_random_ckb;
     IBOutlet id o_loop_ckb;
     IBOutlet id o_repeat_ckb;
+
+    IBOutlet id o_search_keyword;
+
 }
 
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
@@ -63,6 +66,7 @@
 - (IBAction)playItem:(id)sender;
 - (IBAction)deleteItems:(id)sender;
 - (IBAction)selectAll:(id)sender;
+- (IBAction)searchItem:(id)sender;
 
 - (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue;
 

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index d3c21dc4f9e0be1b5a6c47e4c5c4dc8850952b2b..f79689921b1217f8aab0e31fa9766b28dc40d1c6 100644 (file)
--- 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.39 2003/11/16 11:21:48 bigben Exp $
+ * $Id: playlist.m,v 1.40 2003/11/17 13:05:17 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <math.h>
 #include <sys/mount.h>
+#include <vlc_keys.h>
 
 #include "intf.h"
 #include "playlist.h"
@@ -143,6 +144,7 @@
     [o_random_ckb setTitle: _NS("Random")];
     [o_loop_ckb setTitle: _NS("Repeat All")];
     [o_repeat_ckb setTitle: _NS("Repeat One")];
+
 }
 
 - (BOOL)tableView:(NSTableView *)o_tv 
@@ -260,6 +262,54 @@
     [o_table_view selectAll: nil];
 }
 
+
+- (IBAction)searchItem:(id)sender
+{
+    int i_start;
+    int i_current;
+    id o_current_name;
+
+    intf_thread_t * p_intf = [NSApp getIntf];
+    playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                               FIND_ANYWHERE );
+    if ( [o_table_view selectedRow] == [o_table_view numberOfRows]-1 )
+    {
+         i_start = -1;
+    }
+    else 
+    {
+         i_start = [o_table_view selectedRow];
+    }
+
+    for ( i_current = i_start + 1 ; i_current < [o_table_view numberOfRows] ; i_current++ )
+    {
+
+        if( p_playlist == NULL )
+        {
+            o_current_name = nil;
+        }
+
+
+        else 
+        {
+            vlc_mutex_lock( &p_playlist->object_lock );
+            o_current_name = [[NSString stringWithUTF8String: 
+                p_playlist->pp_items[i_current]->psz_name] lastPathComponent]; 
+            vlc_mutex_unlock( &p_playlist->object_lock );
+        }
+
+        if( [o_current_name rangeOfString:[o_search_keyword stringValue] options:NSCaseInsensitiveSearch ].length )
+        {
+             [o_table_view selectRow: i_current byExtendingSelection: NO];
+             [o_table_view scrollRowToVisible: i_current];
+             break;
+        }
+    [o_table_view selectRow: i_current byExtendingSelection: NO];
+    [o_table_view scrollRowToVisible: i_current];
+    }
+    vlc_object_release( p_playlist );
+}
+
 - (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
 {
     int i_item;
@@ -373,6 +423,7 @@
     [o_table_view selectRow: i_row byExtendingSelection: NO];
     [o_table_view scrollRowToVisible: i_row];
 }
+    
 
 @end