[Xineliboutput-cvslog] vdr-xineliboutput/xine/BluRay input_bluray.c, 1.17, 1.18

[Petri H. <phi...@us...>]

Update of /cvsroot/xineliboutput/vdr-xineliboutput/xine/BluRay
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2861

Modified Files:
	input_bluray.c 
Log Message:
Require navigation data


Index: input_bluray.c
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine/BluRay/input_bluray.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- input_bluray.c	28 Nov 2009 12:17:43 -0000	1.17
+++ input_bluray.c	28 Nov 2009 12:22:35 -0000	1.18
@@ -189,7 +189,7 @@
 {
   bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
 
-  if (!this || !this->bdh)
+  if (!this || !this->bdh || !this->nav_title)
     return -1;
 
   /* convert relative seeks to absolute */
@@ -206,7 +206,6 @@
 
   /* clip seek point to nearest random access point */
 
-  if (this->nav_title) {
     uint32_t in_pkt   = offset / PKT_SIZE;
     uint32_t out_pkt  = in_pkt;
     uint32_t out_time = 0;
@@ -214,7 +213,6 @@
     lprintf("bluray_plugin_seek() seeking to %"PRId64" (packet %d)\n", offset, in_pkt);
     offset = (off_t)PKT_SIZE * (off_t)out_pkt;
     lprintf("Nearest random access point at %"PRId64" (packet %d)\n", offset, out_pkt);
-  }
 
   /* clip to aligned unit start */
 
@@ -431,6 +429,7 @@
   this->nav_title = nav_title_open(this->disc_root, this->current_title);
   if (!this->nav_title) {
     LOGMSG("nav_title_open(%s,%s) FAILED\n", this->disc_root, this->current_title);
+    return -1;
   }
 
   /* set stream metainfo */