From 287b968fc164fc68845e35219bc060874c933ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Mon, 16 Mar 2015 20:37:53 +0000
Subject: [PATCH] [MPLAY32]: Some improvements to TogglePlaybackState(). By
 Ricardo Hanke. CORE-9378 #resolve #comment Committed, thanks!

svn path=/trunk/; revision=66744
---
 reactos/base/applications/mplay32/mplay32.c | 139 +++++++++++---------
 1 file changed, 75 insertions(+), 64 deletions(-)

diff --git a/reactos/base/applications/mplay32/mplay32.c b/reactos/base/applications/mplay32/mplay32.c
index ec3079038f8..3bca1f582d9 100644
--- a/reactos/base/applications/mplay32/mplay32.c
+++ b/reactos/base/applications/mplay32/mplay32.c
@@ -27,7 +27,6 @@ BOOL bIsSingleWindow = FALSE;
 UINT MaxFilePos = 0;
 RECT PrevWindowPos;
 
-
 /* ToolBar Buttons */
 static const TBBUTTON Buttons[] =
 {   /* iBitmap,        idCommand,    fsState,         fsStyle,     bReserved[2], dwData, iString */
@@ -552,62 +551,6 @@ SeekForwPlayback(HWND hwnd)
     }
 }
 
-static VOID
-TogglePlaybackState(HWND hwnd)
-{
-    MCIERROR mciError;
-    MCI_GENERIC_PARMS mciGeneric;
-    DWORD dwMode;
-    ULONG idBmp = IDB_PLAYICON;
-    ULONG idCmd = IDC_PLAY;
-
-    if (wDeviceId == 0) return;
-
-    dwMode = GetDeviceMode(hwnd);
-    if (dwMode == MCI_MODE_PLAY)
-    {
-        mciGeneric.dwCallback = (DWORD_PTR)hwnd;
-        mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY, (DWORD_PTR)&mciGeneric);
-        idBmp = IDB_PLAYICON;
-        idCmd = IDC_PLAY;
-    }
-    else if (dwMode == MCI_MODE_PAUSE)
-    {
-        mciGeneric.dwCallback = (DWORD_PTR)hwnd;
-        mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_NOTIFY, (DWORD_PTR)&mciGeneric);
-        idBmp = IDB_PAUSEICON;
-        idCmd = IDC_PAUSE;
-    }
-
-    if (mciError != 0)
-    {
-        ShowMCIError(hwnd, mciError);
-        return;
-    }
-
-    SendMessage(hToolBar,
-                TB_SETCMDID,
-                0,
-                idCmd);
-    SendMessage(hToolBar,
-                TB_CHANGEBITMAP,
-                idCmd,
-                idBmp - IDB_PLAYICON);
-}
-
-static VOID
-ShowDeviceProperties(HWND hwnd)
-{
-    MCIERROR mciError;
-    MCI_GENERIC_PARMS mciGeneric;
-
-    mciError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT, (DWORD_PTR)&mciGeneric);
-    if (mciError != 0)
-    {
-        ShowMCIError(hwnd, mciError);
-    }
-}
-
 VOID CALLBACK
 PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
 {
@@ -671,6 +614,78 @@ StartPlayback(HWND hwnd)
                 IDB_PAUSEICON - IDB_PLAYICON);
 }
 
+static VOID
+TogglePlaybackState(HWND hwnd)
+{
+    MCIERROR mciError;
+    MCI_GENERIC_PARMS mciGeneric;
+    ULONG idBmp = IDB_PLAYICON;
+    ULONG idCmd = IDC_PLAY;
+
+    if (wDeviceId == 0) return;
+
+    switch (GetDeviceMode(hwnd))
+    {
+        case MCI_MODE_OPEN:
+        case MCI_MODE_STOP:
+        {
+            StartPlayback(hwnd);
+            return;
+        }
+
+        case MCI_MODE_PLAY:
+        {
+            mciGeneric.dwCallback = (DWORD_PTR)hwnd;
+            mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY, (DWORD_PTR)&mciGeneric);
+            idBmp = IDB_PLAYICON;
+            idCmd = IDC_PLAY;
+            break;
+        }
+
+        case MCI_MODE_PAUSE:
+        {
+            mciGeneric.dwCallback = (DWORD_PTR)hwnd;
+            mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_NOTIFY, (DWORD_PTR)&mciGeneric);
+            idBmp = IDB_PAUSEICON;
+            idCmd = IDC_PAUSE;
+            break;
+        }
+
+        default:
+        {
+            return;
+        }
+    }
+
+    if (mciError != 0)
+    {
+        ShowMCIError(hwnd, mciError);
+        return;
+    }
+
+    SendMessage(hToolBar,
+                TB_SETCMDID,
+                0,
+                idCmd);
+    SendMessage(hToolBar,
+                TB_CHANGEBITMAP,
+                idCmd,
+                idBmp - IDB_PLAYICON);
+}
+
+static VOID
+ShowDeviceProperties(HWND hwnd)
+{
+    MCIERROR mciError;
+    MCI_GENERIC_PARMS mciGeneric;
+
+    mciError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT, (DWORD_PTR)&mciGeneric);
+    if (mciError != 0)
+    {
+        ShowMCIError(hwnd, mciError);
+    }
+}
+
 static VOID
 CloseMediaFile(HWND hwnd)
 {
@@ -1012,7 +1027,6 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
         case WM_SIZE:
         {
             RECT Rect;
-            UINT Size;
             RECT ToolbarRect;
             MCI_DGV_PUT_PARMS mciPut;
 
@@ -1023,6 +1037,8 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 
                 if (!bIsSingleWindow)
                 {
+                    UINT Size;
+
                     Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom;
                     MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE);
                 }
@@ -1079,12 +1095,7 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                 {
                     if (wDeviceId)
                     {
-                        DWORD dwMode = GetDeviceMode(hwnd);
-
-                        if ((dwMode == MCI_MODE_STOP) || (dwMode == MCI_MODE_OPEN))
-                            StartPlayback(hwnd);
-                        else if ((dwMode == MCI_MODE_PAUSE) || (dwMode = MCI_MODE_PLAY))
-                            TogglePlaybackState(hwnd);
+                        TogglePlaybackState(hwnd);
                     }
                     else
                     {