Mercurial > mplayer.hg

comparison gui/win32/gui.c @ 34452:c3e63d8b6cf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reduce number and avoid conditional definition of searchpath variables.
author ib
date Tue, 10 Jan 2012 13:28:15 +0000
parents 35fd66684548
children 5a45efc630b8
comparison
equal deleted inserted replaced
34451:19277315b8c6 34452:c3e63d8b6cf3
845 case WM_RBUTTONDOWN: 845 case WM_RBUTTONDOWN:
846 { 846 {
847 POINT point; 847 POINT point;
848 char device[MAX_PATH]; 848 char device[MAX_PATH];
849 char searchpath[MAX_PATH]; 849 char searchpath[MAX_PATH];
850 char searchpath2[MAX_PATH];
851 #ifdef CONFIG_CDDA
852 char searchpath3[MAX_PATH];
853 #endif
854 int len, pos = 0, cdromdrive = 0; 850 int len, pos = 0, cdromdrive = 0;
855 UINT errmode; 851 UINT errmode;
856 point.x = GET_X_LPARAM(lParam); 852 point.x = GET_X_LPARAM(lParam);
857 point.y = GET_Y_LPARAM(lParam); 853 point.y = GET_Y_LPARAM(lParam);
858 ClientToScreen(hWnd, &point); 854 ClientToScreen(hWnd, &point);
864 { 860 {
865 if(GetDriveType(device + pos) == DRIVE_CDROM) 861 if(GetDriveType(device + pos) == DRIVE_CDROM)
866 { 862 {
867 char volname[MAX_PATH]; 863 char volname[MAX_PATH];
868 char menuitem[MAX_PATH]; 864 char menuitem[MAX_PATH];
869 int flags = MF_STRING; 865 int flags = MF_STRING, enable = 0;
870 mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] checking %s for CD/VCD/SVCD/DVDs\n", device + pos); 866 mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] checking %s for CD/VCD/SVCD/DVDs\n", device + pos);
871 sprintf(searchpath, "%sVIDEO_TS", device + pos); 867 sprintf(searchpath, "%sVIDEO_TS", device + pos);
872 sprintf(searchpath2, "%sMpegav", device + pos); 868 if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
869 enable = 1;
870 sprintf(searchpath, "%sMpegav", device + pos);
871 if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
872 enable = 1;
873 #ifdef CONFIG_CDDA 873 #ifdef CONFIG_CDDA
874 sprintf(searchpath3, "%sTrack01.cda", device + pos); 874 sprintf(searchpath, "%sTrack01.cda", device + pos);
875 if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
876 enable = 1;
875 #endif 877 #endif
876 if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES) 878 flags |= (enable ? MF_ENABLED : MF_GRAYED);
877 flags |= MF_ENABLED;
878 else if(GetFileAttributes(searchpath2) != INVALID_FILE_ATTRIBUTES)
879 flags |= MF_ENABLED;
880 #ifdef CONFIG_CDDA
881 else if(GetFileAttributes(searchpath3) != INVALID_FILE_ATTRIBUTES)
882 flags |= MF_ENABLED;
883 #endif
884 else
885 flags |= MF_GRAYED;
886 volname[0] = 0; 879 volname[0] = 0;
887 strcpy(menuitem, device + pos); 880 strcpy(menuitem, device + pos);
888 menuitem[strlen(menuitem) - 1]=0; 881 menuitem[strlen(menuitem) - 1]=0;
889 GetVolumeInformation(device + pos, volname, MAX_PATH, NULL, NULL, NULL, NULL, 0); 882 GetVolumeInformation(device + pos, volname, MAX_PATH, NULL, NULL, NULL, NULL, 0);
890 if (strlen(volname)) 883 if (strlen(volname))