From 6f02f88baf7c346ec4d686c73944ee96edfb5aed Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 27 Jan 2009 22:51:30 +0100 Subject: [PATCH] Zip: don't use hacks but rewrite the path. + remove MTU + fix copyright Thanks a lot fenrir for this psz_path --- modules/access/zip/zip.h | 4 ++-- modules/access/zip/zipaccess.c | 10 +--------- modules/access/zip/zipstream.c | 32 +++++++------------------------- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/modules/access/zip/zip.h b/modules/access/zip/zip.h index e6dde5a97e..c78a6ca044 100644 --- a/modules/access/zip/zip.h +++ b/modules/access/zip/zip.h @@ -1,7 +1,7 @@ /***************************************************************************** - * zip.h: Module (access+demux) to extract different archives, based on zlib + * zip.h: Module (access+filter) to extract different archives, based on zlib ***************************************************************************** - * Copyright (C) 2007 the VideoLAN team + * Copyright (C) 2009 the VideoLAN team * $Id$ * * Authors: Jean-Philippe André diff --git a/modules/access/zip/zipaccess.c b/modules/access/zip/zipaccess.c index a30e69640c..d60f3dcb84 100644 --- a/modules/access/zip/zipaccess.c +++ b/modules/access/zip/zipaccess.c @@ -1,7 +1,7 @@ /***************************************************************************** * zipaccess.c: Module (access) to extract different archives, based on zlib ***************************************************************************** - * Copyright (C) 2007 the VideoLAN team + * Copyright (C) 2009 the VideoLAN team * $Id$ * * Authors: Jean-Philippe André @@ -155,7 +155,6 @@ void AccessClose( vlc_object_t *p_this ) free( p_sys->fileFunctions ); free( p_sys ); } - var_Destroy( p_access, "zip-no-xspf" ); } /** ************************************************************************** @@ -164,7 +163,6 @@ void AccessClose( vlc_object_t *p_this ) static int AccessControl( access_t *p_access, int i_query, va_list args ) { bool *pb_bool; - int *pi_int; int64_t *pi_64; switch( i_query ) @@ -182,12 +180,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args ) *pb_bool = false; break; - /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); *pi_64 = DEFAULT_PTS_DELAY; diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c index af2adcc1c4..6596cd6a16 100644 --- a/modules/access/zip/zipstream.c +++ b/modules/access/zip/zipstream.c @@ -1,7 +1,7 @@ /***************************************************************************** * zipstream.c: stream_filter that creates a XSPF playlist from a Zip archive ***************************************************************************** - * Copyright (C) 2007 the VideoLAN team + * Copyright (C) 2009 the VideoLAN team * $Id$ * * Authors: Jean-Philippe André @@ -51,7 +51,7 @@ vlc_module_begin() add_submodule() set_subcategory( SUBCAT_INPUT_ACCESS ) set_description( _( "Zip access" ) ) - set_capability( "access", 70 ) + set_capability( "access", 0 ) add_shortcut( "unzip" ) add_shortcut( "zip" ) set_callbacks( AccessOpen, AccessClose ) @@ -211,26 +211,15 @@ int StreamOpen( vlc_object_t *p_this ) } /* Find the stream uri */ - /* FIXME FIXME FIXME */ - input_thread_t *p_input_thread = (input_thread_t*) - vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); - if( !p_input_thread ) - { - free( p_sys ); - free( p_sys->fileFunctions ); - return VLC_EGENERIC; - } - input_item_t *p_input_item = input_GetItem( p_input_thread ); - if( !p_input_item ) + char *psz_tmp; + if( asprintf( &psz_tmp, "%s.xspf", s->psz_path ) == -1 ) { free( p_sys ); free( p_sys->fileFunctions ); - return VLC_EGENERIC; + return VLC_ENOMEM; } - s->p_sys->psz_path = strdup( p_input_item->psz_uri ); - vlc_gc_decref( p_input_item ); -// vlc_object_release( p_input_thread ); - /* FIXME FIXME FIXME */ + p_sys->psz_path = s->psz_path; + s->psz_path = psz_tmp; return VLC_SUCCESS; } @@ -340,13 +329,6 @@ static int Control( stream_t *s, int i_query, va_list args ) return VLC_SUCCESS; } - case STREAM_GET_MTU: - { - int *pi_mtu = (int*)va_arg( args, int* ); - *pi_mtu = 0; - return VLC_SUCCESS; - } - case STREAM_GET_CONTENT_TYPE: return VLC_EGENERIC; -- 2.39.2