Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MPLAY32]

Browse source 
Implement a single-window mode for videos.
Patch by Ricardo Hanke.

TO ALL TRANSLATORS: Update the translations!

CORE-7910 #resolve #comment Committed, thanks!

svn path=/trunk/; revision=63940
This commit is contained in:
Hermès Bélusca-Maïto 2014-08-24 15:40:34 +00:00
parent 245d743eba
commit 1270840cc9
24 changed files with 244 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/applications/mplay32/lang/bg-BG.rc
View file

@ -20,6 +20,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/cs-CZ.rc
View file

@ -21,6 +21,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/de-DE.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "W&iederholen\tStrg+T", IDM_REPEAT
END
POPUP "&Ansicht"
BEGIN
MENUITEM "Einzelfenster-&Modus", IDM_SWITCHVIEW
END
POPUP "&Gerät"
BEGIN
MENUITEM "&Eigenschaften", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/en-US.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/es-ES.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/fr-FR.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Répé&ter\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "Périp&hérique"
BEGIN
MENUITEM "&Propriétés", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/he-IL.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/it-IT.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/ja-JP.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/nl-NL.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/no-NO.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/pl-PL.rc
View file

@ -24,6 +24,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Urządzenie"
BEGIN
MENUITEM "&Właściwości", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/pt-BR.rc
View file

@ -18,6 +18,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/ro-RO.rc
View file

@ -22,6 +22,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Dispozitiv"
BEGIN
MENUITEM "&Proprietăți…", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/ru-RU.rc
View file

@ -16,6 +16,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Устройство"
BEGIN
MENUITEM "&Свойства", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/sk-SK.rc
View file

@ -21,6 +21,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/sq-AL.rc
View file

@ -20,6 +20,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/sv-SE.rc
View file

@ -23,6 +23,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/tr-TR.rc
View file

@ -18,6 +18,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Aygıt"
BEGIN
MENUITEM "&Husûsiyetler", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/uk-UA.rc
View file

@ -24,6 +24,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/zh-CN.rc
View file

@ -18,6 +18,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

4
reactos/base/applications/mplay32/lang/zh-TW.rc
View file

@ -24,6 +24,10 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
END
POPUP "&Device"
BEGIN
MENUITEM "&Properties", IDM_DEVPROPS

164
reactos/base/applications/mplay32/mplay32.c
View file

