Changeset 23458725ce766bcb7fd908b392948a1449a760c6

Timestamp:

12/08/05 16:20:06 (3 years ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1123856406 +0000

git-parent:

[cf08a571ced3bf3a2435207358ab0bdaf8f359f2]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1123856406 +0000

Message:

ALL: Improvements in the M3U output and parser. Patch by Daniel Stränger.

(Put both artist and name, protect comma with \ )

Files:

• THANKS (modified) (1 diff)
• modules/demux/playlist/m3u.c (modified) (6 diffs)
• modules/misc/playlist/m3u.c (modified) (1 diff)

THANKS

@@ -32 +32 @@
-Damian Ivereigh <damian at cisco.com> - ac3dec uninitialized data structure fix
-Damien Fouilleul <damien.fouilleul at laposte.net> - DirectShow input improvements
+Daniel Str�er <vlc at schmaller d0t de> - M3U improvements
-David Kennedy <dkennedy at tinytoad.com> - X11 fullscreen patch
-David Weber <david_weber at gmx.de> - Mac OS X interface design & graphics (v0.5.0)

modules/demux/playlist/m3u.c

@@ -45 +45 @@
-static int Demux( demux_t *p_demux);
-static int Control( demux_t *p_demux, int i_query, va_list args );
+static void parseEXTINF( char *psz_string, char **ppsz_author, char **ppsz_name, int *pi_duration );
-
-/*****************************************************************************
@@ -109 +110 @@
-    char       *psz_line;
-
-
-
-
-
+
+
+
+
+
+
-
-    playlist_item_t *p_item, *p_current;
@@ -156 +159 @@
-            {
-                /* Extended info */
-                char *psz_duration;
-                psz_parse += sizeof("EXTINF:") - 1;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            }
-            else if( !strncasecmp( psz_parse, "EXTVLCOPT:",
@@ -210 +206 @@
-            }
-            p_item->input.i_duration = i_duration;
-
+
+
+
-            playlist_NodeAddItem( p_playlist, p_item,
-                                  p_current->pp_parents[0]->i_view,
@@ -241 +239 @@
-            if( psz_name ) free( psz_name );
-            psz_name = NULL;
+            if ( psz_author ) free( psz_author );
+            psz_author = NULL;
+            i_parsed_duration = 0;
-            i_duration = -1;
-
@@ -265 +266 @@
-    return VLC_EGENERIC;
-}
+
+static void parseEXTINF(char *psz_string, char **ppsz_author, 
+                        char **ppsz_name, int *pi_duration)
+{
+    char *end=NULL;
+    char *psz_item=NULL;
+
+    end = psz_string + strlen( psz_string );
+
+    /* ignore whitespaces */
+    for (; psz_string < end && ( *psz_string == '\t' || *psz_string == ' ' ); 
+         psz_string++ );
+
+    /* read all digits */
+    psz_item = psz_string;
+    while ( psz_string < end && *psz_string >= '0' && *psz_string <= '9' )
+    {
+        psz_string++;
+    }
+    if ( *psz_item >= '0' && *psz_item <= '9' && *psz_string == ',' )
+    {
+        *psz_string = '\0';
+        *pi_duration = atoi(psz_item);
+    }
+    else
+    {
+        return;
+    }
+    if ( psz_string < end )               /* continue parsing if possible */
+    {
+        psz_string++;
+    }
+
+    /* read the author */
+    char *pos;
+    /* parse the author until unescaped comma is reached */
+    psz_item = pos = psz_string;
+    while( psz_string < end && *psz_string != ',' )
+    {
+        if( *psz_string == '\\' )
+            psz_string++;                 /* Skip escape character */
+        *pos++ = *psz_string++;
+    }
+    *pos = '\0';                          /* terminate the item */
+    *ppsz_author = psz_item;
+
+    if( psz_string < end )               /* continue parsing if possible */
+        psz_string++;
+    /* the title doesn't need to be escaped */
+    *ppsz_name = psz_string;
+
+    return;
+}
+

modules/misc/playlist/m3u.c

@@ -69 +69 @@
-            if( psz_author && *psz_author )
-            {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            else
-            {
-
-
+
+
+
-                         p_playlist->pp_items[i]->input.psz_name );
-            }
-
+
+
-        }
-