NEW : Command lines "/dvdpos title#chapter" and "/dvdpos title#hh:mm:ss.ff" to start playback to position

CHANGED: Number of file and DVD position increase from 5 to 20 (req #1819709)
CHANGED: Bypass of UOPs for DVD (req #1811508). This feature didn't works for x64 build
CHANGED: compilation warning removed

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@808 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 4 insertions, 4 deletions

diff --git a/src/apps/mplayerc/PlayerSubresyncBar.cpp b/src/apps/mplayerc/PlayerSubresyncBar.cpp
index 3a9a6d6b2..65e546a6e 100644
--- a/src/apps/mplayerc/PlayerSubresyncBar.cpp
+++ b/src/apps/mplayerc/PlayerSubresyncBar.cpp
@@ -241,7 +241,7 @@ void CPlayerSubresyncBar::SaveSubtitle()
 		for(int i = 0, j = m_sts.GetCount(); i < j; i++) 

 		{

 			int vobid, cellid, forced, spnum, c;

-			if(_stscanf(m_sts.GetStr(i), _T("%d%c%d%c%d%c%d"), &vobid, &c, &cellid, &c, &forced, &c, &spnum) != 7) continue;

+			if(_stscanf_s(m_sts.GetStr(i), _T("%d%c%d%c%d%c%d"), &vobid, &c, &cellid, &c, &forced, &c, &spnum) != 7) continue;

             sp[spnum].start = m_sts[i].start;

 			sp[spnum].stop = m_sts[i].end;

 			sp[spnum].fValid = true;

@@ -428,7 +428,7 @@ void CPlayerSubresyncBar::UpdateStrings()
 		for(int i = 0, j = m_sts.GetCount(); i < j; i++)

 		{

 			int vobid, cellid, forced, c;

-			if(_stscanf(m_sts.GetStr(i), _T("%d%c%d%c%d"), &vobid, &c, &cellid, &c, &forced) != 5) continue;

+			if(_stscanf_s(m_sts.GetStr(i), _T("%d%c%d%c%d"), &vobid, &c, &cellid, &c, &forced) != 5) continue;

 			if(vobid < 0) str = _T("-");

 			else str.Format(_T("%d"), vobid);

 			m_list.SetItemText(i, COL_VOBID, str);

@@ -577,7 +577,7 @@ static bool ParseTime(CString str, int& ret, bool fWarn = true)
 	str.Trim();

 	if(str.GetLength() > 0 && str[0] == '-') sign = -1;

 

-	int n = _stscanf(str, _T("%d%c%d%c%d%c%d"), &h, &c, &m, &c, &s, &c, &ms);

+	int n = _stscanf_s(str, _T("%d%c%d%c%d%c%d"), &h, &c, &m, &c, &s, &c, &ms);

 

 	h = abs(h);

 

@@ -710,7 +710,7 @@ void CPlayerSubresyncBar::OnEndlabeleditList(NMHDR* pNMHDR, LRESULT* pResult)
 		else if(pItem->iSubItem == COL_LAYER && m_mode == TEXTSUB)

 		{

 			int l;

-			if(_stscanf(pItem->pszText, _T("%d"), &l) == 1)

+			if(_stscanf_s(pItem->pszText, _T("%d"), &l) == 1)

 			{

 				fNeedsUpdate = true;

 				m_sts[pItem->iItem].layer = l;