X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.h;h=340076f3af6b46f168c03db0374d065ed12e2be8;hb=7dd8cdfd0ec842c21af56c705ddf8b7f14410455;hp=db901544dab33a5785f70347b070f390404d2e98;hpb=d2270bdb201cb2d4eccd317b2cf164f94e45c472;p=vlc

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index db901544da..340076f3af 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * playlist.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2005 VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -25,7 +25,7 @@
 /*****************************************************************************
  * VLCPlaylistView interface 
  *****************************************************************************/
-@interface VLCPlaylistView : NSTableView
+@interface VLCPlaylistView : NSOutlineView
 {
 }
 
@@ -36,73 +36,71 @@
  *****************************************************************************/
 @interface VLCPlaylist : NSObject
 {
-    int i_moveRow;
-    bool b_isSortDescending;
+    IBOutlet id o_controller;
 
-    IBOutlet id o_window;
     IBOutlet id o_btn_playlist;
-    IBOutlet id o_table_view;
-
-    IBOutlet id o_status_field;
-    IBOutlet id o_tc_id;
+    IBOutlet id o_playlist_view;
+    IBOutlet id o_outline_view;
     IBOutlet id o_tc_name;
     IBOutlet id o_tc_author;
     IBOutlet id o_tc_duration;
-    IBOutlet id o_tc_sortColumn;
-
-    IBOutlet id o_ctx_menu;
+    IBOutlet id o_status_field;
+    IBOutlet id o_search_field;
+    IBOutlet id o_random_ckb;
+    IBOutlet id o_loop_popup;
     IBOutlet id o_mi_save_playlist;
-    IBOutlet id o_mi_info;
+    IBOutlet id o_ctx_menu;
+
     IBOutlet id o_mi_play;
     IBOutlet id o_mi_delete;
+    IBOutlet id o_mi_info;
     IBOutlet id o_mi_selectall;
-    IBOutlet id o_mi_toggleItemsEnabled;
-
-    IBOutlet id o_random_ckb;
-
-    IBOutlet id o_search_keyword;
-    IBOutlet id o_search_button;
-
-    IBOutlet id o_loop_popup;
+    IBOutlet id o_mi_sort_name;
+    IBOutlet id o_mi_sort_author;
 
-/*For playlist info window*/
+    /* "services discovery" menu in the playlist menu */
+    IBOutlet id o_mi_services;
+    IBOutlet id o_mu_services;
 
-    IBOutlet id o_info_window;
-    IBOutlet id o_uri_lbl;
-    IBOutlet id o_title_lbl;
-    IBOutlet id o_author_lbl;
-    IBOutlet id o_uri_txt;
-    IBOutlet id o_title_txt;
-    IBOutlet id o_author_txt;
-    IBOutlet id o_btn_info_ok;
-    IBOutlet id o_btn_info_cancel;
-    IBOutlet id o_tbv_info;
+    /* "services discovery" menu in the main menu */
+    IBOutlet id o_mm_mi_services;
+    IBOutlet id o_mm_mu_services;
 
     NSImage *o_descendingSortingImage;
     NSImage *o_ascendingSortingImage;
+
+    NSMutableDictionary *o_outline_dict;
+
+    BOOL b_selected_item_met;
+    BOOL b_isSortDescending;
+    int i_current_view;
+    id o_tc_sortColumn;
 }
 
 - (void)initStrings;
+- (void)searchfieldChanged:(NSNotification *)o_notification;
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
+- (NSOutlineView *)outlineView;
 
-- (IBAction)toggleWindow:(id)sender;
-- (IBAction)savePlaylist:(id)sender;
-- (IBAction)playItem:(id)sender;
-- (IBAction)deleteItems:(id)sender;
-- (IBAction)toggleItemsEnabled:(id)sender;
-- (IBAction)selectAll:(id)sender;
-- (IBAction)searchItem:(id)sender;
 - (IBAction)handlePopUp:(id)sender;
+- (IBAction)searchItem:(id)sender;
 
-- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue;
-
-- (void)updateRowSelection;
 - (void)playlistUpdated;
+- (void)playModeUpdated;
+- (void)sortNode:(int)i_mode;
+- (void)updateRowSelection;
 
-/*For playlist info window*/
+- (IBAction)servicesChange:(id)sender;
+- (IBAction)playItem:(id)sender;
+- (IBAction)deleteItem:(id)sender;
+- (IBAction)selectAll:(id)sender;
+- (IBAction)sortNodeByName:(id)sender;
+- (IBAction)sortNodeByAuthor:(id)sender;
+
+- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue;
+- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position inView:(int)i_view enqueue:(BOOL)b_enqueue;
 
-- (int)selectedPlaylistItem;
-- (NSColor *)getColor:(int)i_group;
+- (playlist_item_t *)selectedPlaylistItem;
 
 @end