Changeset 7fef8b8726f85876ffe110a949e1a09251094c83

Timestamp:

17/09/06 20:41:21 (2 years ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1158518481 +0000

git-parent:

[c77d5dcdee547ee3c2345610a56c95c49ae75259]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1158518481 +0000

Message:

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

Files:

• modules/gui/macosx/controls.m (modified) (7 diffs)
• modules/gui/macosx/embeddedwindow.m (modified) (1 diff)
• modules/gui/macosx/extended.m (modified) (2 diffs)
• modules/gui/macosx/intf.m (modified) (22 diffs)
• modules/gui/macosx/playlist.m (modified) (37 diffs)
• modules/gui/macosx/playlistinfo.m (modified) (5 diffs)
• modules/gui/macosx/wizard.m (modified) (1 diff)

modules/gui/macosx/controls.m

@@ -64 +64 @@
-    vlc_value_t val;
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    val.i_int = config_GetInt( p_intf, "key-play-pause" );
-    var_Set( p_intf->p_libvlc, "key-pressed", val );
@@ -156 +153 @@
-    vlc_value_t val;
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
+
-
-    var_Get( p_playlist, "random", &val );
@@ -186 +178 @@
-    vlc_value_t val;
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
+
-
-    var_Get( p_playlist, "repeat", &val );
@@ -220 +207 @@
-    vlc_value_t val;
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
+
-
-    var_Get( p_playlist, "loop", &val );
@@ -346 +328 @@
-    else
-    {
-
-
-
-
-
+
+
+
+
-        {
-            vlc_value_t val;
@@ -356 +337 @@
-            var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool );
-        }
-
+
+
-    }
-
@@ -698 +680 @@
-    vlc_value_t val;
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
-
-
+
+
+
-
-#define p_input p_playlist->p_input

modules/gui/macosx/embeddedwindow.m

