[Deinterlace-checkins] CVS: DScaler/DScaler VBI_VideoText.cpp,1.70,1.71
Brought to you by:
adcockj,
dschmelzer
From: Atsushi N. <at...@us...> - 2004-04-24 08:54:29
|
Update of /cvsroot/deinterlace/DScaler/DScaler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27725/DScaler Modified Files: VBI_VideoText.cpp Log Message: reverted part of last change because there was no need for a new setting variable for input timeout, used ChannelEnterTime instead Index: VBI_VideoText.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/VBI_VideoText.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -r1.70 -r1.71 *** VBI_VideoText.cpp 24 Apr 2004 08:36:28 -0000 1.70 --- VBI_VideoText.cpp 24 Apr 2004 08:54:18 -0000 1.71 *************** *** 49,52 **** --- 49,56 ---- // // $Log$ + // Revision 1.71 2004/04/24 08:54:18 atnak + // reverted part of last change because there was no need for a new setting + // variable for input timeout, used ChannelEnterTime instead + // // Revision 1.70 2004/04/24 08:36:28 atnak // new: user customizable teletext page number input timeout *************** *** 336,341 **** // This variable controls the display duration for VT_ShowHeader(); LONG g_VTOSDTimeout = VT_OSD_DISPLAY_TIMEOUT; - // This variable stores the user custmized input timeout (in seconds) - LONG g_VTOSDInputTimeoutSec = VT_OSD_DEFAULT_INPUT_TIMEOUT; WORD VTPageHistoryHead; --- 340,343 ---- *************** *** 998,1001 **** --- 1000,1006 ---- + // Global defined in DScaler.cpp + extern int ChannelEnterTime; + BOOL VT_OnInput(HDC hDC, LPRECT lpRect, char cInput) { *************** *** 1014,1018 **** } ! g_VTOSDTimeout = g_VTOSDInputTimeoutSec * 1000; if (nLength == 3) --- 1019,1023 ---- } ! g_VTOSDTimeout = ChannelEnterTime; if (nLength == 3) *************** *** 2042,2052 **** "VT", "ForceDoubleHeightSubtitlesFilter", NULL, }, - { - "Page Number Input Timeout (seconds)", SLIDER, 0, - (long*)&g_VTOSDInputTimeoutSec, - VT_OSD_DEFAULT_INPUT_TIMEOUT, 1, 60, 1, 1, - NULL, - "VT", "PageNumberInputTimeout", NULL, - }, }; --- 2047,2050 ---- *************** *** 2104,2108 **** &VTSettings[VT_SUBTITLE_DUPLICATION_FILTER ], &VTSettings[VT_DOUBLEHEIGHT_SUBTITLES_FILTER], - &VTSettings[VT_PAGE_NUMBER_INPUT_TIMEOUT ], }; --- 2102,2105 ---- |