[vlc-devel] commit: access/access_demux: check psz_access rather than b_force ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 28 20:57:52 2010 +0200| [5c939db25df9daa71b88ae59b1286664f264c9ea] | committer: Rémi Denis-Courmont 

access/access_demux: check psz_access rather than b_force

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

 modules/access/cdda.c    |    3 ++-
 modules/access/dvdnav.c  |    3 ++-
 modules/access/dvdread.c |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 75b8cc0..6dface0 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -142,7 +142,8 @@ static int Open( vlc_object_t *p_this )
     if( !p_access->psz_path || !*p_access->psz_path )
     {
         /* Only when selected */
-        if( !p_this->b_force ) return VLC_EGENERIC;
+        if( !p_access->psz_access || !*p_access->psz_access )
+            return VLC_EGENERIC;
 
         psz_name = var_CreateGetString( p_this, "cd-audio" );
         if( !psz_name || !*psz_name )
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 82dedfb..3743cf8 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -183,7 +183,8 @@ static int Open( vlc_object_t *p_this )
     if( !p_demux->psz_path || !*p_demux->psz_path )
     {
         /* Only when selected */
-        if( !p_this->b_force ) return VLC_EGENERIC;
+        if( !p_demux->psz_access || !*p_demux->psz_access )
+            return VLC_EGENERIC;
 
         psz_name = var_CreateGetString( p_this, "dvd" );
         if( !psz_name )
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 641fab5..bd85846 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -204,7 +204,8 @@ static int Open( vlc_object_t *p_this )
     if( !p_demux->psz_path || !*p_demux->psz_path )
     {
         /* Only when selected */
-        if( !p_this->b_force ) return VLC_EGENERIC;
+        if( !p_demux->psz_access || !*p_demux->psz_access )
+            return VLC_EGENERIC;
 
         psz_name = var_CreateGetString( p_this, "dvd" );
         if( !psz_name )