* implemented the previously committed playmode buttons and fixed the playmode saving

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

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index d843b68c4d93f55d1c094f07d557a6a8ef6426ba..46e425cdf53f29d24af2e3c5ed8690f1e3e49dff 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-2004 VideoLAN
+ * Copyright (C) 2002-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -19,11 +19,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
- * VLCPlaylistView interface 
+ * VLCPlaylistView interface
  *****************************************************************************/
 @interface VLCPlaylistView : NSOutlineView
 {
@@ -32,63 +32,113 @@
 @end
 
 /*****************************************************************************
- * VLCPlaylist interface 
+ * VLCPlaylistCommon interface
  *****************************************************************************/
-@interface VLCPlaylist : NSObject
+@interface VLCPlaylistCommon : NSObject
 {
-    IBOutlet id o_controller;
-
-    IBOutlet id o_btn_playlist;
-    IBOutlet id o_outline_view;
     IBOutlet id o_tc_name;
     IBOutlet id o_tc_author;
     IBOutlet id o_tc_duration;
+    IBOutlet id o_outline_view;
+
+    NSMutableDictionary *o_outline_dict;
+}
+
+- (void)initStrings;
+- (playlist_item_t *)selectedPlaylistItem;
+- (NSOutlineView *)outlineView;
+
+@end
+
+/*****************************************************************************
+ * VLCPlaylistWizard interface
+ *****************************************************************************/
+@interface VLCPlaylistWizard : VLCPlaylistCommon
+{
+}
+
+- (IBAction)reloadOutlineView;
+
+@end
+
+/*****************************************************************************
+ * VLCPlaylist interface
+ *****************************************************************************/
+@interface VLCPlaylist : VLCPlaylistCommon
+{
+    IBOutlet id o_controller;
+    IBOutlet id o_playlist_wizard;
+
+    IBOutlet id o_btn_playlist;
+    IBOutlet id o_playlist_view;
     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_preparse;
     IBOutlet id o_mi_selectall;
     IBOutlet id o_mi_sort_name;
     IBOutlet id o_mi_sort_author;
+    IBOutlet id o_mi_recursive_expand;
+
+    /* "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;
+
+    IBOutlet id o_save_accessory_view;
+    IBOutlet id o_save_accessory_popup;
+    IBOutlet id o_save_accessory_text;
+
 
     NSImage *o_descendingSortingImage;
     NSImage *o_ascendingSortingImage;
 
-    NSMutableDictionary *o_outline_dict;
+    NSMutableArray *o_nodes_array;
+    NSMutableArray *o_items_array;
 
     BOOL b_selected_item_met;
     BOOL b_isSortDescending;
-    int i_current_view;
     id o_tc_sortColumn;
+    
+    /* "add node" button and menu entry */
+    IBOutlet id o_mi_addNode;
+    IBOutlet id o_btn_addNode;
 }
 
-- (void)initStrings;
+- (void)searchfieldChanged:(NSNotification *)o_notification;
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
-- (NSOutlineView *)playlistView;
 
-- (IBAction)handlePopUp:(id)sender;
 - (IBAction)searchItem:(id)sender;
 
-- (void)updateTogglePlaylistState;
 - (void)playlistUpdated;
+- (void)playModeUpdated;
 - (void)sortNode:(int)i_mode;
 - (void)updateRowSelection;
 
+- (IBAction)servicesChange:(id)sender;
 - (IBAction)playItem:(id)sender;
+- (IBAction)preparseItem:(id)sender;
+- (IBAction)savePlaylist:(id)sender;
 - (IBAction)deleteItem:(id)sender;
 - (IBAction)selectAll:(id)sender;
 - (IBAction)sortNodeByName:(id)sender;
 - (IBAction)sortNodeByAuthor:(id)sender;
+- (IBAction)recursiveExpandNode:(id)sender;
+
+- (IBAction)addNode:(id)sender;
+- (void)addNodeThreadedly;
 
 - (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;
 
-- (playlist_item_t *)selectedPlaylistItem;
 
 @end