@@ -88 +88 @@
-- (BOOL)windowShouldClose:(id)sender
-{
-
-
-
-
-
-
+
-
-    playlist_Stop( p_playlist );

modules/gui/macosx/extended.m

@@ -370 +370 @@
-    NSArray *o_windows = [NSApp orderedWindows];
-    NSEnumerator *o_enumerator = [o_windows objectEnumerator];
-
-
+
-    vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-    vout_thread_t *p_real_vout;
@@ -849 +848 @@
-    /* save the preferences to make sure that our module-changes will up on
-     * next launch again */
-
-
+
-    int returnedValue;
-    NSArray * theModules;

modules/gui/macosx/intf.m

@@ -457 +457 @@
-    o_size_with_playlist = [o_window frame].size;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
@@ -742 +739 @@
-            /* 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 */
- (pressedDown
+( pressedDown 
-            {
-                [o_controls volumeUp: self];
@@ -750 +747 @@
-            /* 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 */
-
+
+
-                [o_controls volumeDown: self];
-            }
@@ -764 +762 @@
-            /* simulate an event as long as the user holds the button */
-            b_left_right_remote_button_hold = pressedDown;
-
+
+
-                NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier];  
-                [self performSelector:@selector(triggerMovieStepForRemoteButton:) 
@@ -918 +917 @@
-- (id)getPlaylist
-{
-
-
-
-
-
+
-}
-
@@ -1000 +995 @@
-    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    while( !p_intf->b_die )
@@ -1074 +1065 @@
-        vlc_bool_t b_chapters = VLC_FALSE;
-
-
-
+
-        b_plmul = p_playlist->i_size > 1;
-
@@ -1123 +1113 @@
-    if( p_intf->p_sys->b_fullscreen_update )
-    {
-
-
+
-        var_Get( p_playlist, "fullscreen", &val );
-        [o_embedded_window setFullscreen: val.b_bool];
@@ -1147 +1136 @@
-            NSString *o_temp;
-            vout_thread_t *p_vout;
-
-
-
-
+
+
+
-            {
+                vlc_object_release( p_playlist );
-                return;
-            }
@@ -1345 +1334 @@
-    {
-        NSString *o_temp;
-
-
-
-
-
-
+
+
-        o_temp = [NSString stringWithUTF8String:
-                  p_playlist->status.p_item->p_input->psz_name];
@@ -1537 +1522 @@
-
-    /* Stop playback */
-
-
-
-
-
-
+
+
+
-
-    /* FIXME - Wait here until all vouts are terminated because
@@ -1648 +1630 @@
-- (IBAction)intfOpenFile:(id)sender
-{
-!nib_open_loaded
+ !nib_open_loaded 
-    {
-        nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
@@ -1660 +1642 @@
-- (IBAction)intfOpenFileGeneric:(id)sender
-{
-!nib_open_loaded
+ !nib_open_loaded 
-    {
-        nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
@@ -1672 +1654 @@
-- (IBAction)intfOpenDisc:(id)sender
-{
-!nib_open_loaded
+ !nib_open_loaded 
-    {
-        nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
@@ -1684 +1666 @@
-- (IBAction)intfOpenNet:(id)sender
-{
-!nib_open_loaded
+ !nib_open_loaded 
-    {
-        nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
@@ -1696 +1678 @@
-- (IBAction)showWizard:(id)sender
-{
-!nib_wizard_loaded
+ !nib_wizard_loaded 
-    {
-        nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
@@ -1714 +1696 @@
-        o_extended = [[VLCExtended alloc] init];
-    }
-!nib_extended_loaded
+ !nib_extended_loaded 
-    {
-        nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
@@ -1730 +1712 @@
-        o_sfilters = [[VLCsFilters alloc] init];
-    }
-!nib_sfilters_loaded
+ !nib_sfilters_loaded 
-    {
-        nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
@@ -1743 +1725 @@
-{
-    /* we need the wizard-nib for the bookmarks's extract functionality */
-!nib_wizard_loaded
+ !nib_wizard_loaded 
-    {
-        nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
@@ -1749 +1731 @@
-    }
-    
-!nib_bookmarks_loaded
+ !nib_bookmarks_loaded 
-    {
-        nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
@@ -1760 +1742 @@
-- (IBAction)viewAbout:(id)sender
-{
-!nib_about_loaded
+ !nib_about_loaded 
-    {
-        nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
@@ -1779 +1761 @@
-- (IBAction)checkForUpdate:(id)sender
-{
-!nib_update_loaded
+ !nib_update_loaded 
-    {
-        nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];

modules/gui/macosx/playlist.m

@@ -115 +115 @@
-- (void)awakeFromNib
-{
-
-
+
-    [o_outline_view setTarget: self];
-    [o_outline_view setDelegate: self];
@@ -152 +151 @@
-    int i_return = 0;
-    playlist_item_t *p_item = NULL;
-
-
-
-
+
-    if( outlineView != o_outline_view )
-    {
@@ -186 +182 @@
-    playlist_item_t *p_return = NULL, *p_item = NULL;
-    NSValue *o_value;
-
-
-
-
-
+
-
-    if( item == nil )
@@ -207 +199 @@
-
-    o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]];
+    #if 0
-    NSLog( @"%s", p_return->p_input->psz_name);
+    #endif
-    if( o_value == nil )
-    {
-        o_value = [[NSValue valueWithPointer: p_return] retain];
-NSLog( @"error missing
+msg_Err( VLCIntf, @"missing playlist item's pointer
-    }
-    return o_value;
@@ -220 +214 @@
-{
-    int i_return = 0;
-
-
-
-
+
-
-    if( item == nil )
@@ -253 +244 @@
-    id o_value = nil;
-    intf_thread_t *p_intf = VLCIntf;
-    playlist_t *p_playlist;
-    playlist_item_t *p_item;
-    
-    if( item == nil || ![item isKindOfClass: [NSValue class]] ) return( @"error" );
-    
-    /* Check to see if the playlist is present */
-    p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-    if( p_playlist == NULL ) return( @"error");
-    vlc_object_release( p_playlist);
-    
-    p_item = (playlist_item_t *)[item pointerValue];
@@ -355 +340 @@
-- (void)awakeFromNib
-{
-
-
+
-    vlc_list_t *p_list = vlc_list_find( p_playlist, VLC_OBJECT_MODULE,
-                                        FIND_ANYWHERE );
@@ -479 +463 @@
-    [[[[VLCMain sharedInstance] getBookmarks] getDataTable] reloadData];
-
-
-
-
-
+
-
-    if( p_playlist->i_size >= 2 )
@@ -505 +486 @@
-- (void)playModeUpdated
-{
-
-
+
-    vlc_value_t val, val2;
-
-    if( p_playlist == NULL )
-    {
-        return;
-    }
-
-    var_Get( p_playlist, "loop", &val2 );
@@ -540 +515 @@
-    unsigned int j;
-
-
-
+
-    playlist_item_t *p_item, *p_temp_item;
-    NSMutableArray *o_array = [NSMutableArray array];
-
-    if( p_playlist == NULL )
-        return;
-
-    p_item = p_playlist->status.p_item;
@@ -588 +559 @@
-    [o_outline_view scrollRowToVisible: i_row];
-
-p_playlist
+ p_playlist 
-
-    /* update our info-panel to reflect the new item */
@@ -603 +574 @@
-
-{
-
-
+
-    playlist_item_t *p_temp_item = p_item;
-
-    if( p_playlist == NULL )
-    {
-        return NO;
-    }
-
-    if( p_node == p_item )
@@ -694 +659 @@
-{
-    intf_thread_t * p_intf = VLCIntf;
-
-
+
-
-    NSSavePanel *o_save_panel = [NSSavePanel savePanel];
@@ -758 +722 @@
-{
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            else
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -799 +759 @@
-    NSMutableArray *o_to_preparse;
-    intf_thread_t * p_intf = VLCIntf;
-
-
+
-                                                       
-    o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
-    i_count = [o_to_preparse count];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    [self playlistUpdated];
-}
@@ -840 +796 @@
-    NSMenuItem *o_mi = (NSMenuItem *)sender;
-    NSString *o_string = [o_mi representedObject];
-
-
+
-    if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string cString] ) )
-        playlist_ServicesDiscoveryAdd( p_playlist, [o_string cString] );
@@ -869 +824 @@
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
-
-
+
+
-    o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
-    i_count = [o_to_delete count];
@@ -925 +875 @@
-- (void)sortNode:(int)i_mode
-{
-
-
+
-    playlist_item_t * p_item;
-
-    if (p_playlist == NULL)
-    {
-        return;
-    }
-
-    if( [o_outline_view selectedRow] > -1 )
@@ -965 +909 @@
-{
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
-
+
+
-    input_item_t *p_input;
-    int i;
@@ -1057 +996 @@
-{
-    int i_item;
-
-
-
-
-
-
+
-
-    for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
@@ -1101 +1035 @@
-{
-    int i_item;
-
-
-
-
-
-
+
-
-    for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
@@ -1150 +1079 @@
-    intf_thread_t * p_intf = VLCIntf;
-    vlc_value_t val1,val2;
-
-
-
-
-
-
+
-
-    switch( [o_loop_popup indexOfSelectedItem] )
@@ -1194 +1118 @@
-- (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
-{
-
-
+
-    playlist_item_t *p_selected_item;
-    int i_current, i_selected_row;
-
-    if( !p_playlist )
-        return NULL;
-
-    i_selected_row = [o_outline_view selectedRow];
@@ -1265 +1185 @@
-- (IBAction)searchItem:(id)sender
-{
-
-
+
-    id o_result;
-
@@ -1273 +1192 @@
-
-    b_selected_item_met = NO;
-
-    if( p_playlist == NULL )
-        return;
-
-        /*First, only search after the selected item:*
@@ -1361 +1277 @@
-    intf_thread_t *p_intf = VLCIntf;
-
-
-
-
-
-
-
+
-
-    /* Check whether the selected table column header corresponds to a
@@ -1431 +1342 @@
-                                item:(id)item
-{
-
-
+
-
-    id o_playing_item;
-
-    if( !p_playlist ) return;
-
-    o_playing_item = [o_outline_dict objectForKey:
@@ -1469 +1377 @@
-
-    /* simply adds a new node to the end of the playlist */
-
-
+
-    vlc_thread_set_priority( p_playlist, VLC_THREAD_PRIORITY_LOW );
-
-    if( !p_playlist )
-    {
-        return;
-    }
-
-    int ret_v;
@@ -1504 +1406 @@
-{
-    id o_value = [super outlineView: outlineView child: index ofItem: item];
-vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
-
-
-if( !p_playlist ) return nil;
+pl_Yield( VLCIntf );
+
+
+ * check the playlist API for the fixed function, once zorglub implemented it -- fpk, 9/17/06 */
-
-    if( p_playlist->i_size >= 2 )
@@ -1529 +1431 @@
-    [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
-                                                    [o_value pointerValue]]];
-NSLog( @"add
+    msg_Dbg( VLCIntf, "adding
-    return o_value;
-
@@ -1538 +1440 @@
-{
-    unsigned int i;
-
-
+
-
-    /* First remove the items that were moved during the last drag & drop
@@ -1545 +1446 @@
-    [o_items_array removeAllObjects];
-    [o_nodes_array removeAllObjects];
-
-    if( !p_playlist ) return NO;
-
-    for( i = 0 ; i < [items count] ; i++ )
@@ -1585 +1484 @@
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
-{
-
-
+
-    NSPasteboard *o_pasteboard = [info draggingPasteboard];
-
@@ -1627 +1525 @@
-            }
-        }
-p_playlist
+ p_playlist 
-        return NSDragOperationMove;
-    }
@@ -1634 +1532 @@
-    else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
-    {
-p_playlist
+ p_playlist 
-        return NSDragOperationGeneric;
-    }
-p_playlist
+ p_playlist 
-    return NSDragOperationNone;
-}
@@ -1643 +1541 @@
-- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index
-{
-
-
+
-    NSPasteboard *o_pasteboard = [info draggingPasteboard];
-
-    if( !p_playlist ) return NO;
-
-    /* Drag & Drop inside the playlist */
@@ -1734 +1629 @@
-        [o_outline_view scrollRowToVisible: i_row];
-
-p_playlist
+ p_playlist 
-        return YES;
-    }

modules/gui/macosx/playlistinfo.m

@@ -136 +136 @@
-    {
-        intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        [self initPanel:sender];
-    }
@@ -174 +170 @@
-    /* make sure that we got the current item and not an outdated one */
-    intf_thread_t * p_intf = VLCIntf;
-
-
-
-
-
-
-
-
+
+
+
+
-
-    /* check whether our item is valid, because we would crash if not */
@@ -288 +280 @@
-{
-    intf_thread_t * p_intf = VLCIntf;
-