# HG changeset patch
# User mroi
# Date 1049374110 0
# Node ID 4d14c444c15553cd81768f9bdbc9eb09618ce317
# Parent  19a31f4f57cb729eb45a256ecc8f78cf8e0eb961
merge James changes from xine-lib cvs

diff -r 19a31f4f57cb -r 4d14c444c155 vm.c
--- a/vm.c	Tue Apr 01 11:35:39 2003 +0000
+++ b/vm.c	Thu Apr 03 12:48:30 2003 +0000
@@ -1212,7 +1212,7 @@
       break;
       
     case LinkTopPG:
-      /* Link to Top of Program */
+      /* Link to Top of current Program */
       /* BUTTON number:data1 */
       if(link_values.data1 != 0)
 	(vm->state).HL_BTNN_REG = link_values.data1 << 10;
@@ -1334,6 +1334,7 @@
     case LinkPTTN:
       /* Link to Part of current Title Number:data1 */
       /* BUTTON number:data2 */
+      /* PGC Pre-Commands are not executed */
       assert((vm->state).domain == VTS_DOMAIN);
       if(link_values.data2 != 0)
 	(vm->state).HL_BTNN_REG = link_values.data2 << 10;
@@ -1368,6 +1369,8 @@
       /* Jump to VTS Title Domain */
       /* 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))
 	assert(0);
@@ -1377,6 +1380,8 @@
       /* Jump to Title:data1 in same VTS Title Domain */
       /* Only allowed from the VTS Menu Domain(VTSM) */
       /* or the Video Title Set Domain(VTS) */
+      /* Stop SPRM9 Timer */
+      /* Set SPRM1 and SPRM2 */
       assert((vm->state).domain == VTSM_DOMAIN || (vm->state).domain == VTS_DOMAIN); /* ?? */
       if(!set_VTS_TT(vm, (vm->state).vtsN, link_values.data1))
 	assert(0);
@@ -1386,6 +1391,8 @@
       /* Jump to Part:data2 of Title:data1 in same VTS Title Domain */
       /* Only allowed from the VTS Menu Domain(VTSM) */
       /* or the Video Title Set Domain(VTS) */
+      /* Stop SPRM9 Timer */
+      /* Set SPRM1 and SPRM2 */
       assert((vm->state).domain == VTSM_DOMAIN || (vm->state).domain == VTS_DOMAIN); /* ?? */
       if(!set_VTS_PTT(vm, (vm->state).vtsN, link_values.data1, link_values.data2))
 	assert(0);
@@ -1396,6 +1403,7 @@
       /* Jump to First Play Domain */
       /* Only allowed from the VTS Menu Domain(VTSM) */
       /* or the Video Manager domain (VMG) */
+      /* Stop SPRM9 Timer and any GPRM counters */
       assert((vm->state).domain == VMGM_DOMAIN || (vm->state).domain == VTSM_DOMAIN); /* ?? */
       if (!set_FP_PGC(vm))
 	assert(0);
@@ -1404,6 +1412,7 @@
     case JumpSS_VMGM_MENU:
       /* Jump to Video Manger domain - Title Menu:data1 or any PGC in VMG */
       /* Allowed from anywhere except the VTS Title domain */
+      /* Stop SPRM9 Timer and any GPRM counters */
       assert((vm->state).domain != VTS_DOMAIN); /* ?? */
       (vm->state).domain = VMGM_DOMAIN;
       if(!set_MENU(vm, link_values.data1))
@@ -1413,6 +1422,7 @@
     case JumpSS_VTSM:
       /* Jump to a menu in Video Title domain, */
       /* or to a Menu is the current VTS */
+      /* Stop SPRM9 Timer and any GPRM counters */
       /* FIXME: This goes badly wrong for some DVDs. */
       /* FIXME: Keep in touch with ogle people regarding what to do here */
       /* ifoOpenNewVTSI:data1 */
@@ -1445,6 +1455,7 @@
       break;
     case JumpSS_VMGM_PGC:
       /* set_PGCN:data1 */
+      /* Stop SPRM9 Timer and any GPRM counters */
       assert((vm->state).domain != VTS_DOMAIN); /* ?? */
       (vm->state).domain = VMGM_DOMAIN;
       if(!set_PGCN(vm, link_values.data1))
@@ -1807,6 +1818,9 @@
 
 /*
  * $Log$
+ * Revision 1.52  2003/04/03 12:48:30  mroi
+ * merge James changes from xine-lib cvs
+ *
  * Revision 1.51  2003/04/01 11:35:39  mroi
  * * fix TRACE output for play_PGC_PG
  * * remove FIXME output for LinkTopPG, I have seen a disc which makes heavy use of