diff options
author | Nevcairiel <Nevcairiel@users.sourceforge.net> | 2010-08-26 22:52:39 +0400 |
---|---|---|
committer | Nevcairiel <Nevcairiel@users.sourceforge.net> | 2010-08-26 22:52:39 +0400 |
commit | 3528c6414f58d60a7571870958d2109ef18b463d (patch) | |
tree | ef730be0892e71aba2a5955061a7b575301cb6de /src | |
parent | 5698f77ab8c36334d218f102a26f743d661b8e9e (diff) |
Small cleanups and fixes.
Patch by Di Luo <sansnom05@gmail.com>
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2356 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
-rw-r--r-- | src/Subtitles/USFSubtitles.cpp | 6 | ||||
-rw-r--r-- | src/apps/mplayerc/mplayerc.cpp | 3 | ||||
-rw-r--r-- | src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp | 2 | ||||
-rw-r--r-- | src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/Subtitles/USFSubtitles.cpp b/src/Subtitles/USFSubtitles.cpp index d76f5b2e6..df762c2e9 100644 --- a/src/Subtitles/USFSubtitles.cpp +++ b/src/Subtitles/USFSubtitles.cpp @@ -30,7 +30,7 @@ CComVariant val; \
pNode->get_nodeValue(&val); \
-#define BeginEnumAttribs(pNode, pChild, name, value) \
+#define BeginEnumAttribs(pNode, pChild) \
{CComPtr<IXMLDOMNamedNodeMap> pAttribs; \
if(SUCCEEDED(pNode->get_attributes(&pAttribs)) && pAttribs != NULL) \
{ \
@@ -64,7 +64,7 @@ static CStringW GetXML(CComPtr<IXMLDOMNode> pNode) str.Replace('\n', ' ');
for(size_t i = 0; (i = str.Find(L" ", i)) >= 0; )
{
- for(++i; i < str.GetLength() && (str[i] == '\n' || str[i] == ' ');)
+ for(++i; i < str.GetLength() && (str[i] == ' ');)
str.Delete(i);
}
return(str);
@@ -74,7 +74,7 @@ static CStringW GetAttrib(CStringW attrib, CComPtr<IXMLDOMNode> pNode) {
CStringW ret;
- BeginEnumAttribs(pNode, pChild, name, val)
+ BeginEnumAttribs(pNode, pChild)
{
DeclareNameAndValue(pChild, name, val);
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 2a143ede8..f0fa42c54 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -718,6 +718,8 @@ BOOL WINAPI Mine_DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID l return ret;
}
+// Class ssftest is nowhere to see except here. Right now remove it from release build, should we just remove it completely?
+#ifdef _DEBUG
#include "../../Subtitles/SSF.h"
#include "../../Subtitles/RTS.h"
#include "../../SubPic/MemSubPic.h"
@@ -780,6 +782,7 @@ public: ::ExitProcess(0);
}
};
+#endif
BOOL SetHeapOptions() {
HMODULE hLib = LoadLibrary(L"kernel32.dll");
diff --git a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp index 7a6f1592e..b8afdadd3 100644 --- a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp @@ -72,7 +72,7 @@ HRESULT CVMR7AllocatorPresenter::CreateDevice() {
HMONITOR hMonitor = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
if(FAILED(hr = m_pIVMRSurfAllocNotify->ChangeDDrawDevice(m_pDD, hMonitor)))
- return(false);
+ return hr; //return(false);
}
return hr;
diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp index 2ca7501a3..7f7fff05a 100644 --- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp @@ -607,7 +607,7 @@ HRESULT CVMR9AllocatorPresenter::CreateDevice(CString &_Error) if(FAILED(hr = m_pIVMRSurfAllocNotify->ChangeD3DDevice(m_pD3DDev, hMonitor)))
{
_Error += L"m_pIVMRSurfAllocNotify->ChangeD3DDevice failed";
- return(false);
+ return hr; //return(false);
}
}
|