#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 */
" 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" )
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 )
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
intf_thread_t *p_intf = (intf_thread_t *)p_this;
#ifdef Q_WS_X11
- if( !XInitThreads() )
+ if( !vlc_xlib_init( p_this ) )
return VLC_EGENERIC;
char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
return VLC_EGENERIC;
}
XCloseDisplay( p_display );
- putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
#else
char *display = NULL;
#endif
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 (pl_Get(p_this), "window");
var_Destroy (pl_Get(p_this), "qt4-iface");
+ }
QVLCApp::triggerQuit();
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
#endif