/*****************************************************************************
* intf.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2007 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ühne <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 <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.
*****************************************************************************/
-int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
unsigned int CocoaKeyToVLC( unichar i_key );
#define VLCIntf [[VLCMain sharedInstance] getIntf]
struct intf_sys_t
{
NSAutoreleasePool * o_pool;
- NSPort * o_sendport;
-
- /* the current input */
- 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;
-
};
/*****************************************************************************
* VLCMain interface
*****************************************************************************/
@class AppleRemote;
+@class VLCInformation;
@interface VLCMain : NSObject
{
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_bookmarks; /* VLCBookmarks */
id o_embedded_list; /* VLCEmbeddedList*/
id o_interaction_list; /* VLCInteractionList*/
- id o_sfilters; /* VLCsFilters */
+ VLCInformation * o_info; /* VLCInformation */
#ifdef UPDATE_CHECK
id o_update; /* VLCUpdate */
#endif
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 */
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;
int i_lastShownVolume;
+ /* the manage thread */
+ pthread_t manage_thread;
+
+ /* The timer that update the interface */
+ NSTimer * interfaceTimer;
+
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 */
}
- (void)controlTintChanged;
- (id)getControls;
+- (id)getSimplePreferences;
+- (id)getPreferences;
- (id)getPlaylist;
- (id)getInfo;
- (id)getWizard;
- (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)showBookmarks:(id)sender;
-- (IBAction)showSFilters:(id)sender;
- (IBAction)viewAbout:(id)sender;
- (IBAction)showLicense:(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