diff options
Diffstat (limited to 'src/apps/mplayerc/WebClientSocket.cpp')
| -rw-r--r-- | src/apps/mplayerc/WebClientSocket.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/apps/mplayerc/WebClientSocket.cpp b/src/apps/mplayerc/WebClientSocket.cpp index 01eff705b..5e8bbc283 100644 --- a/src/apps/mplayerc/WebClientSocket.cpp +++ b/src/apps/mplayerc/WebClientSocket.cpp @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -344,7 +344,7 @@ bool CWebClientSocket::OnCommand(CStringA& hdr, CStringA& body, CStringA& mime) }
} else if(arg == CMD_SETVOLUME && m_request.Lookup(_T("volume"), arg)) {
int volume = _tcstol(arg, NULL, 10);
- m_pMainFrame->m_wndToolBar.Volume = min(max(volume, 1), 100);
+ m_pMainFrame->m_wndToolBar.Volume = min(max(volume, 0), 100);
m_pMainFrame->OnPlayVolume(0);
}
}
@@ -656,6 +656,8 @@ bool CWebClientSocket::OnStatus(CStringA& hdr, CStringA& body, CStringA& mime) CString title;
m_pMainFrame->GetWindowText(title);
+ CPath file(m_pMainFrame->m_wndPlaylistBar.GetCurFileName());
+
CString status;// = m_pMainFrame->GetStatusMessage();
OAFilterState fs = m_pMainFrame->GetMediaState();
switch (fs) {
@@ -683,11 +685,11 @@ bool CWebClientSocket::OnStatus(CStringA& hdr, CStringA& body, CStringA& mime) title.Replace(_T("'"), _T("\\'"));
status.Replace(_T("'"), _T("\\'"));
- body.Format("OnStatus('%s', '%s', %d, '%s', %d, '%s', %d, %d)", // , '%s', '%s'
+ body.Format("OnStatus('%s', '%s', %d, '%s', %d, '%s', %d, %d, '%s')", // , '%s'
UTF8(title), UTF8(status),
pos, UTF8(posstr), dur, UTF8(durstr),
- m_pMainFrame->IsMuted(), m_pMainFrame->GetVolume()
- /*, UTF8(path), UTF8(dir)*/);
+ m_pMainFrame->IsMuted(), m_pMainFrame->GetVolume(),
+ UTF8(file)/*, UTF8(dir)*/);
return true;
}
|