Mercurial > mplayer.hg
changeset 30830:a25ab9c878f9
Style changes as requested by Diego.
| author | sesse |
|---|---|
| date | Tue, 09 Mar 2010 12:40:14 +0000 |
| parents | 520e26362ad8 |
| children | 9f57c99fce86 |
| files | loader/dshow/graph.c loader/dshow/graph.h |
| diffstat | 2 files changed, 36 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/loader/dshow/graph.c Tue Mar 09 12:01:42 2010 +0000 +++ b/loader/dshow/graph.c Tue Mar 09 12:40:14 2010 +0000 @@ -5,12 +5,13 @@ * http://svn.mplayerhq.hu/mplayer/trunk/ */ +#include <stdio.h> +#include <stdlib.h> + #include "config.h" #include "loader/com.h" #include "loader/dshow/graph.h" #include "loader/wine/winerror.h" -#include <stdio.h> -#include <stdlib.h> // How many FilterGraph objects exist. // Used for knowing when to register and unregister the class in COM. @@ -114,27 +115,26 @@ This->vt = calloc(1, sizeof(*This->vt)); - if (!This->vt) - { + if (!This->vt) { free(This); return NULL; } - This->vt->QueryInterface = FilterGraph_QueryInterface; - This->vt->AddRef = FilterGraph_AddRef; - This->vt->Release = FilterGraph_Release; + This->vt->QueryInterface = FilterGraph_QueryInterface; + This->vt->AddRef = FilterGraph_AddRef; + This->vt->Release = FilterGraph_Release; - This->vt->AddFilter = FilterGraph_AddFilter; - This->vt->RemoveFilter = FilterGraph_RemoveFilter; - This->vt->EnumFilters = FilterGraph_EnumFilters; - This->vt->FindFilterByName = FilterGraph_FindFilterByName; - This->vt->ConnectDirect = FilterGraph_ConnectDirect; - This->vt->Reconnect = FilterGraph_Reconnect; - This->vt->Disconnect = FilterGraph_Disconnect; + This->vt->AddFilter = FilterGraph_AddFilter; + This->vt->RemoveFilter = FilterGraph_RemoveFilter; + This->vt->EnumFilters = FilterGraph_EnumFilters; + This->vt->FindFilterByName = FilterGraph_FindFilterByName; + This->vt->ConnectDirect = FilterGraph_ConnectDirect; + This->vt->Reconnect = FilterGraph_Reconnect; + This->vt->Disconnect = FilterGraph_Disconnect; This->vt->SetDefaultSyncSource = FilterGraph_SetDefaultSyncSource; - This->interfaces[0]=IID_IUnknown; - This->interfaces[1]=IID_IFilterGraph; + This->interfaces[0] = IID_IUnknown; + This->interfaces[1] = IID_IFilterGraph; #ifdef WIN32_LOADER if (GraphKeeper++ == 0)
--- a/loader/dshow/graph.h Tue Mar 09 12:01:42 2010 +0000 +++ b/loader/dshow/graph.h Tue Mar 09 12:40:14 2010 +0000 @@ -6,31 +6,30 @@ typedef struct FilterGraph FilterGraph; -struct FilterGraph -{ +struct FilterGraph { IFilterGraph_vt* vt; DECLARE_IUNKNOWN(); GUID interfaces[2]; - HRESULT STDCALL ( *AddFilter )(FilterGraph* This, - /* [in] */ IBaseFilter* pFilter, - /* [string][in] */ unsigned short* pName); - HRESULT STDCALL ( *RemoveFilter )(FilterGraph* This, - /* [in] */ IBaseFilter* pFilter); - HRESULT STDCALL ( *EnumFilters )(FilterGraph* This, - /* [out] */ IEnumFilters** ppEnum); - HRESULT STDCALL ( *FindFilterByName )(FilterGraph* This, - /* [string][in] */ unsigned short* pName, - /* [out] */ IBaseFilter** ppFilter); - HRESULT STDCALL ( *ConnectDirect )(FilterGraph* This, - /* [in] */ IPin* ppinOut, - /* [in] */ IPin* ppinIn, - /* [in] */ const AM_MEDIA_TYPE* pmt); - HRESULT STDCALL ( *Reconnect )(FilterGraph* This, - /* [in] */ IPin* ppin); - HRESULT STDCALL ( *Disconnect )(FilterGraph* This, - /* [in] */ IPin* ppin); - HRESULT STDCALL ( *SetDefaultSyncSource )(FilterGraph* This); + HRESULT STDCALL (*AddFilter)(FilterGraph* This, + /* [in] */ IBaseFilter* pFilter, + /* [string][in] */ unsigned short* pName); + HRESULT STDCALL (*RemoveFilter)(FilterGraph* This, + /* [in] */ IBaseFilter* pFilter); + HRESULT STDCALL (*EnumFilters)(FilterGraph* This, + /* [out] */ IEnumFilters** ppEnum); + HRESULT STDCALL (*FindFilterByName)(FilterGraph* This, + /* [string][in] */ unsigned short* pName, + /* [out] */ IBaseFilter** ppFilter); + HRESULT STDCALL (*ConnectDirect)(FilterGraph* This, + /* [in] */ IPin* ppinOut, + /* [in] */ IPin* ppinIn, + /* [in] */ const AM_MEDIA_TYPE* pmt); + HRESULT STDCALL (*Reconnect)(FilterGraph* This, + /* [in] */ IPin* ppin); + HRESULT STDCALL (*Disconnect)(FilterGraph* This, + /* [in] */ IPin* ppin); + HRESULT STDCALL (*SetDefaultSyncSource)(FilterGraph* This); }; FilterGraph* FilterGraphCreate(void);