Commit 8f9ee6fd authored by Clément Stenac's avatar Clément Stenac

* modules/demux/m3u.c :
    Added name support. Only implemented for M3U and B4S playlists at the moment

* src/playlist/playlist.c
  include/vlc_playlist.h   : Added the playlist_AddName function to add an item with its name without filling an item structure.
parent 07f6c1da
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlc_playlist.h : Playlist functions * vlc_playlist.h : Playlist functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: vlc_playlist.h,v 1.9 2003/03/17 17:10:21 hartman Exp $ * $Id: vlc_playlist.h,v 1.10 2003/06/27 10:31:02 zorglub Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -77,6 +77,7 @@ void playlist_Destroy ( playlist_t * ); ...@@ -77,6 +77,7 @@ void playlist_Destroy ( playlist_t * );
VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) ); VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) );
VLC_EXPORT( int, playlist_Add, ( playlist_t *, const char *, int, int ) ); VLC_EXPORT( int, playlist_Add, ( playlist_t *, const char *, int, int ) );
VLC_EXPORT( int, playlist_AddName, (playlist_t *,const char *,const char *, int,int ) );
VLC_EXPORT( int, playlist_AddItem, ( playlist_t *, playlist_item_t *, int, int ) ); VLC_EXPORT( int, playlist_AddItem, ( playlist_t *, playlist_item_t *, int, int ) );
VLC_EXPORT( int, playlist_Delete, ( playlist_t *, int ) ); VLC_EXPORT( int, playlist_Delete, ( playlist_t *, int ) );
VLC_EXPORT( int, playlist_Move, ( playlist_t *, int, int ) ); VLC_EXPORT( int, playlist_Move, ( playlist_t *, int, int ) );
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* playlist.c : Playlist management functions * playlist.c : Playlist management functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: playlist.c,v 1.38 2003/06/24 22:26:01 asmax Exp $ * $Id: playlist.c,v 1.39 2003/06/27 10:31:02 zorglub Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -132,6 +132,32 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target, ...@@ -132,6 +132,32 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
return playlist_AddItem( p_playlist, p_item, i_mode, i_pos ); return playlist_AddItem( p_playlist, p_item, i_mode, i_pos );
} }
/*****************************************************************************
* playlist_AddName: add an item to the playlist with his name
*****************************************************************************
* Add an item to the playlist at position i_pos. If i_pos is PLAYLIST_END,
* add it at the end regardless of the playlist current size.
*****************************************************************************/
int playlist_AddName( playlist_t *p_playlist, const char * psz_name,
const char *psz_uri,
int i_mode, int i_pos )
{
playlist_item_t * p_item;
p_item = malloc( sizeof( playlist_item_t ) );
if( p_item == NULL )
{
msg_Err( p_playlist, "out of memory" );
}
p_item->psz_name = strdup( psz_name );
p_item->psz_uri = strdup( psz_uri );
p_item->i_type = 0;
p_item->i_status = 0;
p_item->b_autodeletion = VLC_FALSE;
return playlist_AddItem( p_playlist, p_item, i_mode, i_pos );
}
int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item, int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item,
int i_mode, int i_pos) int i_mode, int i_pos)
...@@ -173,7 +199,7 @@ int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item, ...@@ -173,7 +199,7 @@ int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item,
} }
msg_Dbg( p_playlist, "adding playlist item %s ", p_item->psz_name ); msg_Dbg( p_playlist, "adding playlist item %s ( %s )", p_item->psz_name, p_item->psz_uri);
/* Create the new playlist item */ /* Create the new playlist item */
......
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