p_vout->pf_control = NULL;
#ifdef HAVE_SETENV
- psz_method = config_GetPsz( p_vout, "vout" );
+ char* psz = psz_method = config_GetPsz( p_vout, "vout" );
if( psz_method )
{
while( *psz_method && *psz_method != ':' )
setenv( "SDL_VIDEODRIVER", psz_method + 1, 1 );
}
}
+ free( psz );
#endif
/* Initialize library */
{
case SDL_BUTTON_LEFT:
{
- playlist_t *p_playlist;
-
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~1;
var_Set( p_vout, "mouse-button-down", val );
val.b_bool = true;
var_Set( p_vout, "mouse-clicked", val );
- p_playlist = pl_Yield( p_vout );
-
- if( p_playlist != NULL )
- {
- vlc_value_t val;
- val.b_bool = false;
- var_Set( p_playlist, "intf-popupmenu", val );
- pl_Release( p_playlist );
- }
+ val.b_bool = false;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
}
break;
case SDL_BUTTON_MIDDLE:
{
- playlist_t *p_playlist;
-
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~2;
var_Set( p_vout, "mouse-button-down", val );
case SDL_BUTTON_RIGHT:
{
intf_thread_t *p_intf;
- playlist_t *p_playlist;
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~4;
vlc_object_release( p_intf );
}
- p_playlist = pl_Yield( p_vout );
-
- if( p_playlist != NULL )
- {
- vlc_value_t val;
- val.b_bool = true;
- var_Set( p_playlist, "intf-popupmenu", val );
- pl_Release( p_playlist );
- }
+ val.b_bool = true;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
}
break;
}
/* Quit event (close the window) */
case SDL_QUIT:
{
+#if 0
playlist_t *p_playlist = pl_Yield( p_vout );
if( p_playlist != NULL )
{
playlist_Stop( p_playlist );
- pl_Release( p_playlist );
+ pl_Release( p_vout );
}
+#else
+#warning FIXME FIXME ?
+#endif
}
break;