RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Style changes as requested by Diego. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30872 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
sesse 2010-03-09 12:40:14 +00:00
parent 27aa3db23e
commit f08a70d7df
2 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
loader/dshow/graph.c
View File

@ -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 @@ FilterGraph* FilterGraphCreate()
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)

41
loader/dshow/graph.h
View File

@ -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);