libdvdnav.hg: vm/vm.c comparison

comparison vm/vm.c @ 256:6299ccea8a38 src

killing a lot of asserts and turning them into forced executions of Exit, moving the VM into the STOP domain; also use this condition to report failures right on VM start as problems with the disc (patch heavily inspired by Bastien)

author	mroi
date	Wed, 15 Dec 2004 21:16:58 +0000
parents	f78669338b49
children	97ad00b13609

comparison

equal deleted inserted replaced

-:3e5192f8113f
+:6299ccea8a38
 } else {
 fprintf(MSG_OUT, "NAME OPEN FAILED\n");
 }
 }
-static void ifoOpenNewVTSI(vm_t *vm, dvd_reader_t *dvd, int vtsN) {
+static int ifoOpenNewVTSI(vm_t *vm, dvd_reader_t *dvd, int vtsN) {
 if((vm->state).vtsN == vtsN) {
-return; /*  We alread have it */
+return 1; /*  We alread have it */
 }
 if(vm->vtsi != NULL)
 ifoClose(vm->vtsi);
 vm->vtsi = ifoOpenVTSI(dvd, vtsN);
 if(vm->vtsi == NULL) {
-fprintf(MSG_OUT, "libdvdnav: ifoOpenVTSI failed - CRASHING!!!\n");
+fprintf(MSG_OUT, "libdvdnav: ifoOpenVTSI failed\n");
-assert(0);
+return 0;
 }
 if(!ifoRead_VTS_PTT_SRPT(vm->vtsi)) {
-fprintf(MSG_OUT, "libdvdnav: ifoRead_VTS_PTT_SRPT failed - CRASHING!!!\n");
+fprintf(MSG_OUT, "libdvdnav: ifoRead_VTS_PTT_SRPT failed\n");
-assert(0);
+return 0;
 }
 if(!ifoRead_PGCIT(vm->vtsi)) {
-fprintf(MSG_OUT, "libdvdnav: ifoRead_PGCIT failed - CRASHING!!!\n");
+fprintf(MSG_OUT, "libdvdnav: ifoRead_PGCIT failed\n");
-assert(0);
+return 0;
 }
 if(!ifoRead_PGCI_UT(vm->vtsi)) {
-fprintf(MSG_OUT, "libdvdnav: ifoRead_PGCI_UT failed - CRASHING!!!\n");
+fprintf(MSG_OUT, "libdvdnav: ifoRead_PGCI_UT failed\n");
-assert(0);
+return 0;
 }
 if(!ifoRead_VOBU_ADMAP(vm->vtsi)) {
-fprintf(MSG_OUT, "libdvdnav: ifoRead_VOBU_ADMAP vtsi failed - CRASHING\n");
+fprintf(MSG_OUT, "libdvdnav: ifoRead_VOBU_ADMAP vtsi failed\n");
-assert(0);
+return 0;
 }
 if(!ifoRead_TITLE_VOBU_ADMAP(vm->vtsi)) {
-fprintf(MSG_OUT, "libdvdnav: ifoRead_TITLE_VOBU_ADMAP vtsi failed - CRASHING\n");
+fprintf(MSG_OUT, "libdvdnav: ifoRead_TITLE_VOBU_ADMAP vtsi failed\n");
-assert(0);
+return 0;
 }
 (vm->state).vtsN = vtsN;
+return 1;
 }
 /* Initialisation & Destruction */
 }
 /* Basic Handling */
