Changeset 982c016f90b5992fc7d4e4f6ed5e11f6556d18a6

Timestamp:

06/01/04 09:50:20 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[12dc6ed79fdc9c8c443f5539257c82d6dd266a1b]

git-author:

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

Message:

- src/misc/win32_specific: compilation fix for win32 (can someone please
check that command line parsing still works for items and options? )

- src/libvlc.c

include/vlc/vlc.h : New libvlc functions to get playlist status and

clear the playlist

Patch by Tong Ka Man

- src/playlist/* : Update copyrights

- src/playlist/playlist.c:

-When a user explicitely asks for an item, do play it, even if random mode
-Do not stop playlist upon deletion of an autodelete item
-playlist_Clear (Patch by Tong Ka Man)

Files:

• include/vlc/vlc.h (modified) (2 diffs)
• include/vlc_playlist.h (modified) (2 diffs)
• src/libvlc.c (modified) (2 diffs)
• src/misc/win32_specific.c (modified) (3 diffs)
• src/playlist/group.c (modified) (1 diff)
• src/playlist/info.c (modified) (2 diffs)
• src/playlist/item-ext.c (modified) (5 diffs)
• src/playlist/item.c (modified) (1 diff)
• src/playlist/loadsave.c (modified) (1 diff)
• src/playlist/playlist.c (modified) (7 diffs)
• src/playlist/sort.c (modified) (1 diff)

include/vlc/vlc.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-8 2003/12/02 12:57:35 gbazin
+9 2004/01/06 08:50:20 zorglub
- *
- * This program is free software; you can redistribute it and/or modify
@@ -140 +140 @@
-int     VLC_Stop         ( int );
-int     VLC_FullScreen   ( int );
+int VLC_ClearPlaylist( int );
+vlc_bool_t VLC_IsPlaying ( int );
-
-# ifdef __cplusplus

include/vlc_playlist.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
-0 2004/01/06 04:57:34 rocky
+1 2004/01/06 08:50:20 zorglub
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -158 +158 @@
-/* For internal use. Do not use this one anymore */
-VLC_EXPORT( int,  playlist_AddItem, ( playlist_t *, playlist_item_t *, int, int ) );
+VLC_EXPORT( int,  playlist_Clear, ( playlist_t * ) );
-VLC_EXPORT( int,  playlist_Delete, ( playlist_t *, int ) );
-VLC_EXPORT( int,  playlist_Disable, ( playlist_t *, int ) );

src/libvlc.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-7 2004/01/05 12:59:43
+8 2004/01/06 08:50:20
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -911 +911 @@
-
-/* FIXME: temporary hacks */
+
+
+/*****************************************************************************
+ * VLC_IsPlaying: Query for Playlist Status
+ *****************************************************************************/
+vlc_bool_t VLC_IsPlaying( int i_object )
+{
+
+    playlist_t * p_playlist;
+    vlc_bool_t   playing;
+
+    vlc_t *p_vlc = vlc_current_object( i_object );
+
+    /* Check that the handle is valid */
+    if( !p_vlc )
+    {
+        return VLC_ENOOBJ;
+    }
+
+    p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+    if( !p_playlist )
+    {
+        if( i_object ) vlc_object_release( p_vlc );
+        return VLC_ENOOBJ;
+    }
+
+    playing = playlist_IsPlaying( p_playlist );
+
+    vlc_object_release( p_playlist );
+
+    if( i_object ) vlc_object_release( p_vlc );
+
+    return playing;
+
+}
+
+
+/*****************************************************************************
+ * VLC_ClearPlaylist: Query for Playlist Status
+ *
+ * return: 0
+ *****************************************************************************/
+int VLC_ClearPlaylist( int i_object )
+{
+
+    playlist_t * p_playlist;
+    vlc_t *p_vlc = vlc_current_object( i_object );
+
+    /* Check that the handle is valid */
+    if( !p_vlc )
+    {
+        return VLC_ENOOBJ;
+    }
+
+    p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+
+    if( !p_playlist )
+    {
+        if( i_object ) vlc_object_release( p_vlc );
+        return VLC_ENOOBJ;
+    }
+
+    playlist_Clear(p_playlist);
+
+    vlc_object_release( p_playlist );
+
+    if( i_object ) vlc_object_release( p_vlc );
+    return 0;
+}
+
-
-/*****************************************************************************

src/misc/win32_specific.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-8 2003/12/09 19:18:48 gbazin
+9 2004/01/06 08:50:20 zorglub
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -298 +298 @@
-        if( pwm_data->lpData )
-        {
-
+,i_id,i_pos,j
-            char **ppsz_argv;
-            char *p_data = (char *)pwm_data->lpData;
@@ -322 +322 @@
-                    i_options++;
-                }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                i_opt += i_options;
-            }

src/playlist/group.c

@@ -2 +2 @@
- * playlist.c : Playlist groups management functions
- *****************************************************************************
-1
-5 2004/01/05 12:59:43
+4
+6 2004/01/06 08:50:20
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>

src/playlist/info.c

@@ -2 +2 @@
- * info.c : Playlist info management
- *****************************************************************************
-1
-1 2004/01/05 12:59:43
+4
+2 2004/01/06 08:50:20
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -106 +106 @@
-                      const char * psz_cat )
-{
-    int i;
-
-    /* Check the existence of the playlist */
-    if( p_playlist == NULL)

