Quick patch to make pda.c inteface compile again. It disables the management of the...

[vlc] / modules / gui / macosx / playlist.h

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 7e38344fbe542343a0a039e4fe57a66aed5665aa..995265bb00826e4dd70a6af3f816baa026e626ea 100644 (file)
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * playlist.h: MacOS X interface plugin
+ * playlist.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
- * $Id: playlist.h,v 1.19 2004/01/15 23:59:21 bigben Exp $
+ * Copyright (C) 2002-2005 VideoLAN
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <hartman at videolan dot org>
@@ -25,7 +25,7 @@
 /*****************************************************************************
  * VLCPlaylistView interface 
  *****************************************************************************/
-@interface VLCPlaylistView : NSTableView
+@interface VLCPlaylistView : NSOutlineView
 {
 }
 
@@ -36,50 +36,68 @@
  *****************************************************************************/
 @interface VLCPlaylist : NSObject
 {
-    int i_moveRow;
-    bool b_isSortDescending;
-    
-    IBOutlet id o_window;
+    IBOutlet id o_controller;
+
     IBOutlet id o_btn_playlist;
-    IBOutlet id o_table_view;
-    
-    IBOutlet id o_status_field;
+    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_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_random_ckb;
-    IBOutlet id o_loop_ckb;
-    IBOutlet id o_repeat_ckb;
-
-    IBOutlet id o_search_keyword;
-    IBOutlet id o_search_button;
+    IBOutlet id o_mi_sort_name;
+    IBOutlet id o_mi_sort_author;
+    
+    /* "services discovery" menu in the playlist menu */
+    IBOutlet id o_mi_services;
+    IBOutlet id o_mu_services;
+    
+    /* "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;
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
+- (NSOutlineView *)outlineView;
+
+- (IBAction)handlePopUp:(id)sender;
+- (IBAction)searchItem:(id)sender;
+
+- (void)playlistUpdated;
+- (void)sortNode:(int)i_mode;
+- (void)updateRowSelection;
 
-- (IBAction)toggleWindow:(id)sender;
-- (IBAction)savePlaylist:(id)sender;
+- (IBAction)servicesChange:(id)sender;
 - (IBAction)playItem:(id)sender;
-- (IBAction)deleteItems:(id)sender;
+- (IBAction)deleteItem:(id)sender;
 - (IBAction)selectAll:(id)sender;
-- (IBAction)searchItem:(id)sender;
+- (IBAction)sortNodeByName:(id)sender;
+- (IBAction)sortNodeByAuthor:(id)sender;
 
 - (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue;
 
-- (void)updateRowSelection;
-- (void)playlistUpdated;
+- (playlist_item_t *)selectedPlaylistItem;
 
 @end
+