macosx: merge Eric Dudiak's code from GSoC 2008

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

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 76ecd9323eff143ea571f4c2477e4e70de63d80a..96cee08f15b3f482fe5d709d0413bc106f0c0a85 100644 (file)
--- 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-2005 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -41,14 +41,18 @@
     IBOutlet id o_tc_duration;
     IBOutlet id o_outline_view;
 
+    IBOutlet id o_tc_name_other;
+    IBOutlet id o_tc_author_other;
+    IBOutlet id o_tc_duration_other;
+    IBOutlet id o_outline_view_other;
+
     NSMutableDictionary *o_outline_dict;
-    int i_current_view;
 }
 
 - (void)initStrings;
 - (playlist_item_t *)selectedPlaylistItem;
 - (NSOutlineView *)outlineView;
-
+- (void)swapPlaylists:(id)newList;
 @end
 
 /*****************************************************************************
@@ -72,10 +76,11 @@
 
     IBOutlet id o_btn_playlist;
     IBOutlet id o_playlist_view;
+    IBOutlet id o_sidebar;
     IBOutlet id o_status_field;
+    IBOutlet id o_status_field_embed;
     IBOutlet id o_search_field;
-    IBOutlet id o_random_ckb;
-    IBOutlet id o_loop_popup;
+    IBOutlet id o_search_field_other;
     IBOutlet id o_mi_save_playlist;
     IBOutlet id o_ctx_menu;
 
@@ -83,6 +88,9 @@
     IBOutlet id o_mi_delete;
     IBOutlet id o_mi_info;
     IBOutlet id o_mi_preparse;
+    IBOutlet id o_mi_revealInFinder;
+    IBOutlet id o_mm_mi_revealInFinder;
+    IBOutlet id o_mi_dl_cover_art;
     IBOutlet id o_mi_selectall;
     IBOutlet id o_mi_sort_name;
     IBOutlet id o_mi_sort_author;
@@ -96,6 +104,11 @@
     IBOutlet id o_mm_mi_services;
     IBOutlet id o_mm_mu_services;
 
+    IBOutlet id o_save_accessory_view;
+    IBOutlet id o_save_accessory_popup;
+    IBOutlet id o_save_accessory_text;
+
+
     NSImage *o_descendingSortingImage;
     NSImage *o_ascendingSortingImage;
 
@@ -105,12 +118,15 @@
     BOOL b_selected_item_met;
     BOOL b_isSortDescending;
     id o_tc_sortColumn;
+
+    /* "add node" button and menu entry */
+    IBOutlet id o_mi_addNode;
+    IBOutlet id o_btn_addNode;
 }
 
 - (void)searchfieldChanged:(NSNotification *)o_notification;
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
 
-- (IBAction)handlePopUp:(id)sender;
 - (IBAction)searchItem:(id)sender;
 
 - (void)playlistUpdated;
@@ -118,9 +134,13 @@
 - (void)sortNode:(int)i_mode;
 - (void)updateRowSelection;
 
+- (BOOL)isSelectionEmpty;
+
 - (IBAction)servicesChange:(id)sender;
 - (IBAction)playItem:(id)sender;
+- (IBAction)revealItemInFinder:(id)sender;
 - (IBAction)preparseItem:(id)sender;
+- (IBAction)downloadCoverArt:(id)sender;
 - (IBAction)savePlaylist:(id)sender;
 - (IBAction)deleteItem:(id)sender;
 - (IBAction)selectAll:(id)sender;
@@ -128,9 +148,12 @@
 - (IBAction)sortNodeByAuthor:(id)sender;
 - (IBAction)recursiveExpandNode:(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;
+- (IBAction)addNode:(id)sender;
 
+- (void)playSidebarItem:(id)item;
+- (id)playingItem;
 
-@end
+- (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 enqueue:(BOOL)b_enqueue;
 
+@end