X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.h;h=37acdeec06326c7d0a4b1239b8acb450dc7daad1;hb=48515f2a60b833b4b9e5869190c533f7f848b821;hp=4204f1df4b1605914130555b20183626e388938e;hpb=03d18c98e8576eab70efae9100279861bd657650;p=vlc

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 4204f1df4b..37acdeec06 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.h,v 1.47 2003/11/03 15:27:28 hartman Exp $
+ * $Id: intf.h,v 1.52 2003/12/15 19:25:56 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -56,7 +56,7 @@
 int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
 int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
                      vlc_value_t old_val, vlc_value_t new_val, void *param );
-int CocoaConvertKey( unichar i_key);
+unsigned int CocoaKeyToVLC( unichar i_key );
 
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
@@ -75,7 +75,8 @@ struct intf_sys_t
     vlc_bool_t b_play_status;
     vlc_bool_t b_playlist_update;
     vlc_bool_t b_current_title_update;
-    
+    vlc_bool_t b_fullscreen_update;
+
     /* menus handlers */
     vlc_bool_t b_input_update;
     vlc_bool_t b_aout_update;
@@ -93,23 +94,25 @@ struct intf_sys_t
     id o_prefs;                 /* VLCPrefs       */
 
     IBOutlet id o_window;       /* main window    */
+    IBOutlet id o_scrollfield;  /* info field     */
     IBOutlet id o_timefield;    /* time field     */
     IBOutlet id o_timeslider;   /* time slider    */
     float f_slider;             /* slider value   */
     float f_slider_old;         /* old slider val */ 
     IBOutlet id o_volumeslider; /* volume slider  */
 
-    IBOutlet id o_btn_playlist; /* btn playlist   */
     IBOutlet id o_btn_prev;     /* btn previous   */
-    IBOutlet id o_btn_slower;   /* btn slower     */
+    IBOutlet id o_btn_rewind;   /* btn rewind     */
     IBOutlet id o_btn_play;     /* btn play       */
     IBOutlet id o_btn_stop;     /* btn stop       */
-    IBOutlet id o_btn_faster;   /* btn faster     */
+    IBOutlet id o_btn_ff;       /* btn fast forward     */
     IBOutlet id o_btn_next;     /* btn next       */
-    IBOutlet id o_btn_prefs;    /* btn prefs      */
+    IBOutlet id o_btn_fullscreen;/* btn fullscreen      */
 
     NSImage * o_img_play;       /* btn play img   */
     NSImage * o_img_pause;      /* btn pause img  */
+    NSImage * o_img_play_pressed;       /* btn play img   */
+    NSImage * o_img_pause_pressed;      /* btn pause img  */
 
     IBOutlet id o_controls;     /* VLCControls    */
     IBOutlet id o_playlist;     /* VLCPlaylist    */
@@ -226,9 +229,11 @@ struct intf_sys_t
 }
 
 - (id)getControls;
-
+- (id)getPlaylist;
 - (void)terminate;
 
+- (void)initStrings;
+
 - (void)manage;
 - (void)manageIntf:(NSTimer *)o_timer;
 - (void)setupMenus;