diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2013-10-14 22:45:16 +0400 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2013-10-16 22:39:29 +0400 |
| commit | bb72020db9859779300628077a772e2160dfa424 (patch) | |
| tree | a9728aa5cbd7343d97e63342f4aab22023f7273d /src | |
| parent | 5a58c9398a626a776d64b4451494dc0b6af0298e (diff) | |
Factorize the code for file chapters handling.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mpc-hc/MainFrm.cpp | 96 | ||||
| -rw-r--r-- | src/mpc-hc/MainFrm.h | 2 |
2 files changed, 52 insertions, 46 deletions
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 79f015359..b7806ebdf 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -8245,53 +8245,71 @@ void CMainFrame::OnUpdateAfterplayback(CCmdUI* pCmdUI) }
}
-// navigate
-void CMainFrame::OnNavigateSkip(UINT nID)
+bool CMainFrame::SeekToFileChapter(int iChapter, bool bRelative /*= false*/)
{
- const CAppSettings& s = AfxGetAppSettings();
+ if (GetPlaybackMode() != PM_FILE) {
+ return false;
+ }
- if (GetPlaybackMode() == PM_FILE) {
- SetupChapters();
- m_nLastSkipDirection = nID;
+ SetupChapters();
- if (DWORD nChapters = m_pCB->ChapGetCount()) {
- REFERENCE_TIME rtCur;
- m_pMS->GetCurrentPosition(&rtCur);
+ bool ret = false;
- REFERENCE_TIME rt = rtCur;
- CComBSTR name;
- long i = 0;
+ if (DWORD nChapters = m_pCB->ChapGetCount()) {
+ REFERENCE_TIME rt;
- if (nID == ID_NAVIGATE_SKIPBACK) {
- rt -= 30000000;
- i = m_pCB->ChapLookup(&rt, &name);
- } else if (nID == ID_NAVIGATE_SKIPFORWARD) {
- i = m_pCB->ChapLookup(&rt, &name) + 1;
- name.Empty();
- if (i < (int)nChapters) {
- m_pCB->ChapGet(i, &rt, &name);
+ if (bRelative) {
+ if (SUCCEEDED(m_pMS->GetCurrentPosition(&rt))) {
+ if (iChapter < 0) {
+ // If we are less than 3s after the start of the current chapter, we go to
+ // the previous chapter else we restart current chapter from the beginning
+ rt -= 30000000;
+ iChapter = 0;
+ } else if (iChapter > 0) {
+ iChapter = 1;
}
+ iChapter = m_pCB->ChapLookup(&rt, nullptr) + iChapter;
+ } else {
+ iChapter = -1;
}
+ }
- if (i >= 0 && (DWORD)i < nChapters) {
- SeekTo(rt, false);
- SendStatusMessage(ResStr(IDS_AG_CHAPTER2) + CString(name), 3000);
+ CComBSTR name;
+ if (iChapter >= 0 && DWORD(iChapter) < nChapters && SUCCEEDED(m_pCB->ChapGet(iChapter, &rt, &name))) {
+ SeekTo(rt, false);
+ SendStatusMessage(ResStr(IDS_AG_CHAPTER2) + CString(name), 3000);
+ ret = true;
- REFERENCE_TIME rtDur;
- m_pMS->GetDuration(&rtDur);
+ REFERENCE_TIME rtDur;
+ if (SUCCEEDED(m_pMS->GetDuration(&rtDur))) {
+ const CAppSettings& s = AfxGetAppSettings();
CString strOSD;
+
strOSD.Format(_T("%s%s/%s %s%d/%u - \"%s\""),
s.fRemainingTime ? _T("- ") : _T(""), ReftimeToString2(s.fRemainingTime ? rtDur - rt : rt), ReftimeToString2(rtDur),
- ResStr(IDS_AG_CHAPTER2), i + 1, nChapters, name);
+ ResStr(IDS_AG_CHAPTER2), iChapter + 1, nChapters, name);
m_OSD.DisplayMessage(OSD_TOPLEFT, strOSD, 3000);
- return;
}
}
+ }
- if (nID == ID_NAVIGATE_SKIPBACK) {
- SendMessage(WM_COMMAND, ID_NAVIGATE_SKIPBACKFILE);
- } else if (nID == ID_NAVIGATE_SKIPFORWARD) {
- SendMessage(WM_COMMAND, ID_NAVIGATE_SKIPFORWARDFILE);
+ return ret;
+}
+
+// navigate
+void CMainFrame::OnNavigateSkip(UINT nID)
+{
+ const CAppSettings& s = AfxGetAppSettings();
+
+ if (GetPlaybackMode() == PM_FILE) {
+ m_nLastSkipDirection = nID;
+
+ if (!SeekToFileChapter((nID == ID_NAVIGATE_SKIPBACK) ? -1 : 1, true)) {
+ if (nID == ID_NAVIGATE_SKIPBACK) {
+ SendMessage(WM_COMMAND, ID_NAVIGATE_SKIPBACKFILE);
+ } else if (nID == ID_NAVIGATE_SKIPFORWARD) {
+ SendMessage(WM_COMMAND, ID_NAVIGATE_SKIPFORWARDFILE);
+ }
}
} else if (GetPlaybackMode() == PM_DVD) {
m_dSpeedRate = 1.0;
@@ -8586,21 +8604,7 @@ void CMainFrame::OnNavigateChapters(UINT nID) id -= (int)m_MPLSPlaylist.GetCount();
}
- if (id >= 0 && id < (int)m_pCB->ChapGetCount() && m_pCB->ChapGetCount() > 1) {
- REFERENCE_TIME rt;
- CComBSTR name;
- if (SUCCEEDED(m_pCB->ChapGet(id, &rt, &name))) {
- SeekTo(rt, false);
- SendStatusMessage(ResStr(IDS_AG_CHAPTER2) + CString(name), 3000);
-
- REFERENCE_TIME rtDur;
- m_pMS->GetDuration(&rtDur);
- CString strOSD;
- strOSD.Format(_T("%s%s/%s %s%d/%u - \"%s\""),
- s.fRemainingTime ? _T("- ") : _T(""), ReftimeToString2(s.fRemainingTime ? rtDur - rt : rt), ReftimeToString2(rtDur),
- ResStr(IDS_AG_CHAPTER2), id + 1, m_pCB->ChapGetCount(), name);
- m_OSD.DisplayMessage(OSD_TOPLEFT, strOSD, 3000);
- }
+ if (SeekToFileChapter(id)) {
return;
}
diff --git a/src/mpc-hc/MainFrm.h b/src/mpc-hc/MainFrm.h index 56a74fc81..9a73660d1 100644 --- a/src/mpc-hc/MainFrm.h +++ b/src/mpc-hc/MainFrm.h @@ -274,6 +274,8 @@ class CMainFrame : public CFrameWnd, public CDropTarget // chapters (dvd mode)
void SetupDVDChapters();
+ bool SeekToFileChapter(int iChapter, bool bRelative = false);
+
void AddTextPassThruFilter();
int m_nLoops;
|