[vlc-commits] access: dvdread: warn user on ISO9660 dvd master

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu May 18 17:06:02 2017 +0200| [73d247ee20de74e5f8dc318af75ec5b222165cfd] | committer: Francois Cartegnie

access: dvdread: warn user on ISO9660 dvd master

dvdread has no support outside of expected UDF

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=73d247ee20de74e5f8dc318af75ec5b222165cfd
---

 modules/access/dvdread.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index d18dda1f20..b479b9eeee 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -208,6 +208,16 @@ static int Open( vlc_object_t *p_this )
     /* Ifo allocation & initialisation */
     if( !( p_vmg_file = ifoOpen( p_dvdread, 0 ) ) )
     {
+        char rgsz_volid[32];
+        if( DVDUDFVolumeInfo( p_dvdread, rgsz_volid, 32, NULL, 0 ) )
+        {
+            if( DVDISOVolumeInfo( p_dvdread, rgsz_volid, 32, NULL, 0 ) == 0 )
+            {
+                vlc_dialog_display_error( p_demux, _("Playback failure"),
+                              _("Cannot play a non UDF mastered DVD. (Found ISO9660 '%s')"), rgsz_volid );
+                msg_Err( p_demux, "Invalid UDF DVD. (Found ISO9660 '%s')", rgsz_volid );
+            }
+        }
         msg_Warn( p_demux, "cannot open VMG info" );
         return VLC_EGENERIC;
     }