#include <photon/PtLabel.h>
#include <photon/PdDirect.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
* vout properties to choose the window size, and change them according to the
* actual properties of the display.
*****************************************************************************/
-int E_(OpenVideo) ( vlc_object_t *p_this )
+int OpenVideo ( vlc_object_t *p_this )
{
vout_thread_t * p_vout = (vout_thread_t *)p_this;
*****************************************************************************
* Terminate an output method created by QNXCreate
*****************************************************************************/
-void E_(CloseVideo) ( vlc_object_t *p_this )
+void CloseVideo ( vlc_object_t *p_this )
{
vout_thread_t * p_vout = (vout_thread_t *)p_this;
{
int i_ev, i_buflen;
PhEvent_t *p_event;
- vlc_bool_t b_repos = 0;
+ bool b_repos = 0;
- if (p_vout->b_die)
+ if (!vlc_object_alive (p_vout))
{
return ( 0 );
}
switch( p_ev->event_f )
{
case Ph_WM_CLOSE:
- p_vout->p_libvlc->b_die = VLC_TRUE;
+ p_vout->p_libvlc->b_die = true;
break;
case Ph_WM_MOVE:
{
case Pk_q:
case Pk_Q:
- p_vout->p_libvlc->b_die = VLC_TRUE;
+ p_vout->p_libvlc->b_die = true;
break;
case Pk_f:
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
break;
- case Pk_c:
- case Pk_C:
- p_vout->b_grayscale = ! p_vout->b_grayscale;
- p_vout->i_changes |= VOUT_GRAYSCALE_CHANGE;
- break;
-
default:
break;
}