macosx: fix reveal in finder main menu item

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

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 07bb5181c7283abbab19e438e02a5a0f22250195..29d1a26a726e180bb0501c9005cf966c1fdb1742 100644 (file)
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -25,19 +25,6 @@
 
 #import "PXSourceList.h"
 
-/* playlist column definitions */
-#define TRACKNUM_COLUMN @"tracknumber"
-#define TITLE_COLUMN @"name"
-#define ARTIST_COLUMN @"artist"
-#define DURATION_COLUMN @"duration"
-#define GENRE_COLUMN @"genre"
-#define ALBUM_COLUMN @"album"
-#define DESCRIPTION_COLUMN @"description"
-#define DATE_COLUMN @"date"
-#define LANGUAGE_COLUMN @"language"
-#define URI_COLUMN @"uri"
-#define FILESIZE_COLUMN @"file-size"
-
 /*****************************************************************************
  * VLCPlaylistView interface
  *****************************************************************************/
@@ -45,41 +32,23 @@
 
 @end
 
-/*****************************************************************************
- * VLCPlaylistCommon interface
- *****************************************************************************/
-@interface VLCPlaylistCommon : NSObject <NSOutlineViewDataSource, NSOutlineViewDelegate>
-{
-    IBOutlet VLCPlaylistView* o_outline_view;
-
-    IBOutlet id o_tc_name_other;
-    IBOutlet id o_tc_author_other;
-    IBOutlet id o_tc_duration_other;
-    IBOutlet VLCPlaylistView* o_outline_view_other;
-
-    NSMutableDictionary *o_outline_dict;
-}
-
-- (void)setPlaylistRoot: (playlist_item_t *)root_item;
-- (playlist_item_t *)currentPlaylistRoot;
-- (playlist_item_t *)selectedPlaylistItem;
-- (NSOutlineView *)outlineView;
-- (void)reloadStyles;
-@end
-
 /*****************************************************************************
  * VLCPlaylistWizard interface
  *****************************************************************************/
-@interface VLCPlaylistWizard : VLCPlaylistCommon
+@interface VLCPlaylistWizard : NSObject
 - (IBAction)reloadOutlineView;
 
 @end
 
+#import "PLModel.h"
+
 /*****************************************************************************
  * VLCPlaylist interface
  *****************************************************************************/
-@interface VLCPlaylist : VLCPlaylistCommon
+@interface VLCPlaylist : NSObject<NSOutlineViewDataSource, NSOutlineViewDelegate>
 {
+    IBOutlet VLCPlaylistView* o_outline_view;
+
     IBOutlet id o_controller;
     IBOutlet id o_playlist_wizard;
 
@@ -94,7 +63,6 @@
     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;
@@ -106,9 +74,16 @@
     IBOutlet id o_save_accessory_text;
 
     IBOutlet id o_playlist_header;
+
+    int currentResumeTimeout;
+
+    PLModel *o_model;
 }
 
-- (void)searchfieldChanged:(NSNotification *)o_notification;
+- (PLModel *)model;
+
+- (void)reloadStyles;
+
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
 
 - (IBAction)searchItem:(id)sender;
@@ -132,11 +107,22 @@
 - (IBAction)recursiveExpandNode:(id)sender;
 - (IBAction)showInfoPanel:(id)sender;
 
-- (id)playingItem;
 - (NSArray *)draggedItems;
 
-- (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;
+/**
+ * Simplified version to add new items at the end of the current playlist
+ */
+- (void)addPlaylistItems:(NSArray*)o_array;
+
+/**
+ * Adds new items to the playlist, at specified parent node and index.
+ * @param o_array array of items. Each item is a Dictionary with meta info.
+ * @param i_plItemId parent playlist node id, -1 for default playlist
+ * @param i_position index for new items, -1 for appending at end
+ * @param b_start starts playback of first item if true
+ */
+- (void)addPlaylistItems:(NSArray*)o_array withParentItemId:(int)i_plItemId atPos:(int)i_position startPlayback:(BOOL)b_start;
+
 
 - (void)setColumn: (NSString *)o_column state: (NSInteger)i_state translationDict:(NSDictionary *)o_dict;
 - (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread;