- currently loaded through rightMouseUp because rightMouseDown, etc. don't register any NSRightMouseDowns. If anybody got an idea why, I would be willing to change this of cause, since the current way is quite slower in the user's experience.
- the Snapshot item doesn't work yet (it triggers the fullscreen-event)
- localisation support is complete
Any comments and wanteds for further items are welcome :)
"o_timefield" = id;
"o_timeslider" = id;
"o_volumeslider" = id;
+ "o_vout_menu" = id;
"o_window" = id;
};
SUPERCLASS = NSObject;
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>90 147 478 430 0 0 1024 746 </string>
+ <string>185 59 478 430 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>1617</key>
<string>788 586 109 149 0 0 1440 878 </string>
<key>2197</key>
- <string>172 420 596 143 0 0 1024 746 </string>
+ <string>422 532 596 143 0 0 1440 878 </string>
<key>2709</key>
<string>305 626 508 82 0 0 1024 746 </string>
+ <key>2730</key>
+ <string>694 440 105 68 0 0 1440 878 </string>
<key>29</key>
- <string>76 675 438 44 0 0 1024 746 </string>
+ <string>130 802 438 44 0 0 1440 878 </string>
<key>915</key>
<string>777 479 187 249 0 0 1440 878 </string>
</dict>
<array/>
<key>IBOpenObjects</key>
<array>
+ <integer>2416</integer>
<integer>21</integer>
</array>
<key>IBSystem Version</key>
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan dot 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
IBOutlet id o_dmi_previous;
IBOutlet id o_dmi_mute;
+ /* vout menu */
+ IBOutlet id o_vout_menu;
+ IBOutlet id o_vmi_play;
+ IBOutlet id o_vmi_stop;
+ IBOutlet id o_vmi_prev;
+ IBOutlet id o_vmi_next;
+ IBOutlet id o_vmi_volup;
+ IBOutlet id o_vmi_voldown;
+ IBOutlet id o_vmi_mute;
+ IBOutlet id o_vmi_fullscreen;
+ IBOutlet id o_vmi_snapshot;
+
bool b_small_window;
mtime_t i_end_scroll;
- (id)getInteractionList;
- (id)getMainIntfPgbar;
- (id)getControllerWindow;
+- (id)getVoutMenu;
- (void)terminate;
- (NSString *)localizedString:(char *)psz;
- (char *)delocalizeString:(NSString *)psz;
* 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
[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 nil;
}
+- (id)getVoutMenu
+{
+ return o_vout_menu;
+}
+
- (void)manage
{
playlist_t * p_playlist;
* Derk-Jan Hartman <hartman at videolan dot org>
* Eric Petit <titer@m0k.org>
* Benjamin Pracht <bigben at videolan dot 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 "intf.h"
#include "vout.h"
-
+#import "controls.h"
/*****************************************************************************
* DeviceCallback: Callback triggered when the video-device variable is changed
}
}
break;
+ case NSRightMouseDown:
+ {
+ msg_Dbg( p_vout, "received NSRightMouseDown (generic method)" );
+ [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]];
+ }
+ break;
default:
[super mouseDown: o_event];
- (void)rightMouseDown:(NSEvent *)o_event
{
- vlc_value_t val;
-
if( p_vout )
{
switch( [o_event type] )
{
case NSRightMouseDown:
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int |= 4;
- var_Set( p_vout, "mouse-button-down", val );
+ msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" );
+ [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]];
}
break;
- (void)rightMouseUp:(NSEvent *)o_event
{
- vlc_value_t val;
-
if( p_vout )
{
switch( [o_event type] )
{
case NSRightMouseUp:
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~4;
- var_Set( p_vout, "mouse-button-down", val );
+ /* FIXME: this is the appropriate place, but we can't receive
+ * NSRightMouseDown some how */
+ msg_Dbg( p_vout, "received NSRightMouseUp" );
+ [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]];
}
break;