]> git.sesse.net Git - vlc/blobdiff - modules/demux/playlist/qtl.c
b4s: memory leak
[vlc] / modules / demux / playlist / qtl.c
index eabd67464b20a1a9b179ad1814eef7d246294695..958b29e0afd783c8703515c0843ac306dbc98ea9 100644 (file)
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * qtl.c: QuickTime Media Link Importer
  *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea -@t- videolan -Dot- 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.
  *****************************************************************************/
 
 /*
@@ -47,303 +47,182 @@ volume - 0 (mute) - 100 (max)
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
 
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#include "playlist.h"
-#include "vlc_xml.h"
-
-struct demux_sys_t
-{
-    playlist_t *p_playlist;
-    playlist_item_t *p_current;
-    playlist_item_t *p_item_in_category;
-    int i_parent_id;
+#include <vlc_common.h>
+#include <vlc_demux.h>
 
-    xml_t *p_xml;
-    xml_reader_t *p_xml_reader;
-};
+#include "playlist.h"
+#include <vlc_xml.h>
+#include <vlc_strings.h>
 
 typedef enum { FULLSCREEN_NORMAL,
                FULLSCREEN_DOUBLE,
                FULLSCREEN_HALF,
                FULLSCREEN_CURRENT,
                FULLSCREEN_FULL } qtl_fullscreen_t;
-char* ppsz_fullscreen[] = { "normal", "double", "half", "current", "full" };
+const char* ppsz_fullscreen[] = { "normal", "double", "half", "current", "full" };
 typedef enum { LOOP_TRUE,
                LOOP_FALSE,
                LOOP_PALINDROME } qtl_loop_t;
-char* ppsz_loop[] = { "true", "false", "palindrome" };
+const char* ppsz_loop[] = { "true", "false", "palindrome" };
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
 static int Demux( demux_t *p_demux);
-static int Control( demux_t *p_demux, int i_query, va_list args );
 
 /*****************************************************************************
  * Import_QTL: main import function
  *****************************************************************************/
-int E_(Import_QTL)( vlc_object_t *p_this )
-{
-    DEMUX_BY_EXTENSION_MSG( ".qtl", "using QuickTime Media Link reader" );
-    p_demux->p_sys->p_playlist = NULL;
-    p_demux->p_sys->p_xml = NULL;
-    p_demux->p_sys->p_xml_reader = NULL;
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-void E_(Close_QTL)( vlc_object_t *p_this )
+int Import_QTL( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
-    demux_sys_t *p_sys = p_demux->p_sys;
 
-    if( p_sys->p_playlist )
-        vlc_object_release( p_sys->p_playlist );
-    if( p_sys->p_xml_reader )
-        xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader );
-    if( p_sys->p_xml )
-        xml_Delete( p_sys->p_xml );
-    free( p_sys );
+    if( !demux_IsPathExtension( p_demux, ".qtl" ) )
+        return VLC_EGENERIC;
+
+    p_demux->pf_demux = Demux;
+    p_demux->pf_control = Control;
+    msg_Dbg( p_demux, "using QuickTime Media Link reader" );
+
+    return VLC_SUCCESS;
 }
 
 static int Demux( demux_t *p_demux )
 {
-    demux_sys_t *p_sys = p_demux->p_sys;
-    xml_t *p_xml;
     xml_reader_t *p_xml_reader;
-    char *psz_eltname = NULL;
+    const char *node;
+    input_item_t *p_input;
+    int i_ret = -1;
 
     /* List of all possible attributes. The only required one is "src" */
-    vlc_bool_t b_autoplay = VLC_FALSE;
-    vlc_bool_t b_controler = VLC_TRUE;
-    qtl_fullscreen_t fullscreen = VLC_FALSE;
+    bool b_autoplay = false;
+    bool b_controler = true;
+    qtl_fullscreen_t fullscreen = false;
     char *psz_href = NULL;
-    vlc_bool_t b_kioskmode = VLC_FALSE;
+    bool b_kioskmode = false;
     qtl_loop_t loop = LOOP_FALSE;
     int i_movieid = -1;
     char *psz_moviename = NULL;
-    vlc_bool_t b_playeveryframe = VLC_FALSE;
+    bool b_playeveryframe = false;
     char *psz_qtnext = NULL;
-    vlc_bool_t b_quitwhendone = VLC_FALSE;
+    bool b_quitwhendone = false;
     char *psz_src = NULL;
     char *psz_mimetype = NULL;
     int i_volume = 100;
 
-    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_xml = p_sys->p_xml = xml_Create( p_demux );
-    if( !p_xml ) return -1;
+    input_item_t *p_current_input = GetCurrentItem(p_demux);
 
-    p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
-    if( !p_xml_reader ) return -1;
-    p_sys->p_xml_reader = p_xml_reader;
+    p_xml_reader = xml_ReaderCreate( p_demux, p_demux->s );
+    if( !p_xml_reader )
+        goto error;
 
     /* check root node */
-    if( xml_ReaderRead( p_xml_reader ) != 1 )
-    {
-        msg_Err( p_demux, "invalid file (no root node)" );
-        return -1;
-    }
-
-    if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ||
-        ( psz_eltname = xml_ReaderName( p_xml_reader ) ) == NULL ||
-        strcmp( psz_eltname, "embed" ) )
+    if( xml_ReaderNextNode( p_xml_reader, &node ) != XML_READER_STARTELEM
+     || strcmp( node, "embed" ) )
     {
-        msg_Err( p_demux, "invalid root node %i, %s",
-                 xml_ReaderNodeType( p_xml_reader ), psz_eltname );
-        FREE( psz_eltname );
+        msg_Err( p_demux, "invalid root node <%s>", node );
 
         /* second line has <?quicktime tag ... so we try to skip it */
         msg_Dbg( p_demux, "trying to read one more node" );
-        xml_ReaderRead( p_xml_reader );
-        if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ||
-            ( psz_eltname = xml_ReaderName( p_xml_reader ) ) == NULL ||
-            strcmp( psz_eltname, "embed" ) )
+        if( xml_ReaderNextNode( p_xml_reader, &node ) != XML_READER_STARTELEM
+         || strcmp( node, "embed" ) )
         {
-            msg_Err( p_demux, "invalid root node %i, %s",
-                     xml_ReaderNodeType( p_xml_reader ), psz_eltname );
-            FREE( psz_eltname );
-            return -1;
+            msg_Err( p_demux, "invalid root node <%s>", node );
+            goto error;
         }
     }
