xspf: use correct return value. VLC_FALSE == VLC_SUCCESS

[vlc] / modules / demux / playlist / gvp.c

diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c
index fe3033a0fd761d489f9b760d0d0cd310ea2fd18b..ed3aef58c90f4d880a2a873ac6e02bc7ee9d6be0 100644 (file)
--- a/modules/demux/playlist/gvp.c
+++ b/modules/demux/playlist/gvp.c
@@ -32,16 +32,25 @@
  * description:<desc linei>^M
  * description:<desc final line (no ^M)>
  * lines starting with # are comments
+ *
+ * Example:
+
+# download the free Google Video Player from http://video.google.com/
+gvp_version:1.1
+url:http://vp.video.google.com/videodownload?version=0&secureurl=uAAAAMVHt_Q99OwfGxlWVWH7jd6AA_3n4TboaxIELD_kCg3KcBPSxExZFvQv5DGAxrahVg57KZNZvd0EORPBM3xrxTJ3FdLEWBYiduklpviqjE1Q5zLAkiEZaUsUSFtmbBZDTUUBuN9moYY59eK8lpWXsgTbYB1tLVtaxNBpAMRMyVeHoiJ7BzYdENk-PqJeBbr50QbQ83WK87yJAbN2pSRnF-ucCuNMSLBV7wBL4IcxFpYb1WOK-YXkyxY0NtWlPBufTA&sigh=matNCEVSOR8c-3zN9Gtx0zGinwU&begin=0&len=59749&docid=-715862862672743260
+docid:-715862862672743260
+duration:59749
+title:Apple Macintosh 1984 Superbowl Commercial
+description:The now infamous Apple Macintosh commercial aired during the 1984 SuperBowl.
+
  */
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#include <vlc_demux.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include "playlist.h"
 
 #define MAX_LINE 1024
@@ -49,9 +58,7 @@
 struct demux_sys_t
 {
     playlist_t *p_playlist;
-    playlist_item_t *p_current;
-    playlist_item_t *p_item_in_category;
-    int i_parent_id;
+    input_item_t *p_current_input;
 };
 
 /*****************************************************************************
@@ -66,15 +73,24 @@ static int Control( demux_t *p_demux, int i_query, va_list args );
 int E_(Import_GVP)( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
-    byte_t *p_peek;
+    int i_peek, i, b_found = VLC_FALSE;
+    const byte_t *p_peek;
+
+    i_peek = stream_Peek( p_demux->s, &p_peek, MAX_LINE );
 
-    CHECK_PEEK( p_peek, 12 );
-    if( !POKE( p_peek, "gvp_version:", 12 ) )
+    for( i = 0; i < i_peek - (int)sizeof("gvp_version:"); i++ )
     {
-        return VLC_EGENERIC;
+        if( p_peek[i] == 'g' && p_peek[i+1] == 'v' && p_peek[i+2] == 'p' &&
+            !memcmp( p_peek+i, "gvp_version:", sizeof("gvp_version:") - 1 ) )
+        {
+            b_found = VLC_TRUE;
+            break;
+        }
     }
 
-    STANDARD_DEMUX_INIT_MSG(  "using Google Video Playlist (gvp) import" )
+    if( !b_found ) return VLC_EGENERIC;
+
+    STANDARD_DEMUX_INIT_MSG(  "using Google Video Playlist (gvp) import" );
     p_demux->pf_control = Control;
     p_demux->pf_demux = Demux;
     MALLOC_ERR( p_demux->p_sys, demux_sys_t );
@@ -109,13 +125,12 @@ static int Demux( demux_t *p_demux )
     int i_duration = -1;
     char *psz_title = NULL;
     char *psz_description = NULL;
+    input_item_t *p_input;
 
     INIT_PLAYLIST_STUFF;
 
     p_sys->p_playlist = p_playlist;
-    p_sys->p_current = p_current;
-    p_sys->i_parent_id = i_parent_id;
-    p_sys->p_item_in_category = p_item_in_category;
+    p_sys->p_current_input = p_current_input;
 
     while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
     {
@@ -194,10 +209,7 @@ static int Demux( demux_t *p_demux )
         SADD_INFO( "gvp_version", psz_version );
         SADD_INFO( "docid", psz_docid );
         SADD_INFO( "description", psz_description );
-        playlist_AddWhereverNeeded( p_sys->p_playlist, p_input,
-                            p_sys->p_current, p_sys->p_item_in_category,
-                            (p_sys->i_parent_id > 0 ) ? VLC_TRUE: VLC_FALSE,
-                            PLAYLIST_APPEND );
+        input_ItemAddSubItem( p_current_input, p_input );
     }
 
     HANDLE_PLAY_AND_RELEASE;
@@ -210,7 +222,7 @@ static int Demux( demux_t *p_demux )
 
     p_sys->p_playlist = NULL;
 
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )