X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fqtl.c;h=e1585c6dc108c1cf407911a72715c770c8cdcb52;hb=132030acbbe9d9d69bed8e1382515a0060e9bf45;hp=8e892d9e28670a98979396c5abf2f14fafec5ef4;hpb=496d33dc3e1c4be6407291c55ee5abebab4c79b7;p=vlc diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c index 8e892d9e28..e1585c6dc1 100644 --- a/modules/demux/playlist/qtl.c +++ b/modules/demux/playlist/qtl.c @@ -48,7 +48,11 @@ volume - 0 (mute) - 100 (max) * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include "playlist.h" @@ -56,7 +60,6 @@ volume - 0 (mute) - 100 (max) struct demux_sys_t { - playlist_t *p_playlist; input_item_t *p_current_input; xml_t *p_xml; @@ -83,10 +86,9 @@ 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 ) +int 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; @@ -95,13 +97,11 @@ int E_(Import_QTL)( vlc_object_t *p_this ) /***************************************************************************** * Deactivate: frees unused data *****************************************************************************/ -void E_(Close_QTL)( vlc_object_t *p_this ) +void Close_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 ) @@ -118,24 +118,23 @@ static int Demux( demux_t *p_demux ) input_item_t *p_input; /* 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_input = p_current_input; p_xml = p_sys->p_xml = xml_Create( p_demux ); @@ -191,22 +190,22 @@ static int Demux( demux_t *p_demux ) { if( !strcmp( psz_attrvalue, "true" ) ) { - b_autoplay = VLC_TRUE; + b_autoplay = true; } else { - b_autoplay = VLC_FALSE; + b_autoplay = false; } } else if( !strcmp( psz_attrname, "controler" ) ) { if( !strcmp( psz_attrvalue, "false" ) ) { - b_controler = VLC_FALSE; + b_controler = false; } else { - b_controler = VLC_TRUE; + b_controler = true; } } else if( !strcmp( psz_attrname, "fullscreen" ) ) @@ -241,11 +240,11 @@ static int Demux( demux_t *p_demux ) { if( !strcmp( psz_attrvalue, "true" ) ) { - b_kioskmode = VLC_TRUE; + b_kioskmode = true; } else { - b_kioskmode = VLC_FALSE; + b_kioskmode = false; } } else if( !strcmp( psz_attrname, "loop" ) ) @@ -276,11 +275,11 @@ static int Demux( demux_t *p_demux ) { if( !strcmp( psz_attrvalue, "true" ) ) { - b_playeveryframe = VLC_TRUE; + b_playeveryframe = true; } else { - b_playeveryframe = VLC_FALSE; + b_playeveryframe = false; } } else if( !strcmp( psz_attrname, "qtnext" ) ) @@ -292,11 +291,11 @@ static int Demux( demux_t *p_demux ) { if( !strcmp( psz_attrvalue, "true" ) ) { - b_quitwhendone = VLC_TRUE; + b_quitwhendone = true; } else { - b_quitwhendone = VLC_FALSE; + b_quitwhendone = false; } } else if( !strcmp( psz_attrname, "src" ) ) @@ -323,22 +322,22 @@ static int Demux( demux_t *p_demux ) } msg_Dbg( p_demux, "autoplay: %s (unused by VLC)", - b_autoplay==VLC_TRUE ? "true": "false" ); + b_autoplay==true ? "true": "false" ); msg_Dbg( p_demux, "controler: %s (unused by VLC)", - b_controler==VLC_TRUE?"true": "false" ); + b_controler==true?"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?"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?"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?"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 ); @@ -350,25 +349,25 @@ static int Demux( demux_t *p_demux ) } else { - p_input = input_ItemNewExt( p_sys->p_playlist, + p_input = input_ItemNewExt( p_demux, psz_src, psz_moviename, 0, NULL, -1 ); #define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \ p_input, "QuickTime Media Link", _(type), "%s", field ) ; } SADD_INFO( "href", psz_href ); SADD_INFO( "mime type", psz_mimetype ); input_ItemAddSubItem( p_current_input, p_input ); + vlc_gc_decref( p_input ); if( psz_qtnext ) { - p_input = input_ItemNewExt( p_sys->p_playlist, + p_input = input_ItemNewExt( p_demux, psz_qtnext, NULL, 0, NULL, -1 ); input_ItemAddSubItem( p_current_input, p_input ); + vlc_gc_decref( p_input ); } } HANDLE_PLAY_AND_RELEASE; - p_sys->p_playlist = NULL; - free( psz_href ); free( psz_moviename ); free( psz_qtnext ); @@ -380,5 +379,6 @@ static int Demux( demux_t *p_demux ) 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; }