diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-16 13:37:49 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-16 13:37:49 +0400 |
commit | d8a6c5b12570aec119273ed0bf0890784f45d2ac (patch) | |
tree | 3e0bf064d68ded54002de78b947b3b8d681aba25 /src/apps | |
parent | 22cd497d1334273d22e954653113a08a1dbb1131 (diff) |
-whitespace cleanup
-updated MediaInfoDLL header
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2124 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps')
-rw-r--r-- | src/apps/mplayerc/QuicktimeGraph.h | 4 | ||||
-rw-r--r-- | src/apps/mplayerc/RealMediaGraph.h | 6 | ||||
-rw-r--r-- | src/apps/mplayerc/RealMediaWindowlessSite.h | 4 | ||||
-rw-r--r-- | src/apps/mplayerc/SettingsDefines.h | 12 | ||||
-rw-r--r-- | src/apps/mplayerc/StaticLink.cpp | 18 | ||||
-rw-r--r-- | src/apps/mplayerc/StaticLink.h | 4 | ||||
-rw-r--r-- | src/apps/mplayerc/VMROSD.cpp | 40 | ||||
-rw-r--r-- | src/apps/mplayerc/VMROSD.h | 16 |
8 files changed, 52 insertions, 52 deletions
diff --git a/src/apps/mplayerc/QuicktimeGraph.h b/src/apps/mplayerc/QuicktimeGraph.h index f52ad9c4a..86fae6cfd 100644 --- a/src/apps/mplayerc/QuicktimeGraph.h +++ b/src/apps/mplayerc/QuicktimeGraph.h @@ -58,9 +58,9 @@ public: void Run(), Pause(), Stop();
FILTER_STATE GetState();
- QT::Movie theMovie;
+ QT::Movie theMovie;
QT::MovieController theMC;
- CSize m_size;
+ CSize m_size;
public:
DECLARE_MESSAGE_MAP()
diff --git a/src/apps/mplayerc/RealMediaGraph.h b/src/apps/mplayerc/RealMediaGraph.h index 03b442cd9..c605fd9c8 100644 --- a/src/apps/mplayerc/RealMediaGraph.h +++ b/src/apps/mplayerc/RealMediaGraph.h @@ -76,10 +76,10 @@ protected: //
- FPRMCREATEENGINE m_fpCreateEngine;
- FPRMCLOSEENGINE m_fpCloseEngine;
+ FPRMCREATEENGINE m_fpCreateEngine;
+ FPRMCLOSEENGINE m_fpCloseEngine;
FPRMSETDLLACCESSPATH m_fpSetDLLAccessPath;
- HMODULE m_hRealMediaCore;
+ HMODULE m_hRealMediaCore;
CComPtr<IRMAClientEngine> m_pEngine;
CComPtr<IRMAPlayer> m_pPlayer;
diff --git a/src/apps/mplayerc/RealMediaWindowlessSite.h b/src/apps/mplayerc/RealMediaWindowlessSite.h index 4ec24de2f..f1bf3ffa7 100644 --- a/src/apps/mplayerc/RealMediaWindowlessSite.h +++ b/src/apps/mplayerc/RealMediaWindowlessSite.h @@ -93,7 +93,7 @@ public: // IRMAVideoSurface
- STDMETHODIMP Blt(UCHAR* /*IN*/ pImageData, RMABitmapInfoHeader* /*IN*/ pBitmapInfo, REF(PNxRect) /*IN*/ inDestRect, REF(PNxRect) /*IN*/ inSrcRect);
+ STDMETHODIMP Blt(UCHAR* /*IN*/ pImageData, RMABitmapInfoHeader* /*IN*/ pBitmapInfo, REF(PNxRect) /*IN*/ inDestRect, REF(PNxRect) /*IN*/ inSrcRect);
STDMETHODIMP BeginOptimizedBlt(RMABitmapInfoHeader* /*IN*/ pBitmapInfo);
STDMETHODIMP OptimizedBlt(UCHAR* /*IN*/ pImageBits, REF(PNxRect) /*IN*/ rDestRect, REF(PNxRect) /*IN*/ rSrcRect);
STDMETHODIMP EndOptimizedBlt();
@@ -209,7 +209,7 @@ public: // IRMAVideoSurface
- STDMETHODIMP Blt(UCHAR* /*IN*/ pImageData, RMABitmapInfoHeader* /*IN*/ pBitmapInfo, REF(PNxRect) /*IN*/ inDestRect, REF(PNxRect) /*IN*/ inSrcRect);
+ STDMETHODIMP Blt(UCHAR* /*IN*/ pImageData, RMABitmapInfoHeader* /*IN*/ pBitmapInfo, REF(PNxRect) /*IN*/ inDestRect, REF(PNxRect) /*IN*/ inSrcRect);
STDMETHODIMP BeginOptimizedBlt(RMABitmapInfoHeader* /*IN*/ pBitmapInfo);
STDMETHODIMP OptimizedBlt(UCHAR* /*IN*/ pImageBits, REF(PNxRect) /*IN*/ rDestRect, REF(PNxRect) /*IN*/ rSrcRect);
STDMETHODIMP EndOptimizedBlt();
diff --git a/src/apps/mplayerc/SettingsDefines.h b/src/apps/mplayerc/SettingsDefines.h index a71b323b3..995d633d1 100644 --- a/src/apps/mplayerc/SettingsDefines.h +++ b/src/apps/mplayerc/SettingsDefines.h @@ -203,8 +203,8 @@ #define IDS_RS_LAST_OPEN_DIR _T("LastOpenDir")
#define IDS_RS_ASSOCIATED_WITH_ICON _T("AssociatedWithIcon")
-#define IDS_RS_TOGGLESHADER _T("ToggleShader")
-#define IDS_RS_TOGGLESHADERSSCREENSPACE _T("ToggleShaderScreenSpace")
+#define IDS_RS_TOGGLESHADER _T("ToggleShader")
+#define IDS_RS_TOGGLESHADERSSCREENSPACE _T("ToggleShaderScreenSpace")
#define IDS_RS_DEFAULT_CAPTURE _T("DefaultCapture")
#define IDS_RS_CAPTURE _T("Capture")
@@ -213,9 +213,9 @@ #define IDS_RS_COUNTRY _T("Country")
#define IDS_RS_DVB _T("DVB configuration")
-#define IDS_RS_BDA_NETWORKPROVIDER _T("BDANetworkProvider")
-#define IDS_RS_BDA_TUNER _T("BDATuner")
-#define IDS_RS_BDA_RECEIVER _T("BDAReceiver")
-#define IDS_RS_DVB_LAST_CHANNEL _T("LastChannel")
+#define IDS_RS_BDA_NETWORKPROVIDER _T("BDANetworkProvider")
+#define IDS_RS_BDA_TUNER _T("BDATuner")
+#define IDS_RS_BDA_RECEIVER _T("BDAReceiver")
+#define IDS_RS_DVB_LAST_CHANNEL _T("LastChannel")
#define IDS_D3D9RENDERDEVICE _T("D3D9RenderDevice")
\ No newline at end of file diff --git a/src/apps/mplayerc/StaticLink.cpp b/src/apps/mplayerc/StaticLink.cpp index 6a5f14138..d467c7f2f 100644 --- a/src/apps/mplayerc/StaticLink.cpp +++ b/src/apps/mplayerc/StaticLink.cpp @@ -28,8 +28,8 @@ // CStaticLink
-COLORREF CStaticLink::g_colorUnvisited = RGB(0,0,255); // blue
-COLORREF CStaticLink::g_colorVisited = RGB(128,0,128); // purple
+COLORREF CStaticLink::g_colorUnvisited = RGB(0,0,255); // blue
+COLORREF CStaticLink::g_colorVisited = RGB(128,0,128); // purple
HCURSOR CStaticLink::g_hCursorLink = NULL;
@@ -48,9 +48,9 @@ END_MESSAGE_MAP() //
CStaticLink::CStaticLink(LPCTSTR lpText, BOOL bDeleteOnDestroy)
{
- m_link = lpText; // link text (NULL ==> window text)
- m_color = g_colorUnvisited; // not visited yet
- m_bDeleteOnDestroy = bDeleteOnDestroy; // delete object with window?
+ m_link = lpText; // link text (NULL ==> window text)
+ m_color = g_colorUnvisited; // not visited yet
+ m_bDeleteOnDestroy = bDeleteOnDestroy; // delete object with window?
}
//////////////////
@@ -116,14 +116,14 @@ void CStaticLink::OnLButtonDown(UINT nFlags, CPoint point) // For an URL, this means opening it in the browser.
//
HINSTANCE h = m_link.Navigate();
- if ((UINT)h > 32) // success!
+ if ((UINT)h > 32) // success!
{
- m_color = g_colorVisited; // change color
- Invalidate(); // repaint
+ m_color = g_colorVisited; // change color
+ Invalidate(); // repaint
}
else
{
- MessageBeep(0); // unable to execute file!
+ MessageBeep(0); // unable to execute file!
TRACE(_T("*** WARNING: CStaticLink: unable to navigate link %s\n"),
(LPCTSTR)m_link);
}
diff --git a/src/apps/mplayerc/StaticLink.h b/src/apps/mplayerc/StaticLink.h index 3edd34723..5a574918d 100644 --- a/src/apps/mplayerc/StaticLink.h +++ b/src/apps/mplayerc/StaticLink.h @@ -42,7 +42,7 @@ public: virtual HINSTANCE Navigate()
{
return IsEmpty() ? NULL :
- ShellExecute(0, _T("open"), *this, 0, 0, SW_SHOWNORMAL);
+ ShellExecute(0, _T("open"), *this, 0, 0, SW_SHOWNORMAL);
}
};
@@ -71,7 +71,7 @@ public: static HCURSOR g_hCursorLink;
protected:
- CFont m_font; // underline font for text control
+ CFont m_font; // underline font for text control
bool m_bDeleteOnDestroy; // delete object when window destroyed?
virtual void PostNcDestroy();
diff --git a/src/apps/mplayerc/VMROSD.cpp b/src/apps/mplayerc/VMROSD.cpp index c61eb2f71..43f0d04ab 100644 --- a/src/apps/mplayerc/VMROSD.cpp +++ b/src/apps/mplayerc/VMROSD.cpp @@ -50,8 +50,8 @@ CVMROSD::CVMROSD(void) m_nMessagePos = OSD_NOMESSAGE;
m_bSeekBarVisible = false;
m_bCursorMoving = false;
- m_pMFVMB = NULL;
- m_pVMB = NULL;
+ m_pMFVMB = NULL;
+ m_pVMB = NULL;
memset(&m_BitmapInfo, 0, sizeof(m_BitmapInfo));
m_FontSize = 0;
@@ -112,26 +112,26 @@ void CVMROSD::UpdateBitmap() if (m_pVMB)
{
ZeroMemory(&m_VMR9AlphaBitmap, sizeof(m_VMR9AlphaBitmap) );
- m_VMR9AlphaBitmap.dwFlags = VMRBITMAP_HDC | VMRBITMAP_SRCCOLORKEY;
- m_VMR9AlphaBitmap.hdc = m_MemDC;
- m_VMR9AlphaBitmap.rSrc = m_rectWnd;
+ m_VMR9AlphaBitmap.dwFlags = VMRBITMAP_HDC | VMRBITMAP_SRCCOLORKEY;
+ m_VMR9AlphaBitmap.hdc = m_MemDC;
+ m_VMR9AlphaBitmap.rSrc = m_rectWnd;
m_VMR9AlphaBitmap.rDest.left = 0;
- m_VMR9AlphaBitmap.rDest.top = 0;
+ m_VMR9AlphaBitmap.rDest.top = 0;
m_VMR9AlphaBitmap.rDest.right = 1.0;
m_VMR9AlphaBitmap.rDest.bottom = 1.0;
- m_VMR9AlphaBitmap.fAlpha = 1.0;
- m_VMR9AlphaBitmap.clrSrcKey = m_Color[OSD_TRANSPARENT];
+ m_VMR9AlphaBitmap.fAlpha = 1.0;
+ m_VMR9AlphaBitmap.clrSrcKey = m_Color[OSD_TRANSPARENT];
}
else if (m_pMFVMB)
{
ZeroMemory(&m_MFVideoAlphaBitmap, sizeof(m_MFVideoAlphaBitmap) );
- m_MFVideoAlphaBitmap.params.dwFlags = MFVideoAlphaBitmap_SrcColorKey;
+ m_MFVideoAlphaBitmap.params.dwFlags = MFVideoAlphaBitmap_SrcColorKey;
m_MFVideoAlphaBitmap.params.clrSrcKey = m_Color[OSD_TRANSPARENT];
- m_MFVideoAlphaBitmap.params.rcSrc = m_rectWnd;
+ m_MFVideoAlphaBitmap.params.rcSrc = m_rectWnd;
m_MFVideoAlphaBitmap.params.nrcDest.right = 1;
- m_MFVideoAlphaBitmap.params.nrcDest.bottom = 1;
+ m_MFVideoAlphaBitmap.params.nrcDest.bottom = 1;
m_MFVideoAlphaBitmap.GetBitmapFromDC = TRUE;
- m_MFVideoAlphaBitmap.bitmap.hdc = m_MemDC;
+ m_MFVideoAlphaBitmap.bitmap.hdc = m_MemDC;
}
m_MemDC.SetTextColor(RGB(255, 255, 255));
m_MemDC.SetBkMode(TRANSPARENT);
@@ -213,11 +213,11 @@ void CVMROSD::DrawSlider(CRect* rect, __int64 llMin, __int64 llMax, __int64 llPo m_rectCursor.left = m_rectBar.left;
else
m_rectCursor.left = m_rectBar.left + (long)((m_rectBar.Width() - SLIDER_CURSOR_WIDTH) * llPos / (llMax-llMin));
- m_rectCursor.right = m_rectCursor.left + SLIDER_CURSOR_WIDTH;
- m_rectCursor.top = rect->top + (rect->Height() - SLIDER_CURSOR_HEIGHT) / 2;
- m_rectCursor.bottom = m_rectCursor.top + SLIDER_CURSOR_HEIGHT;
+ m_rectCursor.right = m_rectCursor.left + SLIDER_CURSOR_WIDTH;
+ m_rectCursor.top = rect->top + (rect->Height() - SLIDER_CURSOR_HEIGHT) / 2;
+ m_rectCursor.bottom = m_rectCursor.top + SLIDER_CURSOR_HEIGHT;
- DrawRect (rect, &m_brushBack, &m_penBorder);
+ DrawRect (rect, &m_brushBack, &m_penBorder);
DrawRect (&m_rectBar, &m_brushBar);
DrawRect (&m_rectCursor, NULL, &m_penCursor);
}
@@ -244,7 +244,7 @@ void CVMROSD::DrawMessage() rectMessages = CRect (m_rectWnd.right-10-rectText.Width(), 10, m_rectWnd.right-10, rectText.bottom + 10);
break;
}
- DrawRect (&rectMessages, &m_brushBack, &m_penBorder);
+ DrawRect (&rectMessages, &m_brushBack, &m_penBorder);
m_MemDC.DrawText (m_strMessage, &rectMessages, DT_SINGLELINE |DT_CENTER|DT_VCENTER);
}
}
@@ -354,7 +354,7 @@ bool CVMROSD::OnLButtonDown(UINT nFlags, CPoint point) {
if (m_rectCursor.PtInRect (point))
{
- m_bCursorMoving = true;
+ m_bCursorMoving = true;
bRet = true;
}
else if (m_rectSeekBar.PtInRect(point))
@@ -449,8 +449,8 @@ void CVMROSD::DisplayMessage (OSD_MESSAGEPOS nPos, LPCTSTR strMsg, int nDuration nDuration = -1;
}
- int temp_m_FontSize = m_FontSize;
- CString temp_m_OSD_Font = m_OSD_Font;
+ int temp_m_FontSize = m_FontSize;
+ CString temp_m_OSD_Font = m_OSD_Font;
if (FontSize == 0) m_FontSize = AfxGetAppSettings().nOSD_Size;
else m_FontSize = FontSize;
diff --git a/src/apps/mplayerc/VMROSD.h b/src/apps/mplayerc/VMROSD.h index 32b965fd9..6462045df 100644 --- a/src/apps/mplayerc/VMROSD.h +++ b/src/apps/mplayerc/VMROSD.h @@ -74,15 +74,15 @@ public: bool OnLButtonUp(UINT nFlags, CPoint point);
private :
- CComPtr<IVMRMixerBitmap9> m_pVMB;
+ CComPtr<IVMRMixerBitmap9> m_pVMB;
CComPtr<IMFVideoMixerBitmap> m_pMFVMB;
- CWnd* m_pWnd;
+ CWnd* m_pWnd;
- CCritSec m_Lock;
- CDC m_MemDC;
+ CCritSec m_Lock;
+ CDC m_MemDC;
VMR9AlphaBitmap m_VMR9AlphaBitmap;
MFVideoAlphaBitmap m_MFVideoAlphaBitmap;
- BITMAP m_BitmapInfo;
+ BITMAP m_BitmapInfo;
CFont m_MainFont;
CPen m_penBorder;
@@ -92,7 +92,7 @@ private : CPen m_debugPenBorder;
CBrush m_debugBrushBack;
int m_FontSize;
- CString m_OSD_Font;
+ CString m_OSD_Font;
CRect m_rectWnd;
COLORREF m_Color[OSD_LAST];
@@ -108,9 +108,9 @@ private : __int64 m_llSeekPos;
// Messages
- CString m_strMessage;
+ CString m_strMessage;
OSD_MESSAGEPOS m_nMessagePos;
- CList<CString> m_debugMessages;
+ CList<CString> m_debugMessages;
void UpdateBitmap();
void CalcRect();
|