/*****************************************************************************
* intf.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan dot org>
- * Felix K\9fhne <fkuehne at videolan dot org>
+ * Felix Paul Kühne <fkuehne 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_interface.h>
+#include <vlc_playlist.h>
#include <vlc_vout.h>
#include <vlc_aout.h>
#include <vlc_input.h>
#include <Cocoa/Cocoa.h>
+/* this was introduced in Darwin 9. We need to declare it to prevent both
+ * compilation warnings and errors */
+#ifndef NSInteger
+#define NSInteger int
+#endif
+
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
input_thread_t * p_input;
/* special actions */
- vlc_bool_t b_mute;
+ bool b_mute;
int i_play_status;
/* interface update */
- vlc_bool_t b_intf_update;
- vlc_bool_t b_playlist_update;
- vlc_bool_t b_playmode_update;
- vlc_bool_t b_current_title_update;
- vlc_bool_t b_fullscreen_update;
- vlc_bool_t b_volume_update;
- vlc_bool_t b_intf_show;
+ bool b_intf_update;
+ bool b_playlist_update;
+ bool b_playmode_update;
+ bool b_current_title_update;
+ bool b_fullscreen_update;
+ bool b_volume_update;
+ bool b_intf_show;
/* menus handlers */
- vlc_bool_t b_input_update;
- vlc_bool_t b_aout_update;
- vlc_bool_t b_vout_update;
+ bool b_input_update;
+ bool b_aout_update;
+ bool b_vout_update;
/* The messages window */
msg_subscription_t * p_sub;
{
intf_thread_t *p_intf; /* The main intf object */
id o_prefs; /* VLCPrefs */
+ id o_sprefs; /* VLCSimplePrefs */
id o_about; /* VLAboutBox */
id o_open; /* VLCOpen */
id o_wizard; /* VLCWizard */
id o_embedded_list; /* VLCEmbeddedList*/
id o_interaction_list; /* VLCInteractionList*/
id o_sfilters; /* VLCsFilters */
+ id o_info; /* VLCInformation */
+#ifdef UPDATE_CHECK
id o_update; /* VLCUpdate */
- 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 */
- BOOL nib_wizard_loaded; /* reference to the wizard-nib */
- BOOL nib_extended_loaded; /* reference to the extended-nib */
- BOOL nib_bookmarks_loaded; /* reference to the bookmarks-nib */
- BOOL nib_sfilters_loaded; /* reference to the sfilters-nib */
- BOOL nib_update_loaded; /* reference to the update-nib */
+#endif
+ id o_eyetv; /* VLCEyeTVController */
+ BOOL nib_main_loaded; /* main nibfile */
+ BOOL nib_open_loaded; /* open nibfile */
+ BOOL nib_about_loaded; /* about nibfile */
+ BOOL nib_wizard_loaded; /* wizard nibfile */
+ BOOL nib_extended_loaded; /* extended nibfile */
+ BOOL nib_bookmarks_loaded; /* bookmarks nibfile */
+ BOOL nib_sfilters_loaded; /* sfilters nibfile */
+ BOOL nib_prefs_loaded; /* preferences nibfile */
+ BOOL nib_update_loaded; /* update nibfile */
+ BOOL nib_info_loaded; /* information panel nibfile */
IBOutlet id o_window; /* main window */
IBOutlet id o_playlist_view;/* playlist view */
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_main_pgbar; /* playlist window progress bar */
IBOutlet id o_btn_prev; /* btn previous */
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_ff; /* btn fast forward */
IBOutlet id o_btn_next; /* btn next */
- IBOutlet id o_btn_fullscreen;/* btn fullscreen */
+ IBOutlet id o_btn_fullscreen;/* btn fullscreen (embedded vout window) */
IBOutlet id o_btn_playlist; /* btn playlist */
+ IBOutlet id o_btn_equalizer; /* eq btn */
NSImage * o_img_play; /* btn play img */
NSImage * o_img_pause; /* btn pause img */
IBOutlet id o_controls; /* VLCControls */
IBOutlet id o_playlist; /* VLCPlaylist */
- IBOutlet id o_info; /* VLCInfo */
IBOutlet id o_messages; /* messages tv */
IBOutlet id o_msgs_panel; /* messages panel */
NSLock * o_msg_lock; /* messages lock */
IBOutlet id o_msgs_btn_crashlog; /* messages open crashlog */
- IBOutlet id o_info_window; /* Info panel */
-
/* main menu */
IBOutlet id o_mi_about;
IBOutlet id o_mi_prefs;
+ IBOutlet id o_mi_sprefs;
IBOutlet id o_mi_checkForUpdate;
IBOutlet id o_mi_add_intf;
IBOutlet id o_mu_add_intf;
IBOutlet id o_mi_open_generic;
IBOutlet id o_mi_open_disc;
IBOutlet id o_mi_open_net;
+ IBOutlet id o_mi_open_capture;
IBOutlet id o_mi_open_recent;
IBOutlet id o_mi_open_recent_cm;
IBOutlet id o_mi_open_wizard;
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;
bool b_small_window;
+ bool b_restore_size;
+ NSRect o_restore_rect;
+
mtime_t i_end_scroll;
NSSize o_size_with_playlist;
+ NSThread * manageThread;
+
int i_lastShownVolume;
AppleRemote * o_remote;
- BOOL b_left_right_remote_button_hold; /* true as long as the user holds the left or right button on the remote control */
+ BOOL b_remote_button_hold; /* true as long as the user holds the left,right,plus or minus on the remote control */
}
+ (VLCMain *)sharedInstance;
- (intf_thread_t *)getIntf;
- (void)setIntf:(intf_thread_t *)p_mainintf;
+- (void)controlTintChanged;
+
- (id)getControls;
+- (id)getSimplePreferences;
+- (id)getPreferences;
- (id)getPlaylist;
- (id)getInfo;
- (id)getWizard;
- (id)getMainIntfPgbar;
- (id)getControllerWindow;
- (id)getVoutMenu;
-- (void)terminate;
-- (NSString *)localizedString:(char *)psz;
+- (id)getEyeTVController;
+- (void)applicationWillTerminate:(NSNotification *)notification;
+- (NSString *)localizedString:(const char *)psz;
- (char *)delocalizeString:(NSString *)psz;
- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event;
- (void)manage;
- (void)manageIntf:(NSTimer *)o_timer;
- (void)setupMenus;
+- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification;
- (void)setScrollField:(NSString *)o_string stopAfter:(int )timeout;
- (void)resetScrollField;
- (IBAction)intfOpenFileGeneric:(id)sender;
- (IBAction)intfOpenDisc:(id)sender;
- (IBAction)intfOpenNet:(id)sender;
+- (IBAction)intfOpenCapture:(id)sender;
- (IBAction)showWizard:(id)sender;
- (IBAction)showExtended:(id)sender;
- (IBAction)showSFilters:(id)sender;
- (IBAction)viewAbout:(id)sender;
+- (IBAction)showLicense:(id)sender;
- (IBAction)viewPreferences:(id)sender;
- (IBAction)checkForUpdate:(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)showInformationPanel:(id)sender;
- (IBAction)togglePlaylist:(id)sender;
- (void)updateTogglePlaylistState;
projects / vlc / blobdiff