#include <string.h>
#include <vlc_keys.h>
-#include "intf.h"
-#include "vout.h"
-#include "prefs.h"
-#include "playlist.h"
-#include "controls.h"
-#include "about.h"
-#include "open.h"
-#include "wizard.h"
-#include "extended.h"
-#include "bookmarks.h"
-#include "sfilters.h"
-#include "interaction.h"
-#include "embeddedwindow.h"
-#include "update.h"
-#include "AppleRemote.h"
-#import <vlc_interaction.h>
+#import "intf.h"
+#import "fspanel.h"
+#import "vout.h"
+#import "prefs.h"
+#import "playlist.h"
+#import "controls.h"
+#import "about.h"
+#import "open.h"
+#import "wizard.h"
+#import "extended.h"
+#import "bookmarks.h"
+#import "sfilters.h"
+#import "interaction.h"
+#import "embeddedwindow.h"
+#import "update.h"
+#import "AppleRemote.h"
/*****************************************************************************
* Local prototypes.
o_size_with_playlist = [o_window frame].size;
- p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ p_playlist = pl_Yield( p_intf );
- if( p_playlist )
+ /* Check if we need to start playing */
+ if( p_intf->b_play )
{
- /* Check if we need to start playing */
- if( p_intf->b_play )
- {
- playlist_LockControl( p_playlist, PLAYLIST_AUTOPLAY );
- }
- var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
- val.b_bool = VLC_FALSE;
+ 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);
- var_AddCallback( p_playlist, "intf-show", ShowController, self);
+ var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
+ var_AddCallback( p_playlist, "intf-show", ShowController, self);
- [o_embedded_window setFullscreen: var_GetBool( p_playlist,
- "fullscreen" )];
- vlc_object_release( p_playlist );
- }
+ [o_embedded_window setFullscreen: var_GetBool( p_playlist,
+ "fullscreen" )];
+ vlc_object_release( p_playlist );
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, self );
p_intf->b_interaction = VLC_TRUE;
+ /* update the playmode stuff */
+ p_intf->p_sys->b_playmode_update = VLC_TRUE;
+
nib_main_loaded = TRUE;
}
[o_mi_playlist setTitle: _NS("Playlist")];
[o_mi_info setTitle: _NS("Information")];
[o_mi_messages setTitle: _NS("Messages")];
+ [o_mi_errorsAndWarnings setTitle: _NS("Errors and Warnings")];
[o_mi_bring_atf setTitle: _NS("Bring All to Front")];
[o_vmi_fullscreen setTitle: _NS("Fullscreen")];
[o_vmi_snapshot setTitle: _NS("Snapshot")];
- /* error panel */
- [o_error setTitle: _NS("Error")];
- [o_err_lbl setStringValue: _NS("An error has occurred which probably " \
- "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("Do not display further errors")];
-
[o_info_window setTitle: _NS("Information")];
}
[o_remote stopListening: self];
}
+/* Helper method for the remote control interface in order to trigger forward/backward as long
+ as the user holds the left/right button */
+- (void) triggerMovieStepForRemoteButton: (NSNumber*) buttonIdentifierNumber
+{
+ if (b_left_right_remote_button_hold) {
+ switch([buttonIdentifierNumber intValue]) {
+ case kRemoteButtonRight_Hold:
+ [o_controls forward: self];
+ break;
+ case kRemoteButtonLeft_Hold:
+ [o_controls backward: self];
+ break;
+ }
+ if (b_left_right_remote_button_hold) {
+ /* trigger event */
+ [self performSelector:@selector(triggerMovieStepForRemoteButton:)
+ withObject:buttonIdentifierNumber
+ afterDelay:0.25];
+ }
+ }
+}
+
/* Apple Remote callback */
- (void)appleRemoteButton:(AppleRemoteEventIdentifier)buttonIdentifier
pressedDown:(BOOL)pressedDown
[o_controls play: self];
break;
case kRemoteButtonVolume_Plus:
- [o_controls volumeUp: self];
+ /* there are two events when the plus or minus button is pressed
+ one when the button is pressed down and one when the button is released */
+ if( pressedDown )
+ {
+ [o_controls volumeUp: self];
+ }
break;
case kRemoteButtonVolume_Minus:
- [o_controls volumeDown: self];
+ /* there are two events when the plus or minus button is pressed
+ one when the button is pressed down and one when the button is released */
+ if( pressedDown )
+ {
+ [o_controls volumeDown: self];
+ }
+ break;
+ case kRemoteButtonRight:
+ [o_controls next: self];
+ break;
+ case kRemoteButtonLeft:
+ [o_controls prev: self];
+ break;
+ case kRemoteButtonRight_Hold:
+ case kRemoteButtonLeft_Hold:
+ /* simulate an event as long as the user holds the button */
+ b_left_right_remote_button_hold = pressedDown;
+ if( pressedDown )
+ {
+ NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier];
+ [self performSelector:@selector(triggerMovieStepForRemoteButton:)
+ withObject:buttonIdentifierNumber];
+ }
+ break;
+ case kRemoteButtonMenu:
+ [o_controls windowAction: self];
break;
-
default:
/* Add here whatever you want other buttons to do */
break;
int i;
val.i_int = 0;
- p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ p_hotkeys = p_intf->p_libvlc->p_hotkeys;
i_pressed_modifiers = [o_event modifierFlags];
{
if( p_hotkeys[i].i_key == val.i_int )
{
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
return YES;
}
}
- (id)getPlaylist
{
- if ( o_playlist )
- {
+ if( o_playlist )
return o_playlist;
- }
return nil;
}
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ p_playlist = pl_Yield( p_intf );
- if( p_playlist != NULL )
- {
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
- var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
- vlc_object_release( p_playlist );
- }
+ vlc_object_release( p_playlist );
while( !p_intf->b_die )
{
{
vlc_value_t val;
- if( p_intf->p_vlc->b_die == VLC_TRUE )
+ if( p_intf->p_libvlc->b_die == VLC_TRUE )
{
[o_timer invalidate];
return;
vlc_bool_t b_seekable = VLC_FALSE;
vlc_bool_t b_chapters = VLC_FALSE;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
b_plmul = p_playlist->i_size > 1;
vlc_object_release( p_playlist );
[o_timeslider setFloatValue: 0.0];
[o_timeslider setEnabled: b_seekable];
[o_timefield setStringValue: @"0:00:00"];
+ [[[self getControls] getFSPanel] setStreamPos: 0 setSeconds: 0];
[o_embedded_window setSeekable: b_seekable];
if( p_intf->p_sys->b_fullscreen_update )
{
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
var_Get( p_playlist, "fullscreen", &val );
[o_embedded_window setFullscreen: val.b_bool];
vlc_object_release( p_playlist );
{
NSString *o_temp;
vout_thread_t *p_vout;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
- if( p_playlist == NULL || p_playlist->status.p_item == NULL )
+ if( p_playlist->status.p_item == NULL )
{
+ vlc_object_release( p_playlist );
return;
}
o_temp = [NSString stringWithUTF8String:
o_temp = [NSString stringWithCString:
p_playlist->status.p_item->p_input->psz_name];
[self setScrollField: o_temp stopAfter:-1];
+ [[[self getControls] getFSPanel] setStreamTitle: o_temp];
p_vout = vlc_object_find( p_intf->p_sys->p_input, VLC_OBJECT_VOUT,
FIND_PARENT );
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
+ [[[self getControls] getFSPanel] setStreamPos: pos.f_float setSeconds: i_seconds];
[o_embedded_window setTime: o_time position: f_updated];
}
o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
if( i_lastShownVolume != -1 )
[self setScrollField:o_text stopAfter:1000000];
- i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
[o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
[o_volumeslider setEnabled: TRUE];
p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
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,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- return;
- }
+ playlist_t * p_playlist = pl_Yield( p_intf );
+
o_temp = [NSString stringWithUTF8String:
p_playlist->status.p_item->p_input->psz_name];
if( o_temp == NULL )
- (void)updateMessageArray
{
int i_start, i_stop;
- vlc_value_t quiet;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
i_stop = *p_intf->p_sys->p_sub->pi_stop;
[o_msg_arr addObject: [o_msg_color autorelease]];
[o_msg_lock unlock];
-
- var_Get( p_intf->p_vlc, "verbose", &quiet );
-
- /* disable the display of msg_err for now
- * the interaction system will take care of the error messages now
- */
- #if 0
- if( i_type == 1 && quiet.i_int > -1 )
- {
- NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n",
- p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
- p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
-
- NSRange s_r = NSMakeRange( [[o_err_msg string] length], 0 );
- [o_err_msg setEditable: YES];
- [o_err_msg setSelectedRange: s_r];
- [o_err_msg insertText: o_my_msg];
-
- [o_error makeKeyAndOrderFront: self];
- [o_err_msg setEditable: NO];
- }
- #endif
}
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
{
if( i_status == PLAYING_S )
{
+ [[[self getControls] getFSPanel] setPause];
[o_btn_play setImage: o_img_pause];
[o_btn_play setAlternateImage: o_img_pause_pressed];
[o_btn_play setToolTip: _NS("Pause")];
[o_mi_play setTitle: _NS("Pause")];
[o_dmi_play setTitle: _NS("Pause")];
+ [o_vmi_play setTitle: _NS("Pause")];
}
else
{
+ [[[self getControls] getFSPanel] setPlay];
[o_btn_play setImage: o_img_play];
[o_btn_play setAlternateImage: o_img_play_pressed];
[o_btn_play setToolTip: _NS("Play")];
[o_mi_play setTitle: _NS("Play")];
[o_dmi_play setTitle: _NS("Play")];
+ [o_vmi_play setTitle: _NS("Play")];
}
}
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
+ [[[self getControls] getFSPanel] setStreamPos: pos.f_float setSeconds: i_seconds];
[o_embedded_window setTime: o_time position: f_updated];
}
#undef p_input
#undef p_input
/* Stop playback */
- if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE ) ) )
- {
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
- }
+ p_playlist = pl_Yield( p_intf );
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
/* FIXME - Wait here until all vouts are terminated because
libvlc's VLC_CleanUp destroys interfaces before vouts, which isn't
- (IBAction)intfOpenFile:(id)sender
{
- if (!nib_open_loaded)
+ if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)intfOpenFileGeneric:(id)sender
{
- if (!nib_open_loaded)
+ if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)intfOpenDisc:(id)sender
{
- if (!nib_open_loaded)
+ if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)intfOpenNet:(id)sender
{
- if (!nib_open_loaded)
+ if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)showWizard:(id)sender
{
- if (!nib_wizard_loaded)
+ if ( !nib_wizard_loaded )
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
[o_wizard initStrings];
{
o_extended = [[VLCExtended alloc] init];
}
- if (!nib_extended_loaded)
+ if ( !nib_extended_loaded )
{
nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
[o_extended initStrings];
{
o_sfilters = [[VLCsFilters alloc] init];
}
- if (!nib_sfilters_loaded)
+ if ( !nib_sfilters_loaded )
{
nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
[o_sfilters initStrings];
- (IBAction)showBookmarks:(id)sender
{
/* we need the wizard-nib for the bookmarks's extract functionality */
- if (!nib_wizard_loaded)
+ if ( !nib_wizard_loaded )
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
[o_wizard initStrings];
}
- if (!nib_bookmarks_loaded)
+ if ( !nib_bookmarks_loaded )
{
nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
[o_bookmarks showBookmarks];
- (IBAction)viewAbout:(id)sender
{
- if (!nib_about_loaded)
+ if ( !nib_about_loaded )
{
nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
[o_about showPanel];
- (IBAction)checkForUpdate:(id)sender
{
- if (!nib_update_loaded)
+ if ( !nib_update_loaded )
{
nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
[o_update showUpdateWindow];
}
}
-- (IBAction)closeError:(id)sender
-{
- vlc_value_t val;
-
- if( [o_err_ckbk_surpress state] == NSOnState )
- {
- val.i_int = -1;
- var_Set( p_intf->p_vlc, "verbose", val );
- }
- [o_err_msg setString: @""];
- [o_error performClose: self];
-}
-
- (IBAction)openReadMe:(id)sender
{
NSString * o_path = [[NSBundle mainBundle]
}
}
+- (IBAction)viewErrorsAndWarnings:(id)sender
+{
+ [[[self getInteractionList] getErrorPanel] showPanel];
+}
+
+- (IBAction)showMessagesPanel:(id)sender
+{
+ [o_msgs_panel makeKeyAndOrderFront: sender];
+}
+
- (void)windowDidBecomeKey:(NSNotification *)o_notification
{
if( [o_notification object] == o_msgs_panel )
projects / vlc / blobdiff