[DVDnav-discuss] r1219 - trunk/libdvdnav/src/vm/vm.c

[Erik Hovland]

>> @@ -1437,8 +1441,9 @@ static int process_command(vm_t *vm, lin
>>        if(link_values.data2 != 0)
>>       (vm->state).HL_BTNN_REG = link_values.data2 << 10;
>>        if(!set_VTS_PTT(vm, (vm->state).vtsN, (vm->state).VTS_TTN_REG, link_values.data1))
>> -     assert(0);
>> -      link_values = play_PG(vm);
>> +        link_values.command = Exit;
>> +      else
>> +        link_values = play_PG(vm);
>>        break;
>>      case LinkPGN:
>>        /* Link to Program Number:data1 */
>> @@ -1483,8 +1488,9 @@ static int process_command(vm_t *vm, lin
>>        /* 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);
>> -      link_values = play_PGC(vm);
>> +        link_values.command = Exit;
>> +      else
>> +        link_values = play_PGC(vm);
>>        break;
>>      case JumpVTS_PTT:
>>        /* Jump to Part:data2 of Title:data1 in same VTS Title Domain */
>> @@ -1494,8 +1500,9 @@ static int process_command(vm_t *vm, lin
>>        /* 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);
>> -      link_values = play_PGC_PG(vm, (vm->state).pgN);
>> +        link_values.command = Exit;
>> +      else
>> +        link_values = play_PGC_PG(vm, (vm->state).pgN);
>>        break;
>>
>>      case JumpSS_FP:
>
> The three hunks above contain purely cosmetic (indentation) changes.
> Please avoid mixing them with functional changes next time (i.e.
> commit them separately, after functional).

Do they not turn assert(0) into VM exit commands? I will endeavor to separate
cosmetic changes from code changes.

E

-- 
Erik Hovland
erik at hovland.org
http://hovland.org/