X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.h;h=6376c7cbd477a12cae8b288857512b3f3b84508b;hb=5ea28c6c18a903514f48ae3362da7cc571df4ccf;hp=8271fac1a33f27b0ab535f6945ce7e74ee1c1752;hpb=59cb414dfa3fdba712ac98c495046f3aead15fec;p=vlc diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 8271fac1a3..6376c7cbd4 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -1,12 +1,13 @@ /***************************************************************************** * intf.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2006 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman + * Felix Kühne * * 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 @@ -24,10 +25,11 @@ *****************************************************************************/ #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -49,6 +51,9 @@ unsigned int CocoaKeyToVLC( unichar i_key ); @"/System/Library/CoreServices/SystemVersion.plist"] \ objectForKey: @"ProductVersion"] floatValue] +/* switch this to 1, if you want to use Obj-C with GC */ +#define GC_ENABLED 0 + /***************************************************************************** * intf_sys_t: description and status of the interface *****************************************************************************/ @@ -86,6 +91,7 @@ struct intf_sys_t /***************************************************************************** * VLCMain interface *****************************************************************************/ +@class AppleRemote; @interface VLCMain : NSObject { intf_thread_t *p_intf; /* The main intf object */ @@ -99,6 +105,7 @@ struct intf_sys_t id o_interaction_list; /* VLCInteractionList*/ id o_sfilters; /* VLCsFilters */ id o_update; /* VLCUpdate */ + id o_eyetv; /* VLCEyeTVController */ BOOL nib_main_loaded; /* reference to the main-nib */ BOOL nib_open_loaded; /* reference to the open-nib */ BOOL nib_about_loaded; /* reference to the about-nib */ @@ -118,6 +125,7 @@ struct intf_sys_t float f_slider_old; /* old slider val */ IBOutlet id o_volumeslider; /* volume slider */ + IBOutlet id o_main_pgbar; /* main interface progress bar */ IBOutlet id o_btn_prev; /* btn previous */ IBOutlet id o_btn_rewind; /* btn rewind */ IBOutlet id o_btn_play; /* btn play */ @@ -142,14 +150,6 @@ struct intf_sys_t NSLock * o_msg_lock; /* messages lock */ IBOutlet id o_msgs_btn_crashlog; /* messages open crashlog */ - IBOutlet id o_error; /* error panel */ - IBOutlet id o_err_msg; /* NSTextView */ - IBOutlet id o_err_lbl; - IBOutlet id o_err_bug_lbl; - IBOutlet id o_err_btn_msgs; /* Open Messages */ - IBOutlet id o_err_btn_dismiss; - IBOutlet id o_err_ckbk_surpress; - IBOutlet id o_info_window; /* Info panel */ /* main menu */ @@ -253,13 +253,14 @@ struct intf_sys_t IBOutlet id o_mi_bring_atf; IBOutlet id o_mu_help; + IBOutlet id o_mi_help; IBOutlet id o_mi_readme; IBOutlet id o_mi_documentation; - IBOutlet id o_mi_reportabug; - IBOutlet id o_mi_website; IBOutlet id o_mi_license; + IBOutlet id o_mi_website; IBOutlet id o_mi_donation; IBOutlet id o_mi_forum; + IBOutlet id o_mi_errorsAndWarnings; /* dock menu */ IBOutlet id o_dmi_play; @@ -268,13 +269,31 @@ struct intf_sys_t IBOutlet id o_dmi_previous; IBOutlet id o_dmi_mute; + /* vout menu */ + IBOutlet id o_vout_menu; + IBOutlet id o_vmi_play; + IBOutlet id o_vmi_stop; + IBOutlet id o_vmi_prev; + IBOutlet id o_vmi_next; + IBOutlet id o_vmi_volup; + IBOutlet id o_vmi_voldown; + IBOutlet id o_vmi_mute; + IBOutlet id o_vmi_fullscreen; + IBOutlet id o_vmi_snapshot; + bool b_small_window; + bool b_restore_size; + NSRect o_restore_rect; + mtime_t i_end_scroll; NSSize o_size_with_playlist; int i_lastShownVolume; + + AppleRemote * o_remote; + BOOL b_remote_button_hold; /* true as long as the user holds the left,right,plus or minus on the remote control */ } + (VLCMain *)sharedInstance; @@ -289,7 +308,11 @@ struct intf_sys_t - (id)getBookmarks; - (id)getEmbeddedList; - (id)getInteractionList; -- (void)terminate; +- (id)getMainIntfPgbar; +- (id)getControllerWindow; +- (id)getVoutMenu; +- (id)getEyeTVController; +- (void)applicationWillTerminate:(NSNotification *)notification; - (NSString *)localizedString:(char *)psz; - (char *)delocalizeString:(NSString *)psz; - (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width; @@ -300,6 +323,7 @@ struct intf_sys_t - (void)manage; - (void)manageIntf:(NSTimer *)o_timer; - (void)setupMenus; +- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification; - (void)setScrollField:(NSString *)o_string stopAfter:(int )timeout; - (void)resetScrollField; @@ -323,17 +347,18 @@ struct intf_sys_t - (IBAction)showSFilters:(id)sender; - (IBAction)viewAbout:(id)sender; +- (IBAction)showLicense:(id)sender; - (IBAction)viewPreferences:(id)sender; - (IBAction)checkForUpdate:(id)sender; -- (IBAction)closeError:(id)sender; +- (IBAction)viewHelp:(id)sender; - (IBAction)openReadMe:(id)sender; - (IBAction)openDocumentation:(id)sender; -- (IBAction)reportABug:(id)sender; - (IBAction)openWebsite:(id)sender; -- (IBAction)openLicense:(id)sender; - (IBAction)openForum:(id)sender; - (IBAction)openDonate:(id)sender; - (IBAction)openCrashLog:(id)sender; +- (IBAction)viewErrorsAndWarnings:(id)sender; +- (IBAction)showMessagesPanel:(id)sender; - (IBAction)togglePlaylist:(id)sender; - (void)updateTogglePlaylistState;