vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Mon Feb 24 20:57:13 2020 +0100| [99785abdf1bdb7d0aa4ef234036e81668b79b318] | committer: Francois Cartegnie
access: dvdnav: use new open2 (cherry picked from commit 1a55c0b93b1b7eeab801a4ad281556641e4ee35f) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=99785abdf1bdb7d0aa4ef234036e81668b79b318 --- modules/access/dvdnav.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 2120cb01a2..f8292d62a4 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -191,6 +191,13 @@ static int EventMouse( vlc_object_t *, char const *, static int EventIntf( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); +#if DVDNAV_VERSION >= 60100 +static void DvdNavLog( void *foo, dvdnav_logger_level_t i, const char *p, va_list z) +{ + msg_GenericVa( (demux_t*)foo, i, p, z ); +} +#endif + /***************************************************************************** * CommonOpen: *****************************************************************************/ @@ -360,7 +367,13 @@ static int AccessDemuxOpen ( vlc_object_t *p_this ) /* Open dvdnav */ psz_path = ToLocale( psz_file ); - if( dvdnav_open( &p_dvdnav, psz_path ) != DVDNAV_STATUS_OK ) +#if DVDNAV_VERSION >= 60100 + dvdnav_logger_cb cbs; + cbs.pf_log = DvdNavLog; + if( dvdnav_open2( &p_dvdnav, p_demux, &cbs, psz_path ) != DVDNAV_STATUS_OK ) +#else + if( dvdnav_open( &p_dvdnav, psz_path ) != DVDNAV_STATUS_OK ) +#endif { msg_Warn( p_demux, "cannot open DVD (%s)", psz_file); @@ -424,14 +437,14 @@ static int StreamProbeDVD( stream_t *s ) /***************************************************************************** * dvdnav stream callbacks *****************************************************************************/ -static int stream_cb_seek( void *s, uint64_t pos ) +static int stream_cb_seek( void *demux, uint64_t pos ) { - return vlc_stream_Seek( (stream_t *)s, pos ); + return vlc_stream_Seek( ((demux_t *)demux)->s, pos ); } -static int stream_cb_read( void *s, void* buffer, int size ) +static int stream_cb_read( void *demux, void* buffer, int size ) { - return vlc_stream_Read( (stream_t *)s, buffer, size ); + return vlc_stream_Read( ((demux_t *)demux)->s, buffer, size ); } /***************************************************************************** @@ -466,8 +479,15 @@ static int DemuxOpen ( vlc_object_t *p_this ) }; /* Open dvdnav with stream callbacks */ - if( dvdnav_open_stream( &p_dvdnav, p_demux->s, +#if DVDNAV_VERSION >= 60100 + dvdnav_logger_cb cbs; + cbs.pf_log = DvdNavLog; + if( dvdnav_open_stream2( &p_dvdnav, p_demux, + &cbs, &stream_cb ) != DVDNAV_STATUS_OK ) +#else + if( dvdnav_open_stream( &p_dvdnav, p_demux, &stream_cb ) != DVDNAV_STATUS_OK ) +#endif { msg_Warn( p_demux, "cannot open DVD with open_stream" ); return VLC_EGENERIC; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits