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

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 49e3819bf0..340076f3af 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -1,11 +1,11 @@
 /*****************************************************************************
- * playlist.h: MacOS X interface plugin
+ * playlist.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.h,v 1.9 2003/03/26 00:21:55 sam Exp $
+ * Copyright (C) 2002-2005 VideoLAN
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- *          Derk-Jan Hartman <thedj@users.sourceforge.net>
+ *          Derk-Jan Hartman <hartman at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,9 +25,8 @@
 /*****************************************************************************
  * VLCPlaylistView interface 
  *****************************************************************************/
-@interface VLCPlaylistView : NSTableView
+@interface VLCPlaylistView : NSOutlineView
 {
-    NSColor *o_striped_row_color;
 }
 
 @end
@@ -37,29 +36,71 @@
  *****************************************************************************/
 @interface VLCPlaylist : NSObject
 {
-    int i_moveRow;
-        
-    IBOutlet id o_table_view;
+    IBOutlet id o_controller;
 
+    IBOutlet id o_btn_playlist;
+    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_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_btn_add;
-    IBOutlet id o_btn_remove;
+    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;
+- (void)searchfieldChanged:(NSNotification *)o_notification;
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
+- (NSOutlineView *)outlineView;
+
+- (IBAction)handlePopUp:(id)sender;
+- (IBAction)searchItem:(id)sender;
 
+- (void)playlistUpdated;
+- (void)playModeUpdated;
+- (void)sortNode:(int)i_mode;
+- (void)updateRowSelection;
+
+- (IBAction)servicesChange:(id)sender;
 - (IBAction)playItem:(id)sender;
-- (IBAction)deleteItems:(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_pos enqueue:(BOOL)b_enqueue;
+- (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;
 
-- (void)updateRowSelection;
-- (void)playlistUpdated;
+- (playlist_item_t *)selectedPlaylistItem;
 
 @end
+