-void vm_start(vm_t *vm) {
+int vm_start(vm_t *vm) {
 /* Set pgc to FP (First Play) pgc */
 set_FP_PGC(vm);
 process_command(vm, play_PGC(vm));
+return !vm->stopped;
 }
 void vm_stop(vm_t *vm) {
 if(vm->vmgi) {
 ifoClose(vm->vmgi);
 /* open a new vtsi handle, because the copy might switch to another VTS */
 target->vtsi = NULL;
 vtsN = (target->state).vtsN;
 if (vtsN > 0) {
 (target->state).vtsN = 0;
-ifoOpenNewVTSI(target, target->dvd, vtsN);
+if (!ifoOpenNewVTSI(target, target->dvd, vtsN))
+assert(0);
 /* restore pgc pointer into the new vtsi */
 if (!set_PGCN(target, pgcN))
 assert(0);
 (target->state).pgN = pgN;
 /* Link to Next Program Chain */
 /* BUTTON number:data1 */
 if(link_values.data1 != 0)
 	(vm->state).HL_BTNN_REG = link_values.data1 << 10;
 assert((vm->state).pgc->next_pgc_nr != 0);
-if(!set_PGCN(vm, (vm->state).pgc->next_pgc_nr))
+if(set_PGCN(vm, (vm->state).pgc->next_pgc_nr))
-	assert(0);
+	link_values = play_PGC(vm);
-link_values = play_PGC(vm);
+else
+	link_values.command = Exit;
 break;
 case LinkPrevPGC:
 /* Link to Previous Program Chain */
 /* BUTTON number:data1 */
 if(link_values.data1 != 0)
 	(vm->state).HL_BTNN_REG = link_values.data1 << 10;
 assert((vm->state).pgc->prev_pgc_nr != 0);
-if(!set_PGCN(vm, (vm->state).pgc->prev_pgc_nr))
+if(set_PGCN(vm, (vm->state).pgc->prev_pgc_nr))
-	assert(0);
+	link_values = play_PGC(vm);
-link_values = play_PGC(vm);
+else
+	link_values.command = Exit;
 break;
 case LinkGoUpPGC:
 /* Link to GoUp Program Chain */
 /* BUTTON number:data1 */
 if(link_values.data1 != 0)
 	(vm->state).HL_BTNN_REG = link_values.data1 << 10;
 assert((vm->state).pgc->goup_pgc_nr != 0);
-if(!set_PGCN(vm, (vm->state).pgc->goup_pgc_nr))
+if(set_PGCN(vm, (vm->state).pgc->goup_pgc_nr))
-	assert(0);
+	link_values = play_PGC(vm);
-link_values = play_PGC(vm);
+else
+	link_values.command = Exit;
 break;
 case LinkTailPGC:
 /* Link to Tail of Program Chain */
 /* BUTTON number:data1 */
 if(link_values.data1 != 0)
 	  link_values.command = Exit;
 	  break;
 	}
 	(vm->state).domain = VTS_DOMAIN;
-	ifoOpenNewVTSI(vm, vm->dvd, (vm->state).rsm_vtsN);
+	if (!ifoOpenNewVTSI(vm, vm->dvd, (vm->state).rsm_vtsN))
+	  assert(0);
 	set_PGCN(vm, (vm->state).rsm_pgcN);
 	/* These should never be set in SystemSpace and/or MenuSpace */
 	/* (vm->state).TTN_REG = rsm_tt; ?? */
 	/* (vm->state).TT_PGCN_REG = (vm->state).rsm_pgcN; ?? */
 /* Only allowed from the First Play domain(PGC) */
 /* or the Video Manager domain (VMG) */
 /* Stop SPRM9 Timer */
 /* Set SPRM1 and SPRM2 */
 assert((vm->state).domain == VMGM_DOMAIN || (vm->state).domain == FP_DOMAIN); /* ?? */
-if(!set_TT(vm, link_values.data1))
+if(set_TT(vm, link_values.data1))
-	assert(0);
+link_values = play_PGC(vm);
-link_values = play_PGC(vm);
+else
+	link_values.command = Exit;
 break;
 case JumpVTS_TT:
 /* Jump to Title:data1 in same VTS Title Domain */
 /* Only allowed from the VTS Menu Domain(VTSM) */
 /* or the Video Title Set Domain(VTS) */
 if(link_values.data1 != 0) {
 	if (link_values.data1 != (vm->state).vtsN) {
 	  /* the normal case */
 	  assert((vm->state).domain == VMGM_DOMAIN || (vm->state).domain == FP_DOMAIN); /* ?? */
 	  (vm->state).domain = VTSM_DOMAIN;
-	  ifoOpenNewVTSI(vm, vm->dvd, link_values.data1);  /* Also sets (vm->state).vtsN */
+	  if (!ifoOpenNewVTSI(vm, vm->dvd, link_values.data1))  /* Also sets (vm->state).vtsN */
+	    assert(0);
 	} else {
 	  /* This happens on some discs like "Captain Scarlet & the Mysterons" or
 	   * the German RC2 of "Anatomie" in VTSM. */
 	  assert((vm->state).domain == VTSM_DOMAIN ||
 	    (vm->state).domain == VMGM_DOMAIN || (vm->state).domain == FP_DOMAIN); /* ?? */
 static int set_VTS_PTT(vm_t *vm, int vtsN, int vts_ttn, int part) {
 int pgcN, pgN, res;
 (vm->state).domain = VTS_DOMAIN;
-if(vtsN != (vm->state).vtsN)
+if (vtsN != (vm->state).vtsN)
-ifoOpenNewVTSI(vm, vm->dvd, vtsN);  /* Also sets (vm->state).vtsN */
+if (!ifoOpenNewVTSI(vm, vm->dvd, vtsN))  /* Also sets (vm->state).vtsN */
+return 0;
 if ((vts_ttn < 1) || (vts_ttn > vm->vtsi->vts_ptt_srpt->nr_of_srpts) ||
 (part < 1) || (part > vm->vtsi->vts_ptt_srpt->title[vts_ttn - 1].nr_of_ptts) ) {
 return 0;
 }

Mercurial > libdvdnav.hg

comparison vm/vm.c @ 256:6299ccea8a38 src