comparison dvdnav.c @ 58:18af52093d13 src

* fix debug messages * send spu stream change event only, when there are new streams (should fix problems with Terminator disk 2)
author mroi
date Sat, 06 Jul 2002 16:24:54 +0000
parents 5674fbd44f26
children 30995ad032cf
comparison
equal deleted inserted replaced
57:e1505b603eb8 58:18af52093d13
573 stream_change.physical_letterbox = vm_get_subp_active_stream(this->vm, 1); 573 stream_change.physical_letterbox = vm_get_subp_active_stream(this->vm, 1);
574 stream_change.physical_pan_scan = vm_get_subp_active_stream(this->vm, 2); 574 stream_change.physical_pan_scan = vm_get_subp_active_stream(this->vm, 2);
575 memcpy(buf, &(stream_change), sizeof( dvdnav_spu_stream_change_event_t)); 575 memcpy(buf, &(stream_change), sizeof( dvdnav_spu_stream_change_event_t));
576 this->position_current.spu_channel = this->position_next.spu_channel; 576 this->position_current.spu_channel = this->position_next.spu_channel;
577 #ifdef LOG_DEBUG 577 #ifdef LOG_DEBUG
578 fprintf(stderr,"libdvdnav:SPU_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change.physical); 578 fprintf(stderr,"libdvdnav:SPU_STREAM_CHANGE stream_id_wide=%d\n",stream_change.physical_wide);
579 #endif 579 fprintf(stderr,"libdvdnav:SPU_STREAM_CHANGE stream_id_letterbox=%d\n",stream_change.physical_letterbox);
580 pthread_mutex_unlock(&this->vm_lock); 580 fprintf(stderr,"libdvdnav:SPU_STREAM_CHANGE stream_id_pan_scan=%d\n",stream_change.physical_pan_scan);
581 return S_OK; 581 #endif
582 pthread_mutex_unlock(&this->vm_lock);
583 if (stream_change.physical_wide != -1 &&
584 stream_change.physical_letterbox != -1 &&
585 stream_change.physical_pan_scan != -1) {
586 #ifdef LOG_DEBUG
587 fprintf(stderr,"libdvdnav:SPU_STREAM_CHANGE returning S_OK\n");
588 #endif
589 return S_OK;
590 }
582 } 591 }
583 592
584 if(this->position_current.audio_channel != this->position_next.audio_channel) { 593 if(this->position_current.audio_channel != this->position_next.audio_channel) {
585 dvdnav_audio_stream_change_event_t stream_change; 594 dvdnav_audio_stream_change_event_t stream_change;
586 (*event) = DVDNAV_AUDIO_STREAM_CHANGE; 595 (*event) = DVDNAV_AUDIO_STREAM_CHANGE;
952 return S_OK; 961 return S_OK;
953 } 962 }
954 963
955 /* 964 /*
956 * $Log$ 965 * $Log$
966 * Revision 1.26 2002/07/06 16:24:54 mroi
967 * * fix debug messages
968 * * send spu stream change event only, when there are new streams
969 * (should fix problems with Terminator disk 2)
970 *
957 * Revision 1.25 2002/07/05 14:18:54 mroi 971 * Revision 1.25 2002/07/05 14:18:54 mroi
958 * report all spu types (widescreen, letterbox and pan&scan), not widescreen 972 * report all spu types (widescreen, letterbox and pan&scan), not widescreen
959 * only and report the stream's scale permissions to detect pan&scan material 973 * only and report the stream's scale permissions to detect pan&scan material
960 * 974 *
961 * Revision 1.24 2002/07/05 01:42:30 jcdutton 975 * Revision 1.24 2002/07/05 01:42:30 jcdutton