src/playlist/item-ext.c

@@ -2 +2 @@
- * item-ext.c : Exported playlist item functions
- *****************************************************************************
-1
-3 2004/01/06 04:57:34 rocky
+4
+4 2004/01/06 08:50:20 zorglub
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -46 +46 @@
-*/
-int playlist_AddWDuration( playlist_t *p_playlist, const char * psz_uri,
-           
-           
+                        
+                        
-{
-    playlist_item_t * p_item;
@@ -99 +99 @@
-                     const char *psz_name, int i_mode, int i_pos )
-{
- 
-               
+
+                                
-}
-
@@ -152 +152 @@
- *
- * \param p_playlist the playlist
-
+ (position)
- * \param i_group the new group
- * \return 0 on success, -1 on failure
@@ -365 +365 @@
-}
-
+
+
+/**
+ * Clear all playlist items
+ *
+ * \param p_playlist the playlist to be cleared.
+ * \return returns 0
+ */
+int playlist_Clear( playlist_t * p_playlist ) {
+
+    while( p_playlist->i_groups > 0 )
+    {
+        playlist_DeleteGroup( p_playlist, p_playlist->pp_groups[0]->i_id );
+    }
+
+    while( p_playlist->i_size > 0 )
+    {
+        playlist_Delete( p_playlist, 0 );
+    }
+    return 0;
+}
+
+
-/**
- * Disables a playlist item

src/playlist/item.c

@@ -2 +2 @@
- * item.c : Playlist item functions
- *****************************************************************************
-1
-0 2004/01/05 12:59:43
+4
+1 2004/01/06 08:50:20
- *
- * Authors: Samuel Hocevar <sam@zoy.org>

src/playlist/loadsave.c

@@ -2 +2 @@
- * loadsave.c : Playlist loading / saving functions
- *****************************************************************************
-1
-2 2004/01/05 12:59:43
+4
+3 2004/01/06 08:50:20
- *
- * Authors: Samuel Hocevar <sam@zoy.org>

src/playlist/playlist.c

@@ -2 +2 @@
- * playlist.c : Playlist management functions
- *****************************************************************************
-1
-1 2004/01/05 12:59:43
+4
+2 2004/01/06 08:50:20
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -83 +83 @@
-    var_Set( p_playlist, "intf-show", val );
-
+
+    var_Create( p_playlist, "prevent-skip", VLC_VAR_BOOL );
+    val.b_bool = VLC_FALSE;
+    var_Set( p_playlist, "prevent-skip", val );
+
-    var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-    var_Create( p_playlist, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
@@ -128 +133 @@
-    var_Destroy( p_playlist, "intf-change" );
-    var_Destroy( p_playlist, "item-change" );
+    var_Destroy( p_playlist, "playlist-current" );
+    var_Destroy( p_playlist, "intf-popmenu" );
+    var_Destroy( p_playlist, "intf-show" );
+    var_Destroy( p_playlist, "prevent-skip" );
+    var_Destroy( p_playlist, "random" );
+    var_Destroy( p_playlist, "repeat" );
+    var_Destroy( p_playlist, "loop" );
-
-    while( p_playlist->i_groups > 0 )
@@ -230 +242 @@
-                input_StopThread( p_playlist->p_input );
-            }
+            val.b_bool = VLC_TRUE;
+            var_Set( p_playlist, "prevent-skip", val );
-            p_playlist->i_status = PLAYLIST_RUNNING;
-        }
@@ -353 +367 @@
-                    vlc_mutex_unlock( &p_playlist->object_lock );
-                    playlist_Delete( p_playlist, p_playlist->i_index );
+                    p_playlist->i_index++;
+                    p_playlist->i_status = PLAYLIST_RUNNING;
-                }
-                else
@@ -382 +398 @@
-        else if( p_playlist->i_status != PLAYLIST_STOPPED )
-        {
-
+
+
+
+
+
+
+
-            PlayItem( p_playlist );
-        }
@@ -538 +560 @@
-   if( p_playlist->pp_items[p_playlist->i_index]->b_enabled == VLC_FALSE &&
-       p_playlist->i_enabled != 0)
-
+ 
-        SkipItem( p_playlist , 1 );
-    }

src/playlist/sort.c

@@ -2 +2 @@
- * sort.c : Playlist sorting functions
- *****************************************************************************
-1
-4 2004/01/05 12:59:43
+4
+5 2004/01/06 08:50:20
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>