#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 "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.
var_AddCallback( p_intf, "interaction", InteractCallback, self );
p_intf->b_interaction = VLC_TRUE;
+ // First we setup the blue selection box - another window that will be attached as a child window
+ // to this one, and will be moved by timers as needed.
+
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")];
}
case kRemoteButtonVolume_Minus:
[o_controls volumeDown: self];
break;
+ case kRemoteButtonRight:
+ [o_controls next: self];
+ break;
+ case kRemoteButtonLeft:
+ [o_controls prev: self];
+ break;
+ case kRemoteButtonRight_Hold:
+ [o_controls forward: self];
+ break;
+ case kRemoteButtonLeft_Hold:
+ [o_controls backward: self];
+ break;
+ case kRemoteButtonMenu:
+ [o_controls windowAction: self];
+ break;
default:
/* Add here whatever you want other buttons to do */
[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];
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];
}
- (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 );
-
- 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];
- }
}
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
}
}
-- (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