summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2001-10-06 17:57:52 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2001-10-06 17:57:52 +0000
commit8fbac532702fbe9fe399441e7e8ab775de7a4bff (patch)
treecdb856d9ccee23a10aad144a65c268592e5a89b5
parent9ef14fba2ba1d2a5e97e5d1659e7daf97a4a22ba (diff)
downloadxine-lib-8fbac532702fbe9fe399441e7e8ab775de7a4bff.tar.gz
xine-lib-8fbac532702fbe9fe399441e7e8ab775de7a4bff.tar.bz2
Argh, uscsi ioctls do not work any more in solaris9beta (permission denied) on
volume manager devices, so for now just assume the disk is not encrypted, when the DVD_READ_STRUCTURE command fails. CVS patchset: 754 CVS date: 2001/10/06 17:57:52
-rw-r--r--src/input/input_dvd.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index bdb16ca58..ec7bea92c 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.29 2001/10/06 13:46:07 jkeil Exp $
+ * $Id: input_dvd.c,v 1.30 2001/10/06 17:57:52 jkeil Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -263,12 +263,11 @@ static int openDVDFile (dvd_input_plugin_t *this,
dvd.copyright.type = DVD_STRUCT_COPYRIGHT;
dvd.copyright.layer_num = 0;
- if (dvd_read_copyright(this->raw_fd, &dvd) < 0) {
- printf ("input_dvd: Could not read Copyright Structure\n");
- return 0;
- }
-
- encrypted = (dvd.copyright.cpst != 0) ;
+ if (dvd_read_copyright(this->raw_fd, &dvd) < 0)
+ printf ("input_dvd: Could not read Copyright Structure.\n"
+ " Assuming disk is not encrypted.\n");
+ else
+ encrypted = (dvd.copyright.cpst != 0);
}
#endif