/*****************************************************************************
* macosx.m: Mac OS X module for vlc
*****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2012 VLC authors and VideoLAN
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu>
* Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Felix Paul Kühne <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 "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
+#include <vlc_vout_window.h>
/*****************************************************************************
* External prototypes
int OpenIntf ( vlc_object_t * );
void CloseIntf ( vlc_object_t * );
-int OpenVideoQT ( vlc_object_t * );
-void CloseVideoQT ( vlc_object_t * );
-
-int OpenVideoGL ( vlc_object_t * );
-void CloseVideoGL ( vlc_object_t * );
+int WindowOpen ( vout_window_t *, const vout_window_cfg_t * );
+void WindowClose ( vout_window_t * );
/*****************************************************************************
* Module descriptor
#define OPAQUENESS_LONGTEXT N_( "Set the transparency of the video output. 1 is non-transparent (default) " \
"0 is fully transparent.")
-#define STRETCH_TEXT N_("Stretch video to fill window")
-#define STRETCH_LONGTEXT N_("Stretch the video to fill the entire window when "\
- "resizing the video instead of keeping the aspect ratio and "\
- "displaying black borders.")
-
#define BLACK_TEXT N_("Black screens in fullscreen")
#define BLACK_LONGTEXT N_("In fullscreen mode, keep screen where there is no " \
"video displayed black" )
-#define BACKGROUND_TEXT N_("Use as Desktop Background")
-#define BACKGROUND_LONGTEXT N_("Use the video as the Desktop Background " \
- "Desktop icons cannot be interacted with in this mode." )
-
#define FSPANEL_TEXT N_("Show Fullscreen controller")
#define FSPANEL_LONGTEXT N_("Shows a lucent controller when moving the mouse " \
"in fullscreen mode.")
#define RECENT_ITEMS_LONGTEXT N_("By default, VLC keeps a list of the last 10 items. " \
"This feature can be disabled here.")
-#define EQ_KEEP_TEXT N_("Keep current Equalizer settings")
-#define EQ_KEEP_LONGTEXT N_("By default, VLC keeps the last equalizer settings before " \
- "termination. This feature can be disabled here.")
-
-vlc_module_begin();
- set_description( _("Mac OS X interface") );
- set_capability( "interface", 200 );
- set_callbacks( OpenIntf, CloseIntf );
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_MAIN );
- add_bool( "macosx-autoplay", 1, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT,
- false );
- add_bool( "macosx-recentitems", 1, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,
- false );
- add_bool( "macosx-eq-keep", 1, NULL, EQ_KEEP_TEXT, EQ_KEEP_LONGTEXT,
- false );
- add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT,
- false );
-
- add_submodule();
- set_description( _("Quartz video") );
- set_capability( "video output", 100 );
- set_category( CAT_VIDEO);
- set_subcategory( SUBCAT_VIDEO_VOUT );
- set_callbacks( OpenVideoQT, CloseVideoQT );
-
- add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT,
- false );
- add_bool( "macosx-stretch", 0, NULL, STRETCH_TEXT, STRETCH_LONGTEXT,
- false );
- add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
- OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, true );
- add_bool( "macosx-black", 1, NULL, BLACK_TEXT, BLACK_LONGTEXT,
- false );
- add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
- false );
- add_submodule();
- set_description( "Mac OS X OpenGL" );
- set_capability( "opengl provider", 100 );
- set_category( CAT_VIDEO);
- set_subcategory( SUBCAT_VIDEO_VOUT );
- set_callbacks( OpenVideoGL, CloseVideoGL );
-vlc_module_end();
+#define USE_APPLE_REMOTE_TEXT N_("Control playback with the Apple Remote")
+#define USE_APPLE_REMOTE_LONGTEXT N_("By default, VLC can be remotely controlled with the Apple Remote.")
+
+#define USE_APPLE_REMOTE_VOLUME_TEXT N_("Control system volume with the Apple Remote")
+#define USE_APPLE_REMOTE_VOLUME_LONGTEXT N_("By default, VLC will control its own volume with the Apple Remote. However, you can choose to control the global system volume instead.")
+
+#define USE_MEDIAKEYS_TEXT N_("Control playback with media keys")
+#define USE_MEDIAKEYS_LONGTEXT N_("By default, VLC can be controlled using the media keys on modern Apple " \
+ "keyboards.")
+
+#define INTERFACE_STYLE_TEXT N_("Run VLC with dark interface style")
+#define INTERFACE_STYLE_LONGTEXT N_("By default, VLC will use the dark interface style.")
+
+#define NATIVE_FULLSCREEN_MODE_ON_LION_TEXT N_("Use the native fullscreen mode on OS X Lion")
+#define NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT N_("By default, VLC uses the fullscreen mode known from previous Mac OS X releases. It can also use the native fullscreen mode on Mac OS X 10.7 and later.")
+
+#define KEEPSIZE_TEXT N_( "Resize interface to the native video size" )
+#define KEEPSIZE_LONGTEXT N_( "You have two choices:\n" \
+" - The interface will resize to the native video size\n" \
+" - The video will fit to the interface size\n " \
+"By default, interface resize to the native video size." )
+
+#define PAUSE_MINIMIZED_TEXT N_( "Pause the video playback when minimized" )
+#define PAUSE_MINIMIZED_LONGTEXT N_( \
+"With this option enabled, the playback will be automatically paused when minimizing the window." )
+
+#define ICONCHANGE_TEXT N_( "Allow automatic icon changes" )
+#define ICONCHANGE_LONGTEXT N_( "This option allows the interface to change its icon on various occasions." )
+
+#define LOCK_ASPECT_RATIO_TEXT N_( "Lock Aspect Ratio" )
+
+#define JUMPBUTTONS_TEXT N_( "Shows playlist item control buttons" )
+#define JUMPBUTTONS_LONGTEXT N_( "Shows the previous and next buttons in the main window" )
+
+#define PLAYMODEBUTTONS_TEXT N_( "Show play mode control buttons" )
+#define PLAYMODEBUTTONS_LONGTEXT N_( "Shows the shuffle and repeat buttons in the main window" )
+
+#define BACKGROUND_TEXT N_( "Use as desktop background" )
+#define BACKGROUND_LONGTEXT N_( "Use the video as the desktop background." )
+
+vlc_module_begin ()
+ set_description( N_("Mac OS X interface") )
+ set_capability( "interface", 200 )
+ set_callbacks( OpenIntf, CloseIntf )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_MAIN )
+ cannot_unload_broken_library( )
+ add_bool( "macosx-autoplay", true, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT, false )
+ add_bool( "macosx-recentitems", true, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT, false )
+ add_bool( "macosx-fspanel", true, FSPANEL_TEXT, FSPANEL_LONGTEXT, false )
+ add_bool( "macosx-appleremote", true, USE_APPLE_REMOTE_TEXT, USE_APPLE_REMOTE_LONGTEXT, false )
+ add_bool( "macosx-appleremote-sysvol", false, USE_APPLE_REMOTE_VOLUME_TEXT, USE_APPLE_REMOTE_VOLUME_LONGTEXT, false )
+ add_bool( "macosx-mediakeys", true, USE_MEDIAKEYS_TEXT, USE_MEDIAKEYS_LONGTEXT, false )
+ add_bool( "macosx-interfacestyle", false, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, false )
+ add_bool( "macosx-nativefullscreenmode", false, NATIVE_FULLSCREEN_MODE_ON_LION_TEXT, NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT, false )
+ add_obsolete_bool( "macosx-stretch" ) /* since 2.0.0 */
+ add_obsolete_bool( "macosx-eq-keep" ) /* since 2.0.0 */
+ add_obsolete_bool( "macosx-autosave-volume" ) /* since 2.1.0 */
+ add_bool( "macosx-video-autoresize", true, KEEPSIZE_TEXT, KEEPSIZE_LONGTEXT, false )
+ add_bool( "macosx-pause-minimized", false, PAUSE_MINIMIZED_TEXT, PAUSE_MINIMIZED_LONGTEXT, false )
+ add_bool( "macosx-lock-aspect-ratio", true, LOCK_ASPECT_RATIO_TEXT, LOCK_ASPECT_RATIO_TEXT, true )
+ add_bool( "macosx-icon-change", true, ICONCHANGE_TEXT, ICONCHANGE_LONGTEXT, true )
+ add_bool( "macosx-show-playback-buttons", false, JUMPBUTTONS_TEXT, JUMPBUTTONS_LONGTEXT, false )
+ add_bool( "macosx-show-playmode-buttons", true, PLAYMODEBUTTONS_TEXT, PLAYMODEBUTTONS_LONGTEXT, false )
+ add_bool( "macosx-background", false, BACKGROUND_TEXT, BACKGROUND_LONGTEXT, false )
+
+ add_submodule ()
+ set_description( "Mac OS X Video Output Provider" )
+ set_capability( "vout window nsobject", 100 )
+ set_callbacks( WindowOpen, WindowClose )
+
+ add_integer( "macosx-vdev", 0, VDEV_TEXT, VDEV_LONGTEXT, false )
+ add_float_with_range( "macosx-opaqueness", 1, 0, 1, OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, true );
+ add_bool( "macosx-black", true, BLACK_TEXT, BLACK_LONGTEXT, false )
+vlc_module_end ()
projects / vlc / blobdiff