/*****************************************************************************
* pls.c : PLS playlist format import
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004 VLC authors and VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Demux( demux_t *p_demux);
-static int Control( demux_t *p_demux, int i_query, va_list args );
/*****************************************************************************
* Import_PLS: main import function
static int Demux( demux_t *p_demux )
{
- mtime_t i_duration = -1;
char *psz_name = NULL;
char *psz_line;
char *psz_mrl = NULL;
char *psz_key;
char *psz_value;
int i_item = -1;
- int i_new_item = 0;
- int i_key_length;
input_item_t *p_input;
input_item_t *p_current_input = GetCurrentItem(p_demux);
}
else
{
- msg_Warn( p_demux, "invalid line in pls file" );
free( psz_line );
continue;
}
free( psz_line);
continue;
}
+
/* find the number part of of file1, title1 or length1 etc */
- i_key_length = strlen( psz_key );
- if( i_key_length >= 4 ) /* Ref1 type case */
- {
- i_new_item = atoi( psz_key + 3 );
- if( i_new_item == 0 && i_key_length >= 5 ) /* file1 type case */
- {
- i_new_item = atoi( psz_key + 4 );
- if( i_new_item == 0 && i_key_length >= 6 ) /* title1 type case */
- {
- i_new_item = atoi( psz_key + 5 );
- if( i_new_item == 0 && i_key_length >= 7 ) /* length1 type case */
- {
- i_new_item = atoi( psz_key + 6 );
- }
- }
- }
- }
- if( i_new_item == 0 )
+ int i_new_item;
+ if( sscanf( psz_key, "%*[^0-9]%d", &i_new_item ) != 1 )
{
msg_Warn( p_demux, "couldn't find number of items" );
free( psz_line );
continue;
}
+
if( i_item == -1 )
- {
i_item = i_new_item;
- }
- /* we found a new item, insert the previous */
- if( i_item != i_new_item )
+ else if( i_item != i_new_item )
{
+ /* we found a new item, insert the previous */
if( psz_mrl )
{
- p_input = input_item_New( p_demux, psz_mrl, psz_name );
+ p_input = input_item_New( psz_mrl, psz_name );
input_item_CopyOptions( p_current_input, p_input );
input_item_node_AppendItem( p_subitems, p_input );
vlc_gc_decref( p_input );
+ free( psz_mrl_orig );
+ psz_mrl_orig = psz_mrl = NULL;
}
else
{
}
free( psz_name );
psz_name = NULL;
- i_duration = -1;
i_item = i_new_item;
- i_new_item = 0;
}
+
if( !strncasecmp( psz_key, "file", sizeof("file") -1 ) ||
!strncasecmp( psz_key, "Ref", sizeof("Ref") -1 ) )
{
if( !strncasecmp( psz_key, "Ref", sizeof("Ref") -1 ) )
{
if( !strncasecmp( psz_mrl, "http://", sizeof("http://") -1 ) )
- {
- psz_mrl++;
- psz_mrl[0] = 'm';
- psz_mrl[1] = 'm';
- psz_mrl[2] = 's';
- }
+ memcpy( psz_mrl, "mmsh", 4 );
}
}
else if( !strncasecmp( psz_key, "title", sizeof("title") -1 ) )
psz_name = strdup( psz_value );
}
else if( !strncasecmp( psz_key, "length", sizeof("length") -1 ) )
- {
- i_duration = atoi( psz_value );
- if( i_duration != -1 )
- {
- i_duration *= 1000000;
- }
- }
+ /* duration in seconds */;
else
{
msg_Warn( p_demux, "unknown key found in pls file: %s", psz_key );
/* Add last object */
if( psz_mrl )
{
- p_input = input_item_New( p_demux, psz_mrl, psz_name );
+ p_input = input_item_New( psz_mrl, psz_name );
input_item_CopyOptions( p_current_input, p_input );
input_item_node_AppendItem( p_subitems, p_input );
vlc_gc_decref( p_input );
free( psz_mrl_orig );
- psz_mrl = NULL;
}
else
{
free( psz_name );
psz_name = NULL;
- input_item_AddSubItemTree( p_subitems );
- input_item_node_Delete( p_subitems );
+ input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */
}
-
-static int Control( demux_t *p_demux, int i_query, va_list args )
-{
- VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
- return VLC_EGENERIC;
-}
projects / vlc / blobdiff