* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan.org>
+ * Felix K\9fhne <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
#include "interaction.h"
#include "embeddedwindow.h"
#include "update.h"
+#include "AppleRemote.h"
/*****************************************************************************
* Local prototypes.
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
- p_intf->p_sys->b_playlist_update = TRUE;
- p_intf->p_sys->b_intf_update = TRUE;
- p_intf->p_sys->b_playmode_update = TRUE;
+ p_intf->p_sys->b_playlist_update = VLC_TRUE;
+ p_intf->p_sys->b_intf_update = VLC_TRUE;
+ p_intf->p_sys->b_playmode_update = VLC_TRUE;
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * ShowController: Callback triggered by the show-intf playlist variable
+ * through the ShowIntf-control-intf, to let us show the controller-win;
+ * usually when in fullscreen-mode
+ *****************************************************************************/
+static int ShowController( 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;
+ p_intf->p_sys->b_intf_show = VLC_TRUE;
return VLC_SUCCESS;
}
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
- p_intf->p_sys->b_fullscreen_update = TRUE;
+ p_intf->p_sys->b_fullscreen_update = VLC_TRUE;
return VLC_SUCCESS;
}
o_update = [[VLCUpdate alloc] init];
i_lastShownVolume = -1;
+
+ o_remote = [[AppleRemote alloc] init];
+ [o_remote setDelegate: _o_sharedMainInstance];
+
return _o_sharedMainInstance;
}
val.b_bool = VLC_FALSE;
var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
+ var_AddCallback( p_playlist, "intf-show", ShowController, self);
[o_embedded_window setFullscreen: var_GetBool( p_playlist,
"fullscreen" )];
[o_dmi_next setTitle: _NS("Next")];
[o_dmi_previous setTitle: _NS("Previous")];
[o_dmi_mute setTitle: _NS("Mute")];
+
+ /* vout menu */
+ [o_vmi_play setTitle: _NS("Play")];
+ [o_vmi_stop setTitle: _NS("Stop")];
+ [o_vmi_prev setTitle: _NS("Previous")];
+ [o_vmi_next setTitle: _NS("Next")];
+ [o_vmi_volup setTitle: _NS("Volume Up")];
+ [o_vmi_voldown setTitle: _NS("Volume Down")];
+ [o_vmi_mute setTitle: _NS("Mute")];
+ [o_vmi_fullscreen setTitle: _NS("Fullscreen")];
+ [o_vmi_snapshot setTitle: _NS("Snapshot")];
/* error panel */
[o_error setTitle: _NS("Error")];
return( o_str );
}
+/* Listen to the remote in exclusive mode, only when VLC is the active
+ application */
+- (void)applicationDidBecomeActive:(NSNotification *)aNotification
+{
+ [o_remote startListening: self];
+}
+- (void)applicationDidResignActive:(NSNotification *)aNotification
+{
+ [o_remote stopListening: self];
+}
+
+/* Apple Remote callback */
+- (void)appleRemoteButton:(AppleRemoteEventIdentifier)buttonIdentifier
+ pressedDown:(BOOL)pressedDown
+{
+ switch( buttonIdentifier )
+ {
+ case kRemoteButtonPlay:
+ [o_controls play: self];
+ break;
+ case kRemoteButtonVolume_Plus:
+ [o_controls volumeUp: self];
+ break;
+ case kRemoteButtonVolume_Minus:
+ [o_controls volumeDown: self];
+ break;
+
+ default:
+ /* Add here whatever you want other buttons to do */
+ break;
+ }
+}
+
- (char *)delocalizeString:(NSString *)id
{
NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
return nil;
}
+- (id)getMainIntfPgbar
+{
+ if( o_main_pgbar )
+ return o_main_pgbar;
+
+ msg_Err( p_intf, "main interface progress bar item wasn't found" );
+ return nil;
+}
+
+- (id)getControllerWindow
+{
+ if( o_window )
+ return o_window;
+ return nil;
+}
+
+- (id)getVoutMenu
+{
+ return o_vout_menu;
+}
+
- (void)manage
{
playlist_t * p_playlist;
return;
}
-#define p_input p_intf->p_sys->p_input
if( p_intf->p_sys->b_input_update )
{
/* Called when new input is opened */
vlc_object_release( p_playlist );
- if( ( b_input = ( p_input != NULL ) ) )
+ if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) )
{
+ vlc_object_yield( p_intf->p_sys->p_input );
/* seekable streams */
- var_Get( p_input, "seekable", &val);
- b_seekable = val.b_bool;
+ b_seekable = var_GetBool( p_intf->p_sys->p_input, "seekable" );
/* check wether slow/fast motion is possible*/
- b_control = p_input->input.b_can_pace_control;
+ b_control = p_intf->p_sys->p_input->input.b_can_pace_control;
/* chapters & titles */
- //b_chapters = p_input->stream.i_area_nb > 1;
+ //b_chapters = p_intf->p_sys->p_input->stream.i_area_nb > 1;
+ vlc_object_release( p_intf->p_sys->p_input );
}
[o_btn_stop setEnabled: b_input];
p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
}
- if( p_input && !p_input->b_die )
+ if( p_intf->p_sys->b_intf_show )
+ {
+ [o_window makeKeyAndOrderFront: self];
+
+ p_intf->p_sys->b_intf_show = VLC_FALSE;
+ }
+
+ if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
{
vlc_value_t val;
return;
}
o_temp = [NSString stringWithUTF8String:
- p_playlist->status.p_item->input.psz_name];
+ p_playlist->status.p_item->p_input->psz_name];
if( o_temp == NULL )
o_temp = [NSString stringWithCString:
- p_playlist->status.p_item->input.psz_name];
+ p_playlist->status.p_item->p_input->psz_name];
[self setScrollField: o_temp stopAfter:-1];
- p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT,
+ p_vout = vlc_object_find( p_intf->p_sys->p_input, VLC_OBJECT_VOUT,
FIND_PARENT );
if( p_vout != NULL )
{
p_intf->p_sys->b_current_title_update = FALSE;
}
- if( p_input && [o_timeslider isEnabled] )
+ if( p_intf->p_sys->p_input && [o_timeslider isEnabled] )
{
/* Update the slider */
vlc_value_t time;
vlc_value_t pos;
float f_updated;
- var_Get( p_input, "position", &pos );
+ var_Get( p_intf->p_sys->p_input, "position", &pos );
f_updated = 10000. * pos.f_float;
[o_timeslider setFloatValue: f_updated];
- var_Get( p_input, "time", &time );
+ var_Get( p_intf->p_sys->p_input, "time", &time );
i_seconds = time.i_time / 1000000;
o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
}
/* Manage Playing status */
- var_Get( p_input, "state", &val );
+ var_Get( p_intf->p_sys->p_input, "state", &val );
if( p_intf->p_sys->i_play_status != val.i_int )
{
p_intf->p_sys->i_play_status = val.i_int;
[self setSubmenusEnabled: FALSE];
}
-#undef p_input
[self updateMessageArray];
- (void)resetScrollField
{
i_end_scroll = -1;
-#define p_input p_intf->p_sys->p_input
- if( p_input && !p_input->b_die )
+ if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
{
NSString *o_temp;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
return;
}
o_temp = [NSString stringWithUTF8String:
- p_playlist->status.p_item->input.psz_name];
+ p_playlist->status.p_item->p_input->psz_name];
if( o_temp == NULL )
o_temp = [NSString stringWithCString:
- p_playlist->status.p_item->input.psz_name];
+ p_playlist->status.p_item->p_input->psz_name];
[self setScrollField: o_temp stopAfter:-1];
vlc_object_release( p_playlist );
return;
}
-#undef p_input
[self setScrollField: _NS("VLC media player") stopAfter:-1];
}
projects / vlc / blobdiff