Mercurial > mplayer.hg

comparison gui/win32/preferences.c @ 34697:ac6b38cd0d45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename sub window video window. It was a bad idea to name the video window "sub window" at the time the GUI was written. The term "sub window" does make sense from the programmer's point of view, but it doesn't make any sense at all from the user's point of view, because the sub window simply is the window where the video will be displayed. Moreover, since the term "sub" is generally short for "subtitles", the renaming makes the code much easier to understand.
author ib
date Sat, 03 Mar 2012 16:45:15 +0000
parents 4ff933a89818
children 0a4b7681a408
comparison
equal deleted inserted replaced
34696:f2c90c9dd61c 34697:ac6b38cd0d45
49 soft_vol = 0; 49 soft_vol = 0;
50 gtkAONorm = 0; 50 gtkAONorm = 0;
51 gtkAOExtraStereo = 0; 51 gtkAOExtraStereo = 0;
52 gtkAOExtraStereoMul = 1.0; 52 gtkAOExtraStereoMul = 1.0;
53 audio_delay = 0.0; 53 audio_delay = 0.0;
54 sub_window = 1; 54 video_window = 1;
55 gtkCacheOn = 0; 55 gtkCacheOn = 0;
56 gtkCacheSize = 2048; 56 gtkCacheSize = 2048;
57 gtkAutoSyncOn = 0; 57 gtkAutoSyncOn = 0;
58 gtkAutoSync = 0; 58 gtkAutoSync = 0;
59 player_idle_mode = 1; 59 player_idle_mode = 1;
217 (HMENU) ID_AUTOSYNC, 217 (HMENU) ID_AUTOSYNC,
218 ((LPCREATESTRUCT) lParam) -> hInstance, 218 ((LPCREATESTRUCT) lParam) -> hInstance,
219 NULL); 219 NULL);
220 SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); 220 SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
221 221
222 btn = CreateWindow("button", acp(MSGTR_PREFERENCES_VideoInSubwin), 222 btn = CreateWindow("button", acp(MSGTR_PREFERENCES_ShowInVideoWin),
223 WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 223 WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
224 10, 249, 250, 25, 224 10, 249, 250, 25,
225 hwnd, (HMENU) ID_SUBWINDOW, 225 hwnd, (HMENU) ID_VIDEOWINDOW,
226 ((LPCREATESTRUCT) lParam) -> hInstance, 226 ((LPCREATESTRUCT) lParam) -> hInstance,
227 NULL); 227 NULL);
228 SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); 228 SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
229 229
230 /* osd level */ 230 /* osd level */
427 EnableWindow(updown2, 1); 427 EnableWindow(updown2, 1);
428 } 428 }
429 else gtkAutoSync = 0; 429 else gtkAutoSync = 0;
430 SendDlgItemMessage(hwnd, ID_UPDOWN2, UDM_SETPOS32, 0, (LPARAM)gtkAutoSync); 430 SendDlgItemMessage(hwnd, ID_UPDOWN2, UDM_SETPOS32, 0, (LPARAM)gtkAutoSync);
431 431
432 if(sub_window) 432 if(video_window)
433 SendDlgItemMessage(hwnd, ID_SUBWINDOW, BM_SETCHECK, 1, 0); 433 SendDlgItemMessage(hwnd, ID_VIDEOWINDOW, BM_SETCHECK, 1, 0);
434 434
435 if(!osd_level) 435 if(!osd_level)
436 SendDlgItemMessage(hwnd, ID_NONE, BM_SETCHECK, 1, 0); 436 SendDlgItemMessage(hwnd, ID_NONE, BM_SETCHECK, 1, 0);
437 else if(osd_level == 1) 437 else if(osd_level == 1)
438 SendDlgItemMessage(hwnd, ID_OSD1, BM_SETCHECK, 1, 0); 438 SendDlgItemMessage(hwnd, ID_OSD1, BM_SETCHECK, 1, 0);
527 SendDlgItemMessage(hwnd, ID_NORMALIZE, BM_SETCHECK, 0, 0); 527 SendDlgItemMessage(hwnd, ID_NORMALIZE, BM_SETCHECK, 0, 0);
528 SendDlgItemMessage(hwnd, ID_SOFTMIX, BM_SETCHECK, 0, 0); 528 SendDlgItemMessage(hwnd, ID_SOFTMIX, BM_SETCHECK, 0, 0);
529 SendDlgItemMessage(hwnd, ID_EXTRASTEREO, BM_SETCHECK, 0, 0); 529 SendDlgItemMessage(hwnd, ID_EXTRASTEREO, BM_SETCHECK, 0, 0);
530 SendDlgItemMessage(hwnd, ID_CACHE, BM_SETCHECK, 0, 0); 530 SendDlgItemMessage(hwnd, ID_CACHE, BM_SETCHECK, 0, 0);
531 SendDlgItemMessage(hwnd, ID_AUTOSYNC, BM_SETCHECK, 0, 0); 531 SendDlgItemMessage(hwnd, ID_AUTOSYNC, BM_SETCHECK, 0, 0);
532 SendDlgItemMessage(hwnd, ID_SUBWINDOW, BM_SETCHECK, 1, 0); 532 SendDlgItemMessage(hwnd, ID_VIDEOWINDOW, BM_SETCHECK, 1, 0);
533 SendDlgItemMessage(hwnd, ID_NONE, BM_SETCHECK, 0, 0); 533 SendDlgItemMessage(hwnd, ID_NONE, BM_SETCHECK, 0, 0);
534 SendDlgItemMessage(hwnd, ID_OSD1, BM_SETCHECK, 1, 0); 534 SendDlgItemMessage(hwnd, ID_OSD1, BM_SETCHECK, 1, 0);
535 SendDlgItemMessage(hwnd, ID_OSD2, BM_SETCHECK, 0, 0); 535 SendDlgItemMessage(hwnd, ID_OSD2, BM_SETCHECK, 0, 0);
536 SendDlgItemMessage(hwnd, ID_OSD3, BM_SETCHECK, 0, 0); 536 SendDlgItemMessage(hwnd, ID_OSD3, BM_SETCHECK, 0, 0);
537 SendMessage(hwnd, WM_COMMAND, (WPARAM)ID_APPLY, 0); 537 SendMessage(hwnd, WM_COMMAND, (WPARAM)ID_APPLY, 0);
615 if(SendDlgItemMessage(hwnd, ID_AUTOSYNC, BM_GETCHECK, 0, 0) == BST_CHECKED) 615 if(SendDlgItemMessage(hwnd, ID_AUTOSYNC, BM_GETCHECK, 0, 0) == BST_CHECKED)
616 gtkAutoSyncOn = 1; 616 gtkAutoSyncOn = 1;
617 else gtkAutoSyncOn = 0; 617 else gtkAutoSyncOn = 0;
618 gtkAutoSync = SendDlgItemMessage(hwnd, ID_UPDOWN2, UDM_GETPOS32, 0, 0); 618 gtkAutoSync = SendDlgItemMessage(hwnd, ID_UPDOWN2, UDM_GETPOS32, 0, 0);
619 619
620 /* sub window */ 620 /* video window */
621 if(SendDlgItemMessage(hwnd, ID_SUBWINDOW, BM_GETCHECK, 0, 0) == BST_CHECKED) 621 if(SendDlgItemMessage(hwnd, ID_VIDEOWINDOW, BM_GETCHECK, 0, 0) == BST_CHECKED)
622 sub_window = 1; 622 video_window = 1;
623 else sub_window = 0; 623 else video_window = 0;
624 624
625 /* osd level */ 625 /* osd level */
626 if(SendDlgItemMessage(hwnd, ID_NONE, BM_GETCHECK, 0, 0) == BST_CHECKED) 626 if(SendDlgItemMessage(hwnd, ID_NONE, BM_GETCHECK, 0, 0) == BST_CHECKED)
627 osd_level = 0; 627 osd_level = 0;
628 else if(SendDlgItemMessage(hwnd, ID_OSD1, BM_GETCHECK, 0, 0) == BST_CHECKED) 628 else if(SendDlgItemMessage(hwnd, ID_OSD1, BM_GETCHECK, 0, 0) == BST_CHECKED)