-    FREE( psz_eltname );
 
-    while( xml_ReaderNextAttr( p_sys->p_xml_reader ) == VLC_SUCCESS )
+    const char *attrname, *value;
+    while( (attrname = xml_ReaderNextAttr( p_xml_reader, &value )) != NULL )
     {
-        char *psz_attrname = xml_ReaderName( p_sys->p_xml_reader );
-        char *psz_attrvalue = xml_ReaderValue( p_sys->p_xml_reader );
-
-        if( !psz_attrname || !psz_attrvalue )
-        {
-            FREE( psz_attrname );
-            FREE( psz_attrvalue );
-            return -1;
-        }
-
-        if( !strcmp( psz_attrname, "autoplay" ) )
+        if( !strcmp( attrname, "autoplay" ) )
+            b_autoplay = !strcmp( value, "true" );
+        else if( !strcmp( attrname, "controler" ) )
+            b_controler = !strcmp( attrname, "false" );
+        else if( !strcmp( attrname, "fullscreen" ) )
         {
-            if( !strcmp( psz_attrvalue, "true" ) )
-            {
-                b_autoplay = VLC_TRUE;
-            }
-            else
-            {
-                b_autoplay = VLC_FALSE;
-            }
-        }
-        else if( !strcmp( psz_attrname, "controler" ) )
-        {
-            if( !strcmp( psz_attrvalue, "false" ) )
-            {
-                b_controler = VLC_FALSE;
-            }
-            else
-            {
-                b_controler = VLC_TRUE;
-            }
-        }
-        else if( !strcmp( psz_attrname, "fullscreen" ) )
-        {
-            if( !strcmp( psz_attrvalue, "double" ) )
-            {
+            if( !strcmp( value, "double" ) )
                 fullscreen = FULLSCREEN_DOUBLE;
-            }
-            else if( !strcmp( psz_attrvalue, "half" ) )
-            {
+            else if( !strcmp( value, "half" ) )
                 fullscreen = FULLSCREEN_HALF;
-            }
-            else if( !strcmp( psz_attrvalue, "current" ) )
-            {
+            else if( !strcmp( value, "current" ) )
                 fullscreen = FULLSCREEN_CURRENT;
-            }
-            else if( !strcmp( psz_attrvalue, "full" ) )
-            {
+            else if( !strcmp( value, "full" ) )
                 fullscreen = FULLSCREEN_FULL;
-            }
             else
-            {
                 fullscreen = FULLSCREEN_NORMAL;
-            }
-        }
-        else if( !strcmp( psz_attrname, "href" ) )
-        {
-            psz_href = psz_attrvalue;
-            psz_attrvalue = NULL;
         }
-        else if( !strcmp( psz_attrname, "kioskmode" ) )
+        else if( !strcmp( attrname, "href" ) )
         {
-            if( !strcmp( psz_attrvalue, "true" ) )
-            {
-                b_kioskmode = VLC_TRUE;
-            }
-            else
-            {
-                b_kioskmode = VLC_FALSE;
-            }
+            free( psz_href );
+            psz_href = strdup( value );
         }
-        else if( !strcmp( psz_attrname, "loop" ) )
+        else if( !strcmp( attrname, "kioskmode" ) )
+            b_kioskmode = !strcmp( value, "true" );
+        else if( !strcmp( attrname, "loop" ) )
         {
-            if( !strcmp( psz_attrvalue, "true" ) )
-            {
+            if( !strcmp( value, "true" ) )
                 loop = LOOP_TRUE;
-            }
-            else if( !strcmp( psz_attrvalue, "palindrome" ) )
-            {
+            else if( !strcmp( value, "palindrome" ) )
                 loop = LOOP_PALINDROME;
-            }
             else
-            {
                 loop = LOOP_FALSE;
-            }
-        }
-        else if( !strcmp( psz_attrname, "movieid" ) )
-        {
-            i_movieid = atoi( psz_attrvalue );
-        }
-        else if( !strcmp( psz_attrname, "moviename" ) )
-        {
-            psz_moviename = psz_attrvalue;
-            psz_attrvalue = NULL;
-        }
-        else if( !strcmp( psz_attrname, "playeveryframe" ) )
-        {
-            if( !strcmp( psz_attrvalue, "true" ) )
-            {
-                b_playeveryframe = VLC_TRUE;
-            }
-            else
-            {
-                b_playeveryframe = VLC_FALSE;
-            }
-        }
-        else if( !strcmp( psz_attrname, "qtnext" ) )
-        {
-            psz_qtnext = psz_attrvalue;
-            psz_attrvalue = NULL;
         }
-        else if( !strcmp( psz_attrname, "quitwhendone" ) )
+        else if( !strcmp( attrname, "movieid" ) )
+            i_movieid = atoi( value );
+        else if( !strcmp( attrname, "moviename" ) )
         {
-            if( !strcmp( psz_attrvalue, "true" ) )
-            {
-                b_quitwhendone = VLC_TRUE;
-            }
-            else
-            {
-                b_quitwhendone = VLC_FALSE;
-            }
+            free( psz_moviename );
+            psz_moviename = strdup( value );
         }
-        else if( !strcmp( psz_attrname, "src" ) )
+        else if( !strcmp( attrname, "playeveryframe" ) )
+            b_playeveryframe = !strcmp( value, "true" );
+        else if( !strcmp( attrname, "qtnext" ) )
         {
-            psz_src = psz_attrvalue;
-            psz_attrvalue = NULL;
+            free( psz_qtnext );
+            psz_qtnext = strdup( value );
         }
-        else if( !strcmp( psz_attrname, "mimetype" ) )
+        else if( !strcmp( attrname, "quitwhendone" ) )
+            b_quitwhendone = !strcmp( value, "true" );
+        else if( !strcmp( attrname, "src" ) )
         {
-            psz_mimetype = psz_attrvalue;
-            psz_attrvalue = NULL;
+            free( psz_src );
+            psz_src = strdup( value );
         }
-        else if( !strcmp( psz_attrname, "volume" ) )
+        else if( !strcmp( attrname, "mimetype" ) )
         {
-            i_volume = atoi( psz_attrvalue );
+            free( psz_mimetype );
+            psz_mimetype = strdup( value );
         }
+        else if( !strcmp( attrname, "volume" ) )
+            i_volume = atoi( value );
         else
-        {
             msg_Dbg( p_demux, "Attribute %s with value %s isn't valid",
-                     psz_attrname, psz_attrvalue );
-        }
-        FREE( psz_attrname );
-        FREE( psz_attrvalue );
+                     attrname, value );
     }
 
     msg_Dbg( p_demux, "autoplay: %s (unused by VLC)",
-             b_autoplay==VLC_TRUE ? "true": "false" );
+             b_autoplay ? "true": "false" );
     msg_Dbg( p_demux, "controler: %s (unused by VLC)",
-             b_controler==VLC_TRUE?"true": "false" );
+             b_controler ? "true": "false" );
     msg_Dbg( p_demux, "fullscreen: %s (unused by VLC)",
              ppsz_fullscreen[fullscreen] );
     msg_Dbg( p_demux, "href: %s", psz_href );
     msg_Dbg( p_demux, "kioskmode: %s (unused by VLC)",
-             b_kioskmode==VLC_TRUE?"true":"false" );
+             b_kioskmode ? "true":"false" );
     msg_Dbg( p_demux, "loop: %s (unused by VLC)", ppsz_loop[loop] );
     msg_Dbg( p_demux, "movieid: %d (unused by VLC)", i_movieid );
     msg_Dbg( p_demux, "moviename: %s", psz_moviename );
     msg_Dbg( p_demux, "playeverframe: %s (unused by VLC)",
-             b_playeveryframe==VLC_TRUE?"true":"false" );
+             b_playeveryframe ? "true":"false" );
     msg_Dbg( p_demux, "qtnext: %s", psz_qtnext );
     msg_Dbg( p_demux, "quitwhendone: %s (unused by VLC)",
-             b_quitwhendone==VLC_TRUE?"true":"false" );
+             b_quitwhendone ? "true":"false" );
     msg_Dbg( p_demux, "src: %s", psz_src );
     msg_Dbg( p_demux, "mimetype: %s", psz_mimetype );
     msg_Dbg( p_demux, "volume: %d (unused by VLC)", i_volume );