@ -19,7 +19,9 @@ WORD wDeviceId;
BOOL bIsOpened = FALSE;
BOOL bIsPaused = FALSE;
BOOL bRepeat = FALSE;
BOOL bIsSingleWindow = FALSE;
UINT MaxFilePos = 0;
RECT PrevWindowPos;
/* ToolBar Buttons */
@ -35,9 +37,11 @@ static const TBBUTTON Buttons[] =
{TBICON_FORWARD, IDC_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}
};
void EnableMenuItems(void)
void EnableMenuItems(HWND hwnd)
{
MCI_GENERIC_PARMS mciGeneric;
MCI_DGV_RECT_PARMS mciVideoRect;
MCI_DGV_WINDOW_PARMSW mciVideoWindow;
DWORD dwError;
EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED);
@ -47,12 +51,38 @@ void EnableMenuItems(void)
{
EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_ENABLED);
}
mciVideoWindow.hWnd = hwnd;
dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow);
if (!dwError)
{
dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect);
if (!dwError)
{
EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_ENABLED);
}
}
}
void DisableMenuItems(void)
{
EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_GRAYED);
}
void ResizeClientArea(HWND hwnd, int nWidth, int nHeight)
{
RECT rcClientRect;
RECT rcWindowRect;
POINT ptDifference;
GetClientRect(hwnd, &rcClientRect);
GetWindowRect(hwnd, &rcWindowRect);
ptDifference.x = (rcWindowRect.right - rcWindowRect.left) - rcClientRect.right;
ptDifference.y = (rcWindowRect.bottom - rcWindowRect.top) - rcClientRect.bottom;
MoveWindow(hwnd, rcWindowRect.left, rcWindowRect.top, nWidth + ptDifference.x, nHeight + ptDifference.y, TRUE);
}
static VOID
@ -213,6 +243,77 @@ IsSupportedFileExtension(LPTSTR lpFileName, LPTSTR lpDeviceName, LPDWORD dwSize)
return FALSE;
}
static VOID
SwitchViewMode(HWND hwnd)
{
MCIERROR mciError;
MCI_DGV_RECT_PARMS mciVideoRect;
MCI_DGV_WINDOW_PARMSW mciVideoWindow;
RECT rcToolbarRect;
RECT rcTempRect;
mciVideoWindow.hWnd = hwnd;
mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow);
if (mciError)
{
return;
}
mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect);
if (mciError)
{
return;
}
if (!bIsSingleWindow)
{
GetWindowRect(hwnd, &PrevWindowPos);
SetParent(hTrackBar, hToolBar);
mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD)(LPSTR)&mciVideoRect);
if (mciError)
{
ShowMCIError(hwnd, mciError);
return;
}
GetWindowRect(hToolBar, &rcToolbarRect);
ResizeClientArea(hwnd, mciVideoRect.rc.right, mciVideoRect.rc.bottom + (rcToolbarRect.bottom - rcToolbarRect.top));
mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow);
if (mciError)
{
ShowMCIError(hwnd, mciError);
return;
}
GetWindowRect(hToolBar, &rcTempRect);
MoveWindow(hTrackBar, 180, 0, rcTempRect.right - rcTempRect.left - 180, 25, TRUE);
CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_CHECKED);
bIsSingleWindow = TRUE;
}
else
{
bIsSingleWindow = FALSE;
CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_UNCHECKED);
mciVideoWindow.hWnd = MCI_DGV_WINDOW_DEFAULT;
mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow);
if (mciError)
{
ShowMCIError(hwnd, mciError);
return;
}
SetParent(hTrackBar, hwnd);
MoveWindow(hwnd, PrevWindowPos.left, PrevWindowPos.top, PrevWindowPos.right - PrevWindowPos.left, PrevWindowPos.bottom - PrevWindowPos.top, TRUE);
}
}
static DWORD
CloseMciDevice(VOID)
{
@ -295,7 +396,7 @@ OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName)
bIsOpened = TRUE;
_tcscpy(szPrevFile, lpFileName);
EnableMenuItems();
EnableMenuItems(hwnd);
return 0;
}
@ -307,6 +408,12 @@ StopPlayback(HWND hwnd)
{
SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 1);
KillTimer(hwnd, IDT_PLAYTIMER);
if (bIsSingleWindow)
{
SwitchViewMode(hwnd);
}
CloseMciDevice();
}
}
@ -499,6 +606,11 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
return;
}
if (bIsOpened)
{
StopPlayback(hwnd);
}
mciError = OpenMciDevice(hwnd, szDeviceName, szLocalFileName);
if (mciError != 0)
{
@ -622,12 +734,14 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
LPRECT pRect = (LPRECT)lParam;
if (pRect->right - pRect->left < MAIN_WINDOW_MIN_WIDTH)
pRect->right = pRect->left + MAIN_WINDOW_MIN_WIDTH;
if (pRect->bottom - pRect->top != MAIN_WINDOW_HEIGHT)
pRect->bottom = pRect->top + MAIN_WINDOW_HEIGHT;
if (!bIsSingleWindow)
{
if (pRect->right - pRect->left < MAIN_WINDOW_MIN_WIDTH)
pRect->right = pRect->left + MAIN_WINDOW_MIN_WIDTH;
if (pRect->bottom - pRect->top != MAIN_WINDOW_HEIGHT)
pRect->bottom = pRect->top + MAIN_WINDOW_HEIGHT;
}
return TRUE;
}
@ -635,14 +749,33 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
RECT Rect;
UINT Size;
RECT ToolbarRect;
MCI_DGV_PUT_PARMS mciPut;
if (hToolBar && hTrackBar)
{
SendMessage(hToolBar, TB_AUTOSIZE, 0, 0);
SendMessage(hToolBar, TB_GETITEMRECT, 1, (LPARAM)&Rect);
Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom;
MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE);
if (!bIsSingleWindow)
{
Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom;
MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE);
}
else
{
MoveWindow(hTrackBar, 180, 0, LOWORD(lParam) - 180, 25, TRUE);
GetClientRect(hwnd, &Rect);
GetClientRect(hToolBar, &ToolbarRect);
mciPut.rc.top = 0;
mciPut.rc.left = 0;
mciPut.rc.right = Rect.right;
mciPut.rc.bottom = Rect.bottom - (ToolbarRect.bottom - ToolbarRect.top) - 2;
mciSendCommand(wDeviceId, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT | MCI_WAIT, (DWORD)&mciPut);
}
}
return 0L;
}
@ -664,6 +797,15 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
}
break;
case WM_NCLBUTTONDBLCLK:
{
if (wParam == HTCAPTION)
{
SwitchViewMode(hwnd);
}
}
break;
case WM_COMMAND:
{
switch (LOWORD(wParam))
@ -732,6 +874,10 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
break;
}
case IDM_SWITCHVIEW:
SwitchViewMode(hwnd);
break;
case IDM_DEVPROPS:
ShowDeviceProperties(hwnd);
break;

1
reactos/base/applications/mplay32/resource.h
View file

@ -41,6 +41,7 @@
#define IDM_VOLUMECTL 1004
#define IDM_DEVPROPS 1005
#define IDM_REPEAT 1006
#define IDM_SWITCHVIEW 1007
/* ToolBar Icons */
#define TBICON_PLAY 0