" 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 " \
"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 QT_AUTOLOAD_EXTENSIONS_LONGTEXT N_( "Automatically load the "\
"extensions module on startup" )
-/* 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_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 )
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 );
false )
add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
+ add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */
#ifdef WIN32
- linked_with_a_crap_library_which_uses_atexit()
+ cannot_unload_broken_library()
#endif
add_submodule ()
#ifdef Q_WS_X11
if( !XInitThreads() )
return VLC_EGENERIC;
- x11_display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+
+ 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;
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_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 ) )
{
delete p_sys;
+ free (display);
vlc_mutex_lock (&one.lock);
one.busy = false;
vlc_mutex_unlock (&one.lock);
QVLCApp::triggerQuit();
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);
-#ifdef Q_WS_X11
- free (x11_display);
-#endif
}
static void *Thread( void *obj )
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 */
/* Destroy the MainInputManager */
MainInputManager::killInstance();
-
/* Delete the application automatically */
-#ifdef Q_WS_X11
- free( x11_display );
-#endif
return NULL;
}