# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
"By default, VLC will use the value of the DISPLAY " \
"environment variable.")
-vlc_module_begin();
- add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
- set_description( "General Graphics Interface video output" );
- set_capability( "video output", 30 );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+ add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
+ set_description( "General Graphics Interface video output" )
+ set_capability( "video output", 30 )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
/*****************************************************************************
* vout_sys_t: video output GGI method descriptor
ggi_directbuffer * pp_buffer[2]; /* buffers */
int i_index;
- vlc_bool_t b_must_acquire; /* must be acquired before writing */
+ bool b_must_acquire; /* must be acquired before writing */
};
/*****************************************************************************
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return( 1 );
- }
/* Open and initialize device */
if( OpenDisplay( p_vout ) )
case 'q':
case 'Q':
case GIIUC_Escape:
- vlc_object_kill( p_vout->p_libvlc );
+ libvlc_Quit( p_vout->p_libvlc );
break;
default:
switch( event.pbutton.button )
{
case GII_PBUTTON_LEFT:
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-clicked", val );
+ var_SetBool( p_vout, "mouse-clicked", true );
break;
case GII_PBUTTON_RIGHT:
- {
- intf_thread_t *p_intf;
- p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
- FIND_ANYWHERE );
- if( p_intf )
- {
- p_intf->b_menu_change = 1;
- vlc_object_release( p_intf );
- }
- }
+ var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
break;
}
break;
psz_display = config_GetPsz( p_vout, "ggi_display" );
p_vout->p_sys->p_display = ggiOpen( psz_display, NULL );
- if( psz_display ) free( psz_display );
+ free( psz_display );
if( p_vout->p_sys->p_display == NULL )
{