"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "modules/access/dvdread.c" between
vlc-3.0.14.tar.xz and vlc-3.0.15.tar.xz

About: VLC (VideoLAN Client) is a multimedia player for various audio and video formats (MPEG-1/2/4, DivX, MP3, Vorbis, Ogg, ...) as well as DVDs, Audio CDs, VCDs, and various streaming protocols.

dvdread.c  (vlc-3.0.14.tar.xz):dvdread.c  (vlc-3.0.15.tar.xz)
/***************************************************************************** /*****************************************************************************
* dvdread.c : DvdRead input module for vlc * dvdread.c : DvdRead input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2006 VLC authors and VideoLAN * Copyright (C) 2001-2006 VLC authors and VideoLAN
* $Id: e75bef5986e987657ff554718d43f16bab440141 $ * $Id: 749cbd47e00a1da57c4277187a9fcab03a217867 $
* *
* Authors: St├ęphane Borel <stef@via.ecp.fr> * Authors: St├ęphane Borel <stef@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org> * Gildas Bazin <gbazin@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify it * 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 * 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 * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
skipping to change at line 214 skipping to change at line 214
if( unlikely(psz_file == NULL) ) if( unlikely(psz_file == NULL) )
return VLC_EGENERIC; return VLC_EGENERIC;
if( DiscProbeMacOSPermission( p_this, psz_file ) != VLC_SUCCESS ) if( DiscProbeMacOSPermission( p_this, psz_file ) != VLC_SUCCESS )
{ {
free( psz_file ); free( psz_file );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
/* Open dvdread */ /* Open dvdread */
#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
/* In libdvdread prior to 6.1.2, UTF8 is not supported for windows and
* requires a prior conversion.
* For non win32/os2 platforms, this is just a no-op */
const char *psz_path = ToLocale( psz_file ); const char *psz_path = ToLocale( psz_file );
#else
const char *psz_path = psz_file;
#endif
#if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0) #if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0)
dvd_logger_cb cbs; dvd_logger_cb cbs;
cbs.pf_log = DvdReadLog; cbs.pf_log = DvdReadLog;
dvd_reader_t *p_dvdread = DVDOpen2( p_demux, &cbs, psz_path ); dvd_reader_t *p_dvdread = DVDOpen2( p_demux, &cbs, psz_path );
#else #else
dvd_reader_t *p_dvdread = DVDOpen( psz_path ); dvd_reader_t *p_dvdread = DVDOpen( psz_path );
#endif #endif
#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
LocaleFree( psz_path ); LocaleFree( psz_path );
#endif
if( p_dvdread == NULL ) if( p_dvdread == NULL )
{ {
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file ); msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file );
vlc_dialog_display_error( p_demux, _("Playback failure"), vlc_dialog_display_error( p_demux, _("Playback failure"),
_("DVDRead could not open the disc \"%s\"."), psz_file ); _("DVDRead could not open the disc \"%s\"."), psz_file );
free( psz_file ); free( psz_file );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
free( psz_file ); free( psz_file );
 End of changes. 5 change blocks. 
1 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)