[vlc-devel] [PATCH 8/8] qt4: Make the Qt4 interface compile on Mac OS X

[Rémi Denis-Courmont]

Le mercredi 21 juillet 2010 16:54:26 Juho Vähä-Herttua, vous avez écrit :
> ---
>  modules/gui/qt4/qt4.cpp |   68
> ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 58
> insertions(+), 10 deletions(-)
> 
> diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
> index 990b255..7bd078e 100644
> --- a/modules/gui/qt4/qt4.cpp
> +++ b/modules/gui/qt4/qt4.cpp
> @@ -41,6 +41,9 @@
>  #ifdef Q_WS_X11
>   #include <vlc_xlib.h>
>  #endif
> +#ifdef Q_WS_MAC
> + #include <signal.h>
> +#endif
> 
>  #include "../../../share/icons/32x32/vlc.xpm"
>  #include "../../../share/icons/32x32/vlc-christmas.xpm"
> @@ -63,6 +66,7 @@ static int  WindowOpen   ( vlc_object_t * );
>  static void WindowClose  ( vlc_object_t * );
>  static void *Thread      ( void * );
>  static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t *
> ); +static void Run          ( intf_thread_t * );
> 
>  /*************************************************************************
> **** * Module descriptor
> @@ -248,14 +252,18 @@ vlc_module_begin ()
> 
>          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", 0 )
>  #elif defined(Q_WS_WIN)
>          set_capability( "vout window hwnd", 0 )
> +#elif defined(Q_WS_MAC)
> +        set_capability( "vout window nsobject", 0 )
>  #endif
>          set_callbacks( WindowOpen, WindowClose )
> +#else
> +# error FIXME
>  #endif

I don't see why #error FIXME ? The Qt4 interface should work fine even if it 
cannot embed the video.

-- 
Rémi Denis-Courmont
http://www.remlab.net/
http://fi.linkedin.com/in/remidenis