#include <QMutex>
#include <QMutexLocker>
#include <QWaitCondition>
-#include <QPointer>
#include "qt4.hpp"
-#include "dialogs_provider.hpp"
-#include "input_manager.hpp"
-#include "main_interface.hpp"
-#include "dialogs/help.hpp" /* update */
-#include "recents.hpp"
+#include "input_manager.hpp" /* THEMIM creation */
+#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"
#ifdef HAVE_X11_XLIB_H
#ifdef WIN32
#include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg)
+ Q_IMPORT_PLUGIN(qtaccessiblewidgets)
#endif
/*****************************************************************************
static int OpenDialogs ( vlc_object_t * );
static int WindowOpen ( vlc_object_t * );
static void WindowClose ( vlc_object_t * );
-static void Run ( intf_thread_t * );
static void *Thread ( void * );
static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
#define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \
"your taskbar" )
+#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 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." )
#define SAVEVOL_TEXT N_( "Automatically save the volume on exit" )
-#define BLING_TEXT N_( "Use non native buttons and volume slider" )
-
#define PRIVACY_TEXT N_( "Ask for network policy at start" )
#define RECENTPLAY_TEXT N_( "Save the recently played items in the menu" )
static const char *const psz_mode_list_text[] =
{ QT_NORMAL_MODE_TEXT, QT_ALWAYS_VIDEO_MODE_TEXT, QT_MINIMAL_MODE_TEXT };
-vlc_module_begin();
- set_shortname( "Qt" );
- set_description( N_("Qt interface") );
- set_category( CAT_INTERFACE ) ;
- set_subcategory( SUBCAT_INTERFACE_MAIN );
- set_capability( "interface", 151 );
- set_callbacks( Open, Close );
+vlc_module_begin ()
+ set_shortname( "Qt" )
+ set_description( N_("Qt interface") )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_MAIN )
+ set_capability( "interface", 151 )
+ set_callbacks( Open, Close )
- add_shortcut("qt");
+ add_shortcut("qt")
add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
- QT_MODE_TEXT, QT_MODE_LONGTEXT, false );
+ QT_MODE_TEXT, QT_MODE_LONGTEXT, false )
change_integer_list( i_mode_list, psz_mode_list_text, NULL );
add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
- NOTIFICATION_LONGTEXT, false );
+ NOTIFICATION_LONGTEXT, false )
add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
- OPACITY_LONGTEXT, false );
- add_bool( "qt-blingbling", true, NULL, BLING_TEXT, BLING_TEXT, false );
+ OPACITY_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,
+ KEEPSIZE_LONGTEXT, false )
add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
- TITLE_LONGTEXT, false );
+ TITLE_LONGTEXT, false )
add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
- QT_FULLSCREEN_TEXT, false );
+ QT_FULLSCREEN_TEXT, false )
add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
COMPLETEVOL_LONGTEXT, true );
SAVEVOL_TEXT, true );
add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
FILEDIALOG_PATH_TEXT, true );
- change_autosave();
- change_internal();
+ change_autosave ()
+ change_internal ()
add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
- RECENTPLAY_TEXT, false );
- add_string( "qt-recentplay-filter", "xxx|porn", NULL,
- RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false );
+ 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,
- ADVANCED_PREFS_LONGTEXT, false );
+ ADVANCED_PREFS_LONGTEXT, false )
add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT,
- ERROR_TEXT, false );
+ ERROR_TEXT, false )
#ifdef UPDATE_CHECK
add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
- UPDATER_LONGTEXT, false );
+ UPDATER_LONGTEXT, false )
add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
- UPDATER_DAYS_TEXT, false );
+ UPDATER_DAYS_TEXT, false )
#endif
add_string( "qt-slider-colours",
"255;255;255;20;226;20;255;176;15;235;30;20",
- NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false );
+ NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false )
add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
- false );
- change_internal();
+ false )
+ change_internal ()
- add_submodule();
- set_description( "Dialogs provider" );
- set_capability( "dialogs provider", 51 );
+ add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
- set_callbacks( OpenDialogs, Close );
+ add_submodule ()
+ set_description( "Dialogs provider" )
+ set_capability( "dialogs provider", 51 )
-#if !defined (Q_WS_X11) /*|| HAS_QT43*/
- add_submodule();
- set_capability( "vout window", 50 );
- set_callbacks( WindowOpen, WindowClose );
-#endif
-vlc_module_end();
+ set_callbacks( OpenDialogs, Close )
+ add_submodule ()
+ set_capability( "vout_window", 50 )
+ set_callbacks( WindowOpen, WindowClose )
+
+vlc_module_end ()
+
+/* Ugly, but the Qt4 interface assumes single instance anyway */
static struct
{
QMutex lock;
/* Allocations */
p_sys = p_intf->p_sys = new intf_sys_t;
p_sys->b_isDialogProvider = false;
- p_sys->p_video = NULL; /* ??? */
p_sys->p_popup_menu = NULL; /* ??? */
p_sys->p_playlist = pl_Hold( p_intf );
p_sys->p_mi = NULL;
- if (vlc_clone (&p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW))
+ if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
pl_Release (p_sys->p_playlist);
delete p_sys;
return VLC_ENOMEM;
}
- else
- {
- QMutexLocker locker (&iface.lock);
- while (p_sys->p_mi == NULL)
- iface.ready.wait (&iface.lock);
- }
+ /* */
+ QMutexLocker locker (&iface.lock);
+ vlc_value_t val;
+
+ while( p_sys->p_mi == NULL && !p_sys->b_isDialogProvider )
+ iface.ready.wait( &iface.lock );
+ var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS);
+ val.p_address = p_this;
+ var_Set (p_this->p_libvlc, "qt4-iface", val);
return VLC_SUCCESS;
}
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
- QApplication::postEvent (p_sys->p_mi, new QCloseEvent());
-
- if( p_intf->p_sys->b_isDialogProvider )
- {
- if( DialogsProvider::isAlive() )
- {
- msg_Dbg( p_intf, "Asking the DP to quit nicely" );
- DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
- QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
- }
- vlc_thread_join( p_intf );
- }
+ var_Destroy (p_this->p_libvlc, "qt4-iface");
+ QApplication::quit();
vlc_join (p_sys->thread, NULL);
pl_Release (p_this);
{
intf_thread_t *p_intf = (intf_thread_t *)obj;
MainInterface *p_mi;
- vlc_value_t val;
char dummy[] = "";
char *argv[] = { dummy };
int argc = 1;
/* Initialize timers and the Dialog Provider */
DialogsProvider::getInstance( p_intf );
+ /* Detect screensize for small screens like TV or EEEpc*/
+ p_intf->p_sys->i_screenHeight =
+ app->QApplication::desktop()->availableGeometry().height();
+
#ifdef UPDATE_CHECK
/* Checking for VLC updates */
if( config_GetInt( p_intf, "qt-updates-notif" ) &&
/* Create the normal interface in non-DP mode */
if( !p_intf->pf_show_dialog )
- {
p_mi = new MainInterface( p_intf );
- /* We don't show it because it is done in the MainInterface constructor
- p_mi->show(); */
-
- QMutexLocker locker (&iface.lock);
- p_intf->p_sys->p_mi = p_mi;
- iface.ready.wakeAll ();
- }
else
- {
- vlc_thread_ready( p_intf );
- p_intf->p_sys->b_isDialogProvider = true;
p_mi = NULL;
- }
+
+ /* */
+ iface.lock.lock();
+ p_intf->p_sys->p_mi = p_mi;
+ p_intf->p_sys->b_isDialogProvider = p_mi == NULL;
+ iface.ready.wakeAll();
+ iface.lock.unlock();
/* Explain to the core how to show a dialog :D */
p_intf->pf_show_dialog = ShowDialog;
/* And quit */
msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
+ QApplication::closeAllWindows();
+
if (p_mi != NULL)
{
QMutexLocker locker (&iface.lock);
- p_intf->p_sys->p_mi = NULL;
-
- /* We need to warn to detach from any vout before
- * deleting miP (WindowClose will not be called after it) */
- p_mi->releaseVideo( NULL );
+ msg_Dbg (p_intf, "destroying the main Qt4 interface");
+ p_intf->p_sys->p_mi = NULL;
/* Destroy first the main interface because it is connected to some
slots in the MainInputManager */
- /* Destroy under the iface lock to sync vout QPointer */
delete p_mi;
}
static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg,
intf_dialog_args_t *p_arg )
{
+ VLC_UNUSED( p_intf );
DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg );
- QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
-}
-
-/*****************************************************************************
- * PopupMenuCB: callback to show the popupmenu.
- * We don't show the menu directly here because we don't want the
- * caller to block for a too long time.
- *****************************************************************************/
-static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t old_val, vlc_value_t new_val, void *param )
-{
- intf_thread_t *p_intf = (intf_thread_t *)param;
- ShowDialog( p_intf, INTF_DIALOG_POPUPMENU, new_val.b_bool, 0 );
- return VLC_SUCCESS;
+ QApplication::postEvent( THEDP, event );
}
/**
static int WindowOpen (vlc_object_t *obj)
{
vout_window_t *wnd = (vout_window_t *)obj;
- QPointer<MainInterface> *miP;
+ intf_thread_t *intf = NULL;
+ vlc_value_t val;
if (config_GetInt (obj, "embedded-video") <= 0)
return VLC_EGENERIC;
- intf_thread_t *intf = (intf_thread_t *)
- vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
- if (intf == NULL)
- return VLC_EGENERIC; /* Qt4 not in use */
- assert (intf->i_object_type == VLC_OBJECT_INTF);
-
QMutexLocker (&iface.lock);
- msg_Dbg (obj, "waiting for interface...");
- while (intf->p_sys->p_mi == NULL)
- iface.ready.wait (&iface.lock);
-
- msg_Dbg (obj, "requesting window...");
- /* create our own copy */
- miP = new QPointer<MainInterface> (intf->p_sys->p_mi);
- vlc_object_release (intf);
-
- if (miP->isNull ())
+ if (var_Get (obj->p_libvlc, "qt4-iface", &val) == 0)
+ intf = (intf_thread_t *)val.p_address;
+ if (intf == NULL)
+ { /* If another interface is used, this plugin cannot work */
+ msg_Dbg (obj, "Qt4 interface not found");
return VLC_EGENERIC;
+ }
- wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
- &wnd->width, &wnd->height);
+ MainInterface *p_mi = intf->p_sys->p_mi;
+ msg_Dbg (obj, "requesting video...");
+
+ wnd->handle = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
+ &wnd->width, &wnd->height);
if (!wnd->handle)
return VLC_EGENERIC;
wnd->control = WindowControl;
- wnd->p_private = miP;
+ wnd->p_private = p_mi;
return VLC_SUCCESS;
}
static int WindowControl (vout_window_t *wnd, int query, va_list args)
{
+ MainInterface *p_mi = (MainInterface *)wnd->p_private;
QMutexLocker locker (&iface.lock);
- QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;
- if (miP->isNull ())
- return VLC_EGENERIC;
- return (*miP)->controlVideo (wnd->handle, query, args);
+ return p_mi->controlVideo (wnd->handle, query, args);
}
static void WindowClose (vlc_object_t *obj)
{
vout_window_t *wnd = (vout_window_t *)obj;
+ MainInterface *p_mi = (MainInterface *)wnd->p_private;
QMutexLocker locker (&iface.lock);
- QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;
- if (!miP->isNull ())
- (*miP)->releaseVideo( wnd->handle );
- delete miP;
+ msg_Dbg (obj, "releasing video...");
+ p_mi->releaseVideo ();
}
projects / vlc / blobdiff