/*****************************************************************************
* intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "wizard.h"
#include "extended.h"
#include "bookmarks.h"
+#include "sfilters.h"
+#include "interaction.h"
+#include "embeddedwindow.h"
+#include "update.h"
/*****************************************************************************
* Local prototypes.
[NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
p_intf->p_sys->o_sendport = [[NSPort port] retain];
- p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+ p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
p_intf->b_play = VLC_TRUE;
p_intf->pf_run = Run;
* playlistChanged: Callback triggered by the intf-change playlist
* variable, to let the intf update the playlist.
*****************************************************************************/
-int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
+static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
* FullscreenChanged: Callback triggered by the fullscreen-change playlist
* variable, to let the intf update the controller.
*****************************************************************************/
-int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable,
+static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
return VLC_SUCCESS;
}
+/*****************************************************************************
+ * InteractCallback: Callback triggered by the interaction
+ * variable, to let the intf display error and interaction dialogs
+ *****************************************************************************/
+static int InteractCallback( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ VLCMain *interface = (VLCMain *)param;
+ interaction_dialog_t *p_dialog = (interaction_dialog_t *)(new_val.p_address);
+ NSValue *o_value = [NSValue valueWithPointer:p_dialog];
+
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewInteractionEventNotification" object:[interface getInteractionList]
+ userInfo:[NSDictionary dictionaryWithObject:o_value forKey:@"VLCDialogPointer"]];
+
+ [o_pool release];
+ return VLC_SUCCESS;
+}
static struct
{
} else {
_o_sharedMainInstance = [super init];
}
-
+
o_about = [[VLAboutBox alloc] init];
o_prefs = nil;
o_open = [[VLCOpen alloc] init];
o_wizard = [[VLCWizard alloc] init];
- o_extended = [[VLCExtended alloc] init];
+ o_extended = nil;
o_bookmarks = [[VLCBookmarks alloc] init];
+ o_embedded_list = [[VLCEmbeddedList alloc] init];
+ o_interaction_list = [[VLCInteractionList alloc] init];
+ o_sfilters = nil;
+ o_update = [[VLCUpdate alloc] init];
i_lastShownVolume = -1;
return _o_sharedMainInstance;
playlist_t *p_playlist;
vlc_value_t val;
+ /* Check if we already did this once. Opening the other nibs calls it too, because VLCMain is the owner */
+ if( nib_main_loaded ) return;
+
[self initStrings];
[o_window setExcludedFromWindowsMenu: TRUE];
[o_msgs_panel setExcludedFromWindowsMenu: TRUE];
i_key = config_GetInt( p_intf, "key-next" );
[o_mi_next setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_next setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump+10sec" );
+ i_key = config_GetInt( p_intf, "key-jump+short" );
[o_mi_fwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump-10sec" );
+ i_key = config_GetInt( p_intf, "key-jump-short" );
[o_mi_bwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_bwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump+1min" );
+ i_key = config_GetInt( p_intf, "key-jump+medium" );
[o_mi_fwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump-1min" );
+ i_key = config_GetInt( p_intf, "key-jump-medium" );
[o_mi_bwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_bwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump+5min" );
+ i_key = config_GetInt( p_intf, "key-jump+long" );
[o_mi_fwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump-5min" );
+ i_key = config_GetInt( p_intf, "key-jump-long" );
[o_mi_bwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_bwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-vol-up" );
/* Check if we need to start playing */
if( p_intf->b_play )
{
- playlist_Play( p_playlist );
+ playlist_LockControl( p_playlist, PLAYLIST_AUTOPLAY );
}
var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
val.b_bool = VLC_FALSE;
var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
- [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )];
+ [o_embedded_window setFullscreen: var_GetBool( p_playlist,
+ "fullscreen" )];
vlc_object_release( p_playlist );
}
-}
-
-- (void)dealloc
-{
- [o_about release];
- [o_prefs release];
- [o_open release];
- [o_extended release];
- [o_bookmarks release];
- [super dealloc];
+ var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
+ var_AddCallback( p_intf, "interaction", InteractCallback, self );
+ p_intf->b_interaction = VLC_TRUE;
+
+ nib_main_loaded = TRUE;
}
- (void)initStrings
[o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
/* main menu */
- [o_mi_about setTitle: _NS("About VLC media player...")];
+ [o_mi_about setTitle: [_NS("About VLC media player") \
+ stringByAppendingString: @"..."]];
+ [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];
[o_mi_prefs setTitle: _NS("Preferences...")];
[o_mi_add_intf setTitle: _NS("Add Interface")];
[o_mu_add_intf setTitle: _NS("Add Interface")];
[o_mi_open_net setTitle: _NS("Open Network...")];
[o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_open_recent_cm setTitle: _NS("Clear Menu")];
- [o_mi_open_wizard setTitle: _NS("Wizard...")];
+ [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
[o_mu_edit setTitle: _NS("Edit")];
[o_mi_cut setTitle: _NS("Cut")];
[o_mi_clear setTitle: _NS("Clear")];
[o_mi_select_all setTitle: _NS("Select All")];
- [o_mu_controls setTitle: _NS("Controls")];
+ [o_mu_controls setTitle: _NS("Playback")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_stop setTitle: _NS("Stop")];
[o_mi_faster setTitle: _NS("Faster")];
[o_mi_snapshot setTitle: _NS("Snapshot")];
[o_mi_videotrack setTitle: _NS("Video Track")];
[o_mu_videotrack setTitle: _NS("Video Track")];
+ [o_mi_aspect_ratio setTitle: _NS("Aspect-ratio")];
+ [o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")];
+ [o_mi_crop setTitle: _NS("Crop")];
+ [o_mu_crop setTitle: _NS("Crop")];
[o_mi_screen setTitle: _NS("Video Device")];
[o_mu_screen setTitle: _NS("Video Device")];
[o_mi_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_close_window setTitle: _NS("Close Window")];
[o_mi_controller setTitle: _NS("Controller")];
[o_mi_equalizer setTitle: _NS("Equalizer")];
- [o_mi_extended setTitle: _NS("Extended controls")];
+ [o_mi_extended setTitle: _NS("Extended Controls")];
[o_mi_bookmarks setTitle: _NS("Bookmarks")];
[o_mi_playlist setTitle: _NS("Playlist")];
- [o_mi_info setTitle: _NS("Info")];
+ [o_mi_info setTitle: _NS("Information")];
[o_mi_messages setTitle: _NS("Messages")];
[o_mi_bring_atf setTitle: _NS("Bring All to Front")];
[o_mi_reportabug setTitle: _NS("Report a Bug")];
[o_mi_website setTitle: _NS("VideoLAN Website")];
[o_mi_license setTitle: _NS("License")];
+ [o_mi_donation setTitle: _NS("Make a donation")];
+ [o_mi_forum setTitle: _NS("Online Forum")];
/* dock menu */
[o_dmi_play setTitle: _NS("Play")];
/* error panel */
[o_error setTitle: _NS("Error")];
[o_err_lbl setStringValue: _NS("An error has occurred which probably " \
- "prevented the execution of your request:")];
+ "prevented the proper execution of the program:")];
[o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, " \
"please follow the instructions at:")];
[o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")];
- [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
+ [o_err_ckbk_surpress setTitle: _NS("Do not display further errors")];
- [o_info_window setTitle: _NS("Info")];
+ [o_info_window setTitle: _NS("Information")];
}
- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
- msg_Err( VLCIntf, "cannot convert to wanted encoding: %s",
+ msg_Err( VLCIntf, "cannot convert to the requested encoding: %s",
psz_string );
}
else
return nil;
}
+- (id)getEmbeddedList
+{
+ if( o_embedded_list )
+ {
+ return o_embedded_list;
+ }
+ return nil;
+}
+
+- (id)getInteractionList
+{
+ if( o_interaction_list )
+ {
+ return o_interaction_list;
+ }
+ return nil;
+}
+
- (void)manage
{
- NSDate * o_sleep_date;
playlist_t * p_playlist;
/* new thread requires a new pool */
{
vlc_mutex_lock( &p_intf->change_lock );
-#define p_input p_intf->p_sys->p_input
- if( p_input == NULL )
+ if( p_intf->p_sys->p_input == NULL )
{
- p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
+ p_intf->p_sys->p_input = p_playlist->p_input;
- /* Refresh the interface */
- if( p_input )
+ /* Refresh the interface */
+ if( p_intf->p_sys->p_input )
{
msg_Dbg( p_intf, "input has changed, refreshing interface" );
p_intf->p_sys->b_input_update = VLC_TRUE;
}
}
- else if( p_input->b_die || p_input->b_dead )
+ else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead )
{
/* input stopped */
p_intf->p_sys->b_intf_update = VLC_TRUE;
p_intf->p_sys->i_play_status = END_S;
[self setScrollField: _NS("VLC media player") stopAfter:-1];
- vlc_object_release( p_input );
- p_input = NULL;
+ msg_Dbg( p_intf, "input has stopped, refreshing interface" );
+ p_intf->p_sys->p_input = NULL;
}
-#undef p_input
/* Manage volume status */
[self manageVolumeSlider];
vlc_mutex_unlock( &p_intf->change_lock );
-
- o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .1];
- [NSThread sleepUntilDate: o_sleep_date];
+ msleep( 100000 );
}
-
- [self terminate];
[o_pool release];
}
[o_timeslider setEnabled: b_seekable];
[o_timefield setStringValue: @"0:00:00"];
+ [o_embedded_window setSeekable: b_seekable];
+
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
var_Get( p_playlist, "fullscreen", &val );
- [o_btn_fullscreen setState: val.b_bool];
+ [o_embedded_window setFullscreen: val.b_bool];
vlc_object_release( p_playlist );
p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
p_playlist->status.p_item->input.psz_name];
[self setScrollField: o_temp stopAfter:-1];
- p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT,
+ FIND_PARENT );
if( p_vout != NULL )
{
id o_vout_wnd;
while( ( o_vout_wnd = [o_enum nextObject] ) )
{
- if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
+ if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"]
+ || [[[VLCMain sharedInstance] getEmbeddedList]
+ windowContainsEmbedded: o_vout_wnd] )
{
- [o_vout_wnd updateTitle];
+ msg_Dbg( p_intf, "updateTitle call getVoutView" );
+ [[o_vout_wnd getVoutView] updateTitle];
}
}
vlc_object_release( (vlc_object_t *)p_vout );
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
+ [o_embedded_window setTime: o_time position: f_updated];
}
-
+
if( p_intf->p_sys->b_volume_update )
{
NSString *o_text;
+ int i_volume_step = 0;
o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
if( i_lastShownVolume != -1 )
[self setScrollField:o_text stopAfter:1000000];
-
- [o_volumeslider setFloatValue: (float)i_lastShownVolume / AOUT_VOLUME_STEP];
+ i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+ [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
[o_volumeslider setEnabled: TRUE];
p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
p_intf->p_sys->b_volume_update = FALSE;
{
p_intf->p_sys->i_play_status = val.i_int;
[self playStatusUpdated: p_intf->p_sys->i_play_status];
+ [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
}
}
else
p_intf->p_sys->i_play_status = END_S;
p_intf->p_sys->b_intf_update = VLC_TRUE;
[self playStatusUpdated: p_intf->p_sys->i_play_status];
+ [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
[self setSubmenusEnabled: FALSE];
}
{
vlc_object_t * p_dec_obj;
+ [o_controls setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t *)[VLCVoutView getRealVout: p_vout]
+ var: "aspect-ratio" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_crop target: (vlc_object_t *)[VLCVoutView getRealVout: p_vout]
+ var: "crop" selector: @selector(toggleVar:)];
+
[o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
var: "video-device" selector: @selector(toggleVar:)];
[o_mi_ffmpeg_pp setEnabled: b_enabled];
[o_mi_device setEnabled: b_enabled];
[o_mi_screen setEnabled: b_enabled];
+ [o_mi_aspect_ratio setEnabled: b_enabled];
+ [o_mi_crop setEnabled: b_enabled];
}
- (void)manageVolumeSlider
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
+ [o_embedded_window setTime: o_time position: f_updated];
}
#undef p_input
}
}
msleep( 500000 );
+ /* save the prefs if they were changed in the extended panel */
+ if (o_extended && [o_extended getConfigChanged])
+ {
+ [o_extended savePrefs];
+ }
+
+ p_intf->b_interaction = VLC_FALSE;
+ var_DelCallback( p_intf, "interaction", InteractCallback, self );
+
+ /* release some other objects here, because it isn't sure whether dealloc
+ * will be called later on -- FK (10/6/05) */
+ if( nib_about_loaded && o_about )
+ [o_about release];
+
+ if( nib_open_loaded && o_open )
+ [o_open release];
+
+ if( nib_extended_loaded && o_extended )
+ {
+ [o_extended collapsAll];
+ [o_extended release];
+ }
+
+ if( nib_bookmarks_loaded && o_bookmarks )
+ [o_bookmarks release];
+
+ if( nib_wizard_loaded && o_wizard )
+ [o_wizard release];
+
+ if( o_embedded_list != nil )
+ [o_embedded_list release];
+
+ if( o_interaction_list != nil )
+ [o_interaction_list release];
+
if( o_img_pause_pressed != nil )
{
[o_img_pause_pressed release];
[[NSUserDefaults standardUserDefaults] synchronize];
p_intf->b_die = VLC_TRUE;
- [NSApp stop:NULL];
}
- (IBAction)clearRecentItems:(id)sender
- (IBAction)showExtended:(id)sender
{
+ if ( o_extended == nil )
+ {
+ o_extended = [[VLCExtended alloc] init];
+ }
if (!nib_extended_loaded)
{
nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
}
}
+- (IBAction)showSFilters:(id)sender
+{
+ if ( o_sfilters == nil )
+ {
+ o_sfilters = [[VLCsFilters alloc] init];
+ }
+ if (!nib_sfilters_loaded)
+ {
+ nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
+ [o_sfilters initStrings];
+ [o_sfilters showAsPanel];
+ } else {
+ [o_sfilters showAsPanel];
+ }
+}
+
- (IBAction)showBookmarks:(id)sender
{
/* we need the wizard-nib for the bookmarks's extract functionality */
if (!nib_wizard_loaded)
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
+ [o_wizard initStrings];
}
if (!nib_bookmarks_loaded)
[o_prefs showPrefs];
}
+- (IBAction)checkForUpdate:(id)sender
+{
+ if (!nib_update_loaded)
+ {
+ nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
+ [o_update showUpdateWindow];
+ } else {
+ [o_update showUpdateWindow];
+ }
+}
+
- (IBAction)closeError:(id)sender
{
vlc_value_t val;
}
else
{
- NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("You haven't experienced any heavy crashes yet.") );
+ NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
}
}
projects / vlc / blobdiff