X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.h;h=6eb88e062c52d1df31ebcf08775b6df9cfe2e198;hb=9c623237a0965223c78d8544708d7c1bac62d1ec;hp=40e449980484068b832bbd8ad601bfe1d351d4b0;hpb=cd2c272c7c2d743f6e94c06752242aa4aebaa7c9;p=vlc diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 40e4499804..6eb88e062c 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -1,18 +1,18 @@ /***************************************************************************** - * intf.h: MacOS X interface plugin + * intf.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.h,v 1.46 2003/10/29 02:13:04 hartman Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot - * Derk-Jan Hartman + * Derk-Jan Hartman * * 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 * 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 @@ -31,7 +31,7 @@ #include /***************************************************************************** - * VLCApplication interface + * VLCApplication interface *****************************************************************************/ @interface VLCApplication : NSApplication { @@ -44,6 +44,7 @@ - (void)setIntf:(intf_thread_t *)p_intf; - (intf_thread_t *)getIntf; +- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event; @end @@ -56,7 +57,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 +76,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; @@ -86,40 +88,42 @@ struct intf_sys_t }; /***************************************************************************** - * VLCMain interface + * VLCMain interface *****************************************************************************/ @interface VLCMain : NSObject { 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 */ + 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 */ - IBOutlet id o_info; /* VLCInfo */ + IBOutlet id o_info; /* VLCInfo */ IBOutlet id o_messages; /* messages tv */ IBOutlet id o_msgs_panel; /* messages panel */ NSMutableArray * o_msg_arr; /* messages array */ NSLock * o_msg_lock; /* messages lock */ - IBOutlet id o_msgs_btn_crashlog; /* messages open crashlog */ + IBOutlet id o_msgs_btn_crashlog; /* messages open crashlog */ IBOutlet id o_error; /* error panel */ IBOutlet id o_err_msg; /* NSTextView */ @@ -127,13 +131,16 @@ struct intf_sys_t IBOutlet id o_err_bug_lbl; IBOutlet id o_err_btn_msgs; /* Open Messages */ IBOutlet id o_err_btn_dismiss; - - IBOutlet id o_info_window; /* Info panel */ + IBOutlet id o_err_ckbk_surpress; + + IBOutlet id o_info_window; /* Info panel */ /* main menu */ IBOutlet id o_mi_about; IBOutlet id o_mi_prefs; + IBOutlet id o_mi_add_intf; + IBOutlet id o_mu_add_intf; IBOutlet id o_mi_hide; IBOutlet id o_mi_hide_others; IBOutlet id o_mi_show_all; @@ -166,6 +173,10 @@ struct intf_sys_t IBOutlet id o_mi_loop; IBOutlet id o_mi_fwd; IBOutlet id o_mi_bwd; + IBOutlet id o_mi_fwd1m; + IBOutlet id o_mi_bwd1m; + IBOutlet id o_mi_fwd5m; + IBOutlet id o_mi_bwd5m; IBOutlet id o_mi_program; IBOutlet id o_mu_program; IBOutlet id o_mi_title; @@ -183,6 +194,8 @@ struct intf_sys_t IBOutlet id o_mu_channels; IBOutlet id o_mi_device; IBOutlet id o_mu_device; + IBOutlet id o_mi_visual; + IBOutlet id o_mu_visual; IBOutlet id o_mu_video; IBOutlet id o_mi_half_window; @@ -208,7 +221,7 @@ struct intf_sys_t IBOutlet id o_mi_info; IBOutlet id o_mi_messages; IBOutlet id o_mi_bring_atf; - + IBOutlet id o_mu_help; IBOutlet id o_mi_readme; IBOutlet id o_mi_documentation; @@ -221,12 +234,15 @@ struct intf_sys_t IBOutlet id o_dmi_stop; IBOutlet id o_dmi_next; IBOutlet id o_dmi_previous; + IBOutlet id o_dmi_mute; } - (id)getControls; - +- (id)getPlaylist; - (void)terminate; +- (void)initStrings; + - (void)manage; - (void)manageIntf:(NSTimer *)o_timer; - (void)setupMenus;