Changeset 799b2826ee321796c8c4695c5a7b7489ed5da851

Timestamp:

10/21/06 13:09:51 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1161428991 +0000

git-parent:

[c925ed563df12610851862d43f0cd6b30c37dec8]

git-author:

Clément Stenac <zorglub@videolan.org> 1161428991 +0000

Message:

Playlist

• Remove the random special case
  
• Use the array of currently playing items for all cases
  
• Convert array items to array API
  
• Replace standard searches in sorted arrays by bsearches
  
• Size is not yet fixed (next round).
  

Array

• Add reset/value and bsearch functions
  
• Add foreach helper
  

Files:

• include/vlc_arrays.h (modified) (3 diffs)
• include/vlc_playlist.h (modified) (4 diffs)
• modules/control/hotkeys.c (modified) (1 diff)
• modules/control/http/macro.c (modified) (3 diffs)
• modules/gui/macosx/controls.m (modified) (2 diffs)
• modules/gui/macosx/intf.m (modified) (1 diff)
• modules/gui/macosx/playlist.m (modified) (2 diffs)
• modules/gui/qt4/main_interface.cpp (modified) (1 diff)
• modules/gui/qt4/menus.cpp (modified) (1 diff)
• modules/gui/skins2/commands/cmd_input.cpp (modified) (1 diff)
• src/control/mediacontrol_core.c (modified) (3 diffs)
• src/control/playlist.c (modified) (2 diffs)
• src/input/item.c (modified) (3 diffs)
• src/libvlc.c (modified) (1 diff)
• src/playlist/control.c (modified) (10 diffs)
• src/playlist/engine.c (modified) (4 diffs)
• src/playlist/item.c (modified) (6 diffs)
• src/playlist/search.c (modified) (3 diffs)
• src/playlist/thread.c (modified) (1 diff)
• src/playlist/tree.c (modified) (4 diffs)

include/vlc_arrays.h

@@ -119 +119 @@
-
-/**
-n array
+ sorted array. The key must be comparable by < and >
- * \param entries array of entries
- * \param count number of entries
@@ -219 +219 @@
-    array.p_elems = NULL;
-
+#define ARRAY_RESET(array)                                                  \
+    array.i_alloc = 0;                                                      \
+    array.i_size = 0;                                                       \
+    free( array.p_elems ); array.p_elems = NULL;
+
-#define ARRAY_APPEND(array, elem) {                                         \
-    _ARRAY_GROW1(array);                                                    \
@@ -245 +250 @@
-}
-
+#define ARRAY_VAL(array, pos) array.p_elems[pos]
+
+#define ARRAY_BSEARCH(array, elem, zetype, key, answer) \
+    BSEARCH( array.p_elems, array.i_size, elem, zetype, key, answer)
+
+#define FOREACH_ARRAY( item, array ) { \
+    int fe_idx; \
+    for( fe_idx = 0 ; fe_idx < array.i_size ; fe_idx++ ) \
+    { \
+        item = array.p_elems[fe_idx];
+
+#define FOREACH_END() } }
+
-#endif

include/vlc_playlist.h

@@ -27 +27 @@
-#include <assert.h>
-
-
-
-
- to the playlist in vlc
-/
-
-/*
+
+
+
+\file
+ This file contain structures and function prototypes related
+
+ 
- * \defgroup vlc_playlist Playlist
- * @{
@@ -103 +103 @@
-    int                   i_enabled; /**< How many items are enabled ? */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    int                   i_last_playlist_id; /**< Last id to an item */
@@ -346 +341 @@
-}
-
- 
+
- * \see playlist_AddInput
- */
@@ -434 +429 @@
-    vlc_bool_t b_empty;
-    vlc_mutex_lock( &p_playlist->object_lock );
-
+tems.i
-    vlc_mutex_unlock( &p_playlist->object_lock );
-    return( b_empty );

modules/control/hotkeys.c

