diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-07-31 16:17:28 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-07-31 16:17:28 +0400 |
| commit | 6c3865d2bc680096aca8f8865c85eba32bac4485 (patch) | |
| tree | 0061b162cd1ffb5b8638cb1474f014794fab8996 /src/apps/mplayerc | |
| parent | 6509ee9a3650856e8aa4bc92986430593b07f0c3 (diff) | |
* replace quoted includes with angle bracket ones for system headers
* move some includes in the beginning of the files
* minor white space changes
* update copyright year for files which were updated in previous commits
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3517 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc')
92 files changed, 322 insertions, 250 deletions
diff --git a/src/apps/mplayerc/AppSettings.cpp b/src/apps/mplayerc/AppSettings.cpp index cd394f359..4797654d0 100644 --- a/src/apps/mplayerc/AppSettings.cpp +++ b/src/apps/mplayerc/AppSettings.cpp @@ -24,9 +24,8 @@ #include "stdafx.h"
#include "mplayerc.h"
#include "MiniDump.h"
-
#include "AppSettings.h"
-// Settings
+
CAppSettings::CAppSettings()
: fInitialized(false)
@@ -188,7 +187,6 @@ CAppSettings::CAppSettings() #endif
}
-
void CAppSettings::CreateCommands()
{
#define ADDCMD(cmd) wmcmds.AddTail(wmcmd##cmd)
@@ -1830,7 +1828,6 @@ CAppSettings::CRecentFileAndURLList::CRecentFileAndURLList(UINT nStart, LPCTSTR {
}
-//#include <afximpl.h>
extern BOOL AFXAPI AfxFullPath(LPTSTR lpszPathOut, LPCTSTR lpszFileIn);
extern BOOL AFXAPI AfxComparePath(LPCTSTR lpszPath1, LPCTSTR lpszPath2);
diff --git a/src/apps/mplayerc/AppSettings.h b/src/apps/mplayerc/AppSettings.h index 21e343358..8ce353f48 100644 --- a/src/apps/mplayerc/AppSettings.h +++ b/src/apps/mplayerc/AppSettings.h @@ -30,6 +30,8 @@ #include "MediaFormats.h"
#include "DVBChannel.h"
+#include <afxsock.h>
+
// flags for AppSettings::nCS
enum {
CS_NONE=0,
@@ -171,6 +173,7 @@ typedef struct { int bpp, freq;
DWORD dmDisplayFlags;
} dispmode;
+
typedef struct {
bool bEnabled;
dispmode dmFullscreenRes24Hz;
@@ -228,8 +231,6 @@ public: }
};
-#include <afxsock.h>
-
class CRemoteCtrlClient : public CAsyncSocket
{
protected:
diff --git a/src/apps/mplayerc/AuthDlg.cpp b/src/apps/mplayerc/AuthDlg.cpp index 38c234042..8231d396a 100644 --- a/src/apps/mplayerc/AuthDlg.cpp +++ b/src/apps/mplayerc/AuthDlg.cpp @@ -132,7 +132,6 @@ void CAuthDlg::OnBnClickedOk() OnOK();
}
-
void CAuthDlg::OnCbnSelchangeCombo1()
{
CString username;
diff --git a/src/apps/mplayerc/AuthDlg.h b/src/apps/mplayerc/AuthDlg.h index 89d589967..fc9a03c15 100644 --- a/src/apps/mplayerc/AuthDlg.h +++ b/src/apps/mplayerc/AuthDlg.h @@ -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.
*
@@ -23,7 +23,7 @@ #pragma once
-#include "afxwin.h"
+#include <afxwin.h>
// CAuthDlg dialog
diff --git a/src/apps/mplayerc/BaseGraph.cpp b/src/apps/mplayerc/BaseGraph.cpp index e806700d9..d00af512b 100644 --- a/src/apps/mplayerc/BaseGraph.cpp +++ b/src/apps/mplayerc/BaseGraph.cpp @@ -109,7 +109,6 @@ void CBaseGraph::ClearMessageQueue() }
}
-
void CBaseGraph::NotifyEvent(long lEventCode, LONG_PTR lParam1, LONG_PTR lParam2)
{
if (!m_hNotifyWnd) {
@@ -130,14 +129,17 @@ STDMETHODIMP CBaseGraph::GetTypeInfoCount(UINT* pctinfo) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetIDsOfNames(REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr)
{
return E_NOTIMPL;
@@ -148,30 +150,37 @@ STDMETHODIMP CBaseGraph::AddFilter(IBaseFilter* pFilter, LPCWSTR pName) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::RemoveFilter(IBaseFilter* pFilter)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::EnumFilters(IEnumFilters** ppEnum)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::FindFilterByName(LPCWSTR pName, IBaseFilter** ppFilter)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::ConnectDirect(IPin* ppinOut, IPin* ppinIn, const AM_MEDIA_TYPE* pmt)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::Reconnect(IPin* ppin)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::Disconnect(IPin* ppin)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetDefaultSyncSource()
{
return E_NOTIMPL;
@@ -182,27 +191,33 @@ STDMETHODIMP CBaseGraph::Connect(IPin* ppinOut, IPin* ppinIn) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::Render(IPin* ppinOut)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter)
{
*ppFilter = NULL;
return RenderFile(lpcwstrFileName, NULL);
}//E_NOTIMPL;}
+
STDMETHODIMP CBaseGraph::SetLogFile(DWORD_PTR hFile)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::Abort()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::ShouldOperationContinue()
{
return E_NOTIMPL;
@@ -213,10 +228,12 @@ STDMETHODIMP CBaseGraph::AddSourceFilterForMoniker(IMoniker* pMoniker, IBindCtx* {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::ReconnectEx(IPin* ppin, const AM_MEDIA_TYPE* pmt)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::RenderEx(IPin* pPinOut, DWORD dwFlags, DWORD* pvContext)
{
return E_NOTIMPL;
@@ -227,34 +244,42 @@ STDMETHODIMP CBaseGraph::IsPinDirection(IPin* pPin, PIN_DIRECTION dir) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::IsPinConnected(IPin* pPin)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::ConnectFilter(IBaseFilter* pBF, IPin* pPinIn)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::ConnectFilter(IPin* pPinOut, IBaseFilter* pBF)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::ConnectFilterDirect(IPin* pPinOut, IBaseFilter* pBF, const AM_MEDIA_TYPE* pmt)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::NukeDownstream(IUnknown* pUnk)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::FindInterface(REFIID iid, void** ppv, BOOL bRemove)
{
return QueryInterface(iid, ppv);
}
+
STDMETHODIMP CBaseGraph::AddToROT()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::RemoveFromROT()
{
return E_NOTIMPL;
@@ -265,34 +290,42 @@ STDMETHODIMP CBaseGraph::Run() {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::Pause()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::Stop()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetState(LONG msTimeout, OAFilterState* pfs)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::RenderFile(BSTR strFilename)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::AddSourceFilter(BSTR strFilename, IDispatch** ppUnk)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_FilterCollection(IDispatch** ppUnk)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_RegFilterCollection(IDispatch** ppUnk)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::StopWhenReady()
{
return Stop();
@@ -303,6 +336,7 @@ STDMETHODIMP CBaseGraph::GetEventHandle(OAEVENT* hEvent) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetEvent(long* lEventCode, LONG_PTR* lParam1, LONG_PTR* lParam2, long msTimeout)
{
if (m_msgqueue.IsEmpty()) {
@@ -322,18 +356,22 @@ STDMETHODIMP CBaseGraph::GetEvent(long* lEventCode, LONG_PTR* lParam1, LONG_PTR* return S_OK;
}
+
STDMETHODIMP CBaseGraph::WaitForCompletion(long msTimeout, long* pEvCode)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::CancelDefaultHandling(long lEvCode)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::RestoreDefaultHandling(long lEvCode)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::FreeEventParams(long lEvCode, LONG_PTR lParam1, LONG_PTR lParam2)
{
if (EC_BG_ERROR == lEvCode) {
@@ -359,10 +397,12 @@ STDMETHODIMP CBaseGraph::SetNotifyWindow(OAHWND hwnd, long lMsg, LONG_PTR lInsta return S_OK;
}
+
STDMETHODIMP CBaseGraph::SetNotifyFlags(long lNoNotifyFlags)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetNotifyFlags(long* lplNoNotifyFlags)
{
return E_NOTIMPL;
@@ -373,6 +413,7 @@ STDMETHODIMP CBaseGraph::GetCapabilities(DWORD* pCapabilities) {
return pCapabilities ? *pCapabilities = AM_SEEKING_CanSeekAbsolute|AM_SEEKING_CanGetCurrentPos|AM_SEEKING_CanGetDuration, S_OK : E_POINTER;
}
+
STDMETHODIMP CBaseGraph::CheckCapabilities(DWORD* pCapabilities)
{
CheckPointer(pCapabilities, E_POINTER);
@@ -388,62 +429,77 @@ STDMETHODIMP CBaseGraph::CheckCapabilities(DWORD* pCapabilities) return caps2 == 0 ? E_FAIL : caps2 == *pCapabilities ? S_OK : S_FALSE;
}
+
STDMETHODIMP CBaseGraph::IsFormatSupported(const GUID* pFormat)
{
return !pFormat ? E_POINTER : *pFormat == TIME_FORMAT_MEDIA_TIME ? S_OK : S_FALSE;
}
+
STDMETHODIMP CBaseGraph::QueryPreferredFormat(GUID* pFormat)
{
return GetTimeFormat(pFormat);
}
+
STDMETHODIMP CBaseGraph::GetTimeFormat(GUID* pFormat)
{
return pFormat ? *pFormat = TIME_FORMAT_MEDIA_TIME, S_OK : E_POINTER;
}
+
STDMETHODIMP CBaseGraph::IsUsingTimeFormat(const GUID* pFormat)
{
return IsFormatSupported(pFormat);
}
+
STDMETHODIMP CBaseGraph::SetTimeFormat(const GUID* pFormat)
{
return S_OK == IsFormatSupported(pFormat) ? S_OK : E_INVALIDARG;
}
+
STDMETHODIMP CBaseGraph::GetDuration(LONGLONG* pDuration)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetStopPosition(LONGLONG* pStop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetCurrentPosition(LONGLONG* pCurrent)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetRate(double dRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetRate(double* pdRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetPreroll(LONGLONG* pllPreroll)
{
return E_NOTIMPL;
@@ -454,154 +510,192 @@ STDMETHODIMP CBaseGraph::put_Caption(BSTR strCaption) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Caption(BSTR* strCaption)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_WindowStyle(long WindowStyle)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_WindowStyle(long* WindowStyle)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_WindowStyleEx(long WindowStyleEx)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_WindowStyleEx(long* WindowStyleEx)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_AutoShow(long AutoShow)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_AutoShow(long* AutoShow)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_WindowState(long WindowState)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_WindowState(long* WindowState)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_BackgroundPalette(long BackgroundPalette)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_BackgroundPalette(long* pBackgroundPalette)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_Visible(long Visible)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Visible(long* pVisible)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_Left(long Left)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Left(long* pLeft)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_Width(long Width)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Width(long* pWidth)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_Top(long Top)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Top(long* pTop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_Height(long Height)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Height(long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_Owner(OAHWND Owner)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Owner(OAHWND* Owner)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_MessageDrain(OAHWND Drain)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_MessageDrain(OAHWND* Drain)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_BorderColor(long* Color)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_BorderColor(long Color)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_FullScreenMode(long* FullScreenMode)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_FullScreenMode(long FullScreenMode)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetWindowForeground(long Focus)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::NotifyOwnerMessage(OAHWND hwnd, long uMsg, LONG_PTR wParam, LONG_PTR lParam)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetWindowPosition(long Left, long Top, long Width, long Height)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetWindowPosition(long* pLeft, long* pTop, long* pWidth, long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetMinIdealImageSize(long* pWidth, long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetMaxIdealImageSize(long* pWidth, long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetRestorePosition(long* pLeft, long* pTop, long* pWidth, long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::HideCursor(long HideCursor)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::IsCursorHidden(long* CursorHidden)
{
return E_NOTIMPL;
@@ -612,126 +706,157 @@ STDMETHODIMP CBaseGraph::get_AvgTimePerFrame(REFTIME* pAvgTimePerFrame) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_BitRate(long* pBitRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_BitErrorRate(long* pBitErrorRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_VideoWidth(long* pVideoWidth)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_VideoHeight(long* pVideoHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_SourceLeft(long SourceLeft)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_SourceLeft(long* pSourceLeft)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_SourceWidth(long SourceWidth)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_SourceWidth(long* pSourceWidth)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_SourceTop(long SourceTop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_SourceTop(long* pSourceTop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_SourceHeight(long SourceHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_SourceHeight(long* pSourceHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_DestinationLeft(long DestinationLeft)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_DestinationLeft(long* pDestinationLeft)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_DestinationWidth(long DestinationWidth)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_DestinationWidth(long* pDestinationWidth)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_DestinationTop(long DestinationTop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_DestinationTop(long* pDestinationTop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_DestinationHeight(long DestinationHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_DestinationHeight(long* pDestinationHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetSourcePosition(long Left, long Top, long Width, long Height)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetSourcePosition(long* pLeft, long* pTop, long* pWidth, long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetDefaultSourcePosition()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetDestinationPosition(long Left, long Top, long Width, long Height)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetDestinationPosition(long* pLeft, long* pTop, long* pWidth, long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::SetDefaultDestinationPosition()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetVideoSize(long* pWidth, long* pHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetVideoPaletteEntries(long StartIndex, long Entries, long* pRetrieved, long* pPalette)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::GetCurrentImage(long* pBufferSize, long* pDIBImage)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::IsUsingDefaultSource()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::IsUsingDefaultDestination()
{
return E_NOTIMPL;
@@ -742,14 +867,17 @@ STDMETHODIMP CBaseGraph::put_Volume(long lVolume) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Volume(long* plVolume)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::put_Balance(long lBalance)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::get_Balance(long* plBalance)
{
return E_NOTIMPL;
@@ -760,6 +888,7 @@ STDMETHODIMP CBaseGraph::QueryProgress(LONGLONG* pllTotal, LONGLONG* pllCurrent) {
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseGraph::AbortOperation()
{
return E_NOTIMPL;
diff --git a/src/apps/mplayerc/CGdiPlusBitmap.h b/src/apps/mplayerc/CGdiPlusBitmap.h index 1ea829478..1cacd9661 100644 --- a/src/apps/mplayerc/CGdiPlusBitmap.h +++ b/src/apps/mplayerc/CGdiPlusBitmap.h @@ -33,7 +33,6 @@ public: }
};
-
class CGdiPlusBitmapResource : public CGdiPlusBitmap
{
protected:
@@ -70,8 +69,7 @@ public: }
};
-inline
-void CGdiPlusBitmapResource::Empty()
+inline void CGdiPlusBitmapResource::Empty()
{
CGdiPlusBitmap::Empty();
if (m_hBuffer) {
@@ -81,8 +79,7 @@ void CGdiPlusBitmapResource::Empty() }
}
-inline
-bool CGdiPlusBitmapResource::Load(LPCTSTR pName, LPCTSTR pType, HMODULE hInst)
+inline bool CGdiPlusBitmapResource::Load(LPCTSTR pName, LPCTSTR pType, HMODULE hInst)
{
Empty();
diff --git a/src/apps/mplayerc/ChildView.h b/src/apps/mplayerc/ChildView.h index 0a23dae25..338c9605f 100644 --- a/src/apps/mplayerc/ChildView.h +++ b/src/apps/mplayerc/ChildView.h @@ -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.
*
diff --git a/src/apps/mplayerc/ComPropertySheet.h b/src/apps/mplayerc/ComPropertySheet.h index 65a8a65fb..f427d9748 100644 --- a/src/apps/mplayerc/ComPropertySheet.h +++ b/src/apps/mplayerc/ComPropertySheet.h @@ -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.
*
diff --git a/src/apps/mplayerc/DVBChannel.cpp b/src/apps/mplayerc/DVBChannel.cpp index f1984e34a..9d140fc55 100644 --- a/src/apps/mplayerc/DVBChannel.cpp +++ b/src/apps/mplayerc/DVBChannel.cpp @@ -47,7 +47,6 @@ CDVBChannel::~CDVBChannel(void) {
}
-
void CDVBChannel::FromString(CString strValue)
{
int i = 0;
@@ -92,7 +91,6 @@ void CDVBChannel::FromString(CString strValue) }
}
-
CString CDVBChannel::ToString()
{
CString strValue;
@@ -126,7 +124,6 @@ CString CDVBChannel::ToString() return strValue;
}
-
void CDVBChannel::SetName(BYTE* Value)
{
USES_CONVERSION;
@@ -162,4 +159,4 @@ void CDVBChannel::AddStreamInfo (ULONG ulPID, DVB_STREAM_TYPE nType, PES_STREAM_ }
break;
}
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/DVBChannel.h b/src/apps/mplayerc/DVBChannel.h index 7a8937a69..4f82b87ef 100644 --- a/src/apps/mplayerc/DVBChannel.h +++ b/src/apps/mplayerc/DVBChannel.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -45,7 +45,6 @@ typedef enum { DVB_UNKNOWN = 0xFF
} DVB_STREAM_TYPE;
-
typedef struct {
ULONG PID;
DVB_STREAM_TYPE Type;
diff --git a/src/apps/mplayerc/EditListEditor.cpp b/src/apps/mplayerc/EditListEditor.cpp index 6eeaf3fb8..f9928f89e 100644 --- a/src/apps/mplayerc/EditListEditor.cpp +++ b/src/apps/mplayerc/EditListEditor.cpp @@ -58,7 +58,6 @@ void CClip::SetOut (REFERENCE_TIME rtVal) }
};
-
CString CClip::GetIn()
{
if (m_rtIn == _I64_MIN) {
@@ -77,7 +76,6 @@ CString CClip::GetOut() }
}
-
IMPLEMENT_DYNAMIC(CEditListEditor, CSizingControlBarG)
CEditListEditor::CEditListEditor(void)
{
@@ -107,7 +105,6 @@ BEGIN_MESSAGE_MAP(CEditListEditor, CSizingControlBarG) ON_NOTIFY(LVN_ENDLABELEDIT, IDC_EDITLIST, OnEndlabeleditList)
END_MESSAGE_MAP()
-
BOOL CEditListEditor::Create(CWnd* pParentWnd)
{
if (!CSizingControlBarG::Create(_T("Edit List Editor"), pParentWnd, ID_VIEW_EDITLISTEDITOR)) {
@@ -164,7 +161,6 @@ void CEditListEditor::ResizeListColumn() }
}
-
void CEditListEditor::SaveEditListToFile()
{
if ((m_bFileOpen || m_EditList.GetCount() >0) && !m_strFileName.IsEmpty()) {
@@ -342,7 +338,6 @@ POSITION CEditListEditor::InsertClip(POSITION pos, CClip& NewClip) return NewClipPos;
}
-
void CEditListEditor::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
{
if (nIDCtl != IDC_EDITLIST) {
@@ -429,7 +424,6 @@ void CEditListEditor::OnLvnKeyDown(NMHDR* pNMHDR, LRESULT* pResult) }
}
-
void CEditListEditor::OnBeginDrag(NMHDR* pNMHDR, LRESULT* pResult)
{
ModifyStyle(WS_EX_ACCEPTFILES, 0);
@@ -541,7 +535,6 @@ void CEditListEditor::OnLButtonUp(UINT nFlags, CPoint point) __super::OnLButtonUp(nFlags, point);
}
-
void CEditListEditor::DropItemOnList()
{
m_ptDropPoint.y -= 10; //
diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index 701ce17a8..0081bb436 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -25,17 +25,18 @@ #include "mplayerc.h"
#include "FGManager.h"
#include "../../DSUtil/DSUtil.h"
-#include "../../filters/filters.h"
+#include "../../filters/Filters.h"
#include "AllocatorCommon7.h"
#include "AllocatorCommon.h"
#include "SyncAllocatorPresenter.h"
#include "DeinterlacerFilter.h"
#include "WinAPIUtils.h"
+#include "../../DeCSS/VobFile.h"
#include <initguid.h>
#include <moreuuids.h>
#include <dmodshow.h>
-#include <D3d9.h>
-#include <Vmr9.h>
+#include <d3d9.h>
+#include <vmr9.h>
#include <evr.h>
#include <evr9.h>
#include <ksproxy.h>
@@ -2512,8 +2513,6 @@ CFGManagerDVD::CFGManagerDVD(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd) m_transform.AddTail(DNew CFGFilterRegistry(GUIDFromCString(_T("{F50B3F13-19C4-11CF-AA9A-02608C9BABA2}")), MERIT64_DO_NOT_USE));
}
-#include "../../DeCSS/VobFile.h"
-
class CResetDVD : public CDVDSession
{
public:
@@ -2641,4 +2640,3 @@ STDMETHODIMP CFGAggregator::NonDelegatingQueryInterface(REFIID riid, void** ppv) m_pUnkInner && (riid != IID_IUnknown && SUCCEEDED(m_pUnkInner->QueryInterface(riid, ppv))) ? S_OK :
__super::NonDelegatingQueryInterface(riid, ppv);
}
-
diff --git a/src/apps/mplayerc/FGManagerBDA.cpp b/src/apps/mplayerc/FGManagerBDA.cpp index fe37d255e..9926be2e2 100644 --- a/src/apps/mplayerc/FGManagerBDA.cpp +++ b/src/apps/mplayerc/FGManagerBDA.cpp @@ -29,7 +29,7 @@ #include <mpeg2data.h>
#include <tuner.h>
#include <time.h>
-#include <Dvbsiparser.h>
+#include <dvbsiparser.h>
#include "../../DSUtil/DSUtil.h"
#include "../../DSUtil/GolombBuffer.h"
@@ -289,7 +289,6 @@ CFGManagerBDA::~CFGManagerBDA() LOG (_T("\nCFGManagerBDA object destroyed."));
}
-
HRESULT CFGManagerBDA::CreateKSFilter(IBaseFilter** ppBF, CLSID KSCategory, CStringW& DisplayName)
{
HRESULT hr = VFW_E_NOT_FOUND;
@@ -321,7 +320,6 @@ HRESULT CFGManagerBDA::CreateKSFilter(IBaseFilter** ppBF, CLSID KSCategory, CStr return hr;
}
-
HRESULT CFGManagerBDA::SearchIBDATopology(const CComPtr<IBaseFilter>& pTuner, REFIID iid, CComPtr<IUnknown>& pUnk)
{
CComQIPtr<IBDA_Topology> pTop(pTuner);
@@ -356,8 +354,6 @@ HRESULT CFGManagerBDA::SearchIBDATopology(const CComPtr<IBaseFilter>& pTuner, RE return hr;
}
-
-
HRESULT CFGManagerBDA::ConnectFilters(IBaseFilter* pOutFilter, IBaseFilter* pInFilter)
{
HRESULT hr = VFW_E_CANNOT_CONNECT;
@@ -395,8 +391,6 @@ HRESULT CFGManagerBDA::ConnectFilters(IBaseFilter* pOutFilter, IBaseFilter* pInF return hr;
}
-
-
STDMETHODIMP CFGManagerBDA::RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList)
{
HRESULT hr;
@@ -533,7 +527,6 @@ STDMETHODIMP CFGManagerBDA::SetFrequency(ULONG freq) return hr;
}
-
STDMETHODIMP CFGManagerBDA::Scan(ULONG ulFrequency, HWND hWnd)
{
CMpeg2DataParser Parser (m_DVBStreams[DVB_PSI].GetFilter());
@@ -683,7 +676,6 @@ STDMETHODIMP CFGManagerBDA::Info(long lIndex, AM_MEDIA_TYPE** ppmt, DWORD* pdwFl return hr;
}
-
STDMETHODIMP CFGManagerBDA::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
CheckPointer(ppv, E_POINTER);
@@ -694,7 +686,6 @@ STDMETHODIMP CFGManagerBDA::NonDelegatingQueryInterface(REFIID riid, void** ppv) __super::NonDelegatingQueryInterface(riid, ppv);
}
-
HRESULT CFGManagerBDA::CreateMicrosoftDemux(IBaseFilter* pReceiver, CComPtr<IBaseFilter>& pMpeg2Demux)
{
CComPtr<IMpeg2Demultiplexer> pDemux;
@@ -746,7 +737,6 @@ HRESULT CFGManagerBDA::CreateMicrosoftDemux(IBaseFilter* pReceiver, CComPtr<IBas return S_OK;
}
-
HRESULT CFGManagerBDA::SetChannelInternal (CDVBChannel* pChannel)
{
HRESULT hr = S_OK;
@@ -802,7 +792,6 @@ HRESULT CFGManagerBDA::SetChannelInternal (CDVBChannel* pChannel) return hr;
}
-
HRESULT CFGManagerBDA::SwitchStream (DVB_STREAM_TYPE& nOldType, DVB_STREAM_TYPE nNewType)
{
if ((nNewType != nOldType) || (nNewType == DVB_H264)) {
@@ -838,7 +827,6 @@ HRESULT CFGManagerBDA::UpdatePSI(PresentFollowing &NowNext) return hr;
}
-
HRESULT CFGManagerBDA::ChangeState(FILTER_STATE nRequested)
{
HRESULT hr = S_OK;
@@ -880,7 +868,6 @@ HRESULT CFGManagerBDA::ChangeState(FILTER_STATE nRequested) return hr;
}
-
FILTER_STATE CFGManagerBDA::GetState()
{
CComPtr<IMediaControl> pMC;
diff --git a/src/apps/mplayerc/FGManagerBDA.h b/src/apps/mplayerc/FGManagerBDA.h index ea4367506..b03ec01a7 100644 --- a/src/apps/mplayerc/FGManagerBDA.h +++ b/src/apps/mplayerc/FGManagerBDA.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -115,7 +115,6 @@ private : }
};
-
class CFGManagerBDA : public CFGManagerPlayer, IBDATuner, IAMStreamSelect
{
public:
diff --git a/src/apps/mplayerc/FakeFilterMapper2.cpp b/src/apps/mplayerc/FakeFilterMapper2.cpp index 79499dd30..d518e5e7a 100644 --- a/src/apps/mplayerc/FakeFilterMapper2.cpp +++ b/src/apps/mplayerc/FakeFilterMapper2.cpp @@ -290,6 +290,7 @@ LONG WINAPI Mine_RegCloseKey(HKEY a0) }
return Real_RegCloseKey(a0);
}
+
LONG WINAPI Mine_RegFlushKey(HKEY a0)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -297,6 +298,7 @@ LONG WINAPI Mine_RegFlushKey(HKEY a0) }
return Real_RegFlushKey(a0);
}
+
LONG WINAPI Mine_RegCreateKeyA(HKEY a0, LPCSTR a1, PHKEY a2)
{
if (CFilterMapper2::m_pFilterMapper2) {
@@ -305,6 +307,7 @@ LONG WINAPI Mine_RegCreateKeyA(HKEY a0, LPCSTR a1, PHKEY a2) }
return Real_RegCreateKeyA(a0, a1, a2);
}
+
LONG WINAPI Mine_RegCreateKeyW(HKEY a0, LPCWSTR a1, PHKEY a2)
{
if (CFilterMapper2::m_pFilterMapper2) {
@@ -313,6 +316,7 @@ LONG WINAPI Mine_RegCreateKeyW(HKEY a0, LPCWSTR a1, PHKEY a2) }
return Real_RegCreateKeyW(a0, a1, a2);
}
+
LONG WINAPI Mine_RegCreateKeyExA(HKEY a0, LPCSTR a1, DWORD a2, LPSTR a3, DWORD a4, REGSAM a5, LPSECURITY_ATTRIBUTES a6, PHKEY a7, LPDWORD a8)
{
if (CFilterMapper2::m_pFilterMapper2) {
@@ -321,6 +325,7 @@ LONG WINAPI Mine_RegCreateKeyExA(HKEY a0, LPCSTR a1, DWORD a2, LPSTR a3, DWORD a }
return Real_RegCreateKeyExA(a0, a1, a2, a3, a4, a5, a6, a7, a8);
}
+
LONG WINAPI Mine_RegCreateKeyExW(HKEY a0, LPCWSTR a1, DWORD a2, LPWSTR a3, DWORD a4, REGSAM a5, LPSECURITY_ATTRIBUTES a6, PHKEY a7, LPDWORD a8)
{
if (CFilterMapper2::m_pFilterMapper2) {
@@ -329,6 +334,7 @@ LONG WINAPI Mine_RegCreateKeyExW(HKEY a0, LPCWSTR a1, DWORD a2, LPWSTR a3, DWORD }
return Real_RegCreateKeyExW(a0, a1, a2, a3, a4, a5, a6, a7, a8);
}
+
LONG WINAPI Mine_RegDeleteKeyA(HKEY a0, LPCSTR a1)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
@@ -336,6 +342,7 @@ LONG WINAPI Mine_RegDeleteKeyA(HKEY a0, LPCSTR a1) }
return Real_RegDeleteKeyA(a0, a1);
}
+
LONG WINAPI Mine_RegDeleteKeyW(HKEY a0, LPCWSTR a1)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
@@ -343,6 +350,7 @@ LONG WINAPI Mine_RegDeleteKeyW(HKEY a0, LPCWSTR a1) }
return Real_RegDeleteKeyW(a0, a1);
}
+
LONG WINAPI Mine_RegDeleteValueA(HKEY a0, LPCSTR a1)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
@@ -350,6 +358,7 @@ LONG WINAPI Mine_RegDeleteValueA(HKEY a0, LPCSTR a1) }
return Real_RegDeleteValueA(a0, a1);
}
+
LONG WINAPI Mine_RegDeleteValueW(HKEY a0, LPCWSTR a1)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
@@ -357,6 +366,7 @@ LONG WINAPI Mine_RegDeleteValueW(HKEY a0, LPCWSTR a1) }
return Real_RegDeleteValueW(a0, a1);
}
+
LONG WINAPI Mine_RegEnumKeyExA(HKEY a0, DWORD a1, LPSTR a2, LPDWORD a3, LPDWORD a4, LPSTR a5, LPDWORD a6, struct _FILETIME* a7)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -364,6 +374,7 @@ LONG WINAPI Mine_RegEnumKeyExA(HKEY a0, DWORD a1, LPSTR a2, LPDWORD a3, LPDWORD }
return Real_RegEnumKeyExA(a0, a1, a2, a3, a4, a5, a6, a7);
}
+
LONG WINAPI Mine_RegEnumKeyExW(HKEY a0, DWORD a1, LPWSTR a2, LPDWORD a3, LPDWORD a4, LPWSTR a5, LPDWORD a6, struct _FILETIME* a7)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -371,6 +382,7 @@ LONG WINAPI Mine_RegEnumKeyExW(HKEY a0, DWORD a1, LPWSTR a2, LPDWORD a3, LPDWORD }
return Real_RegEnumKeyExW(a0, a1, a2, a3, a4, a5, a6, a7);
}
+
LONG WINAPI Mine_RegEnumValueA(HKEY a0, DWORD a1, LPSTR a2, LPDWORD a3, LPDWORD a4, LPDWORD a5, LPBYTE a6, LPDWORD a7)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -378,6 +390,7 @@ LONG WINAPI Mine_RegEnumValueA(HKEY a0, DWORD a1, LPSTR a2, LPDWORD a3, LPDWORD }
return Real_RegEnumValueA(a0, a1, a2, a3, a4, a5, a6, a7);
}
+
LONG WINAPI Mine_RegEnumValueW(HKEY a0, DWORD a1, LPWSTR a2, LPDWORD a3, LPDWORD a4, LPDWORD a5, LPBYTE a6, LPDWORD a7)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -385,6 +398,7 @@ LONG WINAPI Mine_RegEnumValueW(HKEY a0, DWORD a1, LPWSTR a2, LPDWORD a3, LPDWORD }
return Real_RegEnumValueW(a0, a1, a2, a3, a4, a5, a6, a7);
}
+
LONG WINAPI Mine_RegOpenKeyA(HKEY a0, LPCSTR a1, PHKEY a2)
{
if (CFilterMapper2::m_pFilterMapper2) {
@@ -393,6 +407,7 @@ LONG WINAPI Mine_RegOpenKeyA(HKEY a0, LPCSTR a1, PHKEY a2) }
return Real_RegOpenKeyA(a0, a1, a2);
}
+
LONG WINAPI Mine_RegOpenKeyW(HKEY a0, LPCWSTR a1, PHKEY a2)
{
if (CFilterMapper2::m_pFilterMapper2) {
@@ -401,6 +416,7 @@ LONG WINAPI Mine_RegOpenKeyW(HKEY a0, LPCWSTR a1, PHKEY a2) }
return Real_RegOpenKeyW(a0, a1, a2);
}
+
LONG WINAPI Mine_RegOpenKeyExA(HKEY a0, LPCSTR a1, DWORD a2, REGSAM a3, PHKEY a4)
{
if (CFilterMapper2::m_pFilterMapper2 && (a3&(KEY_SET_VALUE|KEY_CREATE_SUB_KEY))) {
@@ -409,6 +425,7 @@ LONG WINAPI Mine_RegOpenKeyExA(HKEY a0, LPCSTR a1, DWORD a2, REGSAM a3, PHKEY a4 }
return Real_RegOpenKeyExA(a0, a1, a2, a3, a4);
}
+
LONG WINAPI Mine_RegOpenKeyExW(HKEY a0, LPCWSTR a1, DWORD a2, REGSAM a3, PHKEY a4)
{
if (CFilterMapper2::m_pFilterMapper2 && (a3&(KEY_SET_VALUE|KEY_CREATE_SUB_KEY))) {
@@ -417,6 +434,7 @@ LONG WINAPI Mine_RegOpenKeyExW(HKEY a0, LPCWSTR a1, DWORD a2, REGSAM a3, PHKEY a }
return Real_RegOpenKeyExW(a0, a1, a2, a3, a4);
}
+
LONG WINAPI Mine_RegQueryInfoKeyA(HKEY a0, LPSTR a1, LPDWORD a2, LPDWORD a3, LPDWORD a4, LPDWORD a5, LPDWORD a6, LPDWORD a7, LPDWORD a8, LPDWORD a9, LPDWORD a10, struct _FILETIME* a11)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -424,6 +442,7 @@ LONG WINAPI Mine_RegQueryInfoKeyA(HKEY a0, LPSTR a1, LPDWORD a2, LPDWORD a3, LPD }
return Real_RegQueryInfoKeyA(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
}
+
LONG WINAPI Mine_RegQueryInfoKeyW(HKEY a0, LPWSTR a1, LPDWORD a2, LPDWORD a3, LPDWORD a4, LPDWORD a5, LPDWORD a6, LPDWORD a7, LPDWORD a8, LPDWORD a9, LPDWORD a10, struct _FILETIME* a11)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -431,6 +450,7 @@ LONG WINAPI Mine_RegQueryInfoKeyW(HKEY a0, LPWSTR a1, LPDWORD a2, LPDWORD a3, LP }
return Real_RegQueryInfoKeyW(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
}
+
LONG WINAPI Mine_RegQueryValueA(HKEY a0, LPCSTR a1, LPSTR a2, PLONG a3)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -439,6 +459,7 @@ LONG WINAPI Mine_RegQueryValueA(HKEY a0, LPCSTR a1, LPSTR a2, PLONG a3) }
return Real_RegQueryValueA(a0, a1, a2, a3);
}
+
LONG WINAPI Mine_RegQueryValueW(HKEY a0, LPCWSTR a1, LPWSTR a2, PLONG a3)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -447,6 +468,7 @@ LONG WINAPI Mine_RegQueryValueW(HKEY a0, LPCWSTR a1, LPWSTR a2, PLONG a3) }
return Real_RegQueryValueW(a0, a1, a2, a3);
}
+
LONG WINAPI Mine_RegQueryValueExA(HKEY a0, LPCSTR a1, LPDWORD a2, LPDWORD a3, LPBYTE a4, LPDWORD a5)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -455,6 +477,7 @@ LONG WINAPI Mine_RegQueryValueExA(HKEY a0, LPCSTR a1, LPDWORD a2, LPDWORD a3, LP }
return Real_RegQueryValueExA(a0, a1, a2, a3, a4, a5);
}
+
LONG WINAPI Mine_RegQueryValueExW(HKEY a0, LPCWSTR a1, LPDWORD a2, LPDWORD a3, LPBYTE a4, LPDWORD a5)
{
if (CFilterMapper2::m_pFilterMapper2 && a0 == FAKEHKEY) {
@@ -463,6 +486,7 @@ LONG WINAPI Mine_RegQueryValueExW(HKEY a0, LPCWSTR a1, LPDWORD a2, LPDWORD a3, L }
return Real_RegQueryValueExW(a0, a1, a2, a3, a4, a5);
}
+
LONG WINAPI Mine_RegSetValueA(HKEY a0, LPCSTR a1, DWORD a2, LPCSTR a3, DWORD a4)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
@@ -470,6 +494,7 @@ LONG WINAPI Mine_RegSetValueA(HKEY a0, LPCSTR a1, DWORD a2, LPCSTR a3, DWORD a4) }
return Real_RegSetValueA(a0, a1, a2, a3, a4);
}
+
LONG WINAPI Mine_RegSetValueW(HKEY a0, LPCWSTR a1, DWORD a2, LPCWSTR a3, DWORD a4)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
@@ -477,6 +502,7 @@ LONG WINAPI Mine_RegSetValueW(HKEY a0, LPCWSTR a1, DWORD a2, LPCWSTR a3, DWORD a }
return Real_RegSetValueW(a0, a1, a2, a3, a4);
}
+
LONG WINAPI Mine_RegSetValueExA(HKEY a0, LPCSTR a1, DWORD a2, DWORD a3, BYTE* a4, DWORD a5)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
@@ -484,6 +510,7 @@ LONG WINAPI Mine_RegSetValueExA(HKEY a0, LPCSTR a1, DWORD a2, DWORD a3, BYTE* a4 }
return Real_RegSetValueExA(a0, a1, a2, a3, a4, a5);
}
+
LONG WINAPI Mine_RegSetValueExW(HKEY a0, LPCWSTR a1, DWORD a2, DWORD a3, BYTE* a4, DWORD a5)
{
if (CFilterMapper2::m_pFilterMapper2 && (a0 == FAKEHKEY || (int)a0 < 0)) {
diff --git a/src/apps/mplayerc/FavoriteOrganizeDlg.h b/src/apps/mplayerc/FavoriteOrganizeDlg.h index 561aa87a2..cf26fa004 100644 --- a/src/apps/mplayerc/FavoriteOrganizeDlg.h +++ b/src/apps/mplayerc/FavoriteOrganizeDlg.h @@ -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.
*
@@ -23,8 +23,8 @@ #pragma once
-#include "afxcmn.h"
-#include "afxwin.h"
+#include <afxcmn.h>
+#include <afxwin.h>
#include "../../thirdparty/ui/ResizableLib/ResizableDialog.h"
diff --git a/src/apps/mplayerc/FullscreenWnd.cpp b/src/apps/mplayerc/FullscreenWnd.cpp index 4d8787efb..50b7d6d22 100644 --- a/src/apps/mplayerc/FullscreenWnd.cpp +++ b/src/apps/mplayerc/FullscreenWnd.cpp @@ -90,7 +90,6 @@ BOOL CFullscreenWnd::PreTranslateMessage(MSG* pMsg) return CWnd::PreTranslateMessage(pMsg);
}
-
BOOL CFullscreenWnd::PreCreateWindow(CREATESTRUCT& cs)
{
if (!CWnd::PreCreateWindow(cs)) {
@@ -105,7 +104,6 @@ BOOL CFullscreenWnd::PreCreateWindow(CREATESTRUCT& cs) // CFullscreenWnd message handlers
-
BOOL CFullscreenWnd::OnEraseBkgnd(CDC* pDC)
{
return false;
@@ -121,7 +119,6 @@ BOOL CFullscreenWnd::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) return FALSE;
}
-
void CFullscreenWnd::ShowCursor(bool bVisible)
{
if (m_bCursorVisible != bVisible) {
diff --git a/src/apps/mplayerc/GoToDlg.cpp b/src/apps/mplayerc/GoToDlg.cpp index 4d898c579..34b62b283 100644 --- a/src/apps/mplayerc/GoToDlg.cpp +++ b/src/apps/mplayerc/GoToDlg.cpp @@ -143,7 +143,6 @@ void CGoToDlg::OnBnClickedOk1() }
}
-
void CGoToDlg::OnBnClickedOk2()
{
UpdateData();
diff --git a/src/apps/mplayerc/GoToDlg.h b/src/apps/mplayerc/GoToDlg.h index d63b657e1..0ea877a74 100644 --- a/src/apps/mplayerc/GoToDlg.h +++ b/src/apps/mplayerc/GoToDlg.h @@ -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.
*
@@ -23,7 +23,7 @@ #pragma once
-#include "afxwin.h"
+#include <afxwin.h>
// CGoToDlg dialog
diff --git a/src/apps/mplayerc/Ifo.cpp b/src/apps/mplayerc/Ifo.cpp index e0866ad18..4fa280294 100644 --- a/src/apps/mplayerc/Ifo.cpp +++ b/src/apps/mplayerc/Ifo.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.
*
@@ -95,7 +95,6 @@ CIfo::CIfo() m_dwSize = 0;
}
-
int CIfo::GetMiscPGCI (CIfo::ifo_hdr_t *hdr, int title, uint8_t **ptr)
{
pgci_sub_t *pgci_sub;
@@ -165,7 +164,6 @@ CIfo::pgc_t* CIfo::GetPGCI(const int title, const ifo_hdr_t* hdr) return (pgc_t *) ptr;
}
-
bool CIfo::IsVTS()
{
if (m_dwSize<12 || (strncmp ((char*)m_pBuffer, "DVDVIDEO-VTS", 12)!=0)) {
@@ -175,7 +173,6 @@ bool CIfo::IsVTS() return true;
}
-
bool CIfo::IsVMG()
{
if (m_dwSize<12 || (strncmp ((char*)m_pBuffer, "DVDVIDEO-VMG", 12)!=0)) {
@@ -259,7 +256,6 @@ bool CIfo::SaveFile (LPCTSTR strFile) return bRet;
}
-
CIfo::~CIfo(void)
{
delete[] m_pBuffer;
diff --git a/src/apps/mplayerc/LcdSupport.cpp b/src/apps/mplayerc/LcdSupport.cpp index 81974d819..2db44c426 100644 --- a/src/apps/mplayerc/LcdSupport.cpp +++ b/src/apps/mplayerc/LcdSupport.cpp @@ -71,7 +71,6 @@ void LCD_UpdateThread(void * Control) _endthread();
}
-
/******************************************************************************************************
******************************************** CLCDMyManager ******************************************/
@@ -183,7 +182,6 @@ void CLCDMyManager::OnLCDButtonUp(int nButton) }
}
-
/******************************************************************************************************
********************************************** CMPC_Lcd *********************************************/
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index f7587bc68..2497d3403 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -23,19 +23,16 @@ #include "stdafx.h"
#include "mplayerc.h"
-
#include "MainFrm.h"
#include <math.h>
#include <afxpriv.h>
-
#include <atlconv.h>
#include <atlrx.h>
#include <atlsync.h>
#include "WinAPIUtils.h"
-
#include "OpenFileDlg.h"
#include "OpenDlg.h"
#include "SaveDlg.h"
@@ -50,6 +47,8 @@ #include "FullscreenWnd.h"
#include "TunerScanDlg.h"
#include "OpenDirHelper.h"
+#include "SubtitleDlDlg.h"
+#include "ISDb.h"
#include <mtype.h>
#include <Mpconfig.h>
@@ -61,7 +60,8 @@ #include <initguid.h>
#include <uuids.h>
#include <moreuuids.h>
-#include <Qnetwork.h>
+#include <qnetwork.h>
+#include <psapi.h>
//#include <qedit.h> // Casimir666 : incompatible with D3D.h
#include "../../DSUtil/DSUtil.h"
@@ -69,7 +69,7 @@ #include "FGManagerBDA.h"
#include "TextPassThruFilter.h"
-#include "../../filters/filters.h"
+#include "../../filters/Filters.h"
#include "../../filters/PinInfoWnd.h"
#include "AllocatorCommon7.h"
@@ -83,6 +83,9 @@ #include "IPinHook.h"
+#include "jpeg.h"
+#include "pngdib/pngdib.h"
+
#define DEFCLIENTW 292
#define DEFCLIENTH 200
@@ -1533,8 +1536,6 @@ void CMainFrame::OnDisplayChange() // untested, not sure if it's working... }
}
-#include <psapi.h>
-
void CMainFrame::OnSysCommand(UINT nID, LPARAM lParam)
{
// Only stop screensaver if video playing; allow for audio only
@@ -2365,6 +2366,7 @@ bool CMainFrame::GraphEventComplete() // our WM_GRAPHNOTIFY handler
//
#include <comdef.h>
+
LRESULT CMainFrame::OnGraphNotify(WPARAM wParam, LPARAM lParam)
{
AppSettings& s = AfxGetAppSettings();
@@ -4375,8 +4377,6 @@ int CALLBACK BrowseCallbackProc(HWND hwnd,UINT uMsg,LPARAM lp, LPARAM pData) return 0;
}
-
-
void CMainFrame::OnFileOpendvd()
{
if ((m_iMediaLoadState == MLS_LOADING) || m_pFullscreenWnd->IsWindow()) {
@@ -4742,9 +4742,6 @@ bool CMainFrame::GetDIB(BYTE** ppData, long& size, bool fSilent) return true;
}
-#include "jpeg.h"
-#include "../../thirdparty/pngdib/pngdib.h"
-
void CMainFrame::SaveDIB(LPCTSTR fn, BYTE* pData, long size)
{
CString ext = CString(CPath(fn).GetExtension()).MakeLower();
@@ -5327,17 +5324,6 @@ void CMainFrame::OnUpdateFileSaveThumbnails(CCmdUI* pCmdUI) pCmdUI->Enable(m_iMediaLoadState == MLS_LOADED && !m_fAudioOnly && (GetPlaybackMode() == PM_FILE /*|| GetPlaybackMode() == PM_DVD*/));
}
-/*
-void CMainFrame::OnFileConvert()
-{
- CConvertDlg().DoModal();
-}
-
-void CMainFrame::OnUpdateFileConvert(CCmdUI* pCmdUI)
-{
- // TODO: Add your command update UI handler code here
-}
-*/
void CMainFrame::OnFileLoadsubtitle()
{
if (!m_pCAP) {
@@ -5444,11 +5430,6 @@ void CMainFrame::OnUpdateFileSavesubtitle(CCmdUI* pCmdUI) pCmdUI->Enable(m_iSubtitleSel >= 0);
}
-///////////////
-
-#include "SubtitleDlDlg.h"
-#include "ISDb.h"
-
void CMainFrame::OnFileISDBSearch()
{
CStringA url = "http://" + AfxGetAppSettings().strISDb + "/index.php?";
@@ -5629,7 +5610,6 @@ void CMainFrame::OnUpdateViewDisplayStats(CCmdUI* pCmdUI) pCmdUI->SetCheck (supported && (AfxGetMyApp()->m_Renderers.m_fDisplayStats));
}
-
void CMainFrame::OnViewResetStats()
{
AfxGetMyApp()->m_Renderers.m_bResetStats = true; // Reset by "consumer"
@@ -5835,7 +5815,6 @@ void CMainFrame::OnUpdateViewEVROutputRange(CCmdUI* pCmdUI) }
}
-
void CMainFrame::OnUpdateViewFlushGPU(CCmdUI* pCmdUI)
{
AppSettings& s = AfxGetAppSettings();
@@ -5895,7 +5874,6 @@ void CMainFrame::OnUpdateViewAlternativeVSync(CCmdUI* pCmdUI) pCmdUI->SetCheck(r.m_RenderSettings.fVMR9AlterativeVSync);
}
-
void CMainFrame::OnUpdateViewFullscreenGUISupport(CCmdUI* pCmdUI)
{
AppSettings& s = AfxGetAppSettings();
@@ -6507,7 +6485,6 @@ void CMainFrame::OnUpdateViewControlBar(CCmdUI* pCmdUI) pCmdUI->SetCheck(!!(AfxGetAppSettings().nCS & (1<<nID)));
}
-
void CMainFrame::OnViewSubresync()
{
ShowControlBar(&m_wndSubresyncBar, !m_wndSubresyncBar.IsWindowVisible(), TRUE);
@@ -7058,7 +7035,6 @@ void CMainFrame::OnViewOptions() // play
-
void CMainFrame::OnPlayPlay()
{
if (m_iMediaLoadState == MLS_CLOSED) {
@@ -7181,7 +7157,6 @@ void CMainFrame::OnPlayPause() OnPlayPauseI();
}
-
void CMainFrame::OnPlayPlaypause()
{
OAFilterState fs = GetMediaState();
@@ -7753,7 +7728,6 @@ void CMainFrame::OnUpdatePlayResetRate(CCmdUI* pCmdUI) pCmdUI->Enable(m_iMediaLoadState == MLS_LOADED);
}
-
void CMainFrame::SetAudioDelay(REFERENCE_TIME rtShift)
{
if (CComQIPtr<IAudioSwitcherFilter> pASF = FindFilter(__uuidof(CAudioSwitcherFilter), pGB)) {
@@ -8711,7 +8685,6 @@ public: }
};
-
void CMainFrame::OnFavoritesAdd()
{
AppSettings& s = AfxGetAppSettings();
@@ -9720,7 +9693,6 @@ void CMainFrame::AutoChangeMonitorMode() }
}
-
void CMainFrame::MoveVideoWindow(bool fShowStats)
{
if (m_iMediaLoadState == MLS_LOADED && !m_fAudioOnly && IsWindowVisible()) {
@@ -10216,7 +10188,6 @@ bool CMainFrame::IsRealEngineCompatible(CString strFilename) const return true;
}
-
void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD)
{
ASSERT(pGB == NULL);
@@ -11301,7 +11272,7 @@ void CMainFrame::OpenSetupWindowTitle(CString fn) }
// foxX: simply global now, figures out if, based on the options selected by the user
-// the language of audio stream a from pSS is more ``important" than that of audio b
+// the language of audio stream a from pSS is more "important" than that of audio b
bool DoesAudioPrecede(const CComPtr<IAMStreamSelect> &pSS, int a, int b)
{
WCHAR* pName = NULL;
@@ -13032,7 +13003,6 @@ void CMainFrame::SetupFavoritesSubMenu() }
}
-
void CMainFrame::SetupShadersSubMenu()
{
CMenu* pSub = &m_shaders;
@@ -14375,14 +14345,11 @@ bool CMainFrame::CreateFullScreenWindow() return m_pFullscreenWnd->IsWindow();
}
-
bool CMainFrame::IsD3DFullScreenMode() const
{
return m_pFullscreenWnd->IsWindow();
};
-
-
void CMainFrame::SetVMR9ColorControl(float dBrightness, float dContrast, float dHue, float dSaturation)
{
VMR9ProcAmpControl ClrControl;
@@ -14422,7 +14389,6 @@ LPCTSTR CMainFrame::GetDVDAudioFormatName (DVD_AudioAttributes& ATR) const }
}
-
afx_msg void CMainFrame::OnGotoSubtitle(UINT nID)
{
OnPlayPause();
@@ -14434,7 +14400,6 @@ afx_msg void CMainFrame::OnGotoSubtitle(UINT nID) }
}
-
afx_msg void CMainFrame::OnShiftSubtitle(UINT nID)
{
if (m_nCurSubtitle >= 0) {
@@ -14453,7 +14418,6 @@ afx_msg void CMainFrame::OnShiftSubtitle(UINT nID) }
}
-
afx_msg void CMainFrame::OnSubtitleDelay(UINT nID)
{
if (m_pCAP) {
@@ -14475,7 +14439,6 @@ afx_msg void CMainFrame::OnSubtitleDelay(UINT nID) }
}
-
afx_msg void CMainFrame::OnLanguage(UINT nID)
{
CMenu DefaultMenu;
@@ -14518,7 +14481,6 @@ afx_msg void CMainFrame::OnLanguage(UINT nID) // OldMenu->DestroyMenu();
}
-
afx_msg void CMainFrame::OnUpdateLanguage(CCmdUI* pCmdUI)
{
AppSettings &s = AfxGetAppSettings();
@@ -14537,7 +14499,6 @@ afx_msg void CMainFrame::OnUpdateLanguage(CCmdUI* pCmdUI) pCmdUI->SetCheck(nLang == s.iLanguage);
}
-
void CMainFrame::ProcessAPICommand(COPYDATASTRUCT* pCDS)
{
CAtlList<CString> fns;
@@ -14651,7 +14612,6 @@ void CMainFrame::ProcessAPICommand(COPYDATASTRUCT* pCDS) }
}
-
void CMainFrame::SendAPICommand (MPCAPI_COMMAND nCommand, LPCWSTR fmt, ...)
{
AppSettings& s = AfxGetAppSettings();
@@ -14674,7 +14634,6 @@ void CMainFrame::SendAPICommand (MPCAPI_COMMAND nCommand, LPCWSTR fmt, ...) }
}
-
void CMainFrame::SendNowPlayingToApi()
{
if (!AfxGetAppSettings().hMasterWnd) {
@@ -14767,7 +14726,6 @@ void CMainFrame::SendNowPlayingToApi() }
}
-
void CMainFrame::SendSubtitleTracksToApi()
{
CStringW strSubs;
@@ -14809,7 +14767,6 @@ void CMainFrame::SendSubtitleTracksToApi() SendAPICommand (CMD_LISTSUBTITLETRACKS, strSubs);
}
-
void CMainFrame::SendAudioTracksToApi()
{
CStringW strAudios;
@@ -14860,7 +14817,6 @@ void CMainFrame::SendAudioTracksToApi() }
-
void CMainFrame::SendPlaylistToApi()
{
CStringW strPlaylist;
@@ -15511,4 +15467,4 @@ void CMainFrame::WTSUnRegisterSessionNotification() FreeLibrary( hWtsLib );
hWtsLib = NULL;
}
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h index f35f51973..48c282199 100644 --- a/src/apps/mplayerc/MainFrm.h +++ b/src/apps/mplayerc/MainFrm.h @@ -38,9 +38,7 @@ #include "EditListEditor.h"
#include "PPageSheet.h"
#include "PPageFileInfoSheet.h"
-
#include "FileDropTarget.h"
-
#include "KeyProvider.h"
#include "../../SubPic/ISubPic.h"
@@ -59,8 +57,8 @@ #include <IBufferInfo.h>
#include "WebServer.h"
-#include <D3d9.h>
-#include <Vmr9.h>
+#include <d3d9.h>
+#include <vmr9.h>
#include <evr.h>
#include <evr9.h>
#include "VMROSD.h"
diff --git a/src/apps/mplayerc/Monitors.cpp b/src/apps/mplayerc/Monitors.cpp index 57c23ea93..0a4f9d29d 100644 --- a/src/apps/mplayerc/Monitors.cpp +++ b/src/apps/mplayerc/Monitors.cpp @@ -95,8 +95,6 @@ BOOL CMonitors::IsMonitor( const HMONITOR hMonitor ) return match.foundMatch;
}
-
-
//this is the callback method that gets called via IsMontior
BOOL CALLBACK CMonitors::FindMatchingMonitorHandle( HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData )
{
@@ -113,7 +111,6 @@ BOOL CALLBACK CMonitors::FindMatchingMonitorHandle( HMONITOR hMonitor, HDC hdcMo return TRUE; //keep enumerating
}
-
BOOL CMonitors::AllMonitorsShareDisplayFormat()
{
return ::GetSystemMetrics( SM_SAMEDISPLAYFORMAT );
@@ -126,7 +123,6 @@ int CMonitors::GetMonitorCount() return ::GetSystemMetrics(SM_CMONITORS);
}
-
CMonitor CMonitors::GetMonitor( const int index ) const
{
#if _MFC_VER >= 0x0700
diff --git a/src/apps/mplayerc/MpcApi.h b/src/apps/mplayerc/MpcApi.h index 74dea7365..9428b7f44 100644 --- a/src/apps/mplayerc/MpcApi.h +++ b/src/apps/mplayerc/MpcApi.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
diff --git a/src/apps/mplayerc/Mpeg2SectionData.cpp b/src/apps/mplayerc/Mpeg2SectionData.cpp index 8a415796e..62fa5f76a 100644 --- a/src/apps/mplayerc/Mpeg2SectionData.cpp +++ b/src/apps/mplayerc/Mpeg2SectionData.cpp @@ -141,7 +141,6 @@ HRESULT CMpeg2DataParser::ParseSIHeader(CGolombBuffer& gb, DVB_SI SIType, WORD& return S_OK;
}
-
HRESULT CMpeg2DataParser::ParseSDT(ULONG ulFreq)
{
HRESULT hr;
@@ -205,7 +204,6 @@ HRESULT CMpeg2DataParser::ParseSDT(ULONG ulFreq) return S_OK;
}
-
HRESULT CMpeg2DataParser::ParsePAT()
{
HRESULT hr;
@@ -242,7 +240,6 @@ HRESULT CMpeg2DataParser::ParsePAT() return S_OK;
}
-
HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel)
{
HRESULT hr;
@@ -314,7 +311,6 @@ HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel) return S_OK;
}
-
HRESULT CMpeg2DataParser::SetTime(CGolombBuffer& gb, PresentFollowing &NowNext)
{
char DescBuffer[10];
diff --git a/src/apps/mplayerc/MultiMonitor.cpp b/src/apps/mplayerc/MultiMonitor.cpp index 8dc6bb127..ae5d77035 100644 --- a/src/apps/mplayerc/MultiMonitor.cpp +++ b/src/apps/mplayerc/MultiMonitor.cpp @@ -33,7 +33,6 @@ CMonitor::CMonitor() : m_hMonitor( NULL ) {
}
-
// copy constructor
CMonitor::CMonitor( const CMonitor& monitor )
{
@@ -44,8 +43,6 @@ CMonitor::~CMonitor() {
}
-
-
void CMonitor::Attach( const HMONITOR hMonitor )
{
ASSERT( CMonitors::IsMonitor( hMonitor ) );
@@ -139,7 +136,6 @@ BOOL CMonitor::IsOnMonitor( const LPRECT lprc ) const return rect.IntersectRect( rect, lprc );
}
-
void CMonitor::GetMonitorRect( LPRECT lprc ) const
{
ASSERT( IsMonitor() );
diff --git a/src/apps/mplayerc/OpenFileDlg.h b/src/apps/mplayerc/OpenFileDlg.h index 00bc26f79..877fe9261 100644 --- a/src/apps/mplayerc/OpenFileDlg.h +++ b/src/apps/mplayerc/OpenFileDlg.h @@ -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.
*
@@ -23,7 +23,7 @@ #pragma once
-#include "afxwin.h"
+#include <afxwin.h>
// COpenFileDlg
diff --git a/src/apps/mplayerc/PPageAccelTbl.cpp b/src/apps/mplayerc/PPageAccelTbl.cpp index f532027c1..5fd6c9984 100644 --- a/src/apps/mplayerc/PPageAccelTbl.cpp +++ b/src/apps/mplayerc/PPageAccelTbl.cpp @@ -1406,6 +1406,7 @@ CString CPPageAccelTbl::MakeAppCommandLabel(UINT id) }
return CString("");
}
+
void CPPageAccelTbl::DoDataExchange(CDataExchange* pDX)
{
__super::DoDataExchange(pDX);
@@ -1433,6 +1434,7 @@ END_MESSAGE_MAP() // CPPageAccelTbl message handlers
static WNDPROC OldControlProc;
+
static LRESULT CALLBACK ControlProc(HWND control, UINT message, WPARAM wParam, LPARAM lParam)
{
if (message == WM_KEYDOWN) {
@@ -1758,7 +1760,6 @@ void CPPageAccelTbl::OnEndlabeleditList(NMHDR* pNMHDR, LRESULT* pResult) }
}
-
void CPPageAccelTbl::OnTimer(UINT_PTR nIDEvent)
{
UpdateData();
@@ -1831,4 +1832,4 @@ void CPPageAccelTbl::OnCancel() }
__super::OnCancel();
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/PPageAudioSwitcher.cpp b/src/apps/mplayerc/PPageAudioSwitcher.cpp index e269c3b60..2dd23d934 100644 --- a/src/apps/mplayerc/PPageAudioSwitcher.cpp +++ b/src/apps/mplayerc/PPageAudioSwitcher.cpp @@ -223,8 +223,6 @@ void CPPageAudioSwitcher::OnEnChangeEdit1() }
}
-#include <math.h>
-
void CPPageAudioSwitcher::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
{
if (nIDCtl != IDC_LIST1) {
diff --git a/src/apps/mplayerc/PPageAudioSwitcher.h b/src/apps/mplayerc/PPageAudioSwitcher.h index 561167981..4e2aa9af5 100644 --- a/src/apps/mplayerc/PPageAudioSwitcher.h +++ b/src/apps/mplayerc/PPageAudioSwitcher.h @@ -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.
*
diff --git a/src/apps/mplayerc/PPageCapture.cpp b/src/apps/mplayerc/PPageCapture.cpp index 22ae4d016..b0646b1da 100644 --- a/src/apps/mplayerc/PPageCapture.cpp +++ b/src/apps/mplayerc/PPageCapture.cpp @@ -320,7 +320,6 @@ END_MESSAGE_MAP() // CPPageCapture message handlers
-
BOOL CPPageCapture::OnInitDialog()
{
__super::OnInitDialog();
diff --git a/src/apps/mplayerc/PPageCapture.h b/src/apps/mplayerc/PPageCapture.h index ecebdb341..bbe8501ef 100644 --- a/src/apps/mplayerc/PPageCapture.h +++ b/src/apps/mplayerc/PPageCapture.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -23,8 +23,8 @@ #pragma once
#include "PPageBase.h"
-#include "afxcmn.h"
-#include "afxwin.h"
+#include <afxcmn.h>
+#include <afxwin.h>
// CPPageCapture dialog
diff --git a/src/apps/mplayerc/PPageExternalFilters.cpp b/src/apps/mplayerc/PPageExternalFilters.cpp index c888e7a3b..32331023e 100644 --- a/src/apps/mplayerc/PPageExternalFilters.cpp +++ b/src/apps/mplayerc/PPageExternalFilters.cpp @@ -31,7 +31,7 @@ #include <moreuuids.h>
#include <initguid.h>
-#include <Dmoreg.h>
+#include <dmoreg.h>
// CPPageExternalFilters dialog
diff --git a/src/apps/mplayerc/PPageFileInfoClip.h b/src/apps/mplayerc/PPageFileInfoClip.h index 29e01cdb4..da370c183 100644 --- a/src/apps/mplayerc/PPageFileInfoClip.h +++ b/src/apps/mplayerc/PPageFileInfoClip.h @@ -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.
*
@@ -23,7 +23,7 @@ #pragma once
-#include "afxwin.h"
+#include <afxwin.h>
// CPPageFileInfoClip dialog
diff --git a/src/apps/mplayerc/PPageFileInfoDetails.cpp b/src/apps/mplayerc/PPageFileInfoDetails.cpp index 8ded9250d..65507ddaa 100644 --- a/src/apps/mplayerc/PPageFileInfoDetails.cpp +++ b/src/apps/mplayerc/PPageFileInfoDetails.cpp @@ -27,7 +27,7 @@ #include <atlbase.h>
#include "../../DSUtil/DSUtil.h"
#include <d3d9.h>
-#include "Vmr9.h"
+#include <vmr9.h>
#include <moreuuids.h>
diff --git a/src/apps/mplayerc/PPageFileInfoDetails.h b/src/apps/mplayerc/PPageFileInfoDetails.h index 672043620..a831a303e 100644 --- a/src/apps/mplayerc/PPageFileInfoDetails.h +++ b/src/apps/mplayerc/PPageFileInfoDetails.h @@ -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.
*
@@ -24,7 +24,7 @@ #pragma once
#include "../../SubPic/ISubPic.h"
-#include "afxwin.h"
+#include <afxwin.h>
// CPPageFileInfoDetails dialog
diff --git a/src/apps/mplayerc/PPageFileInfoRes.h b/src/apps/mplayerc/PPageFileInfoRes.h index f8f9bd4df..c739aa6cf 100644 --- a/src/apps/mplayerc/PPageFileInfoRes.h +++ b/src/apps/mplayerc/PPageFileInfoRes.h @@ -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.
*
@@ -23,8 +23,8 @@ #pragma once
-#include "afxwin.h"
-#include "afxcmn.h"
+#include <afxwin.h>
+#include <afxcmn.h>
#include "../../DSUtil/DSMPropertyBag.h"
#include "PPageBase.h"
diff --git a/src/apps/mplayerc/PPageFileMediaInfo.cpp b/src/apps/mplayerc/PPageFileMediaInfo.cpp index 50faf9b85..4b62a9273 100644 --- a/src/apps/mplayerc/PPageFileMediaInfo.cpp +++ b/src/apps/mplayerc/PPageFileMediaInfo.cpp @@ -66,6 +66,7 @@ END_MESSAGE_MAP() // CPPageFileMediaInfo message handlers
static WNDPROC OldControlProc;
+
static LRESULT CALLBACK ControlProc(HWND control, UINT message, WPARAM wParam, LPARAM lParam)
{
if (message == WM_KEYDOWN) {
@@ -156,4 +157,3 @@ bool CPPageFileMediaInfo::HasMediaInfo() return MI.IsReady();
}
#endif
-
diff --git a/src/apps/mplayerc/PPageFormats.cpp b/src/apps/mplayerc/PPageFormats.cpp index 0ca251a7c..6d81ad813 100644 --- a/src/apps/mplayerc/PPageFormats.cpp +++ b/src/apps/mplayerc/PPageFormats.cpp @@ -31,7 +31,6 @@ // CPPageFormats dialog
-
CComPtr<IApplicationAssociationRegistration> CPPageFormats::m_pAAR;
// TODO: change this along with the root key for settings and the mutex name to
@@ -112,7 +111,6 @@ void CPPageFormats::SetChecked(int iItem, int iChecked) m_list.SetItem(&lvi);
}
-
CString CPPageFormats::GetEnqueueCommand()
{
CString path;
@@ -612,7 +610,6 @@ BOOL CPPageFormats::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE
}
-
BOOL CPPageFormats::SetFileAssociation(CString strExt, CString strProgID, bool fRegister)
{
CString extoldreg, extOldIcon;
@@ -743,7 +740,6 @@ BOOL CPPageFormats::SetFileAssociation(CString strExt, CString strProgID, bool f return SUCCEEDED (hr);
}
-
BOOL CPPageFormats::OnApply()
{
UpdateData();
diff --git a/src/apps/mplayerc/PPageFormats.h b/src/apps/mplayerc/PPageFormats.h index 10438a33c..2dcdc1980 100644 --- a/src/apps/mplayerc/PPageFormats.h +++ b/src/apps/mplayerc/PPageFormats.h @@ -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.
*
@@ -25,7 +25,7 @@ #include "PPageBase.h"
#include "PlayerListCtrl.h"
-#include "afxwin.h"
+#include <afxwin.h>
// CPPageFormats dialog
diff --git a/src/apps/mplayerc/PPageFullscreen.cpp b/src/apps/mplayerc/PPageFullscreen.cpp index 6b6f416bd..6072cf4c4 100644 --- a/src/apps/mplayerc/PPageFullscreen.cpp +++ b/src/apps/mplayerc/PPageFullscreen.cpp @@ -249,6 +249,7 @@ void CPPageFullscreen::OnUpdateTimeout(CCmdUI* pCmdUI) UpdateData();
pCmdUI->Enable(m_iShowBarsWhenFullScreen);
}
+
void CPPageFullscreen::ModesUpdate()
{
CMonitors monitors;
diff --git a/src/apps/mplayerc/PPageFullscreen.h b/src/apps/mplayerc/PPageFullscreen.h index 7710db0fa..a38ea1127 100644 --- a/src/apps/mplayerc/PPageFullscreen.h +++ b/src/apps/mplayerc/PPageFullscreen.h @@ -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.
*
@@ -23,6 +23,7 @@ #pragma once
+
#include "PPageBase.h"
// CPPageFullscreen dialog
diff --git a/src/apps/mplayerc/PPageInternalFilters.cpp b/src/apps/mplayerc/PPageInternalFilters.cpp index 559b7b8a6..62bc04b3e 100644 --- a/src/apps/mplayerc/PPageInternalFilters.cpp +++ b/src/apps/mplayerc/PPageInternalFilters.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h"
#include "PPageInternalFilters.h"
#include "ComPropertySheet.h"
-#include "../../filters/filters.h"
+#include "../../filters/Filters.h"
#include "internal_filter_config.h"
@@ -376,7 +376,6 @@ CPPageInternalFilters::~CPPageInternalFilters() {
}
-
void CPPageInternalFilters::DoDataExchange(CDataExchange* pDX)
{
__super::DoDataExchange(pDX);
diff --git a/src/apps/mplayerc/PPageInternalFilters.h b/src/apps/mplayerc/PPageInternalFilters.h index 81b6d9aca..f269c9095 100644 --- a/src/apps/mplayerc/PPageInternalFilters.h +++ b/src/apps/mplayerc/PPageInternalFilters.h @@ -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.
*
@@ -24,7 +24,7 @@ #pragma once
#include "PPageBase.h"
-#include "afxwin.h"
+#include <afxwin.h>
class CPPageInternalFiltersListBox : public CCheckListBox
diff --git a/src/apps/mplayerc/PPageLogo.cpp b/src/apps/mplayerc/PPageLogo.cpp index 9b47fdc68..6b5ac3703 100644 --- a/src/apps/mplayerc/PPageLogo.cpp +++ b/src/apps/mplayerc/PPageLogo.cpp @@ -110,7 +110,6 @@ BOOL CPPageLogo::OnApply() return __super::OnApply();
}
-
void CPPageLogo::OnBnClickedRadio1()
{
ASSERT(m_logoidpos);
@@ -124,7 +123,6 @@ void CPPageLogo::OnBnClickedRadio1() SetModified();
}
-
void CPPageLogo::OnBnClickedRadio2()
{
UpdateData();
diff --git a/src/apps/mplayerc/PPageLogo.h b/src/apps/mplayerc/PPageLogo.h index e5dec95bb..744d1d6ba 100644 --- a/src/apps/mplayerc/PPageLogo.h +++ b/src/apps/mplayerc/PPageLogo.h @@ -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.
*
diff --git a/src/apps/mplayerc/PPageMisc.cpp b/src/apps/mplayerc/PPageMisc.cpp index 919368ab0..7ea7d416a 100644 --- a/src/apps/mplayerc/PPageMisc.cpp +++ b/src/apps/mplayerc/PPageMisc.cpp @@ -124,7 +124,6 @@ BOOL CPPageMisc::OnApply() return __super::OnApply();
}
-
void CPPageMisc::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
{
if (*pScrollBar == m_SliBrightness) {
diff --git a/src/apps/mplayerc/PPageMisc.h b/src/apps/mplayerc/PPageMisc.h index 88ec517c0..f0de9fbf4 100644 --- a/src/apps/mplayerc/PPageMisc.h +++ b/src/apps/mplayerc/PPageMisc.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -23,7 +23,7 @@ #pragma once
#include "PPageBase.h"
-#include "afxcmn.h"
+#include <afxcmn.h>
// CPPageMisc dialog
diff --git a/src/apps/mplayerc/PPageOutput.cpp b/src/apps/mplayerc/PPageOutput.cpp index dc0093c2b..7f5e9ff3f 100644 --- a/src/apps/mplayerc/PPageOutput.cpp +++ b/src/apps/mplayerc/PPageOutput.cpp @@ -26,7 +26,6 @@ #include "PPageOutput.h"
#include "WinAPIUtils.h"
#include <moreuuids.h>
-
#include "Monitors.h"
// CPPageOutput dialog
@@ -334,6 +333,7 @@ void CPPageOutput::OnUpdateMixerYUV(CCmdUI* pCmdUI) {
pCmdUI->Enable(!!IsDlgButtonChecked(IDC_DSVMR9LOADMIXER) && IsDlgButtonChecked(IDC_DSVMR9REN));
}
+
void CPPageOutput::OnSurfaceChange()
{
SetModified();
diff --git a/src/apps/mplayerc/PPagePlayback.cpp b/src/apps/mplayerc/PPagePlayback.cpp index 9e5f87f9f..97e9e2cb7 100644 --- a/src/apps/mplayerc/PPagePlayback.cpp +++ b/src/apps/mplayerc/PPagePlayback.cpp @@ -255,4 +255,4 @@ void CPPagePlayback::OnCancel() }
__super::OnCancel();
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/PPagePlayer.cpp b/src/apps/mplayerc/PPagePlayer.cpp index 73ece2080..f47c03134 100644 --- a/src/apps/mplayerc/PPagePlayer.cpp +++ b/src/apps/mplayerc/PPagePlayer.cpp @@ -200,4 +200,4 @@ BOOL CPPagePlayer::OnKillActive() }
return __super::OnKillActive();
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/PPageSheet.cpp b/src/apps/mplayerc/PPageSheet.cpp index f8c537e3e..8fa5e6b05 100644 --- a/src/apps/mplayerc/PPageSheet.cpp +++ b/src/apps/mplayerc/PPageSheet.cpp @@ -127,7 +127,6 @@ END_MESSAGE_MAP() // CTreePropSheetTreeCtrl message handlers
-
BOOL CTreePropSheetTreeCtrl::PreCreateWindow(CREATESTRUCT& cs)
{
cs.dwExStyle |= WS_EX_CLIENTEDGE;
diff --git a/src/apps/mplayerc/PPageSubMisc.cpp b/src/apps/mplayerc/PPageSubMisc.cpp index da6f99bc2..1095536ce 100644 --- a/src/apps/mplayerc/PPageSubMisc.cpp +++ b/src/apps/mplayerc/PPageSubMisc.cpp @@ -119,6 +119,7 @@ void CPPageSubMisc::OnBnClickedButton2() CWebTextFile wtf;
UINT nIconType = MB_ICONEXCLAMATION;
+
if (wtf.Open(_T("http://") + ISDb + _T("/test.php")) && wtf.ReadString(str) && str == ver) {
msg = ResStr(IDS_PPSDB_URLCORRECT);
nIconType = MB_ICONINFORMATION;
diff --git a/src/apps/mplayerc/PPageSubMisc.h b/src/apps/mplayerc/PPageSubMisc.h index c113b5937..4417b8c23 100644 --- a/src/apps/mplayerc/PPageSubMisc.h +++ b/src/apps/mplayerc/PPageSubMisc.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
diff --git a/src/apps/mplayerc/PPageSubtitles.cpp b/src/apps/mplayerc/PPageSubtitles.cpp index dfd7ba08a..1139826b7 100644 --- a/src/apps/mplayerc/PPageSubtitles.cpp +++ b/src/apps/mplayerc/PPageSubtitles.cpp @@ -195,7 +195,6 @@ void CPPageSubtitles::OnUpdatePosOverride(CCmdUI* pCmdUI) pCmdUI->Enable(m_fOverridePlacement);
}
-
void CPPageSubtitles::OnSubDelayInterval()
{
// If incorrect number, revert modifications
diff --git a/src/apps/mplayerc/PPageWebServer.cpp b/src/apps/mplayerc/PPageWebServer.cpp index 9543efd96..63868afc4 100644 --- a/src/apps/mplayerc/PPageWebServer.cpp +++ b/src/apps/mplayerc/PPageWebServer.cpp @@ -210,7 +210,6 @@ END_MESSAGE_MAP() // CPPageWebServer message handlers
-
void CPPageWebServer::OnEnChangeEdit1()
{
UpdateData();
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index 5b1cd4bda..24590a222 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -607,7 +607,6 @@ BOOL CPlayerCaptureDialog::PreTranslateMessage(MSG* pMsg) return __super::PreTranslateMessage(pMsg);
}
-
void CPlayerCaptureDialog::EmptyVideo()
{
// first save channel from previous session
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.h b/src/apps/mplayerc/PlayerCaptureDialog.h index fd8932986..fcd700b23 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.h +++ b/src/apps/mplayerc/PlayerCaptureDialog.h @@ -23,8 +23,8 @@ #pragma once
-#include "afxwin.h"
-#include "afxcmn.h"
+#include <afxwin.h>
+#include <afxcmn.h>
#include "../../filters/transform/BufferFilter/BufferFilter.h"
#include "FloatEdit.h"
diff --git a/src/apps/mplayerc/PlayerListCtrl.cpp b/src/apps/mplayerc/PlayerListCtrl.cpp index 90a7dd2f9..9a40ea573 100644 --- a/src/apps/mplayerc/PlayerListCtrl.cpp +++ b/src/apps/mplayerc/PlayerListCtrl.cpp @@ -96,7 +96,6 @@ void CInPlaceEdit::OnNcDestroy() delete this;
}
-
void CInPlaceEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
{
if (nChar == VK_ESCAPE || nChar == VK_RETURN) {
@@ -338,7 +337,6 @@ void CInPlaceListBox::OnNcDestroy() }
-
// CPlayerListCtrl
IMPLEMENT_DYNAMIC(CPlayerListCtrl, CListCtrl)
diff --git a/src/apps/mplayerc/PlayerNavigationBar.cpp b/src/apps/mplayerc/PlayerNavigationBar.cpp index 1f7cc5bf7..f3128f5d3 100644 --- a/src/apps/mplayerc/PlayerNavigationBar.cpp +++ b/src/apps/mplayerc/PlayerNavigationBar.cpp @@ -22,9 +22,9 @@ #include "stdafx.h"
#include "mplayerc.h"
-#include "mainfrm.h"
+#include "MainFrm.h"
#include "PlayerNavigationBar.h"
-#include "afxwin.h"
+#include <afxwin.h>
// CPlayerCaptureBar
diff --git a/src/apps/mplayerc/PlayerNavigationDialog.cpp b/src/apps/mplayerc/PlayerNavigationDialog.cpp index 4f1cea984..d227abf9c 100644 --- a/src/apps/mplayerc/PlayerNavigationDialog.cpp +++ b/src/apps/mplayerc/PlayerNavigationDialog.cpp @@ -22,7 +22,7 @@ #include "stdafx.h"
#include "mplayerc.h"
-#include "mainfrm.h"
+#include "MainFrm.h"
#include "PlayerNavigationDialog.h"
#include "../../DSUtil/DSUtil.h"
#include <moreuuids.h>
@@ -50,7 +50,6 @@ BOOL CPlayerNavigationDialog::Create(CWnd* pParent) return TRUE;
}
-
void CPlayerNavigationDialog::DoDataExchange(CDataExchange* pDX)
{
__super::DoDataExchange(pDX);
diff --git a/src/apps/mplayerc/PlayerNavigationDialog.h b/src/apps/mplayerc/PlayerNavigationDialog.h index 7bea5ac9c..db8f36857 100644 --- a/src/apps/mplayerc/PlayerNavigationDialog.h +++ b/src/apps/mplayerc/PlayerNavigationDialog.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -22,8 +22,8 @@ #pragma once
-#include "afxwin.h"
-#include "afxcmn.h"
+#include <afxwin.h>
+#include <afxcmn.h>
#include "../../filters/transform/BufferFilter/BufferFilter.h"
#include "FloatEdit.h"
#include "DVBChannel.h"
diff --git a/src/apps/mplayerc/PlayerPlaylistBar.h b/src/apps/mplayerc/PlayerPlaylistBar.h index c1bdd8968..43086ffc5 100644 --- a/src/apps/mplayerc/PlayerPlaylistBar.h +++ b/src/apps/mplayerc/PlayerPlaylistBar.h @@ -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.
*
diff --git a/src/apps/mplayerc/PlayerSeekBar.cpp b/src/apps/mplayerc/PlayerSeekBar.cpp index 224b1e8c2..c7b1cde84 100644 --- a/src/apps/mplayerc/PlayerSeekBar.cpp +++ b/src/apps/mplayerc/PlayerSeekBar.cpp @@ -309,7 +309,6 @@ void CPlayerSeekBar::OnPaint() // Do not call CDialogBar::OnPaint() for painting messages
}
-
void CPlayerSeekBar::OnSize(UINT nType, int cx, int cy)
{
HideToolTip();
@@ -499,4 +498,4 @@ void CPlayerSeekBar::UpdateToolTipText() m_ti.lpszText = (LPTSTR)(LPCTSTR)m_tooltipText;
m_tooltip.SendMessage(TTM_SETTOOLINFO, 0, (LPARAM)&m_ti);
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/PlayerSeekBar.h b/src/apps/mplayerc/PlayerSeekBar.h index 170c72ead..78e2207a0 100644 --- a/src/apps/mplayerc/PlayerSeekBar.h +++ b/src/apps/mplayerc/PlayerSeekBar.h @@ -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.
*
diff --git a/src/apps/mplayerc/PlayerStatusBar.cpp b/src/apps/mplayerc/PlayerStatusBar.cpp index c6f6c99dd..33b32b98c 100644 --- a/src/apps/mplayerc/PlayerStatusBar.cpp +++ b/src/apps/mplayerc/PlayerStatusBar.cpp @@ -270,7 +270,6 @@ END_MESSAGE_MAP() // CPlayerStatusBar message handlers
-
BOOL CPlayerStatusBar::OnEraseBkgnd(CDC* pDC)
{
for (CWnd* pChild = GetWindow(GW_CHILD); pChild; pChild = pChild->GetNextWindow()) {
diff --git a/src/apps/mplayerc/PlayerStatusBar.h b/src/apps/mplayerc/PlayerStatusBar.h index 258683cc7..4e2e298e2 100644 --- a/src/apps/mplayerc/PlayerStatusBar.h +++ b/src/apps/mplayerc/PlayerStatusBar.h @@ -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.
*
diff --git a/src/apps/mplayerc/PlayerSubresyncBar.cpp b/src/apps/mplayerc/PlayerSubresyncBar.cpp index c030e6a55..c45009e48 100644 --- a/src/apps/mplayerc/PlayerSubresyncBar.cpp +++ b/src/apps/mplayerc/PlayerSubresyncBar.cpp @@ -1252,7 +1252,6 @@ void CPlayerSubresyncBar::OnCustomdrawList(NMHDR* pNMHDR, LRESULT* pResult) }
}
-
bool CPlayerSubresyncBar::IsShortCut(MSG* pMsg)
{
if (pMsg->message == WM_KEYDOWN && VK_F1 <= pMsg->wParam && pMsg->wParam <= VK_F6) {
@@ -1312,7 +1311,6 @@ bool CPlayerSubresyncBar::IsShortCut(MSG* pMsg) return false;
}
-
int CPlayerSubresyncBar::FindNearestSub(__int64& rtPos, bool bForward)
{
long lCurTime = rtPos / 10000 + (bForward ? 1 : -1);
@@ -1337,7 +1335,6 @@ int CPlayerSubresyncBar::FindNearestSub(__int64& rtPos, bool bForward) return -1;
}
-
bool CPlayerSubresyncBar::ShiftSubtitle(int nItem, long lValue, __int64& rtPos)
{
bool bRet = false;
diff --git a/src/apps/mplayerc/Playlist.h b/src/apps/mplayerc/Playlist.h index d4c15a7b7..7ef65b558 100644 --- a/src/apps/mplayerc/Playlist.h +++ b/src/apps/mplayerc/Playlist.h @@ -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.
*
diff --git a/src/apps/mplayerc/PnSPresetsDlg.cpp b/src/apps/mplayerc/PnSPresetsDlg.cpp index 4d2429514..f24a7c4d7 100644 --- a/src/apps/mplayerc/PnSPresetsDlg.cpp +++ b/src/apps/mplayerc/PnSPresetsDlg.cpp @@ -71,7 +71,6 @@ BOOL CPnSPresetsDlg::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE
}
-
void CPnSPresetsDlg::StringToParams(CString str, CString& label, double& PosX, double& PosY, double& ZoomX, double& ZoomY)
{
int i = 0, j = 0;
diff --git a/src/apps/mplayerc/PngImage.cpp b/src/apps/mplayerc/PngImage.cpp index ced4b0de4..cff55d815 100644 --- a/src/apps/mplayerc/PngImage.cpp +++ b/src/apps/mplayerc/PngImage.cpp @@ -22,7 +22,6 @@ */
#include "stdafx.h"
-
#include <malloc.h>
#include "PngImage.h"
#include "libpng/png.h"
@@ -142,4 +141,4 @@ bool CPngImage::LoadFromResource(UINT id) { }
return ret;
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/QuicktimeGraph.cpp b/src/apps/mplayerc/QuicktimeGraph.cpp index eb7472f37..36a4e844c 100644 --- a/src/apps/mplayerc/QuicktimeGraph.cpp +++ b/src/apps/mplayerc/QuicktimeGraph.cpp @@ -139,16 +139,19 @@ STDMETHODIMP CQuicktimeGraph::Run() m_wndDestFrame.Run();
return S_OK;
}
+
STDMETHODIMP CQuicktimeGraph::Pause()
{
m_wndDestFrame.Pause();
return S_OK;
}
+
STDMETHODIMP CQuicktimeGraph::Stop()
{
m_wndDestFrame.Stop();
return S_OK;
}
+
STDMETHODIMP CQuicktimeGraph::GetState(LONG msTimeout, OAFilterState* pfs)
{
// TODO: this seems to deadlock when opening from the net
@@ -175,6 +178,7 @@ STDMETHODIMP CQuicktimeGraph::GetDuration(LONGLONG* pDuration) return S_OK;
}
+
STDMETHODIMP CQuicktimeGraph::GetCurrentPosition(LONGLONG* pCurrent)
{
CheckPointer(pCurrent, E_POINTER);
@@ -195,6 +199,7 @@ STDMETHODIMP CQuicktimeGraph::GetCurrentPosition(LONGLONG* pCurrent) return S_OK;
}
+
STDMETHODIMP CQuicktimeGraph::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
CheckPointer(pCurrent, E_POINTER);
@@ -221,10 +226,12 @@ STDMETHODIMP CQuicktimeGraph::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFl return S_OK;
}
+
STDMETHODIMP CQuicktimeGraph::SetRate(double dRate)
{
return m_wndDestFrame.theMovie ? SetMovieRate(m_wndDestFrame.theMovie, (Fixed)(dRate * 0x10000)), S_OK : E_UNEXPECTED;
}
+
STDMETHODIMP CQuicktimeGraph::GetRate(double* pdRate)
{
CheckPointer(pdRate, E_POINTER);
@@ -256,6 +263,7 @@ STDMETHODIMP CQuicktimeGraph::SetDestinationPosition(long Left, long Top, long W return S_OK;
}
+
STDMETHODIMP CQuicktimeGraph::GetVideoSize(long* pWidth, long* pHeight)
{
if (!pWidth || !pHeight) {
@@ -280,6 +288,7 @@ STDMETHODIMP CQuicktimeGraph::put_Volume(long lVolume) return E_UNEXPECTED;
}
+
STDMETHODIMP CQuicktimeGraph::get_Volume(long* plVolume)
{
CheckPointer(plVolume, E_POINTER);
@@ -347,10 +356,12 @@ STDMETHODIMP CQuicktimeGraph::Step(DWORD dwFrames, IUnknown* pStepObject) ? NotifyEvent(EC_STEP_COMPLETE), S_OK : E_FAIL;
*/
}
+
STDMETHODIMP CQuicktimeGraph::CanStep(long bMultiple, IUnknown* pStepObject)
{
return m_wndDestFrame.theMovie ? S_OK : S_FALSE;
}
+
STDMETHODIMP CQuicktimeGraph::CancelStep()
{
return E_NOTIMPL;
diff --git a/src/apps/mplayerc/RealMediaGraph.cpp b/src/apps/mplayerc/RealMediaGraph.cpp index 46f939f21..d7ce447e6 100644 --- a/src/apps/mplayerc/RealMediaGraph.cpp +++ b/src/apps/mplayerc/RealMediaGraph.cpp @@ -279,29 +279,35 @@ STDMETHODIMP CRealMediaPlayer::OnPosLength(UINT32 ulPosition, UINT32 ulLength) m_nDuration = (REFERENCE_TIME)ulLength*10000;
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnPresentationOpened()
{
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnPresentationClosed()
{
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnStatisticsChanged()
{
m_pRMG->NotifyEvent(EC_LENGTH_CHANGED);
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnPreSeek(UINT32 ulOldTime, UINT32 ulNewTime)
{
m_nCurrent = (REFERENCE_TIME)ulNewTime*10000;
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnPostSeek(UINT32 ulOldTime, UINT32 ulNewTime)
{
m_nCurrent = (REFERENCE_TIME)ulNewTime*10000;
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnStop()
{
m_nCurrent = 0;
@@ -311,21 +317,25 @@ STDMETHODIMP CRealMediaPlayer::OnStop() }
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnPause(UINT32 ulTime)
{
m_State = State_Paused;
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnBegin(UINT32 ulTime)
{
m_State = State_Running;
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnBuffering(UINT32 ulFlags, UINT16 unPercentComplete)
{
m_unPercentComplete = unPercentComplete;
return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::OnContacting(const char* pHostName)
{
return PNR_OK;
@@ -421,10 +431,12 @@ STDMETHODIMP CRealMediaPlayer::SitesNotNeeded(UINT32 uRequestID) return PNR_OK;
}
+
STDMETHODIMP CRealMediaPlayer::BeginChangeLayout()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CRealMediaPlayer::DoneChangeLayout()
{
if (m_fVideoSizeChanged) {
@@ -440,6 +452,7 @@ STDMETHODIMP CRealMediaPlayer::PositionChanged(PNxPoint* pos) {
return E_NOTIMPL;
}
+
STDMETHODIMP CRealMediaPlayer::SizeChanged(PNxSize* size)
{
if (m_VideoSize.cx == 0 || m_VideoSize.cy == 0) {
@@ -455,6 +468,7 @@ STDMETHODIMP CRealMediaPlayer::OnBuffer(RMAAudioData* pAudioInData, RMAAudioData {
return E_NOTIMPL;
}
+
STDMETHODIMP CRealMediaPlayer::OnInit(RMAAudioFormat* pFormat)
{
m_pRMG->NotifyEvent(EC_BG_AUDIO_CHANGED, pFormat->uChannels, 0);
@@ -690,16 +704,19 @@ STDMETHODIMP CRealMediaGraph::Run() m_pRMP->m_UserState = State_Running;
return (PNR_OK == m_pRMP->m_pPlayer->Begin()) ? S_OK : E_FAIL;
}
+
STDMETHODIMP CRealMediaGraph::Pause()
{
m_pRMP->m_UserState = State_Paused;
return (PNR_OK == m_pRMP->m_pPlayer->Pause()) ? S_OK : E_FAIL;
}
+
STDMETHODIMP CRealMediaGraph::Stop()
{
m_pRMP->m_UserState = State_Stopped;
return (PNR_OK == m_pRMP->m_pPlayer->Stop()) ? S_OK : E_FAIL;
}
+
STDMETHODIMP CRealMediaGraph::GetState(LONG msTimeout, OAFilterState* pfs)
{
return pfs ? *pfs = m_pRMP->m_State, S_OK : E_POINTER;
@@ -710,10 +727,12 @@ STDMETHODIMP CRealMediaGraph::GetDuration(LONGLONG* pDuration) {
return pDuration ? *pDuration = m_pRMP->m_nDuration, S_OK : E_POINTER;
}
+
STDMETHODIMP CRealMediaGraph::GetCurrentPosition(LONGLONG* pCurrent)
{
return pCurrent ? *pCurrent = m_pRMP->m_nCurrent, S_OK : E_POINTER;
}
+
STDMETHODIMP CRealMediaGraph::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
return (dwCurrentFlags&AM_SEEKING_AbsolutePositioning)
@@ -736,6 +755,7 @@ STDMETHODIMP CRealMediaGraph::SetDestinationPosition(long Left, long Top, long W m_pRMP->SetDestRect(CRect(CPoint(Left, Top), CSize(Width, Height)));
return S_OK;
}
+
STDMETHODIMP CRealMediaGraph::GetVideoSize(long* pWidth, long* pHeight)
{
if (!pWidth || !pHeight) {
@@ -758,6 +778,7 @@ STDMETHODIMP CRealMediaGraph::put_Volume(long lVolume) return PNR_OK == m_pRMP->m_pVolume->SetVolume(volume) ? S_OK : E_FAIL;
}
+
STDMETHODIMP CRealMediaGraph::get_Volume(long* plVolume)
{
if (!m_pRMP->m_pVolume) {
diff --git a/src/apps/mplayerc/RealMediaWindowlessSite.cpp b/src/apps/mplayerc/RealMediaWindowlessSite.cpp index 14d6b38bc..1ee746620 100644 --- a/src/apps/mplayerc/RealMediaWindowlessSite.cpp +++ b/src/apps/mplayerc/RealMediaWindowlessSite.cpp @@ -65,6 +65,7 @@ void DSObjects::ExtractRects(REGION* pRegion) PN_VECTOR_DELETE(lpRgnData);
}
+
REGION* DSObjects::RMACreateRectRegion(int left, int top, int right, int bottom)
{
REGION* retVal = DNew REGION;
@@ -72,32 +73,38 @@ REGION* DSObjects::RMACreateRectRegion(int left, int top, int right, int bottom) ExtractRects(retVal);
return retVal;
}
+
void DSObjects::RMASubtractRegion(REGION* regM, REGION* regS, REGION* regD)
{
CombineRgn((HRGN)regD->pOSRegion, (HRGN)regM->pOSRegion, (HRGN)regS->pOSRegion, RGN_DIFF);
ExtractRects(regD);
}
+
void DSObjects::RMAUnionRegion(REGION* reg1, REGION* reg2, REGION* regD)
{
CombineRgn((HRGN)regD->pOSRegion, (HRGN)reg1->pOSRegion, (HRGN)reg2->pOSRegion, RGN_OR);
ExtractRects(regD);
}
+
void DSObjects::RMAIntersectRegion(REGION* reg1, REGION* reg2, REGION* regD)
{
CombineRgn((HRGN)regD->pOSRegion, (HRGN)reg1->pOSRegion, (HRGN)reg2->pOSRegion, RGN_AND);
ExtractRects(regD);
}
+
BOOL DSObjects::RMAEqualRegion(REGION* reg1, REGION* reg2)
{
return EqualRgn((HRGN)reg1->pOSRegion, (HRGN)reg2->pOSRegion)
&& !memcmp(®1->extents, ®2->extents, sizeof(PNxRect)) ? TRUE : FALSE;
}
+
void DSObjects::RMADestroyRegion(REGION* reg)
{
if (reg) DeleteObject((HRGN)reg->pOSRegion),
PN_VECTOR_DELETE(reg->rects);
PN_DELETE(reg);
}
+
REGION* DSObjects::RMACreateRegion()
{
return RMACreateRectRegion(0,0,0,0);
diff --git a/src/apps/mplayerc/RegFilterChooserDlg.h b/src/apps/mplayerc/RegFilterChooserDlg.h index 20433e806..eefc1cb4b 100644 --- a/src/apps/mplayerc/RegFilterChooserDlg.h +++ b/src/apps/mplayerc/RegFilterChooserDlg.h @@ -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.
*
@@ -23,7 +23,7 @@ #pragma once
-#include "afxwin.h"
+#include <afxwin.h>
// CRegFilterChooserDlg dialog
diff --git a/src/apps/mplayerc/SaveDlg.cpp b/src/apps/mplayerc/SaveDlg.cpp index a3c6f0a1d..4b82a0cb5 100644 --- a/src/apps/mplayerc/SaveDlg.cpp +++ b/src/apps/mplayerc/SaveDlg.cpp @@ -24,7 +24,7 @@ #include "stdafx.h"
#include "mplayerc.h"
#include "SaveDlg.h"
-#include "../../filters/filters.h"
+#include "../../filters/Filters.h"
// CSaveDlg dialog
diff --git a/src/apps/mplayerc/SaveDlg.h b/src/apps/mplayerc/SaveDlg.h index 247f198d5..6d1943180 100644 --- a/src/apps/mplayerc/SaveDlg.h +++ b/src/apps/mplayerc/SaveDlg.h @@ -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.
*
@@ -23,8 +23,8 @@ #pragma once
-#include "afxcmn.h"
-#include "afxwin.h"
+#include <afxcmn.h>
+#include <afxwin.h>
// CSaveDlg dialog
diff --git a/src/apps/mplayerc/SelectMediaType.h b/src/apps/mplayerc/SelectMediaType.h index 3b64b6e7e..5d82466de 100644 --- a/src/apps/mplayerc/SelectMediaType.h +++ b/src/apps/mplayerc/SelectMediaType.h @@ -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.
*
@@ -23,7 +23,7 @@ #pragma once
-#include "afxwin.h"
+#include <afxwin.h>
// CSelectMediaType dialog
diff --git a/src/apps/mplayerc/SettingsDefines.h b/src/apps/mplayerc/SettingsDefines.h index 89f86dca1..883ce3c37 100644 --- a/src/apps/mplayerc/SettingsDefines.h +++ b/src/apps/mplayerc/SettingsDefines.h @@ -239,8 +239,8 @@ #define IDS_FASTSEEK_KEYFRAME _T("FastSeek")
-#define IDS_REMAINING_TIME _T("RemainingTime")
+#define IDS_REMAINING_TIME _T("RemainingTime")
-#define IDS_R_SHADERS_INITIALIZED _T("Initialized")
-#define IDS_R_SHADERS_COMBINE _T("Combine")
-#define IDS_R_SHADERS_COMBINESCREENSPACE _T("CombineScreenSpace")
\ No newline at end of file +#define IDS_R_SHADERS_INITIALIZED _T("Initialized")
+#define IDS_R_SHADERS_COMBINE _T("Combine")
+#define IDS_R_SHADERS_COMBINESCREENSPACE _T("CombineScreenSpace")
diff --git a/src/apps/mplayerc/ShaderCombineDlg.h b/src/apps/mplayerc/ShaderCombineDlg.h index 90cab7fc3..896b96965 100644 --- a/src/apps/mplayerc/ShaderCombineDlg.h +++ b/src/apps/mplayerc/ShaderCombineDlg.h @@ -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.
*
@@ -23,7 +23,7 @@ #pragma once
-#include "afxwin.h"
+#include <afxwin.h>
// CShaderCombineDlg dialog
diff --git a/src/apps/mplayerc/ShockwaveGraph.cpp b/src/apps/mplayerc/ShockwaveGraph.cpp index e2e491765..0db13edb6 100644 --- a/src/apps/mplayerc/ShockwaveGraph.cpp +++ b/src/apps/mplayerc/ShockwaveGraph.cpp @@ -25,6 +25,7 @@ #include "ShockwaveGraph.h"
#include "resource.h"
#include "../../DSUtil/DSUtil.h"
+#include <math.h>
using namespace DSObjects;
@@ -85,6 +86,7 @@ STDMETHODIMP CShockwaveGraph::Run() // m_wndDestFrame.EnableWindow();
return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::Pause()
{
try {
@@ -98,6 +100,7 @@ STDMETHODIMP CShockwaveGraph::Pause() m_fs = State_Paused;
return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::Stop()
{
try {
@@ -109,6 +112,7 @@ STDMETHODIMP CShockwaveGraph::Stop() m_fs = State_Stopped;
return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::GetState(LONG msTimeout, OAFilterState* pfs)
{
OAFilterState fs = m_fs;
@@ -135,10 +139,12 @@ STDMETHODIMP CShockwaveGraph::IsFormatSupported(const GUID* pFormat) {
return !pFormat ? E_POINTER : *pFormat == TIME_FORMAT_FRAME ? S_OK : S_FALSE;
}
+
STDMETHODIMP CShockwaveGraph::GetTimeFormat(GUID* pFormat)
{
return pFormat ? *pFormat = TIME_FORMAT_FRAME, S_OK : E_POINTER;
}
+
STDMETHODIMP CShockwaveGraph::GetDuration(LONGLONG* pDuration)
{
CheckPointer(pDuration, E_POINTER);
@@ -153,6 +159,7 @@ STDMETHODIMP CShockwaveGraph::GetDuration(LONGLONG* pDuration) }
return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::GetCurrentPosition(LONGLONG* pCurrent)
{
CheckPointer(pCurrent, E_POINTER);
@@ -167,6 +174,7 @@ STDMETHODIMP CShockwaveGraph::GetCurrentPosition(LONGLONG* pCurrent) }
return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
if (dwCurrentFlags&AM_SEEKING_AbsolutePositioning) {
@@ -194,10 +202,12 @@ STDMETHODIMP CShockwaveGraph::put_Visible(long Visible) }
return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::get_Visible(long* pVisible)
{
return pVisible ? *pVisible = (m_wndDestFrame.IsWindowVisible() ? OATRUE : OAFALSE), S_OK : E_POINTER;
}
+
STDMETHODIMP CShockwaveGraph::SetWindowPosition(long Left, long Top, long Width, long Height)
{
if (IsWindow(m_wndWindowFrame.m_hWnd)) {
@@ -216,6 +226,7 @@ STDMETHODIMP CShockwaveGraph::SetDestinationPosition(long Left, long Top, long W return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::GetVideoSize(long* pWidth, long* pHeight)
{
if (!pWidth || !pHeight) {
@@ -238,8 +249,6 @@ STDMETHODIMP CShockwaveGraph::GetVideoSize(long* pWidth, long* pHeight) return S_OK;
}
-#include <math.h>
-
// IBasicAudio
STDMETHODIMP CShockwaveGraph::put_Volume(long lVolume)
{
@@ -250,6 +259,7 @@ STDMETHODIMP CShockwaveGraph::put_Volume(long lVolume) return S_OK;
}
+
STDMETHODIMP CShockwaveGraph::get_Volume(long* plVolume)
{
CheckPointer(plVolume, E_POINTER);
diff --git a/src/apps/mplayerc/SubtitleDlDlg.cpp b/src/apps/mplayerc/SubtitleDlDlg.cpp index 0b9b08b6d..35bc01dcf 100644 --- a/src/apps/mplayerc/SubtitleDlDlg.cpp +++ b/src/apps/mplayerc/SubtitleDlDlg.cpp @@ -130,7 +130,6 @@ void CSubtitleDlDlg::OnUpdateOk(CCmdUI* pCmdUI) pCmdUI->Enable(fEnable);
}
-
void CSubtitleDlDlg::OnHdnItemclickList1(NMHDR *pNMHDR, LRESULT *pResult)
{
LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
diff --git a/src/apps/mplayerc/SubtitleDlDlg.h b/src/apps/mplayerc/SubtitleDlDlg.h index 8aaf0f250..19af52c47 100644 --- a/src/apps/mplayerc/SubtitleDlDlg.h +++ b/src/apps/mplayerc/SubtitleDlDlg.h @@ -24,7 +24,7 @@ #pragma once
#include "ISDb.h"
-#include "afxwin.h"
+#include <afxwin.h>
// CSubtitleDlDlg dialog
diff --git a/src/apps/mplayerc/TunerScanDlg.cpp b/src/apps/mplayerc/TunerScanDlg.cpp index 0c98f7aa7..7be17cdea 100644 --- a/src/apps/mplayerc/TunerScanDlg.cpp +++ b/src/apps/mplayerc/TunerScanDlg.cpp @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -164,7 +164,6 @@ void CTunerScanDlg::OnBnClickedCheckOffset() m_OffsetEditBox.EnableWindow(m_bUseOffset);
}
-
LRESULT CTunerScanDlg::OnScanProgress(WPARAM wParam, LPARAM lParam)
{
m_Progress.SetPos(wParam);
@@ -224,7 +223,6 @@ LRESULT CTunerScanDlg::OnNewChannel(WPARAM wParam, LPARAM lParam) return TRUE;
}
-
void CTunerScanDlg::SetProgress (bool bState)
{
if (bState) {
diff --git a/src/apps/mplayerc/TunerScanDlg.h b/src/apps/mplayerc/TunerScanDlg.h index 106a2f4c5..20642bcb1 100644 --- a/src/apps/mplayerc/TunerScanDlg.h +++ b/src/apps/mplayerc/TunerScanDlg.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -21,8 +21,8 @@ */
#pragma once
-#include "afxcmn.h"
-#include "afxwin.h"
+#include <afxcmn.h>
+#include <afxwin.h>
// CTunerScanDlg dialog
diff --git a/src/apps/mplayerc/VMROSD.cpp b/src/apps/mplayerc/VMROSD.cpp index cbd83e272..f5dbf3a18 100644 --- a/src/apps/mplayerc/VMROSD.cpp +++ b/src/apps/mplayerc/VMROSD.cpp @@ -64,7 +64,6 @@ CVMROSD::~CVMROSD(void) m_MemDC.DeleteDC();
}
-
void CVMROSD::OnSize(UINT nType, int cx, int cy)
{
if (m_pWnd && (m_pVMB || m_pMFVMB)) {
@@ -77,7 +76,6 @@ void CVMROSD::OnSize(UINT nType, int cx, int cy) }
}
-
void CVMROSD::UpdateBitmap()
{
CAutoLock Lock(&m_Lock);
@@ -149,7 +147,6 @@ void CVMROSD::Start (CWnd* pWnd, IVMRMixerBitmap9* pVMB) UpdateBitmap();
}
-
void CVMROSD::Start (CWnd* pWnd, IMFVideoMixerBitmap* pMFVMB)
{
m_pMFVMB = pMFVMB;
@@ -159,7 +156,6 @@ void CVMROSD::Start (CWnd* pWnd, IMFVideoMixerBitmap* pMFVMB) UpdateBitmap();
}
-
void CVMROSD::Start (CWnd* pWnd, IMadVRTextOsd* pMVTO)
{
m_pMFVMB = NULL;
@@ -168,7 +164,6 @@ void CVMROSD::Start (CWnd* pWnd, IMadVRTextOsd* pMVTO) m_pWnd = pWnd;
}
-
void CVMROSD::Stop()
{
if (m_pVMB) {
@@ -233,7 +228,6 @@ void CVMROSD::DrawSlider(CRect* rect, __int64 llMin, __int64 llMax, __int64 llPo DrawRect (&m_rectCursor, NULL, &m_penCursor);
}
-
void CVMROSD::DrawMessage()
{
if (m_BitmapInfo.bmWidth*m_BitmapInfo.bmHeight*(m_BitmapInfo.bmBitsPixel/8) == 0) {
@@ -510,4 +504,4 @@ void CVMROSD::HideMessage(bool hide) Invalidate();
}
}
-}
\ No newline at end of file +}
diff --git a/src/apps/mplayerc/VMROSD.h b/src/apps/mplayerc/VMROSD.h index b8a5b9180..f0b0a0f66 100644 --- a/src/apps/mplayerc/VMROSD.h +++ b/src/apps/mplayerc/VMROSD.h @@ -23,8 +23,8 @@ #pragma once
#include <atlbase.h>
-#include <D3d9.h>
-#include <Vmr9.h>
+#include <d3d9.h>
+#include <vmr9.h>
#include <evr9.h>
#include "madVRAllocatorPresenter.h"
diff --git a/src/apps/mplayerc/VolumeCtrl.cpp b/src/apps/mplayerc/VolumeCtrl.cpp index 5dc04110a..28dab7d4e 100644 --- a/src/apps/mplayerc/VolumeCtrl.cpp +++ b/src/apps/mplayerc/VolumeCtrl.cpp @@ -77,7 +77,6 @@ END_MESSAGE_MAP() // CVolumeCtrl message handlers
-
void CVolumeCtrl::OnNMCustomdraw(NMHDR* pNMHDR, LRESULT* pResult)
{
LPNMCUSTOMDRAW pNMCD = reinterpret_cast<LPNMCUSTOMDRAW>(pNMHDR);
diff --git a/src/apps/mplayerc/WebClientSocket.cpp b/src/apps/mplayerc/WebClientSocket.cpp index 9b7d186b7..1c9e5abe9 100644 --- a/src/apps/mplayerc/WebClientSocket.cpp +++ b/src/apps/mplayerc/WebClientSocket.cpp @@ -29,6 +29,7 @@ #include "../../Subtitles/TextFile.h"
#include "WebServer.h"
#include "WebClientSocket.h"
+#include "jpeg.h"
CWebClientSocket::CWebClientSocket(CWebServer* pWebServer, CMainFrame* pMainFrame)
: m_pWebServer(pWebServer)
@@ -776,8 +777,6 @@ bool CWebClientSocket::OnPlayer(CStringA& hdr, CStringA& body, CStringA& mime) return true;
}
-#include "jpeg.h"
-
bool CWebClientSocket::OnSnapShotJpeg(CStringA& hdr, CStringA& body, CStringA& mime)
{
// TODO: add quality control and return logo when nothing is loaded
diff --git a/src/apps/mplayerc/WinAPIUtils.cpp b/src/apps/mplayerc/WinAPIUtils.cpp index 2491ec1ed..a5d49567d 100644 --- a/src/apps/mplayerc/WinAPIUtils.cpp +++ b/src/apps/mplayerc/WinAPIUtils.cpp @@ -21,7 +21,6 @@ */
#include "stdafx.h"
-
#include "WinAPIUtils.h"
BOOL IsWinXPOrLater()
diff --git a/src/apps/mplayerc/internal_filter_config.h b/src/apps/mplayerc/internal_filter_config.h index a18393a7a..7b82c5ce8 100644 --- a/src/apps/mplayerc/internal_filter_config.h +++ b/src/apps/mplayerc/internal_filter_config.h @@ -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.
*
@@ -20,8 +20,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-/* For configuring which internal filters are included into the build.
- */
+
+// For configuring which internal filters are included into the build.
+
#pragma once
|