vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Jun 3 22:58:18 2017 +0300| [1d1ed7e080f846e9c432f369a6b11ae512f60364] | committer: Rémi Denis-Courmont
playlist: remove dead code > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d1ed7e080f846e9c432f369a6b11ae512f60364 --- modules/demux/playlist/playlist.c | 39 --------------------------------------- modules/demux/playlist/playlist.h | 17 +---------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c index 80432d2113..449d5fd5b7 100644 --- a/modules/demux/playlist/playlist.c +++ b/modules/demux/playlist/playlist.c @@ -132,45 +132,6 @@ vlc_module_begin () set_callbacks( Import_WPL, Close_WPL ) vlc_module_end () -int Control(demux_t *demux, int query, va_list args) -{ - (void) demux; - switch( query ) - { - case DEMUX_IS_PLAYLIST: - { - bool *pb_bool = va_arg( args, bool * ); - *pb_bool = true; - return VLC_SUCCESS; - } - case DEMUX_GET_META: - { - return vlc_stream_vaControl(demux->s, STREAM_GET_META, args); - } - case DEMUX_HAS_UNSUPPORTED_META: - { - *(va_arg( args, bool * )) = false; - return VLC_SUCCESS; - } - } - return VLC_EGENERIC; -} - -/** - * Computes the base URL. - * - * Rebuilds the base URL for the playlist. - */ -char *(FindPrefix)(demux_t *p_demux) -{ - char *url; - - if (unlikely(asprintf(&url, "%s://%s", p_demux->psz_access, - p_demux->psz_location) == -1)) - url = NULL; - return url; -} - /** * Resolves a playlist location. * diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h index e470373db6..1a763c5ef7 100644 --- a/modules/demux/playlist/playlist.h +++ b/modules/demux/playlist/playlist.h @@ -22,11 +22,8 @@ *****************************************************************************/ #include <vlc_input.h> -#include <vlc_demux.h> -int Control(demux_t *, int, va_list); char *ProcessMRL( const char *, const char * ); -char *FindPrefix( demux_t * ); int Import_Old ( vlc_object_t * ); @@ -68,10 +65,7 @@ void Close_WPL ( vlc_object_t * ); int Import_Dir ( vlc_object_t * ); #define GetCurrentItem(obj) input_GetItem((obj)->p_input) -#define GetSource(obj) \ - (_Generic((obj), \ - demux_t *: ((demux_t *)(obj))->s, \ - stream_t *: ((stream_t *)(obj))->p_source)) +#define GetSource(obj) ((obj)->p_source) #define CHECK_FILE(obj) \ do { \ @@ -79,12 +73,3 @@ do { \ STREAM_IS_DIRECTORY ) == VLC_SUCCESS ) \ return VLC_EGENERIC; \ } while(0) - -#define FindPrefix(obj) \ - (_Generic((obj), \ - demux_t *: FindPrefix((demux_t *)(obj)), \ - stream_t *: strdup(((stream_t *)(obj))->psz_url))) - -#define STANDARD_DEMUX_INIT_MSG( msg ) do { \ - DEMUX_INIT_COMMON(); \ - msg_Dbg( p_demux, "%s", msg ); } while(0) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