@@ -355,42 +234,36 @@ static int Demux( demux_t *p_demux )
     }
     else
     {
-        p_input = input_ItemNewExt( p_sys->p_playlist,
-                                psz_src, psz_moviename, 0, NULL, -1 );
-#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
-                    p_input, "QuickTime Media Link", _(type), "%s", field ) ; }
+        input_item_node_t *p_subitems = input_item_node_Create( p_current_input );
+        p_input = input_item_New( psz_src, psz_moviename );
+#define SADD_INFO( type, field ) if( field ) { input_item_AddInfo( \
+                    p_input, "QuickTime Media Link", type, "%s", field ) ; }
         SADD_INFO( "href", psz_href );
-        SADD_INFO( "mime type", psz_mimetype );
-        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 );
-
+        SADD_INFO( _("Mime"), psz_mimetype );
+        input_item_node_AppendItem( p_subitems, p_input );
+        vlc_gc_decref( p_input );
         if( psz_qtnext )
         {
-            p_input = input_ItemNewExt( p_sys->p_playlist,
-                                        psz_qtnext, NULL, 0, NULL, -1 );
-            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 );
+            resolve_xml_special_chars( psz_qtnext );
+            p_input = input_item_New( psz_qtnext, NULL );
+            input_item_node_AppendItem( p_subitems, p_input );
+            vlc_gc_decref( p_input );
         }
+        input_item_node_PostAndDelete( p_subitems );
     }
 
-    HANDLE_PLAY_AND_RELEASE;
-
-    p_sys->p_playlist = NULL;
+    i_ret = 0; /* Needed for correct operation of go back */
 
-    FREE( psz_href );
-    FREE( psz_moviename );
-    FREE( psz_qtnext );
-    FREE( psz_src );
-    FREE( psz_mimetype );
+error:
+    if( p_xml_reader )
+        xml_ReaderDelete( p_xml_reader );
 
-    return VLC_SUCCESS;
-}
+    vlc_gc_decref(p_current_input);
 
-static int Control( demux_t *p_demux, int i_query, va_list args )
-{
-    return VLC_EGENERIC;
+    free( psz_href );
+    free( psz_moviename );
+    free( psz_qtnext );
+    free( psz_src );
+    free( psz_mimetype );
+    return i_ret;
 }