Should fix assertion errors.
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
- playlist_t *p_playlist = pl_Yield( p_intf );
- var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_intf );
+ var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
/* VideoWidget connect mess to avoid different threads speaking to each other */
CONNECT( this, askReleaseVideo( void * ),
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Unregister callback for the intf-popupmenu variable */
- playlist_t *p_playlist = pl_Yield( p_intf );
- var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_intf );
+ var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
p_intf->b_interaction = false;
var_DelCallback( p_intf, "interaction", InteractCallback, this );
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
- playlist_t *p_playlist = pl_Yield( p_intf );
- if( p_playlist != NULL )
- {
- var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_playlist );
- }
+ var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
Start( 100 /*milliseconds*/, wxTIMER_CONTINUOUS );
}
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Unregister callback */
- playlist_t *p_playlist = pl_Yield( p_intf );
- if( p_playlist != NULL )
- {
- var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_playlist );
- }
+ var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
}
/*****************************************************************************
static void DirectXPopupMenu( event_thread_t *p_event, bool b_open )
{
- playlist_t *p_playlist = vlc_object_find( p_event,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( p_playlist )
- {
- vlc_value_t val;
- val.b_bool = b_open;
- var_Set( p_playlist, "intf-popupmenu", val );
- vlc_object_release( p_playlist );
- }
+ vlc_value_t val;
+ val.b_bool = b_open;
+ var_Set( p_event->p_libvlc, "intf-popupmenu", val );
}
static int DirectXConvertKey( int i_key );
case SDL_BUTTON_LEFT:
{
playlist_t *p_playlist;
+ vlc_value_t val;
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~1;
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;
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 );
}
+#else
+#warning FIXME FIXME ?
+#endif
}
break;
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 );
- }
+ vlc_value_t val; val.b_bool = false;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
}
break;
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 );
- }
+ vlc_value_t val; val.b_bool = true;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
}
break;
== p_vout->p_sys->p_win->wm_delete_window ) )
{
/* the user wants to close the window */
+#if 0
playlist_t * p_playlist = pl_Yield( p_vout );
if( p_playlist != NULL )
{
playlist_Stop( p_playlist );
pl_Release( p_playlist );
}
+#else
+#warning FIXME FIXME FIXME
+#endif
}
}
var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
/* Create a variable for showing the interface (moved from playlist). */
- var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
- var_SetBool( p_playlist, "intf-show", true );
+ var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
+ var_SetBool( p_libvlc, "intf-show", true );
+
+ var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
/*
* Get input filenames given as commandline arguments
val.i_int = -1;
var_Set( p_playlist, "playlist-current", val );
- var_Create( p_playlist, "intf-popupmenu", VLC_VAR_BOOL );
-
var_Create( p_playlist, "activity", VLC_VAR_INTEGER );
var_SetInteger( p_playlist, "activity", 0 );
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- playlist_t *p_playlist = pl_Yield( p_this );
vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool );
(void)psz_cmd; (void)oldval; (void)p_data;
- /* Modify playlist as well because the vout might have to be restarted */
- var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
- var_Set( p_playlist, "video-on-top", newval );
+ /* Modify libvlc as well because the vout might have to be restarted */
+ var_Create( p_vout->p_libvlc, "video-on-top", VLC_VAR_BOOL );
+ var_Set( p_vout->p_libvlc, "video-on-top", newval );
- pl_Release( p_this );
return VLC_SUCCESS;
}
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vlc_value_t val;
- playlist_t *p_playlist = pl_Yield( p_this );
(void)psz_cmd; (void)oldval; (void)p_data;
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- /* Modify playlist as well because the vout might have to be restarted */
- var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL );
- var_Set( p_playlist, "fullscreen", newval );
- pl_Release( p_playlist );
+ /* Modify libvlc as well because the vout might have to be restarted */
+ var_Create( p_vout->p_libvlc, "fullscreen", VLC_VAR_BOOL );
+ var_Set( p_vout->p_libvlc, "fullscreen", newval );
val.b_bool = true;
var_Set( p_vout, "intf-change", val );