[Deinterlace-checkins] CVS: dTV/dTV dTV.c,1.18,1.19 dTV.dsp,1.5,1.6 dTV.RC,1.16,1.17
Brought to you by:
adcockj,
dschmelzer
Menu
▾
▴
[Deinterlace-checkins] CVS: dTV/dTV dTV.c,1.18,1.19 dTV.dsp,1.5,1.6 dTV.RC,1.16,1.17
|
From: Mark R. <mdr...@us...> - 2000-12-07 09:15:37
|
Update of /cvsroot/deinterlace/dTV/dTV In directory slayer.i.sourceforge.net:/tmp/cvs-serv29810 Modified Files: dTV.c dTV.dsp dTV.RC Log Message: Added hotkeys and onscreen display for audio input selection Index: dTV.c =================================================================== RCS file: /cvsroot/deinterlace/dTV/dTV/dTV.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** dTV.c 2000/11/28 10:07:34 1.18 --- dTV.c 2000/12/07 09:15:27 1.19 *************** *** 674,677 **** --- 674,678 ---- ShowText(hWnd,"UNMUTE"); } + SetMenuAnalog(); break; *************** *** 768,771 **** --- 769,773 ---- ShowCursor(bShowCursor); } + SetMenuAnalog(); break; *************** *** 824,827 **** --- 826,837 ---- case IDM_AUDIO_5: AudioSource = LOWORD(wParam) - IDM_AUDIO_0; + switch (LOWORD(AudioSource)) { + case 0: ShowText(hWnd, "Audio Input - Tuner"); break; + case 1: ShowText(hWnd, "Audio Input - MSP/Radio"); break; + case 2: ShowText(hWnd, "Audio Input - External"); break; + case 3: ShowText(hWnd, "Audio Input - Internal"); break; + case 4: ShowText(hWnd, "Audio Input - Disabled"); break; + case 5: ShowText(hWnd, "Audio Input - Stereo"); break; + } Stop_Capture(); Audio_SetSource(AudioSource); *************** *** 1349,1352 **** --- 1359,1363 ---- case SIZE_RESTORED: WorkoutOverlaySize(); + SetMenuAnalog(); break; default: *************** *** 1868,1872 **** } ! CheckMenuItem(GetMenu(hWnd), IDM_TUNER, (VideoSource == 0)?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_EXTERN1, (VideoSource == 1)?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_EXTERN2, (VideoSource == 2)?MF_CHECKED:MF_UNCHECKED); --- 1879,1883 ---- } ! CheckMenuItem(GetMenu(hWnd), IDM_TUNER, (VideoSource == 0)?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_EXTERN1, (VideoSource == 1)?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_EXTERN2, (VideoSource == 2)?MF_CHECKED:MF_UNCHECKED); *************** *** 1875,1878 **** --- 1886,1890 ---- CheckMenuItem(GetMenu(hWnd), IDM_EXTERN5, (VideoSource == 5)?MF_CHECKED:MF_UNCHECKED); + CheckMenuItem(GetMenu(hWnd), IDM_MUTE, System_In_Mute?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_AUDIO_0, (AudioSource == 0)?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_AUDIO_1, (AudioSource == 1)?MF_CHECKED:MF_UNCHECKED); *************** *** 1907,1913 **** CheckMenuItem(GetMenu(hWnd), IDM_MINOR_CARRIER_7, (MSPMinorMode == 7)?MF_CHECKED:MF_UNCHECKED); ! CheckMenuItem(GetMenu(hWnd), IDM_STATUSBAR, bDisplayStatusBar?MF_CHECKED:MF_UNCHECKED); ! CheckMenuItem(GetMenu(hWnd), IDM_ON_TOP, bAlwaysOnTop?MF_CHECKED:MF_UNCHECKED); ! CheckMenuItem(GetMenu(hWnd), IDM_AUTOSTEREO, AutoStereoSelect?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_SPLASH_ON_STARTUP, bDisplaySplashScreen?MF_CHECKED:MF_UNCHECKED); --- 1919,1926 ---- CheckMenuItem(GetMenu(hWnd), IDM_MINOR_CARRIER_7, (MSPMinorMode == 7)?MF_CHECKED:MF_UNCHECKED); ! CheckMenuItem(GetMenu(hWnd), IDM_TOGGLECURSOR, bShowCursor?MF_CHECKED:MF_UNCHECKED); ! CheckMenuItem(GetMenu(hWnd), IDM_STATUSBAR, bDisplayStatusBar?MF_CHECKED:MF_UNCHECKED); ! CheckMenuItem(GetMenu(hWnd), IDM_ON_TOP, bAlwaysOnTop?MF_CHECKED:MF_UNCHECKED); ! CheckMenuItem(GetMenu(hWnd), IDM_AUTOSTEREO, AutoStereoSelect?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(GetMenu(hWnd), IDM_SPLASH_ON_STARTUP, bDisplaySplashScreen?MF_CHECKED:MF_UNCHECKED); Index: dTV.dsp =================================================================== RCS file: /cvsroot/deinterlace/dTV/dTV/dTV.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** dTV.dsp 2000/11/09 20:50:09 1.5 --- dTV.dsp 2000/12/07 09:15:27 1.6 *************** *** 160,163 **** --- 160,167 ---- # Begin Source File + SOURCE=.\OSD.c + # End Source File + # Begin Source File + SOURCE=.\Other.c # End Source File *************** *** 253,256 **** --- 257,264 ---- SOURCE=.\MixerDev.h + # End Source File + # Begin Source File + + SOURCE=.\OSD.h # End Source File # Begin Source File Index: dTV.RC =================================================================== RCS file: /cvsroot/deinterlace/dTV/dTV/dTV.RC,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** dTV.RC 2000/11/28 10:07:34 1.16 --- dTV.RC 2000/12/07 09:15:27 1.17 *************** *** 614,618 **** STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "About dTV" ! FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,305,9,58,19,WS_GROUP,WS_EX_CLIENTEDGE --- 614,618 ---- STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "About dTV" ! FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,305,9,58,19,WS_GROUP,WS_EX_CLIENTEDGE *************** *** 1066,1075 **** POPUP "&Audio Input" BEGIN ! MENUITEM "&Tuner", IDM_AUDIO_0 ! MENUITEM "&MSP/Radio", IDM_AUDIO_1 ! MENUITEM "&External", IDM_AUDIO_2 ! MENUITEM "&Internal", IDM_AUDIO_3 ! MENUITEM "M&ute", IDM_AUDIO_4 ! MENUITEM "&Stereo", IDM_AUDIO_5 END POPUP "Video &Input" --- 1066,1076 ---- POPUP "&Audio Input" BEGIN ! MENUITEM "&Mute\tM", IDM_MUTE ! MENUITEM "&Tuner\tCtrl+Shift+F1", IDM_AUDIO_0 ! MENUITEM "MSP/&Radio\tCtrl+Shift+F2", IDM_AUDIO_1 ! MENUITEM "&External\tCtrl+Shift+F3", IDM_AUDIO_2 ! MENUITEM "&Internal\tCtrl+Shift+F4", IDM_AUDIO_3 ! MENUITEM "&Disabled\tCtrl+Shift+F5", IDM_AUDIO_4 ! MENUITEM "&Stereo\tCtrl+Shift+F6", IDM_AUDIO_5 END POPUP "Video &Input" *************** *** 1449,1465 **** --- 1450,1480 ---- VK_ADD, IDM_VOLUMEPLUS, VIRTKEY, NOINVERT VK_DOWN, IDM_VT_PAGE_DOWN, VIRTKEY, NOINVERT + VK_END, IDM_SHOW_OSD, VIRTKEY, NOINVERT VK_ESCAPE, IDM_END, VIRTKEY, NOINVERT VK_F1, IDM_TUNER, VIRTKEY, CONTROL, ALT, NOINVERT + VK_F1, IDM_AUDIO_0, VIRTKEY, SHIFT, CONTROL, + NOINVERT VK_F1, IDM_TYPEFORMAT_0, VIRTKEY, SHIFT, ALT, NOINVERT VK_F2, IDM_EXTERN1, VIRTKEY, CONTROL, ALT, NOINVERT + VK_F2, IDM_AUDIO_1, VIRTKEY, SHIFT, CONTROL, + NOINVERT VK_F2, IDM_TYPEFORMAT_1, VIRTKEY, SHIFT, ALT, NOINVERT VK_F3, IDM_EXTERN2, VIRTKEY, CONTROL, ALT, NOINVERT + VK_F3, IDM_AUDIO_2, VIRTKEY, SHIFT, CONTROL, + NOINVERT VK_F3, IDM_TYPEFORMAT_2, VIRTKEY, SHIFT, ALT, NOINVERT VK_F4, IDM_EXTERN5, VIRTKEY, CONTROL, ALT, NOINVERT + VK_F4, IDM_AUDIO_3, VIRTKEY, SHIFT, CONTROL, + NOINVERT VK_F4, IDM_TYPEFORMAT_3, VIRTKEY, SHIFT, ALT, NOINVERT VK_F5, IDM_EXTERN3, VIRTKEY, CONTROL, ALT, NOINVERT + VK_F5, IDM_AUDIO_4, VIRTKEY, SHIFT, CONTROL, + NOINVERT VK_F5, IDM_TYPEFORMAT_4, VIRTKEY, SHIFT, ALT, NOINVERT VK_F6, IDM_EXTERN4, VIRTKEY, CONTROL, ALT, NOINVERT + VK_F6, IDM_AUDIO_5, VIRTKEY, SHIFT, CONTROL, + NOINVERT VK_F6, IDM_TYPEFORMAT_5, VIRTKEY, SHIFT, ALT, NOINVERT + VK_HOME, IDM_CHANNEL_LIST, VIRTKEY, NOINVERT VK_LEFT, IDM_VT_PAGE_MINUS, VIRTKEY, NOINVERT VK_NEXT, IDM_CHANNELMINUS, VIRTKEY, NOINVERT *************** *** 1478,1483 **** "_", IDM_VOLUMEMINUS, ASCII, NOINVERT "`", IDM_SASPECT_COMPUTE, ASCII, NOINVERT - VK_HOME, IDM_CHANNEL_LIST, VIRTKEY, NOINVERT - VK_END, IDM_SHOW_OSD, VIRTKEY, NOINVERT END --- 1493,1496 ---- |