@@ -797 +797 @@
-
-    char *psz_bookmark = strdup( val.psz_string );
-
+tems.i
-    {
-        if( !strcmp( psz_bookmark,
-p_playlist->pp_items[i]
+ARRAY_VAL( p_playlist->items,i )
-        {
-            playlist_LockControl( p_playlist, PLAYLIST_VIEWPLAY, NULL,
-p_playlist->pp_items[i]
+ARRAY_VAL( p_playlist->items, i )
-            break;
-        }

modules/control/http/macro.c

@@ -399 +399 @@
-                    }
-
-
+tems.i
-                    {
-                        /* Check if the item is in the keep list */
@@ -405 +405 @@
-                        {
-                            if( p_items[j] ==
-
+
+
-                                break;
-                        }
@@ -411 +412 @@
-                        {
-                            playlist_LockDeleteAllFromInput( p_sys->p_playlist,
- p_sys->p_playlist->pp_it
+p_sys->p_playlist->items.p_el
-                            msg_Dbg( p_intf, "requested playlist delete: %d",
-                                     i );

modules/gui/macosx/controls.m

@@ -69 +69 @@
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-_playlist->i_size <= 0
+laylist_IsEmpty( p_playlist )
-    {
-        vlc_mutex_unlock( &p_playlist->object_lock );
@@ -813 +813 @@
-             [[o_mi title] isEqualToString: _NS("Next")] )
-    {
-
+
+
-    }
-    else if( [[o_mi title] isEqualToString: _NS("Random")] )

modules/gui/macosx/intf.m

@@ -1068 +1068 @@
-
-        playlist_t * p_playlist = pl_Yield( p_intf );
-
+
+
-
-        vlc_object_release( p_playlist );

modules/gui/macosx/playlist.m

@@ -465 +465 @@
-    playlist_t *p_playlist = pl_Yield( VLCIntf );
-
-
+
+
-    {
-        [o_status_field setStringValue: [NSString stringWithFormat:
-
+tems.i
-    }
-    else
-    {
-_playlist->i_size == 0
+laylist_IsEmpty( p_playlist )
-        {
-            [o_status_field setStringValue: _NS("No items in the playlist")];
@@ -1367 +1368 @@
-    /* FIXME: playlist->i_size doesn't provide the correct number of items anymore
-     * check the playlist API for the fixed function, once zorglub implemented it -- fpk, 9/17/06 */
-
-
+
+tems.i
-    {
-        [o_status_field setStringValue: [NSString stringWithFormat:
-
+tems.i
-    }
-    else
-    {
-_playlist->i_size == 0
+laylist_IsEmpty( p_playlist )
-        {
-            [o_status_field setStringValue: _NS("No items in the playlist")];

modules/gui/qt4/main_interface.cpp

@@ -557 +557 @@
-void MainInterface::play()
-{
-THEPL->i_size
+playlist_IsEmpty(THEPL)
-    {
-        /* The playlist is empty, open a file requester */

modules/gui/qt4/menus.cpp

@@ -355 +355 @@
-            MIM_SADD( qtr("Pause"), "", "", togglePlayPause() ) \
-    } \
-
+tems.i
-        MIM_SADD( qtr("Play"), "", "", togglePlayPause() ) \
-    \

modules/gui/skins2/commands/cmd_input.cpp

@@ -36 +36 @@
-    }
-
-
-
+
-        playlist_Play( pPlaylist );
-    }
-    else
-    {

src/control/mediacontrol_core.c

@@ -221 +221 @@
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-
+tems.i
-    {
-        int i_from;
@@ -361 +361 @@
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-
+tems.i
-
-    retval = mediacontrol_PlaylistSeq__alloc( i_playlist_size );
@@ -367 +367 @@
-    for( i_index = 0 ; i_index < i_playlist_size ; i_index++ )
-    {
-p_playlist->pp_items[i_index]
+ARRAY_VAL(p_playlist->items, i_index)
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );

src/control/playlist.c

@@ -45 +45 @@
-    ///\todo Handle additionnal options
-
-
+tems.i
-    if( i_id > 0 )
-    {
@@ -137 +137 @@
-{
-    assert( PL );
-
+tems.i
-}
-

src/input/item.c

@@ -77 +77 @@
-    input_ItemClean( p_input );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    pl_Release( p_obj );
-    free( p_input );
@@ -187 +182 @@
-input_item_t *input_ItemGetById( playlist_t *p_playlist, int i_id )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    return NULL;
-}
@@ -229 +212 @@
-    PL_LOCK;
-    p_input->i_id = ++p_playlist->i_last_input_id;
-
-
-
+
-    PL_UNLOCK;
-    pl_Release( p_obj );

src/libvlc.c

@@ -671 +671 @@
-    int i_size;
-    LIBVLC_PLAYLIST_FUNC;
-
+tems.i
-    LIBVLC_PLAYLIST_FUNC_END;
-    return i_size;

src/playlist/control.c

@@ -85 +85 @@
-    vlc_value_t val;
-
-
-
+
-        return VLC_EGENERIC;
-    }
-
-    switch( i_query )
@@ -101 +99 @@
-    // Item null = take the first child of node
-    case PLAYLIST_VIEWPLAY:
-        p_playlist->b_reset_random = VLC_TRUE;
-        p_node = (playlist_item_t *)va_arg( args, playlist_item_t * );
-        p_item = (playlist_item_t *)va_arg( args, playlist_item_t * );
@@ -114 +111 @@
-        p_playlist->request.p_node = p_node;
-        p_playlist->request.p_item = p_item;
+        if( p_item && var_GetBool( p_playlist, "random" ) )
+            p_playlist->b_reset_currently_playing = VLC_TRUE;
-        break;
-
@@ -262 +261 @@
- *****************************************************************************/
-
+static void ResyncCurrentIndex(playlist_t *p_playlist, playlist_item_t *p_cur )
+{
+     PL_DEBUG("resyncing on %s", PLI_NAME(p_cur) );
+     /* Simply resync index */
+     int i;
+     p_playlist->i_current_index = -1;
+     for( i = 0 ; i< p_playlist->current.i_size; i++ )
+     {
+          if( ARRAY_VAL(p_playlist->current, i) == p_cur )
+          {
+              p_playlist->i_current_index = i;
+              break;
+          }
+     }
+     PL_DEBUG("%s is at %i", PLI_NAME(p_cur), p_playlist->i_current_index );
+}
+
+static void ResetCurrentlyPlaying( playlist_t *p_playlist, vlc_bool_t b_random,
+                                   playlist_item_t *p_cur )
+{
+    playlist_item_t *p_next = NULL;
+    PL_DEBUG("rebuilding array of current - root %s",
+              PLI_NAME(p_playlist->status.p_node) );
+    ARRAY_RESET(p_playlist->current);
+    p_playlist->i_current_index = -1;
+    while( 1 )
+    {
+        /** FIXME: this is *slow* */
+        p_next = playlist_GetNextLeaf( p_playlist,
+                                       p_playlist->status.p_node,
+                                       p_next, VLC_TRUE, VLC_FALSE );
+        if( p_next )
+        {
+            if( p_next == p_cur )
+                p_playlist->i_current_index = p_playlist->current.i_size;
+            ARRAY_APPEND( p_playlist->current, p_next);
+        }
+        else break;
+    }
+    PL_DEBUG("rebuild done - %i items, index %i", p_playlist->current.i_size,
+                                                  p_playlist->i_current_index);
+    if( b_random )
+    {
+        /* Shuffle the array */
+        srand( (unsigned int)mdate() );
+        int swap = 0;
+        int j;
+        for( j = p_playlist->current.i_size - 1; j > 0; j-- )
+        {
+            swap++;
+            int i = rand() % (j+1); /* between 0 and j */
+            playlist_item_t *p_tmp;
+            p_tmp = ARRAY_VAL(p_playlist->current, i);
+            ARRAY_VAL(p_playlist->current,i) = ARRAY_VAL(p_playlist->current,j);
+            ARRAY_VAL(p_playlist->current,j) = p_tmp;
+        }
+    }
+    p_playlist->b_reset_currently_playing = VLC_FALSE;
+}
+
-/** This function calculates the next playlist item, depending
- *  on the playlist course mode (forward, backward, random, view,...). */
@@ -276 +335 @@
-    /* Handle quickly a few special cases */
-    /* No items to play */
-
+tems.i
-    {
-        msg_Info( p_playlist, "playlist is empty" );
@@ -309 +368 @@
-    }
-
-    /* Random case. This is an exception: if request, but request is skip +- 1
-     * we don't go to next item but select a new random one. */
-    if( b_random &&
-        ( !p_playlist->request.b_request ||
-        ( p_playlist->request.b_request &&
-            ( p_playlist->request.p_item == NULL ||
-              p_playlist->request.i_skip == 1    ||
-              p_playlist->request.i_skip == -1 ) ) ) )
-    {
-       PL_DEBUG( "doing random, have %i items, currently at %i, reset %i\n",
-                        p_playlist->i_random, p_playlist->i_random_index,
-                        p_playlist->b_reset_random );
-       if( p_playlist->b_reset_random )
-        {
-            int j;
-            FREE( p_playlist->pp_random );
-            if( !p_playlist->b_reset_random &&  !b_loop ) goto end;
-            p_playlist->i_random = 0;
-            p_playlist->i_random_index = 0;
-            p_playlist->i_random = playlist_GetAllEnabledChildren(
-                                                p_playlist,
-                                                p_playlist->status.p_node,
-                                                &p_playlist->pp_random );
-            /* Shuffle the array */
-            srand( (unsigned int)mdate() );
-            int swap = 0;
-            for( j = p_playlist->i_random -1; j > 0; j-- )
-            {
-                swap++;
-                int i = rand() % (j+1); /* between 0 and j */
-                playlist_item_t *p_tmp;
-                p_tmp = p_playlist->pp_random[i];
-                p_playlist->pp_random[i] = p_playlist->pp_random[j];
-                p_playlist->pp_random[j] = p_tmp;
-            }
-            p_playlist->b_reset_random = VLC_FALSE;
-            PL_DEBUG( "random rebuilt, have %i items", p_playlist->i_random );
-        }
-        else
-        {
-            /* Go backward or forward */
-            if( !p_playlist->request.b_request || !p_playlist->request.p_item ||
-                                               p_playlist->request.i_skip == 1 )
-                p_playlist->i_random_index++;
-            else
-                p_playlist->i_random_index--;
-            /* Handle bounds situations */
-            if( p_playlist->i_random_index == -1 )
-            {
-                if( !b_loop || p_playlist->i_random == 0 ) goto end;
-                p_playlist->i_random_index = p_playlist->i_random - 1;
-            }
-            else if( p_playlist->i_random_index == p_playlist->i_random )
-            {
-                if( !b_loop || p_playlist->i_random == 0 ) goto end;
-                p_playlist->i_random_index = 0;
-            }
-        }
-        PL_DEBUG( "using random item %i", p_playlist->i_random_index );
-        if ( p_playlist->i_random == 0 ) goto end; /* Can this happen ?? */
-        p_new = p_playlist->pp_random[p_playlist->i_random_index];
-end:
-        if( !p_new ) p_playlist->b_reset_random = VLC_TRUE;
-        p_playlist->request.i_skip = 0;
-        p_playlist->request.b_request = VLC_FALSE;
-        return p_new;
-    }
-
-    /* Start the real work */
-    if( p_playlist->request.b_request )
@@ -386 +377 @@
-                        PLI_NAME( p_playlist->request.p_node ), i_skip );
-
-
+
+
+
-            p_playlist->status.p_node = p_playlist->request.p_node;
+            p_playlist->b_reset_currently_playing = VLC_TRUE;
+        }
-
-        /* If we are asked for a node, dont take it */
@@ -393 +388 @@
-            i_skip++;
-
-
+
+
+
+
+
+
+
+
-        {
-            for( i = i_skip; i > 0 ; i-- )
-            {
-
-
-
-
+
+
-                {
-                    PL_DEBUG( "looping - restarting at beginning of node" );
-
-
-
-
+
-                }
-            }
-
-
+
+
+
+
-        {
-            for( i = i_skip; i < 0 ; i++ )
-            {
-
-
-
-
+
+
-                {
-                    PL_DEBUG( "looping - restarting at end of node" );
-
-
-
-
+
-                }
-                if( p_new == NULL ) break;
-            }
+            p_new = ARRAY_VAL( p_playlist->current,
+                               p_playlist->i_current_index );
-        }
-        /* Clear the request */
@@ -434 +429 @@
-    else
-    {
-
+
+
-        /* Cant go to next from current item */
-        if( p_playlist->status.p_item &&
@@ -440 +436 @@
-            return NULL;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* The new item can't be autoselected  */
-        if( p_new != NULL && p_new->i_flags & PLAYLIST_SKIP_FLAG )
-            return NULL;
-    }
-    if( p_new == NULL )
-    {
-        msg_Dbg( p_playlist, "did not find something to play" );
-    }
-    return p_new;

src/playlist/engine.c

@@ -35 +35 @@
-static void VariablesInit( playlist_t *p_playlist );
-
+static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd,
+                           vlc_value_t oldval, vlc_value_t newval, void *a )
+{
+    ((playlist_t*)p_this)->b_reset_currently_playing = VLC_TRUE;
+    return VLC_SUCCESS;
+}
+
-/**
- * Create playlist
@@ -67 +74 @@
-    p_playlist->i_sout_destroyed_date = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    i_tree = var_CreateGetBool( p_playlist, "playlist-tree" );
@@ -163 +165 @@
-
-    PL_LOCK;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    PL_UNLOCK;
-
@@ -636 +652 @@
-    var_CreateGetBool( p_playlist, "repeat" );
-    var_CreateGetBool( p_playlist, "loop" );
-
+
+
+

src/playlist/item.c

@@ -404 +404 @@
-                                      p_playlist->p_root_onelevel, VLC_FALSE );
-        }
-random
+currently_playing
-        var_SetInteger( p_playlist, "item-change", p_item_in_category->
-                                                        p_input->i_id );
@@ -545 +545 @@
-    p_add->i_node = i_node_id;
-    val.p_address = p_add;
-random
+currently_playing
-    var_Set( p_playlist, "item-append", val );
-    free( p_add );
@@ -611 +611 @@
-              playlist_item_t *p_node, int i_pos )
-{
-
-
-
-
+
+
-    p_playlist->i_enabled ++;
-
-    if( i_pos == PLAYLIST_END )
-    {
-        playlist_NodeAppend( p_playlist, p_item, p_node );
-    }
-    else
-    {
-        playlist_NodeInsert( p_playlist, p_item, p_node, i_pos );
-
+
-    if( !p_playlist->b_doing_ml )
-        playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id );
@@ -637 +632 @@
-
-    /* Remove it from the array of available items */
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -650 +641 @@
-                vlc_bool_t b_stop )
-{
-, i_top, i_bottom
+
-    int i_id = p_item->i_id;
-    vlc_bool_t b_flag = VLC_FALSE;
@@ -658 +649 @@
-        return playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE );
-    }
-random
+currently_playing
-    var_SetInteger( p_playlist, "item-deleted", i_id );
-
-    /* Remove the item from the bank */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    /* Check if it is the current item */