#include <QMutex>
#include <QMutexLocker>
#include <QWaitCondition>
+#include <QPointer>
#include "qt4.hpp"
#include "dialogs_provider.hpp"
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static int OpenDialogs ( vlc_object_t * );
-static int OpenWindow ( vlc_object_t * );
-static void CloseWindow ( vlc_object_t * );
+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 ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
add_submodule();
set_capability( "vout window", 50 );
- set_callbacks( OpenWindow, CloseWindow );
+ set_callbacks( WindowOpen, WindowClose );
vlc_module_end();
/*****************************************************************************
/* Initialize timers and the Dialog Provider */
DialogsProvider::getInstance( p_intf );
+ QPointer<MainInterface> *miP = NULL;
+
/* Create the normal interface in non-DP mode */
if( !p_intf->pf_show_dialog )
{
p_mi->show(); */
p_intf->p_sys->b_isDialogProvider = false;
- val.p_address = p_intf->p_sys->p_mi;
+ miP = new QPointer<MainInterface> (p_intf->p_sys->p_mi);
+ val.p_address = miP;
QMutexLocker locker (&windowLock);
var_Set (p_intf, "window_widget", val);
windowWait.wakeAll ();
/* And quit */
- QMutexLocker locker (&windowLock);
- val.p_address = NULL;
- var_Set (p_intf, "window_widget", val);
+ if (miP)
+ {
+ QMutexLocker locker (&windowLock);
+ val.p_address = NULL;
+ var_Set (p_intf, "window_widget", val);
+ delete miP;
+ }
+
/* Destroy first the main interface because it is connected to some slots
in the MainInputManager */
delete p_intf->p_sys->p_mi;
*/
#include <vlc_window.h>
-static int ControlWindow (vout_window_t *, int, va_list);
+static int WindowControl (vout_window_t *, int, va_list);
-static int OpenWindow (vlc_object_t *obj)
+static int WindowOpen (vlc_object_t *obj)
{
vout_window_t *wnd = (vout_window_t *)obj;
- /* TODO: should probably be in the libvlc core instead: */
- if (!config_GetInt (obj, "embedded-video"))
- return VLC_EGENERIC;
-
intf_thread_t *intf = (intf_thread_t *)
vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
if (intf == NULL)
windowWait.wait (&windowLock);
}
- MainInterface *mi = (MainInterface *)ptrval.p_address;
- msg_Dbg (obj, "requesting window (%p)...", mi);
+ msg_Dbg (obj, "requesting window...");
+ QPointer<MainInterface> *miP = (QPointer<MainInterface> *)ptrval.p_address;
+ miP = new QPointer<MainInterface> (*miP); /* create our own copy */
+ vlc_object_release (intf);
+
+ if (miP->isNull ())
+ return VLC_EGENERIC;
+
+ if (config_GetInt (obj, "embedded-video") <= 0)
+ {
+ (*miP)->requestNotEmbeddedVideo (wnd->vout);
+ return VLC_EGENERIC;
+ }
- wnd->handle = mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
- &wnd->width, &wnd->height);
+ wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
+ &wnd->width, &wnd->height);
windowLock.unlock ();
- wnd->control = ControlWindow;
- wnd->p_private = intf;
+ wnd->control = WindowControl;
+ wnd->p_private = miP;
return VLC_SUCCESS;
}
-static int ControlWindow (vout_window_t *wnd, int query, va_list args)
+static int WindowControl (vout_window_t *wnd, int query, va_list args)
{
- intf_thread_t *intf = (intf_thread_t *)wnd->p_private;
- intf->p_sys->p_mi->controlVideo (wnd->handle, query, args);
+ QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;
+ QMutexLocker locker (&windowLock);
+
+ if (miP->isNull ())
+ return VLC_EGENERIC;
+ return (*miP)->controlVideo (wnd->handle, query, args);
}
-static void CloseWindow (vlc_object_t *obj)
+static void WindowClose (vlc_object_t *obj)
{
vout_window_t *wnd = (vout_window_t *)obj;
- intf_thread_t *intf = (intf_thread_t *)obj->p_private;
+ QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;
+ QMutexLocker locker (&windowLock);
- intf->p_sys->p_mi->releaseVideo (wnd->handle);
- vlc_object_release (intf);
+ if (!miP->isNull ())
+ (*miP)->releaseVideo (wnd->handle);
+ delete miP;
}
-