#include "../../../share/vlc32x32-christmas.xpm"
#include <vlc_plugin.h>
+#ifdef WIN32
+ #include <QtPlugin>
+ Q_IMPORT_PLUGIN(qjpeg)
+#endif
+
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static int WindowOpen ( vlc_object_t * );
static void WindowClose ( vlc_object_t * );
static void Run ( intf_thread_t * );
-static void Init ( intf_thread_t * );
+static void *Init ( vlc_object_t * );
static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
/*****************************************************************************
#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" )
#define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" )
+#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" )
+
static const int i_mode_list[] =
{ QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE };
static const char *const psz_mode_list_text[] =
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, 0 );
+ change_integer_list( i_mode_list, psz_mode_list_text, NULL );
add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
NOTIFICATION_LONGTEXT, false );
MINIMIZED_LONGTEXT, true);
add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
TITLE_LONGTEXT, false );
+ add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
+ QT_FULLSCREEN_TEXT, false );
add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
COMPLETEVOL_LONGTEXT, true );
#ifdef UPDATE_CHECK
add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
UPDATER_LONGTEXT, false );
- add_integer( "qt-updates-days", 14, NULL, UPDATER_DAYS_TEXT,
+ add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
UPDATER_DAYS_TEXT, false );
#endif
add_string( "qt-slider-colours",
set_callbacks( OpenDialogs, Close );
+#if 0
add_submodule();
set_capability( "vout window", 50 );
set_callbacks( WindowOpen, WindowClose );
+#endif
vlc_module_end();
/*****************************************************************************
memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
p_intf->pf_run = Run;
+ p_intf->p_sys->p_mi = NULL;
/* Access to the playlist */
- p_intf->p_sys->p_playlist = pl_Yield( p_intf );
+ p_intf->p_sys->p_playlist = pl_Hold( p_intf );
/* Listen to the messages */
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+ /* one settings to rule them all */
var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
return VLC_SUCCESS;
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- vlc_object_lock( p_intf );
- p_intf->b_dead = true;
- vlc_object_unlock( p_intf );
-
if( p_intf->p_sys->b_isDialogProvider )
{
- DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
- QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
-
+ 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 );
}
msg_Err( p_intf, "failed to create Qt dialogs thread" );
}
else
- Init( p_intf );
+ {
+ int canc = vlc_savecancel ();
+ Init( VLC_OBJECT(p_intf) );
+ vlc_restorecancel( canc );
+ }
}
static QMutex windowLock;
static QWaitCondition windowWait;
-static void Init( intf_thread_t *p_intf )
+static void *Init( vlc_object_t *obj )
{
+ intf_thread_t *p_intf = (intf_thread_t *)obj;
vlc_value_t val;
char dummy[] = "";
char *argv[] = { dummy };
int argc = 1;
+ int canc = vlc_savecancel ();
Q_INIT_RESOURCE( vlc );
QApplication *app = new QApplication( argc, argv , true );
p_intf->p_sys->p_app = app;
- /* Icon setting
- FIXME: use a bigger icon ? */
+ p_intf->p_sys->mainSettings = new QSettings(
+#ifdef WIN32
+ QSettings::IniFormat,
+#else
+ QSettings::NativeFormat,
+#endif
+ QSettings::UserScope, "vlc", "vlc-qt-interface" );
+
+ /* Icon setting */
if( QDate::currentDate().dayOfYear() >= 354 )
app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
else
QPointer<MainInterface> *miP = NULL;
+#ifdef UPDATE_CHECK
+ /* Checking for VLC updates */
+ if( config_GetInt( p_intf, "qt-updates-notif" ) &&
+ !config_GetInt( p_intf, "qt-privacy-ask" ) )
+ {
+ int interval = config_GetInt( p_intf, "qt-updates-days" );
+ if( QDate::currentDate() >
+ getSettings()->value( "updatedate" ).toDate().addDays( interval ) )
+ {
+ /* The constructor of the update Dialog will do the 1st request */
+ UpdateDialog::getInstance( p_intf );
+ getSettings()->setValue( "updatedate", QDate::currentDate() );
+ }
+ }
+#endif
+
/* Create the normal interface in non-DP mode */
if( !p_intf->pf_show_dialog )
{
#ifdef ENABLE_NLS
// Translation - get locale
- QLocale ql = QLocale::system();
+# if defined (WIN32) || defined (__APPLE__)
+ char* psz_tmp = config_GetPsz( p_intf, "language" );
+ QString lang = qfu( psz_tmp );
+ free( psz_tmp);
+ if (lang == "auto")
+ lang = QLocale::system().name();
+# else
+ QString lang = QLocale::system().name();
+# endif
// Translations for qt's own dialogs
QTranslator qtTranslator( 0 );
// Let's find the right path for the translation file
QString path = QString( QT4LOCALEDIR );
#else
QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
- "locale" + DIR_SEP );
+ "locale" + DIR_SEP + "qt4" + DIR_SEP );
#endif
// files depending on locale
- bool b_loaded = qtTranslator.load( path + "qt_" + ql.name());
+ bool b_loaded = qtTranslator.load( path + "qt_" + lang );
if (!b_loaded)
msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
app->installTranslator( &qtTranslator );
p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? psz_path
: config_GetHomeDir();
-#ifdef UPDATE_CHECK
- /* Checking for VLC updates */
- if( config_GetInt( p_intf, "qt-updates-notif" ) )
- {
- int interval = config_GetInt( p_intf, "qt-updates-days" );
- QSettings settings( "vlc", "vlc-qt-interface" );
- if( QDate::currentDate() >
- settings.value( "updatedate" ).toDate().addDays( interval ) )
- {
- /* The constructor of the update Dialog will do the 1st request */
- UpdateDialog::getInstance( p_intf );
- settings.setValue( "updatedate", QDate::currentDate() );
- }
- }
-#endif
-
/* Launch */
app->exec();
/* And quit */
+ msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
if (miP)
{
QMutexLocker locker (&windowLock);
+
+ /* We need to warn to detach from any vout before
+ * deleting miP (WindowClose will not be called after it) */
+ p_intf->p_sys->p_mi->releaseVideo( NULL );
+
val.p_address = NULL;
var_Set (p_intf, "window_widget", val);
delete miP;
in the MainInputManager */
delete p_intf->p_sys->p_mi;
- /* Destroy then other windows, because some are connected to some slots
- in the MainInputManager */
+ /* Destroy all remaining windows,
+ because some are connected to some slots
+ in the MainInputManager
+ Settings must be destroyed after that.
+ */
DialogsProvider::killInstance();
+ /* Delete the configuration. Application has to be deleted after that. */
+ delete p_intf->p_sys->mainSettings;
+
/* Destroy the MainInputManager */
MainInputManager::killInstance();
/* Save the path */
config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
free( psz_path );
+ vlc_restorecancel (canc);
+ return NULL;
}
/*****************************************************************************
wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
&wnd->width, &wnd->height);
windowLock.unlock ();
+
+ if (!wnd->handle)
+ return VLC_EGENERIC;
+
wnd->control = WindowControl;
wnd->p_private = miP;
return VLC_SUCCESS;
QMutexLocker locker (&windowLock);
if (!miP->isNull ())
- (*miP)->releaseVideo( wnd->vout, wnd->handle );
+ (*miP)->releaseVideo( wnd->handle );
delete miP;
}
projects / vlc / blobdiff