Commit d3d77668 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove pl_Get. This endorsed unyielded playlist access.

parent 2b5eb318
...@@ -262,8 +262,6 @@ struct playlist_add_t ...@@ -262,8 +262,6 @@ struct playlist_add_t
#define PL_LOCK vlc_object_lock( p_playlist ) #define PL_LOCK vlc_object_lock( p_playlist )
#define PL_UNLOCK vlc_object_unlock( p_playlist ) #define PL_UNLOCK vlc_object_unlock( p_playlist )
#define pl_Get( a ) a->p_libvlc->p_playlist
VLC_EXPORT( playlist_t *, __pl_Yield, ( vlc_object_t * ) ); VLC_EXPORT( playlist_t *, __pl_Yield, ( vlc_object_t * ) );
#define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) ) #define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) )
......
...@@ -553,7 +553,7 @@ static int Run( input_thread_t *p_input ) ...@@ -553,7 +553,7 @@ static int Run( input_thread_t *p_input )
/* We have finished */ /* We have finished */
p_input->b_eof = true; p_input->b_eof = true;
playlist_Signal( pl_Get( p_input ) ); playlist_Signal( p_input->p_libvlc->p_playlist );
} }
/* Wait until we are asked to die */ /* Wait until we are asked to die */
...@@ -2110,7 +2110,7 @@ static int UpdateFromAccess( input_thread_t *p_input ) ...@@ -2110,7 +2110,7 @@ static int UpdateFromAccess( input_thread_t *p_input )
vlc_meta_t *p_meta = vlc_meta_New(); vlc_meta_t *p_meta = vlc_meta_New();
access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta ); access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
InputUpdateMeta( p_input, p_meta ); InputUpdateMeta( p_input, p_meta );
var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id ); var_SetInteger( p_input->p_libvlc->p_playlist, "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META; p_access->info.i_update &= ~INPUT_UPDATE_META;
} }
...@@ -2153,7 +2153,7 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length ) ...@@ -2153,7 +2153,7 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
if( !p_input->b_preparsing ) if( !p_input->b_preparsing )
{ {
pl_Yield( p_input ); pl_Yield( p_input );
var_SetInteger( pl_Get( p_input ), "item-change", var_SetInteger( p_input->p_libvlc->p_playlist, "item-change",
p_input->p->input.p_item->i_id ); p_input->p->input.p_item->i_id );
pl_Release( p_input ); pl_Release( p_input );
} }
......
...@@ -509,26 +509,24 @@ static void vout_Destructor( vlc_object_t * p_this ) ...@@ -509,26 +509,24 @@ static void vout_Destructor( vlc_object_t * p_this )
#ifndef __APPLE__ #ifndef __APPLE__
vout_thread_t *p_another_vout; vout_thread_t *p_another_vout;
playlist_t *p_playlist = pl_Get( p_vout ); playlist_t *p_playlist = pl_Yield( p_vout );
if( p_playlist->b_die ) return; if( p_playlist->b_die )
vlc_object_yield( p_playlist ); {
/* This is a dirty hack for mostly Linux, where there is no way to get the GUI pl_Release( p_vout );
back if you closed it while playing video. This is solved in Mac OS X, return;
where we have this novelty called menubar, that will always allow you access }
to the applications main functionality. They should try that on linux sometime */ /* This is a dirty hack mostly for Linux, where there is no way to get the
* GUI back if you closed it while playing video. This is solved in
* Mac OS X, where we have this novelty called menubar, that will always
* allow you access to the applications main functionality. They should try
* that on linux sometime. */
p_another_vout = vlc_object_find( p_this->p_libvlc, p_another_vout = vlc_object_find( p_this->p_libvlc,
VLC_OBJECT_VOUT, FIND_ANYWHERE ); VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_another_vout == NULL ) if( p_another_vout == NULL )
{ var_SetBool( p_playlist, "intf-show", true );
vlc_value_t val;
val.b_bool = true;
var_Set( p_playlist, "intf-show", val );
}
else else
{
vlc_object_release( p_another_vout ); vlc_object_release( p_another_vout );
} pl_Release( p_vout );
vlc_object_release( p_playlist );
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment