Skip to content

VLC
VLC
Commit ba6501f3 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

s/pl_Yield/pl_Hold/

parent 7060dbb9
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 235 deletions
include/vlc_playlist.h
View file @ ba6501f3
......@@ -273,8 +273,8 @@ enum pl_locked_state
#define PL_LOCK vlc_object_lock( p_playlist )
#define PL_UNLOCK vlc_object_unlock( p_playlist )
VLC_EXPORT( playlist_t *, __pl_Yield, ( vlc_object_t * ) );
#define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) )
VLC_EXPORT( playlist_t *, __pl_Hold, ( vlc_object_t * ) );
#define pl_Hold( a ) __pl_Hold( VLC_OBJECT(a) )
VLC_EXPORT( void, __pl_Release, ( vlc_object_t * ) );
#define pl_Release(a) __pl_Release( VLC_OBJECT(a) )
......@@ -420,7 +420,7 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file)
#define pl_CurrentInput(a) __pl_CurrentInput( VLC_OBJECT(a) )
static inline input_thread_t * __pl_CurrentInput( vlc_object_t * p_this )
{
playlist_t * p_playlist = pl_Yield( p_this );
playlist_t * p_playlist = pl_Hold( p_this );
if( !p_playlist ) return NULL;
input_thread_t * p_input = playlist_CurrentInput( p_playlist );
pl_Release( p_this );
......
modules/access/cdda.c
View file @ ba6501f3
......@@ -187,7 +187,7 @@ static int Open( vlc_object_t *p_this )
if( p_sys->i_track < 0 && i_mrl_tracknum <= 0 )
{
/* We only do separate items if the whole disc is requested */
playlist_t *p_playlist = pl_Yield( p_access );
playlist_t *p_playlist = pl_Hold( p_access );
i_ret = -1;
if( p_playlist )
......
modules/access/cdda/info.c
View file @ ba6501f3
......@@ -864,7 +864,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
#endif
if (! p_cdda->b_nav_mode ) {
p_playlist = pl_Yield( p_access );
p_playlist = pl_Hold( p_access );
}
if( b_single_track || p_cdda->b_nav_mode ) {
......
modules/access/directory.c
View file @ ba6501f3
......@@ -208,7 +208,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
if( psz_name == NULL )
return VLC_ENOMEM;
playlist_t *p_playlist = pl_Yield( p_access );
playlist_t *p_playlist = pl_Hold( p_access );
input_thread_t *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
playlist_item_t *p_item_in_category;
......
modules/access_output/http.c
View file @ ba6501f3
......@@ -295,7 +295,7 @@ static int Open( vlc_object_t *p_this )
if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") )
{
char *psz_txt, *psz_name;
playlist_t *p_playlist = pl_Yield( p_access );
playlist_t *p_playlist = pl_Hold( p_access );
char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input );
char *psz_newuri = psz_uri;
......
modules/codec/cmml/intf.c
View file @ ba6501f3
......@@ -437,7 +437,7 @@ static void FollowAnchor ( intf_thread_t *p_intf )
mtime_t i_seconds;
vlc_value_t time;
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
/* Get new URL */
p_current_item = p_playlist->status.p_item;
......@@ -641,7 +641,7 @@ void GoBack( intf_thread_t *p_intf )
#endif
/* Find the playlist */
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
/* Retrieve navigation history from playlist */
if( var_Get( p_playlist, "navigation-history", &history ) != VLC_SUCCESS ||
......@@ -713,7 +713,7 @@ void GoForward( intf_thread_t *p_intf )
#endif
/* Find the playlist */
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
/* Retrieve navigation history from playlist */
if( var_Get( p_playlist, "navigation-history", &history ) != VLC_SUCCESS ||
......
modules/codec/vorbis.c
View file @ ba6501f3
......@@ -694,7 +694,7 @@ static void ParseVorbisComments( decoder_t *p_dec )
r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
}
}
var_SetInteger( pl_Yield( p_input ), "item-change", p_item->i_id );
var_SetInteger( pl_Hold( p_input ), "item-change", p_item->i_id );
pl_Release( p_input );
free( psz_comment );
i++;
......
modules/control/dbus.c
View file @ ba6501f3
......@@ -126,7 +126,7 @@ vlc_module_end();
DBUS_METHOD( Quit )
{ /* exits vlc */
REPLY_INIT;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
playlist_Stop( p_playlist );
pl_Release( ((vlc_object_t*) p_this) );
vlc_object_kill(((vlc_object_t*)p_this)->p_libvlc);
......@@ -166,7 +166,7 @@ DBUS_METHOD( PositionGet )
vlc_value_t position;
dbus_int32_t i_pos;
playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) );
playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) );
PL_LOCK;
input_thread_t *p_input = p_playlist->p_input;
......@@ -205,7 +205,7 @@ DBUS_METHOD( PositionSet )
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
p_playlist = pl_Yield( ((vlc_object_t*) p_this) );
p_playlist = pl_Hold( ((vlc_object_t*) p_this) );
PL_LOCK;
input_thread_t *p_input = p_playlist->p_input;
......@@ -265,7 +265,7 @@ DBUS_METHOD( VolumeSet )
DBUS_METHOD( Next )
{ /* next playlist item */
REPLY_INIT;
playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) );
playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) );
playlist_Next( p_playlist );
pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND;
......@@ -274,7 +274,7 @@ DBUS_METHOD( Next )
DBUS_METHOD( Prev )
{ /* previous playlist item */
REPLY_INIT;
playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) );
playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) );
playlist_Prev( p_playlist );
pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND;
......@@ -283,7 +283,7 @@ DBUS_METHOD( Prev )
DBUS_METHOD( Stop )
{ /* stop playing */
REPLY_INIT;
playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) );
playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) );
playlist_Stop( p_playlist );
pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND;
......@@ -308,7 +308,7 @@ DBUS_METHOD( GetStatus )
DBUS_METHOD( Pause )
{
REPLY_INIT;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
playlist_Pause( p_playlist );
pl_Release( (vlc_object_t*) p_this );
REPLY_SEND;
......@@ -317,7 +317,7 @@ DBUS_METHOD( Pause )
DBUS_METHOD( Play )
{
REPLY_INIT;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
PL_LOCK;
input_thread_t *p_input = p_playlist->p_input;
......@@ -342,7 +342,7 @@ DBUS_METHOD( GetCurrentMetadata )
{
REPLY_INIT;
OUT_ARGUMENTS;
playlist_t* p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t* p_playlist = pl_Hold( (vlc_object_t*) p_this );
PL_LOCK;
if( p_playlist->status.p_item )
GetInputMeta( p_playlist->status.p_item->p_input, &args );
......@@ -407,7 +407,7 @@ DBUS_METHOD( AddTrack )
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
p_playlist = pl_Yield( (vlc_object_t*) p_this );
p_playlist = pl_Hold( (vlc_object_t*) p_this );
playlist_Add( p_playlist, psz_mrl, NULL, PLAYLIST_APPEND |
( ( b_play == TRUE ) ? PLAYLIST_GO : 0 ) ,
PLAYLIST_END, true, false );
......@@ -424,7 +424,7 @@ DBUS_METHOD( GetCurrentTrack )
REPLY_INIT;
OUT_ARGUMENTS;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
dbus_int32_t i_position = p_playlist->i_current_index;
pl_Release( (vlc_object_t*) p_this );
......@@ -441,7 +441,7 @@ DBUS_METHOD( GetMetadata )
dbus_int32_t i_position;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
PL_LOCK;
dbus_message_get_args( p_from, &error,
......@@ -473,7 +473,7 @@ DBUS_METHOD( GetLength )
REPLY_INIT;
OUT_ARGUMENTS;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
dbus_int32_t i_elements = p_playlist->current.i_size;
pl_Release( (vlc_object_t*) p_this );
......@@ -489,7 +489,7 @@ DBUS_METHOD( DelTrack )
dbus_error_init( &error );
dbus_int32_t i_position;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
dbus_message_get_args( p_from, &error,
DBUS_TYPE_INT32, &i_position,
......@@ -541,7 +541,7 @@ DBUS_METHOD( SetLoop )
}
val.b_bool = ( b_loop == TRUE ) ? true : false ;
p_playlist = pl_Yield( (vlc_object_t*) p_this );
p_playlist = pl_Hold( (vlc_object_t*) p_this );
var_Set ( p_playlist, "loop", val );
pl_Release( ((vlc_object_t*) p_this) );
......@@ -573,7 +573,7 @@ DBUS_METHOD( Repeat )
val.b_bool = ( b_repeat == TRUE ) ? true : false ;
p_playlist = pl_Yield( (vlc_object_t*) p_this );
p_playlist = pl_Hold( (vlc_object_t*) p_this );
var_Set ( p_playlist, "repeat", val );
pl_Release( ((vlc_object_t*) p_this) );
......@@ -605,7 +605,7 @@ DBUS_METHOD( SetRandom )
val.b_bool = ( b_random == TRUE ) ? true : false ;
p_playlist = pl_Yield( (vlc_object_t*) p_this );
p_playlist = pl_Hold( (vlc_object_t*) p_this );
var_Set ( p_playlist, "random", val );
pl_Release( ((vlc_object_t*) p_this) );
......@@ -764,7 +764,7 @@ static int Open( vlc_object_t *p_this )
dbus_connection_flush( p_conn );
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
PL_LOCK;
var_AddCallback( p_playlist, "playlist-current", TrackChange, p_intf );
var_AddCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf );
......@@ -792,7 +792,7 @@ static int Open( vlc_object_t *p_this )
static void Close ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
playlist_t *p_playlist = pl_Yield( p_intf );;
playlist_t *p_playlist = pl_Hold( p_intf );;
input_thread_t *p_input;
PL_LOCK;
......@@ -855,7 +855,7 @@ DBUS_SIGNAL( TrackListChangeSignal )
SIGNAL_INIT("TrackListChange");
OUT_ARGUMENTS;
playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_data );
playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_data );
dbus_int32_t i_elements = p_playlist->current.i_size;
pl_Release( (vlc_object_t*) p_data );
......@@ -996,7 +996,7 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var,
p_sys->b_meta_read = false;
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
p_input = p_playlist->p_input;
if( !p_input )
......@@ -1035,7 +1035,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
{
intf_sys_t* p_sys = p_intf->p_sys;
dbus_int32_t i_caps = CAPS_CAN_HAS_TRACKLIST;
playlist_t* p_playlist = pl_Yield( p_intf );
playlist_t* p_playlist = pl_Hold( p_intf );
if( !b_playlist_locked ) PL_LOCK;
if( p_playlist->current.i_size > 0 )
......@@ -1160,7 +1160,7 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args,
playlist_t* p_playlist = NULL;
input_thread_t* p_input = NULL;
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
if( lock )
PL_LOCK;
......
modules/control/gestures.c
View file @ ba6501f3
......@@ -227,7 +227,7 @@ static void RunIntf( intf_thread_t *p_intf )
case GESTURE(RIGHT,LEFT,NONE,NONE):
{
input_thread_t * p_input;
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
p_input = input_from_playlist( p_playlist );
vlc_object_release( p_playlist );
......@@ -254,13 +254,13 @@ static void RunIntf( intf_thread_t *p_intf )
}
break;
case GESTURE(LEFT,DOWN,NONE,NONE):
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
playlist_Prev( p_playlist );
vlc_object_release( p_playlist );
break;
case GESTURE(RIGHT,DOWN,NONE,NONE):
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
playlist_Next( p_playlist );
vlc_object_release( p_playlist );
......@@ -293,7 +293,7 @@ static void RunIntf( intf_thread_t *p_intf )
vlc_value_t val, list, list2;
int i_count, i;
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
p_input = input_from_playlist( p_playlist );
......@@ -348,7 +348,7 @@ static void RunIntf( intf_thread_t *p_intf )
vlc_value_t val, list, list2;
int i_count, i;
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
p_input = input_from_playlist( p_playlist );
vlc_object_release( p_playlist );
......
modules/control/hotkeys.c
View file @ ba6501f3
......@@ -149,7 +149,7 @@ static void Run( intf_thread_t *p_intf )
vout_thread_t *p_vout = NULL;
vlc_value_t val;
int i;
playlist_t *p_playlist = pl_Yield( p_intf );
playlist_t *p_playlist = pl_Hold( p_intf );
int canc = vlc_savecancel();
vlc_cleanup_push( __pl_Release, p_intf );
......@@ -947,7 +947,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
{
vlc_value_t val;
char psz_bookmark_name[11];
playlist_t *p_playlist = pl_Yield( p_intf );
playlist_t *p_playlist = pl_Hold( p_intf );
sprintf( psz_bookmark_name, "bookmark%i", i_num );
var_Create( p_intf, psz_bookmark_name, VLC_VAR_STRING|VLC_VAR_DOINHERIT );
......@@ -973,7 +973,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
static void SetBookmark( intf_thread_t *p_intf, int i_num )
{
playlist_t *p_playlist = pl_Yield( p_intf );
playlist_t *p_playlist = pl_Hold( p_intf );
char psz_bookmark_name[11];
sprintf( psz_bookmark_name, "bookmark%i", i_num );
var_Create( p_intf, psz_bookmark_name,
......
modules/control/http/http.c
View file @ ba6501f3
......@@ -128,7 +128,7 @@ static int Open( vlc_object_t *p_this )
return( VLC_ENOMEM );
}
p_sys->p_playlist = pl_Yield( p_this );
p_sys->p_playlist = pl_Hold( p_this );
p_sys->p_input = NULL;
p_sys->p_vlm = NULL;
p_sys->psz_address = psz_address;
......
modules/control/rc.c
View file @ ba6501f3
......@@ -506,7 +506,7 @@ static void Run( intf_thread_t *p_intf )
FIND_ANYWHERE );
if( p_input )
{
p_playlist = pl_Yield( p_input );
p_playlist = pl_Hold( p_input );
}
}
/* New input has been registered */
......@@ -991,7 +991,7 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd,
p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_input )
{
p_playlist = pl_Yield( p_input );
p_playlist = pl_Hold( p_input );
char cmd[6];
switch( p_playlist->status.i_status )
{
......@@ -1303,7 +1303,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t val;
intf_thread_t *p_intf = (intf_thread_t*)p_this;
playlist_t *p_playlist = pl_Yield( p_this );
playlist_t *p_playlist = pl_Hold( p_this );
PL_LOCK;
if( p_playlist->p_input )
......@@ -1525,7 +1525,7 @@ static int Quit( vlc_object_t *p_this, char const *psz_cmd,
VLC_UNUSED(oldval); VLC_UNUSED(newval);
playlist_t *p_playlist;
p_playlist = pl_Yield( p_this );
p_playlist = pl_Hold( p_this );
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
......@@ -1912,7 +1912,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd,
return VLC_EGENERIC;
}
p_playlist = pl_Yield( p_this );
p_playlist = pl_Hold( p_this );
if( p_playlist->p_input )
{
......
modules/gui/beos/InterfaceWindow.cpp
View file @ ba6501f3
......@@ -203,7 +203,7 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame,
fLastUpdateTime( system_time() ),
fSettings( new BMessage( 'sett' ) )
{
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, this );
......
modules/gui/beos/ListViews.cpp
View file @ ba6501f3
......@@ -690,7 +690,7 @@ PlaylistView::MouseDown( BPoint where )
// only do something if user clicked the same item twice
if ( fLastClickedItem == item )
{
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
if( p_playlist )
{
playlist_Goto( p_playlist, i );
......@@ -989,7 +989,7 @@ PlaylistView::SetPlaying( bool playing )
void
PlaylistView::RebuildList()
{
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
// remove all items
BListItem * item;
......@@ -1077,7 +1077,7 @@ PlaylistView::SetDisplayMode( uint32 mode )
BListItem*
PlaylistView::_PlayingItem() const
{
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
if( !p_playlist )
{
......@@ -1099,7 +1099,7 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem )
{
if ( item == playingItem )
{
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
if( !p_playlist )
{
......
modules/gui/beos/PlayListWindow.cpp
View file @ ba6501f3
......@@ -291,7 +291,7 @@ PlayListWindow::UpdatePlaylist( bool rebuild )
if( rebuild )
fListView->RebuildList();
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
fListView->SetCurrent( p_playlist->i_index );
fListView->SetPlaying( p_playlist->status.i_status == PLAYLIST_RUNNING );
pl_Release( p_intf );
......
modules/gui/macosx/applescript.m
View file @ ba6501f3
......@@ -41,7 +41,7 @@
if ( [o_command isEqualToString:@"GetURL"] || [o_command isEqualToString:@"OpenURL"] )
{
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL )
{
return nil;
......@@ -90,7 +90,7 @@
NSString *o_command = [[self commandDescription] commandName];
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL )
{
return nil;
......
modules/gui/macosx/controls.m
View file @ ba6501f3
......@@ -143,7 +143,7 @@
- (IBAction)play:(id)sender
{
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
bool empty;
PL_LOCK;
......@@ -220,7 +220,7 @@
{
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
var_Get( p_playlist, "random", &val );
val.b_bool = !val.b_bool;
......@@ -260,7 +260,7 @@
- (void)shuffle
{
vlc_value_t val;
playlist_t *p_playlist = pl_Yield( VLCIntf );
playlist_t *p_playlist = pl_Hold( VLCIntf );
var_Get( p_playlist, "random", &val );
[o_btn_shuffle setState: val.b_bool];
vlc_object_release( p_playlist );
......@@ -270,7 +270,7 @@
{
vlc_value_t looping,repeating;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
var_Get( p_playlist, "repeat", &repeating );
var_Get( p_playlist, "loop", &looping );
......@@ -338,7 +338,7 @@
{
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
var_Get( p_playlist, "repeat", &val );
if (!val.b_bool)
......@@ -367,7 +367,7 @@
{
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
var_Get( p_playlist, "loop", &val );
if (!val.b_bool)
......@@ -506,7 +506,7 @@
}
else
{
playlist_t * p_playlist = pl_Yield( VLCIntf );
playlist_t * p_playlist = pl_Hold( VLCIntf );
if( [o_title isEqualToString: _NS("Fullscreen")] ||
[sender isKindOfClass:[NSButton class]] )
......@@ -927,7 +927,7 @@
BOOL bEnabled = TRUE;
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
input_thread_t * p_input = playlist_CurrentInput( p_playlist );
if( [[o_mi title] isEqualToString: _NS("Faster")] ||
......
modules/gui/macosx/embeddedwindow.m
View file @ ba6501f3
......@@ -157,7 +157,7 @@
- (BOOL)windowShouldClose:(id)sender
{
playlist_t * p_playlist = pl_Yield( VLCIntf );
playlist_t * p_playlist = pl_Hold( VLCIntf );
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
......
modules/gui/macosx/equalizer.m
View file @ ba6501f3
......@@ -54,7 +54,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
aout_instance_t *p_aout = (aout_instance_t *)p_object;
if( !p_object )
{
p_object = (vlc_object_t *)pl_Yield( p_intf );
p_object = (vlc_object_t *)pl_Hold( p_intf );
}
psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
......@@ -125,7 +125,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = (vlc_object_t *)pl_Yield( p_intf );
p_object = (vlc_object_t *)pl_Hold( p_intf );
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
psz_string = config_GetPsz( p_intf, "audio-filter" );
......@@ -181,7 +181,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = (vlc_object_t *)pl_Yield( p_intf );
p_object = (vlc_object_t *)pl_Hold( p_intf );
var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
VLC_VAR_DOINHERIT );
......@@ -241,7 +241,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = (vlc_object_t *)pl_Yield( p_intf );
p_object = (vlc_object_t *)pl_Hold( p_intf );
char psz_values[102];
memset( psz_values, 0, 102 );
......@@ -281,7 +281,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object= vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = (vlc_object_t *)pl_Yield( p_intf );
p_object = (vlc_object_t *)pl_Hold( p_intf );
char psz_values[102];
memset( psz_values, 0, 102 );
......@@ -324,7 +324,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = (vlc_object_t *)pl_Yield( p_intf );
p_object = (vlc_object_t *)pl_Hold( p_intf );
var_SetFloat( p_object, "equalizer-preamp", f_preamp );
......@@ -362,7 +362,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
aout_instance_t *p_aout = (aout_instance_t *)p_object;
if( p_object == NULL )
p_object = (vlc_object_t *)pl_Yield( p_intf );
p_object = (vlc_object_t *)pl_Hold( p_intf );
var_SetBool( p_object, "equalizer-2pass", b_2p );
if( ( [o_ckb_enable state] ) && ( p_aout != NULL ) )
......@@ -397,7 +397,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_t *p_object= vlc_object_find( VLCIntf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = (vlc_object_t *)pl_Yield( VLCIntf );
p_object = (vlc_object_t *)pl_Hold( VLCIntf );
[o_window setExcludedFromWindowsMenu: TRUE];
......
modules/gui/macosx/extended.m
View file @ ba6501f3
......@@ -408,7 +408,7 @@ static VLCExtended *_o_sharedInstance = nil;
id o_window = [NSApp keyWindow];
NSArray *o_windows = [NSApp orderedWindows];
NSEnumerator *o_enumerator = [o_windows objectEnumerator];
playlist_t * p_playlist = pl_Yield( VLCIntf );
playlist_t * p_playlist = pl_Hold( VLCIntf );
vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
vout_thread_t *p_real_vout;
......@@ -753,7 +753,7 @@ static VLCExtended *_o_sharedInstance = nil;
{
/* save the preferences to make sure that our module-changes will up on
* next launch again */
playlist_t * p_playlist = pl_Yield( VLCIntf );
playlist_t * p_playlist = pl_Hold( VLCIntf );
int returnedValue;
NSArray * theModules;
theModules = [[NSArray alloc] initWithObjects: @"main",
......
modules/gui/macosx/intf.m
View file @ ba6501f3
......@@ -395,7 +395,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_size_with_playlist = [o_window contentRectForFrameRect:[o_window frame]].size;
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
val.b_bool = false;
......@@ -745,7 +745,7 @@ static VLCMain *_o_sharedMainInstance = nil;
/* Kill the playlist, so that it doesn't accept new request
* such as the play request from vlc.c (we are a blocking interface). */
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
vlc_object_kill( p_playlist );
pl_Release( p_intf );
......@@ -1394,7 +1394,7 @@ static void * manage_cleanup( void * args )
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );
var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
......@@ -1487,7 +1487,7 @@ static void * manage_cleanup( void * args )
bool b_seekable = false;
bool b_chapters = false;
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
/* TODO: fix i_size use */
b_plmul = p_playlist->items.i_size > 1;
......@@ -1675,7 +1675,7 @@ end:
- (void)setupMenus
{
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
input_thread_t * p_input = playlist_CurrentInput( p_playlist );
if( p_input != NULL )
{
......@@ -1788,7 +1788,7 @@ end:
- (void)resetScrollField
{
playlist_t * p_playlist = pl_Yield( p_intf );
playlist_t * p_playlist = pl_Hold( p_intf );
input_thread_t * p_input = playlist_CurrentInput( p_playlist );
i_end_scroll = -1;
......@@ -1870,7 +1870,7 @@ end:
default:
return;
}
p_playlist = pl_Yield( p_intf );
p_playlist = pl_Hold( p_intf );