#include "util/qvlcapp.hpp" /* QVLCApplication definition */
#ifdef Q_WS_X11
- #include <X11/Xlib.h>
+ #include <vlc_xlib.h>
#endif
-#include "../../../share/vlc32x32.xpm"
-#include "../../../share/vlc32x32-christmas.xpm"
+#include "../../../share/icons/32x32/vlc.xpm"
+#include "../../../share/icons/32x32/vlc-christmas.xpm"
#include <vlc_plugin.h>
#ifdef WIN32 /* For static builds */
#define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \
"in the dialogs." )
-#define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." )
+#define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1" )
#define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \
"for main interface, playlist and extended panel."\
" This option only works with Windows and " \
"X11 with composite extensions." )
-#define OPACITY_FS_TEXT N_( "Fullscreen controller opacity opacity between 0.1 and 1." )
+#define OPACITY_FS_TEXT N_( "Fullscreen controller opacity between 0.1 and 1" )
#define OPACITY_FS_LONGTEXT N_( "Sets the fullscreen controller opacity between 0.1 and 1 " \
"for main interface, playlist and extended panel."\
" This option only works with Windows and " \
"software amplification." )
#define SAVEVOL_TEXT N_( "Automatically save the volume on exit" )
+#define STARTVOL_TEXT N_( "Default start volume" )
#define PRIVACY_TEXT N_( "Ask for network policy at start" )
"as lyrics, album arts...\n" \
" - minimal mode with limited controls" )
-#define QT_NORMAL_MODE_TEXT N_( "Classic" )
-#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete (with information area)" )
-#define QT_MINIMAL_MODE_TEXT N_( "Minimal (without menu)" )
-
#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" )
#define QT_NATIVEOPEN_TEXT N_( "Embed the file browser in open dialog" )
#define FULLSCREEN_NUMBER_LONGTEXT N_( "Screennumber of fullscreen, instead of" \
"same screen where interface is" )
-/* Various modes definition */
-static const int i_mode_list[] =
- { QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE };
-static const char *const psz_mode_list_text[] =
- { QT_NORMAL_MODE_TEXT, QT_ALWAYS_VIDEO_MODE_TEXT, QT_MINIMAL_MODE_TEXT };
+#define QT_AUTOLOAD_EXTENSIONS_TEXT N_( "Load extensions on startup" )
+#define QT_AUTOLOAD_EXTENSIONS_LONGTEXT N_( "Automatically load the "\
+ "extensions module on startup" )
+#define QT_MINIMAL_MODE_TEXT N_("Start in minimal view (without menus)" )
/**********************************************************************/
vlc_module_begin ()
set_callbacks( OpenIntf, Close )
add_shortcut("qt")
- add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
- QT_MODE_TEXT, QT_MODE_LONGTEXT, false )
- change_integer_list( i_mode_list, psz_mode_list_text, NULL )
+
+ add_bool( "qt-minimal-view", false, NULL, QT_MINIMAL_MODE_TEXT,
+ QT_MINIMAL_MODE_TEXT, false );
add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
NOTIFICATION_LONGTEXT, false )
COMPLETEVOL_LONGTEXT, true )
add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT,
SAVEVOL_TEXT, true )
+ add_integer_with_range( "qt-startvolume", QT_VOLUME_DEFAULT, 0,
+ QT_VOLUME_MAX, NULL, STARTVOL_TEXT, STARTVOL_TEXT, true )
add_bool( "qt-embedded-open", false, NULL, QT_NATIVEOPEN_TEXT,
QT_NATIVEOPEN_TEXT, false )
add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
false )
- change_internal ()
+ change_private ()
add_integer( "qt-fullscreen-screennumber", -1, NULL, FULLSCREEN_NUMBER_TEXT,
FULLSCREEN_NUMBER_LONGTEXT, false );
+ add_bool( "qt-autoload-extensions", true, NULL,
+ QT_AUTOLOAD_EXTENSIONS_TEXT, QT_AUTOLOAD_EXTENSIONS_LONGTEXT,
+ false )
+
add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
+ add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */
+
+#ifdef WIN32
+ cannot_unload_broken_library()
+#endif
add_submodule ()
set_description( "Dialogs provider" )
set_callbacks( OpenDialogs, Close )
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MAC)
add_submodule ()
#if defined(Q_WS_X11)
- set_capability( "vout window xid", 50 )
+ set_capability( "vout window xid", 0 )
#elif defined(Q_WS_WIN)
- set_capability( "vout window hwnd", 50 )
+ set_capability( "vout window hwnd", 0 )
+#elif defined(Q_WS_MAC)
+ set_capability( "vout window nsobject", 0 )
#endif
set_callbacks( WindowOpen, WindowClose )
#endif
#ifdef Q_WS_X11
static char *x11_display = NULL;
#endif
+static struct
+{
+ vlc_mutex_t lock;
+ bool busy;
+} one = { VLC_STATIC_MUTEX, false };
/*****************************************************************************
* Module callbacks
intf_thread_t *p_intf = (intf_thread_t *)p_this;
#ifdef Q_WS_X11
- x11_display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+ if( !vlc_xlib_init( p_this ) )
+ return VLC_EGENERIC;
+
+ char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
Display *p_display = XOpenDisplay( x11_display );
if( !p_display )
{
msg_Err( p_intf, "Could not connect to X server" );
+ free (display);
return VLC_EGENERIC;
}
XCloseDisplay( p_display );
- putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
+#else
+ char *display = NULL;
#endif
+ bool busy;
+ vlc_mutex_lock (&one.lock);
+ busy = one.busy;
+ one.busy = true;
+ vlc_mutex_unlock (&one.lock);
+ if (busy)
+ {
+ msg_Err (p_this, "cannot start Qt4 multiple times");
+ free (display);
+ return VLC_EGENERIC;
+ }
+
/* Allocations of p_sys */
intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t;
p_intf->p_sys->b_isDialogProvider = isDialogProvider;
- p_sys->p_popup_menu = NULL;
p_sys->p_mi = NULL;
- p_sys->p_playlist = pl_Hold( p_intf );
+ p_sys->p_playlist = pl_Get( p_intf );
/* */
+#ifdef Q_WS_X11
+ x11_display = display;
+#endif
vlc_sem_init (&ready, 0);
if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
- pl_Release (p_sys->p_playlist);
delete p_sys;
+ free (display);
+ vlc_mutex_lock (&one.lock);
+ one.busy = false;
+ vlc_mutex_unlock (&one.lock);
return VLC_ENOMEM;
}
if( !p_sys->b_isDialogProvider )
{
- vlc_value_t val;
- 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);
+ 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");
}
return VLC_SUCCESS;
}
intf_sys_t *p_sys = p_intf->p_sys;
if( !p_sys->b_isDialogProvider )
- var_Destroy (p_this->p_libvlc, "qt4-iface");
+ {
+ var_Destroy (pl_Get(p_this), "window");
+ var_Destroy (pl_Get(p_this), "qt4-iface");
+ }
QVLCApp::triggerQuit();
vlc_join (p_sys->thread, NULL);
- pl_Release (p_this);
- delete p_sys;
#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);
}
static void *Thread( void *obj )
#ifdef UPDATE_CHECK
/* Checking for VLC updates */
- if( config_GetInt( p_intf, "qt-updates-notif" ) &&
- !config_GetInt( p_intf, "qt-privacy-ask" ) )
+ if( var_InheritBool( p_intf, "qt-updates-notif" ) &&
+ !var_InheritBool( p_intf, "qt-privacy-ask" ) )
{
- int interval = config_GetInt( p_intf, "qt-updates-days" );
+ int interval = var_InheritInteger( p_intf, "qt-updates-days" );
if( QDate::currentDate() >
getSettings()->value( "updatedate" ).toDate().addDays( interval ) )
{
p_mi = new MainInterface( p_intf );
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;
/* */
- p_intf->p_sys->p_mi = p_mi;
vlc_sem_post (&ready);
/* Last settings */
app.exec();
/* And quit */
- msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
-
QApplication::closeAllWindows();
if (p_mi != NULL)
{
- /* FIXME: are we sure that video window is already destroyed? */
+#warning BUG!
+ /* FIXME: the video window may still be registerd at this point */
+ /* See LP#448082 as an example. */
- 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 the MainInputManager */
MainInputManager::killInstance();
-
/* Delete the application automatically */
-#ifdef Q_WS_X11
- free( x11_display );
-#endif
return NULL;
}
/* */
if( p_wnd->cfg->is_standalone )
return VLC_EGENERIC;
+#if defined (Q_WS_X11)
+ if( var_InheritBool( p_obj, "video-wallpaper" ) )
+ return VLC_EGENERIC;
+#endif
vlc_value_t val;
-
- if( var_Get( p_obj->p_libvlc, "qt4-iface", &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;
unsigned i_height = p_wnd->cfg->height;
#if defined (Q_WS_X11)
- p_wnd->xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
- if( !p_wnd->xid )
+ 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->x11_display = x11_display;
+ p_wnd->display.x11 = x11_display;
#elif defined (Q_WS_WIN)
- p_wnd->hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
- if( !p_wnd->hwnd )
+ p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_wnd->handle.hwnd )
+ return VLC_EGENERIC;
+
+#elif defined (Q_WS_MAC)
+ p_wnd->handle.nsobject = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_wnd->handle.nsobject )
return VLC_EGENERIC;
#else
# error FIXME
projects / vlc / blobdiff