# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
static void ToggleFullScreen ( vout_thread_t * );
-static void RunQtThread( event_thread_t *p_event );
+static void* RunQtThread( vlc_object_t *p_this );
} /* extern "C" */
/*****************************************************************************
extern "C"
{
-vlc_module_begin();
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VOUT );
-// add_category_hint( N_("QT Embedded"), NULL );
-// add_string( "qte-display", "landscape", NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT);
- set_description( N_("QT Embedded video output") );
- set_capability( "video output", 70 );
- add_shortcut( "qte" );
- set_callbacks( Open, Close);
-vlc_module_end();
+vlc_module_begin ()
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VOUT )
+// add_category_hint( N_("QT Embedded"), NULL )
+// add_string( "qte-display", "landscape", NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT)
+ set_description( N_("QT Embedded video output") )
+ set_capability( "video output", 70 )
+ add_shortcut( "qte" )
+ set_callbacks( Open, Close)
+vlc_module_end ()
} /* extern "C" */
p_vout->p_sys = (struct vout_sys_t*) malloc( sizeof( struct vout_sys_t ) );
if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return( 1 );
- }
p_vout->pf_init = Init;
p_vout->pf_end = End;
#ifdef NEED_QTE_MAIN
p_vout->p_sys->p_qte_main =
- module_Need( p_this, "gui-helper", "qte", true );
+ module_need( p_this, "gui-helper", "qte", true );
if( p_vout->p_sys->p_qte_main == NULL )
{
free( p_vout->p_sys );
#ifdef NEED_QTE_MAIN
msg_Dbg( p_vout, "releasing gui-helper" );
- module_Unneed( p_vout, p_vout->p_sys->p_qte_main );
+ module_unneed( p_vout, p_vout->p_sys->p_qte_main );
#endif
- if( p_vout->p_sys )
- {
- free( p_vout->p_sys );
- p_vout->p_sys = NULL;
- }
+ free( p_vout->p_sys );
+ p_vout->p_sys = NULL;
}
/*****************************************************************************
I_OUTPUTPICTURES = 0;
- p_vout->output.i_chroma = (dd == 16) ? VLC_FOURCC('R','V','1','6'): VLC_FOURCC('R','V','3','2');
+ p_vout->output.i_chroma = (dd == 16) ? VLC_CODEC_RGB16 : VLC_CODEC_RGB32;
p_vout->output.i_rmask = 0xf800;
p_vout->output.i_gmask = 0x07e0;
p_vout->output.i_bmask = 0x001f;
// SDL_ShowCursor( 0 );
// }
//
-// if( p_vout->p_libvlc->b_die )
+// if( !vlc_object_alive (p_vout->p_libvlc) )
// p_vout->p_sys->bRunning = FALSE;
return 0;
/*****************************************************************************
* main loop of qtapplication
*****************************************************************************/
-static void RunQtThread(event_thread_t *p_event)
+static void* RunQtThread( vlc_object_t *p_this )
{
+ event_thread_t *p_event = (event_thread_t *)p_this;
+ int canc = vlc_savecancel ();
msg_Dbg( p_event->p_vout, "RunQtThread starting" );
#ifdef NEED_QTE_MAIN
p_event->p_vout->p_sys->bRunning = TRUE;
#ifdef NEED_QTE_MAIN
- while(!p_event->b_die && p_event->p_vout->p_sys->bRunning)
+ while(vlc_object_alive (p_event) && p_event->p_vout->p_sys->bRunning)
{
/* Check if we are asked to exit */
- if( p_event->b_die )
+ if( !vlc_object_alive (p_event) )
break;
msleep(100);
#endif
msg_Dbg( p_event->p_vout, "RunQtThread terminating" );
+ vlc_restorecancel (canc);
+ return NULL;
}