Skip to content

V
vlc
Commit 7fef8b87 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* updated all files to yield the playlist instead of finding it

parent c77d5dcd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 199 additions and 371 deletions
modules/gui/macosx/controls.m
View file @ 7fef8b87
......@@ -63,10 +63,8 @@
{
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist )
{
playlist_t * p_playlist = pl_Yield( p_intf );
vlc_mutex_lock( &p_playlist->object_lock );
if( p_playlist->i_size <= 0 )
{
......@@ -80,7 +78,6 @@
vlc_object_release( p_playlist );
}
}
val.i_int = config_GetInt( p_intf, "key-play-pause" );
var_Set( p_intf->p_libvlc, "key-pressed", val );
}
......@@ -155,12 +152,7 @@
{
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return;
}
playlist_t * p_playlist = pl_Yield( p_intf );
var_Get( p_playlist, "random", &val );
val.b_bool = !val.b_bool;
......@@ -185,12 +177,7 @@
{
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return;
}
playlist_t * p_playlist = pl_Yield( p_intf );
var_Get( p_playlist, "repeat", &val );
if (!val.b_bool)
......@@ -219,12 +206,7 @@
{
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return;
}
playlist_t * p_playlist = pl_Yield( p_intf );
var_Get( p_playlist, "loop", &val );
if (!val.b_bool)
......@@ -345,17 +327,17 @@
}
else
{
playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( VLCIntf );
if( p_playlist && ( [o_title isEqualToString: _NS("Fullscreen")] ||
[sender isKindOfClass:[NSButton class]] ) )
if( [o_title isEqualToString: _NS("Fullscreen")] ||
[sender isKindOfClass:[NSButton class]] )
{
vlc_value_t val;
var_Get( p_playlist, "fullscreen", &val );
var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool );
}
if( p_playlist ) vlc_object_release( (vlc_object_t *)p_playlist );
vlc_object_release( p_playlist );
}
}
......@@ -697,14 +679,9 @@
BOOL bEnabled = TRUE;
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist != NULL )
{
vlc_mutex_lock( &p_playlist->object_lock );
}
else return FALSE;
#define p_input p_playlist->p_input
......
modules/gui/macosx/embeddedwindow.m
View file @ 7fef8b87
......@@ -87,12 +87,7 @@
- (BOOL)windowShouldClose:(id)sender
{
playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return NO;
}
playlist_t * p_playlist = pl_Yield( VLCIntf );
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
......
modules/gui/macosx/extended.m
View file @ 7fef8b87
......@@ -369,8 +369,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 = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( VLCIntf );
vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
vout_thread_t *p_real_vout;
......@@ -848,8 +847,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 = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( VLCIntf );
int returnedValue;
NSArray * theModules;
theModules = [[NSArray alloc] initWithObjects: @"main", @"headphone",
......
modules/gui/macosx/intf.m
View file @ 7fef8b87
......@@ -456,10 +456,8 @@ static VLCMain *_o_sharedMainInstance = nil;
o_size_with_playlist = [o_window frame].size;
p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
p_playlist = pl_Yield( p_intf );
if( p_playlist )
{
/* Check if we need to start playing */
if( p_intf->b_play )
{
......@@ -474,7 +472,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_embedded_window setFullscreen: var_GetBool( p_playlist,
"fullscreen" )];
vlc_object_release( p_playlist );
}
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, self );
......@@ -741,7 +738,7 @@ static VLCMain *_o_sharedMainInstance = nil;
case kRemoteButtonVolume_Plus:
/* there are two events when the plus or minus button is pressed
one when the button is pressed down and one when the button is released */
if (pressedDown)
if( pressedDown )
{
[o_controls volumeUp: self];
}
......@@ -749,7 +746,8 @@ static VLCMain *_o_sharedMainInstance = nil;
case kRemoteButtonVolume_Minus:
/* there are two events when the plus or minus button is pressed
one when the button is pressed down and one when the button is released */
if (pressedDown) {
if( pressedDown )
{
[o_controls volumeDown: self];
}
break;
......@@ -763,7 +761,8 @@ static VLCMain *_o_sharedMainInstance = nil;
case kRemoteButtonLeft_Hold:
/* simulate an event as long as the user holds the button */
b_left_right_remote_button_hold = pressedDown;
if (pressedDown) {
if( pressedDown )
{
NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier];
[self performSelector:@selector(triggerMovieStepForRemoteButton:)
withObject:buttonIdentifierNumber];
......@@ -917,11 +916,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (id)getPlaylist
{
if ( o_playlist )
{
return o_playlist;
}
return nil;
}
- (id)getInfo
......@@ -999,11 +994,8 @@ static VLCMain *_o_sharedMainInstance = nil;
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
p_playlist = pl_Yield( p_intf );
if( p_playlist != NULL )
{
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
......@@ -1011,7 +1003,6 @@ static VLCMain *_o_sharedMainInstance = nil;
var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
vlc_object_release( p_playlist );
}
while( !p_intf->b_die )
{
......@@ -1073,8 +1064,7 @@ static VLCMain *_o_sharedMainInstance = nil;
vlc_bool_t b_seekable = VLC_FALSE;
vlc_bool_t b_chapters = VLC_FALSE;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
b_plmul = p_playlist->i_size > 1;
vlc_object_release( p_playlist );
......@@ -1122,8 +1112,7 @@ static VLCMain *_o_sharedMainInstance = nil;
if( p_intf->p_sys->b_fullscreen_update )
{
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
var_Get( p_playlist, "fullscreen", &val );
[o_embedded_window setFullscreen: val.b_bool];
vlc_object_release( p_playlist );
......@@ -1146,11 +1135,11 @@ static VLCMain *_o_sharedMainInstance = nil;
{
NSString *o_temp;
vout_thread_t *p_vout;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL || p_playlist->status.p_item == NULL )
if( p_playlist->status.p_item == NULL )
{
vlc_object_release( p_playlist );
return;
}
o_temp = [NSString stringWithUTF8String:
......@@ -1344,12 +1333,8 @@ static VLCMain *_o_sharedMainInstance = nil;
if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
{
NSString *o_temp;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return;
}
playlist_t * p_playlist = pl_Yield( p_intf );
o_temp = [NSString stringWithUTF8String:
p_playlist->status.p_item->p_input->psz_name];
if( o_temp == NULL )
......@@ -1536,12 +1521,9 @@ static VLCMain *_o_sharedMainInstance = nil;
#undef p_input
/* Stop playback */
if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ) ) )
{
p_playlist = pl_Yield( p_intf );
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
/* FIXME - Wait here until all vouts are terminated because
libvlc's VLC_CleanUp destroys interfaces before vouts, which isn't
......@@ -1647,7 +1629,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)intfOpenFile:(id)sender
{
if (!nib_open_loaded)
if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
......@@ -1659,7 +1641,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)intfOpenFileGeneric:(id)sender
{
if (!nib_open_loaded)
if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
......@@ -1671,7 +1653,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)intfOpenDisc:(id)sender
{
if (!nib_open_loaded)
if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
......@@ -1683,7 +1665,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)intfOpenNet:(id)sender
{
if (!nib_open_loaded)
if ( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
......@@ -1695,7 +1677,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)showWizard:(id)sender
{
if (!nib_wizard_loaded)
if ( !nib_wizard_loaded )
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
[o_wizard initStrings];
......@@ -1713,7 +1695,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{
o_extended = [[VLCExtended alloc] init];
}
if (!nib_extended_loaded)
if ( !nib_extended_loaded )
{
nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
[o_extended initStrings];
......@@ -1729,7 +1711,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{
o_sfilters = [[VLCsFilters alloc] init];
}
if (!nib_sfilters_loaded)
if ( !nib_sfilters_loaded )
{
nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
[o_sfilters initStrings];
......@@ -1742,13 +1724,13 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)showBookmarks:(id)sender
{
/* we need the wizard-nib for the bookmarks's extract functionality */
if (!nib_wizard_loaded)
if ( !nib_wizard_loaded )
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
[o_wizard initStrings];
}
if (!nib_bookmarks_loaded)
if ( !nib_bookmarks_loaded )
{
nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
[o_bookmarks showBookmarks];
......@@ -1759,7 +1741,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)viewAbout:(id)sender
{
if (!nib_about_loaded)
if ( !nib_about_loaded )
{
nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
[o_about showPanel];
......@@ -1778,7 +1760,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)checkForUpdate:(id)sender
{
if (!nib_update_loaded)
if ( !nib_update_loaded )
{
nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
[o_update showUpdateWindow];
......
modules/gui/macosx/playlist.m
View file @ 7fef8b87
This diff is collapsed.
modules/gui/macosx/playlistinfo.m
View file @ 7fef8b87
......@@ -135,14 +135,10 @@
else
{
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist )
{
p_item = p_playlist->status.p_item;
vlc_object_release( p_playlist );
}
[self initPanel:sender];
}
......@@ -173,14 +169,10 @@
{
/* make sure that we got the current item and not an outdated one */
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist )
{
p_item = p_playlist->status.p_item;
vlc_object_release( p_playlist );
}
/* check whether our item is valid, because we would crash if not */
if(! [self isItemInPlaylist: p_item] ) return;
......@@ -287,8 +279,7 @@
- (IBAction)infoOk:(id)sender
{
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
vlc_value_t val;
if( [self isItemInPlaylist: p_item] )
......@@ -316,15 +307,9 @@
- (BOOL)isItemInPlaylist:(playlist_item_t *)p_local_item
{
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_t * p_playlist = pl_Yield( p_intf );
int i;
if( p_playlist == NULL )
{
return NO;
}
for( i = 0 ; i < p_playlist->i_all_size ; i++ )
{
if( p_playlist->pp_all_items[i] == p_local_item )
......@@ -430,7 +415,8 @@ static VLCInfoTreeItem *o_root_item = nil;
}
+ (VLCInfoTreeItem *)rootItem {
if (o_root_item == nil) o_root_item = [[VLCInfoTreeItem alloc] initWithName:@"main" value: @"" ID: 0 parent:nil];
if( o_root_item == nil )
o_root_item = [[VLCInfoTreeItem alloc] initWithName:@"main" value: @"" ID: 0 parent:nil];
return o_root_item;
}
......
modules/gui/macosx/wizard.m
View file @ 7fef8b87
......@@ -1277,10 +1277,8 @@ static VLCWizard *_o_sharedInstance = nil;
{
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE);
if( p_playlist )
{
playlist_t * p_playlist = pl_Yield( p_intf );
int x = 0;
int y = [[o_userSelections objectForKey:@"pathToStrm"] count];
while( x != y )
......@@ -1329,10 +1327,7 @@ static VLCWizard *_o_sharedInstance = nil;
x += 1;
}
vlc_object_release(p_playlist);
} else {
msg_Err( p_intf, "unable to find playlist" );
}
vlc_object_release( p_playlist );
/* close the window, since we are done */
[o_wizard_window close];
......
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