Comparer: handle Space play/pause from the timeline view (#11)

Author: chammoru

Comparer/ComparerDoc.cpp

@@ -682,6 +682,20 @@ void CComparerDoc::KillPlayTimer()
 	mIsPlaying = false;
 }
 
+void CComparerDoc::TogglePlay()
+{
+	if (mIsPlaying) {
+		KillPlayTimer();
+		return;
+	}
+
+	CMainFrame *pMainFrm = static_cast<CMainFrame *>(AfxGetMainWnd());
+	mIsPlaying = true;
+	pMainFrm->SetTimer(CTI_ID_PLAY, ROUND2I((1000 / mFps) - FPS_ADJUSTMENT), NULL);
+	if (!NextScenes())
+		SetScenes(0);
+}
+
 void CComparerDoc::MarkImgViewProcessing()
 {
 	CMainFrame* pMainFrm = static_cast<CMainFrame*>(AfxGetMainWnd());

Comparer/ComparerDoc.h

@@ -101,6 +101,7 @@ class CComparerDoc : public CDocument
 	}
 	std::vector<ComparerPane*> GetOtherPanes(ComparerPane* pane);
 	void KillPlayTimer();
+	void TogglePlay();
 	bool OffsetScenes(long offset);
 	void MarkImgViewProcessing();
 	bool CheckImgViewProcessing();

Comparer/ComparerView.cpp

@@ -802,8 +802,6 @@ void CComparerView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 	if (nChar != VK_SPACE && isProcessing)
 		return;
 
-	CMainFrame *pMainFrm = static_cast<CMainFrame *>(AfxGetMainWnd());
-
 	switch (nChar) {
 	case VK_RIGHT:
 		pDoc->OffsetScenes(1);
@@ -812,15 +810,7 @@ void CComparerView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 		pDoc->OffsetScenes(-1);
 		break;
 	case VK_SPACE:
-		if (!pDoc->mIsPlaying) {
-			pDoc->mIsPlaying = true;
-			pMainFrm->SetTimer(CTI_ID_PLAY, ROUND2I((1000 / pDoc->mFps) - FPS_ADJUSTMENT), NULL);
-			bool changed = pDoc->NextScenes();
-			if (!changed)
-				pDoc->SetScenes(0);
-		} else {
-			pDoc->KillPlayTimer();
-		}
+		pDoc->TogglePlay();
 		break;
 	case 'H': // Toggle hexadecimal pixel values.
 		pDoc->mHexMode = !pDoc->mHexMode;

Comparer/PosInfoView.cpp

@@ -51,6 +51,7 @@ BEGIN_MESSAGE_MAP(CPosInfoView, CScrollView)
 	ON_WM_DESTROY()
 	ON_WM_MOUSEWHEEL()
 	ON_WM_VSCROLL()
+	ON_WM_KEYDOWN()
 END_MESSAGE_MAP()
 
 
@@ -351,3 +352,16 @@ void CPosInfoView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 
 	CScrollView::OnVScroll(nSBCode, nPos, pScrollBar);
 }
+
+void CPosInfoView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
+{
+	// The timeline owns focus after a seek click, so route play/pause here too.
+	if (nChar == VK_SPACE) {
+		CComparerDoc* pDoc = GetDocument();
+		pDoc->TogglePlay();
+		pDoc->UpdateAllViews(NULL);
+		return;
+	}
+
+	CScrollView::OnKeyDown(nChar, nRepCnt, nFlags);
+}

Comparer/PosInfoView.h

@@ -61,6 +61,7 @@ class CPosInfoView : public CScrollView
 	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
 	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
 	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 };