#include <QApplication>
#include <QDate>
+#include <QMutex>
#include "qt4.hpp"
-#include "input_manager.hpp" /* THEMIM creation */
+#include "input_manager.hpp" /* THEMIM destruction */
#include "dialogs_provider.hpp" /* THEDP creation */
#include "main_interface.hpp" /* MainInterface creation */
#include "dialogs/help.hpp" /* Launch Update */
#include "recents.hpp" /* Recents Item destruction */
#include "util/qvlcapp.hpp" /* QVLCApplication definition */
+#include <vlc_aout_intf.h>
#ifdef Q_WS_X11
#include <vlc_xlib.h>
#endif
#include "../../../share/icons/32x32/vlc.xpm"
-#include "../../../share/icons/32x32/vlc-christmas.xpm"
+#include "../../../share/icons/32x32/vlc-xmas.xpm"
#include <vlc_plugin.h>
+#include <vlc_vout_window.h>
#ifdef WIN32 /* For static builds */
#include <QtPlugin>
static int OpenDialogs ( vlc_object_t * );
static int Open ( vlc_object_t *, bool );
static void Close ( vlc_object_t * );
-static int WindowOpen ( vlc_object_t * );
-static void WindowClose ( vlc_object_t * );
+static int WindowOpen ( vout_window_t *, const vout_window_cfg_t * );
+static void WindowClose ( vout_window_t * );
static void *Thread ( void * );
static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
#define TITLE_TEXT N_( "Show playing item name in window title" )
#define TITLE_LONGTEXT N_( "Show the name of the song or video in the " \
- "controler window title." )
+ "controller window title." )
#define NOTIFICATION_TEXT N_( "Show notification popup on track change" )
#define NOTIFICATION_LONGTEXT N_( \
#define QT_NATIVEOPEN_TEXT N_( "Embed the file browser in open dialog" )
#define FULLSCREEN_NUMBER_TEXT N_( "Define which screen fullscreen goes" )
-#define FULLSCREEN_NUMBER_LONGTEXT N_( "Screennumber of fullscreen, instead of" \
+#define FULLSCREEN_NUMBER_LONGTEXT N_( "Screennumber of fullscreen, instead of " \
"same screen where interface is" )
#define QT_AUTOLOAD_EXTENSIONS_TEXT N_( "Load extensions on startup" )
#define QT_MINIMAL_MODE_TEXT N_("Start in minimal view (without menus)" )
+#define QT_BGCONE_TEXT N_( "Display background cone or art" )
+#define QT_BGCONE_LONGTEXT N_( "Display background cone or current album art " \
+ "when not playing." \
+ "Can be disabled to prevent burning screen." )
+#define QT_BGCONE_EXPANDS_TEXT N_( "Expanding background cone or art." )
+#define QT_BGCONE_EXPANDS_LONGTEXT N_( "Background art fits window's size" )
+
+#define QT_DISABLE_VOLUME_KEYS_TEXT N_( "Ignore keyboard volume buttons." )
+#define QT_DISABLE_VOLUME_KEYS_LONGTEXT N_( \
+ "With this option checked, the volume up, volume down and mute buttons on your " \
+ "keyboard will always change your system volume. With this option unchecked, the " \
+ "volume buttons will change VLC's volume when VLC is selected and change the " \
+ "system volume when VLC is not selected." )
+
+#define QT_PAUSE_MINIMIZED_TEXT N_( "Pause the video playback when minimized" )
+#define QT_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.")
+
/**********************************************************************/
vlc_module_begin ()
set_shortname( "Qt" )
add_shortcut("qt")
- add_bool( "qt-minimal-view", false, NULL, QT_MINIMAL_MODE_TEXT,
+ add_bool( "qt-minimal-view", false, QT_MINIMAL_MODE_TEXT,
QT_MINIMAL_MODE_TEXT, false );
- add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
+ add_bool( "qt-system-tray", true, SYSTRAY_TEXT,
+ SYSTRAY_LONGTEXT, false)
+ add_bool( "qt-notification", true, NOTIFICATION_TEXT,
NOTIFICATION_LONGTEXT, false )
+ add_bool( "qt-start-minimized", false, MINIMIZED_TEXT,
+ MINIMIZED_LONGTEXT, true)
+ add_bool( "qt-pause-minimized", true, QT_PAUSE_MINIMIZED_TEXT,
+ QT_PAUSE_MINIMIZED_LONGTEXT, false )
- add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
+ add_float_with_range( "qt-opacity", 1., 0.1, 1., OPACITY_TEXT,
OPACITY_LONGTEXT, false )
- add_float_with_range( "qt-fs-opacity", 0.8, 0.1, 1., NULL, OPACITY_FS_TEXT,
+ add_float_with_range( "qt-fs-opacity", 0.8, 0.1, 1., OPACITY_FS_TEXT,
OPACITY_FS_LONGTEXT, false )
- add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT,
- SYSTRAY_LONGTEXT, false)
- add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT,
- MINIMIZED_LONGTEXT, true)
- add_bool( "qt-video-autoresize", true, NULL, KEEPSIZE_TEXT,
+ add_bool( "qt-video-autoresize", true, KEEPSIZE_TEXT,
KEEPSIZE_LONGTEXT, false )
- add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
+ add_bool( "qt-name-in-title", true, TITLE_TEXT,
TITLE_LONGTEXT, false )
- add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
+ add_bool( "qt-fs-controller", true, QT_FULLSCREEN_TEXT,
QT_FULLSCREEN_TEXT, false )
- add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
+ add_bool( "qt-recentplay", true, RECENTPLAY_TEXT,
+ RECENTPLAY_TEXT, false )
+ add_string( "qt-recentplay-filter", "",
+ RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false )
+
+#ifdef UPDATE_CHECK
+ add_bool( "qt-updates-notif", true, UPDATER_TEXT,
+ UPDATER_LONGTEXT, false )
+ add_integer( "qt-updates-days", 3, UPDATER_DAYS_TEXT,
+ UPDATER_DAYS_TEXT, false )
+#endif
+
+ add_bool( "qt-volume-complete", false, COMPLETEVOL_TEXT,
COMPLETEVOL_LONGTEXT, true )
- add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT,
+ add_bool( "qt-autosave-volume", false, SAVEVOL_TEXT,
SAVEVOL_TEXT, true )
add_integer_with_range( "qt-startvolume", QT_VOLUME_DEFAULT, 0,
- QT_VOLUME_MAX, NULL, STARTVOL_TEXT, STARTVOL_TEXT, true )
+ QT_VOLUME_MAX, STARTVOL_TEXT, STARTVOL_TEXT, true )
- add_bool( "qt-embedded-open", false, NULL, QT_NATIVEOPEN_TEXT,
+#ifdef WIN32
+ add_bool( "qt-disable-volume-keys" /* name */,
+ true /* default value */,
+ QT_DISABLE_VOLUME_KEYS_TEXT /* text */,
+ QT_DISABLE_VOLUME_KEYS_LONGTEXT /* longtext */,
+ false /* advanced mode only */)
+#endif
+
+ add_bool( "qt-embedded-open", false, QT_NATIVEOPEN_TEXT,
QT_NATIVEOPEN_TEXT, false )
- add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
- RECENTPLAY_TEXT, false )
- add_string( "qt-recentplay-filter", "", NULL,
- RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false )
- add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
- ADVANCED_OPTIONS_LONGTEXT, true )
- add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT,
+
+ add_bool( "qt-advanced-pref", false, ADVANCED_PREFS_TEXT,
ADVANCED_PREFS_LONGTEXT, false )
- add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT,
+ add_bool( "qt-error-dialogs", true, ERROR_TEXT,
ERROR_TEXT, false )
-#ifdef UPDATE_CHECK
- add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
- UPDATER_LONGTEXT, false )
- add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
- UPDATER_DAYS_TEXT, false )
-#endif
- add_string( "qt-slider-colours",
- "255;255;255;20;210;20;255;199;15;245;39;29",
- NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false )
- add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
+ add_string( "qt-slider-colours", "153;210;153;20;210;20;255;199;15;245;39;29",
+ SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false )
+
+ add_bool( "qt-privacy-ask", true, PRIVACY_TEXT, PRIVACY_TEXT,
false )
change_private ()
- add_integer( "qt-fullscreen-screennumber", -1, NULL, FULLSCREEN_NUMBER_TEXT,
+ add_integer( "qt-fullscreen-screennumber", -1, FULLSCREEN_NUMBER_TEXT,
FULLSCREEN_NUMBER_LONGTEXT, false );
- add_bool( "qt-autoload-extensions", true, NULL,
+ add_bool( "qt-autoload-extensions", true,
QT_AUTOLOAD_EXTENSIONS_TEXT, QT_AUTOLOAD_EXTENSIONS_LONGTEXT,
false )
+ add_bool( "qt-bgcone", true, QT_BGCONE_TEXT, QT_BGCONE_LONGTEXT, true )
+ add_bool( "qt-bgcone-expands", false, QT_BGCONE_EXPANDS_TEXT,
+ QT_BGCONE_EXPANDS_LONGTEXT, true )
+
+
add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */
-#ifdef WIN32
+ add_bool( "qt-icon-change", true, ICONCHANGE_TEXT, ICONCHANGE_LONGTEXT, true )
+
+ add_obsolete_bool( "qt-adv-options" ) /* Since 1.2.0 */
+
cannot_unload_broken_library()
-#endif
add_submodule ()
set_description( "Dialogs provider" )
/* Ugly, but the Qt4 interface assumes single instance anyway */
static vlc_sem_t ready;
-#ifdef Q_WS_X11
-static char *x11_display = NULL;
-#endif
-static struct
-{
- vlc_mutex_t lock;
- bool busy;
-} one = { VLC_STATIC_MUTEX, false };
+static QMutex lock;
+static bool busy = false;
+static bool active = false;
/*****************************************************************************
* Module callbacks
*****************************************************************************/
+#ifdef Q_WS_MAC
+/* Used to abort the app.exec() on OSX after libvlc_Quit is called */
+#include "../../../lib/libvlc_internal.h" /* libvlc_SetExitHandler */
+static void Abort( void *obj )
+{
+ QVLCApp::triggerQuit();
+}
+#endif
+
+static void RegisterIntf( vlc_object_t *p_this )
+{
+ playlist_t *pl = pl_Get(p_this);
+ var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS);
+ var_SetAddress (pl, "qt4-iface", p_this);
+ var_Create (pl, "window", VLC_VAR_STRING);
+ var_SetString (pl, "window", "qt4,any");
+}
+
/* Open Interface */
static int Open( vlc_object_t *p_this, bool isDialogProvider )
{
if( !vlc_xlib_init( p_this ) )
return VLC_EGENERIC;
- char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
- Display *p_display = XOpenDisplay( x11_display );
+ Display *p_display = XOpenDisplay( NULL );
if( !p_display )
{
msg_Err( p_intf, "Could not connect to X server" );
- free (display);
return VLC_EGENERIC;
}
XCloseDisplay( p_display );
-#else
- char *display = NULL;
#endif
- bool busy;
- vlc_mutex_lock (&one.lock);
- busy = one.busy;
- one.busy = true;
- vlc_mutex_unlock (&one.lock);
+ QMutexLocker locker (&lock);
if (busy)
{
msg_Err (p_this, "cannot start Qt4 multiple times");
- free (display);
return VLC_EGENERIC;
}
intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t;
p_intf->p_sys->b_isDialogProvider = isDialogProvider;
p_sys->p_mi = NULL;
- p_sys->p_playlist = pl_Get( p_intf );
/* */
-#ifdef Q_WS_X11
- x11_display = display;
-#endif
vlc_sem_init (&ready, 0);
+#ifdef Q_WS_MAC
+ /* Run mainloop on the main thread as Cocoa requires */
+ libvlc_SetExitHandler( p_intf->p_libvlc, Abort, p_intf );
+ Thread( (void *)p_intf );
+#else
if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
delete p_sys;
- free (display);
- vlc_mutex_lock (&one.lock);
- one.busy = false;
- vlc_mutex_unlock (&one.lock);
return VLC_ENOMEM;
}
+#endif
- /* */
+ /* Wait for the interface to be ready. This prevents the main
+ * LibVLC thread from starting video playback before we can create
+ * an embedded video window. */
vlc_sem_wait (&ready);
vlc_sem_destroy (&ready);
+ busy = active = true;
- if( !p_sys->b_isDialogProvider )
+#ifndef Q_WS_MAC
+ if( !isDialogProvider )
{
- playlist_t *pl = pl_Get(p_this);
- var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS);
- var_SetAddress (pl, "qt4-iface", p_this);
- var_Create (pl, "window", VLC_VAR_STRING);
- var_SetString (pl, "window", "qt4,any");
+ RegisterIntf( p_this );
}
+#endif
+
return VLC_SUCCESS;
}
var_Destroy (pl_Get(p_this), "qt4-iface");
}
+ /* And quit */
+ msg_Dbg( p_this, "requesting exit..." );
QVLCApp::triggerQuit();
+ msg_Dbg( p_this, "waiting for UI thread..." );
+#ifndef Q_WS_MAC
vlc_join (p_sys->thread, NULL);
-#ifdef Q_WS_X11
- free (x11_display);
- x11_display = NULL;
#endif
delete p_sys;
- vlc_mutex_lock (&one.lock);
- one.busy = false;
- vlc_mutex_unlock (&one.lock);
+
+ QMutexLocker locker (&lock);
+ assert (busy);
+ busy = false;
}
static void *Thread( void *obj )
intf_thread_t *p_intf = (intf_thread_t *)obj;
MainInterface *p_mi;
char dummy[] = "vlc"; /* for WM_CLASS */
- char *argv[4] = { dummy, NULL, };
+ char *argv[2] = { dummy, NULL, };
int argc = 1;
Q_INIT_RESOURCE( vlc );
/* Start the QApplication here */
-#ifdef Q_WS_X11
- if( x11_display != NULL )
- {
- argv[argc++] = const_cast<char *>("-display");
- argv[argc++] = x11_display;
- argv[argc] = NULL;
- }
-#endif
-
QVLCApp app( argc, argv );
p_intf->p_sys->p_app = &app;
#endif
QSettings::UserScope, "vlc", "vlc-qt-interface" );
- /* Icon setting */
- if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
- app.setWindowIcon( QIcon(vlc_christmas_xpm) );
+ /* Icon setting, Mac uses icon from .icns */
+#ifndef Q_WS_MAC
+ if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
+ app.setWindowIcon( QIcon(vlc_xmas_xpm) );
else
app.setWindowIcon( QIcon(vlc_xpm) );
+#endif
/* Initialize timers and the Dialog Provider */
DialogsProvider::getInstance( p_intf );
- /* Detect screensize for small screens like TV or EEEpc*/
+ /* Detect screensize for small screens like TV or Netbooks */
p_intf->p_sys->i_screenHeight =
app.QApplication::desktop()->availableGeometry().height();
/* Create the normal interface in non-DP mode */
if( !p_intf->p_sys->b_isDialogProvider )
+ {
p_mi = new MainInterface( p_intf );
+ p_intf->p_sys->p_mi = p_mi;
+ }
else
p_mi = NULL;
- p_intf->p_sys->p_mi = p_mi;
/* Explain how to show a dialog :D */
p_intf->pf_show_dialog = ShowDialog;
- /* */
+ /* Tell the main LibVLC thread we are ready */
vlc_sem_post (&ready);
+#ifdef Q_WS_MAC
+ /* We took over main thread, register and start here */
+ if( !p_intf->p_sys->b_isDialogProvider )
+ {
+ RegisterIntf( (vlc_object_t *)p_intf );
+ playlist_Play( THEPL );
+ }
+#endif
+
/* Last settings */
- app.setQuitOnLastWindowClosed( false );
+ if( p_intf->p_sys->b_isDialogProvider )
+ app.setQuitOnLastWindowClosed( false );
+ else
+ app.setQuitOnLastWindowClosed( true );
/* Retrieve last known path used in file browsing */
p_intf->p_sys->filepath =
/* Launch */
app.exec();
- /* And quit */
- QApplication::closeAllWindows();
-
+ msg_Dbg( p_intf, "QApp exec() finished" );
if (p_mi != NULL)
{
-#warning BUG!
- /* FIXME: the video window may still be registerd at this point */
- /* See LP#448082 as an example. */
+ QMutexLocker locker (&lock);
+ active = false;
p_intf->p_sys->p_mi = NULL;
/* Destroy first the main interface because it is connected to some
/* Delete the recentsMRL object before the configuration */
RecentsMRL::killInstance();
- /* Save the path */
- getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath );
-
- /* Save volume on exit */
- audio_volume_t i_volume;
- if ( var_InheritBool( p_intf, "qt-autosave-volume" ) )
- aout_VolumeGet( p_intf, &i_volume );
+ /* Save the path or delete if recent play are disabled */
+ if( var_InheritBool( p_intf, "qt-recentplay" ) )
+ getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath );
else
- i_volume = config_GetInt( p_intf, "qt-startvolume" );
- config_PutInt( p_intf, "volume", i_volume );
- config_SaveConfigFile( p_intf, NULL );
+ getSettings()->remove( "filedialog-path" );
/* Delete the configuration. Application has to be deleted after that. */
delete p_intf->p_sys->mainSettings;
*
* TODO move it out of here ?
*/
-#include <vlc_vout_window.h>
-
static int WindowControl( vout_window_t *, int i_query, va_list );
-static int WindowOpen( vlc_object_t *p_obj )
+static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
{
- vout_window_t *p_wnd = (vout_window_t*)p_obj;
-
/* */
- if( p_wnd->cfg->is_standalone )
+ if( cfg->is_standalone )
return VLC_EGENERIC;
#if defined (Q_WS_X11)
- if( var_InheritBool( p_obj, "video-wallpaper" ) )
+ if( var_InheritBool( p_wnd, "video-wallpaper" ) )
return VLC_EGENERIC;
#endif
- vlc_value_t val;
- if( var_Inherit( p_obj, "qt4-iface", VLC_VAR_ADDRESS, &val ) )
- val.p_address = NULL;
-
- intf_thread_t *p_intf = (intf_thread_t *)val.p_address;
-
+ intf_thread_t *p_intf =
+ (intf_thread_t *)var_InheritAddress( p_wnd, "qt4-iface" );
if( !p_intf )
{ /* If another interface is used, this plugin cannot work */
- msg_Dbg( p_obj, "Qt4 interface not found" );
+ msg_Dbg( p_wnd, "Qt4 interface not found" );
return VLC_EGENERIC;
}
+ QMutexLocker locker (&lock);
+ if (unlikely(!active))
+ return VLC_EGENERIC;
+
MainInterface *p_mi = p_intf->p_sys->p_mi;
- msg_Dbg( p_obj, "requesting video..." );
+ msg_Dbg( p_wnd, "requesting video..." );
- int i_x = p_wnd->cfg->x;
- int i_y = p_wnd->cfg->y;
- unsigned i_width = p_wnd->cfg->width;
- unsigned i_height = p_wnd->cfg->height;
+ int i_x = cfg->x;
+ int i_y = cfg->y;
+ unsigned i_width = cfg->width;
+ unsigned i_height = cfg->height;
#if defined (Q_WS_X11)
p_wnd->handle.xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
if( !p_wnd->handle.xid )
return VLC_EGENERIC;
- p_wnd->display.x11 = x11_display;
+ p_wnd->display.x11 = NULL;
#elif defined (Q_WS_WIN)
p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
{
MainInterface *p_mi = (MainInterface *)p_wnd->sys;
+ QMutexLocker locker (&lock);
+
+ if (unlikely(!active))
+ {
+ msg_Warn (p_wnd, "video already released before control");
+ return VLC_EGENERIC;
+ }
return p_mi->controlVideo( i_query, args );
}
-static void WindowClose( vlc_object_t *p_obj )
+static void WindowClose( vout_window_t *p_wnd )
{
- vout_window_t *p_wnd = (vout_window_t*)p_obj;
MainInterface *p_mi = (MainInterface *)p_wnd->sys;
-
- msg_Dbg( p_obj, "releasing video..." );
+ QMutexLocker locker (&lock);
+
+ /* Normally, the interface terminates after the video. In the contrary, the
+ * Qt4 main loop is gone, so we cannot send any event to the user interface
+ * widgets. Ideally, we would keep the Qt4 main loop running until after
+ * the video window is released. But it is far simpler to just have the Qt4
+ * thread destroy the window early, and to turn this function into a stub.
+ *
+ * That assumes the video output will behave sanely if it window is
+ * destroyed asynchronously.
+ * XCB and Xlib-XCB are fine with that. Plain Xlib wouldn't, */
+ if (unlikely(!active))
+ {
+ msg_Warn (p_wnd, "video already released");
+ return;
+ }
+ msg_Dbg (p_wnd, "releasing video...");
p_mi->releaseVideo();
}
-
projects / vlc / blobdiff