From b35edca8bfdab76c6251104c474cf15f05391da4 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 9 Mar 2010 12:00:30 +0000 Subject: Commit files by Steinar Gunderson, forgotten in r30866. Fixes compilation on x86-32. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30870 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dshow/graph.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 loader/dshow/graph.h (limited to 'loader/dshow/graph.h') diff --git a/loader/dshow/graph.h b/loader/dshow/graph.h new file mode 100644 index 0000000000..62423960a0 --- /dev/null +++ b/loader/dshow/graph.h @@ -0,0 +1,38 @@ +#ifndef MPLAYER_GRAPH_H +#define MPLAYER_GRAPH_H + +#include "interfaces.h" +#include "cmediasample.h" + +typedef struct FilterGraph 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); +}; + +FilterGraph* FilterGraphCreate(void); + +#endif /* MPLAYER_GRAPH_H */ -- cgit v1.2.3 From f08a70d7df96e78cb2694fb0927acc4997e51254 Mon Sep 17 00:00:00 2001 From: sesse Date: Tue, 9 Mar 2010 12:40:14 +0000 Subject: Style changes as requested by Diego. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30872 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dshow/graph.h | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'loader/dshow/graph.h') diff --git a/loader/dshow/graph.h b/loader/dshow/graph.h index 62423960a0..45697d5e8b 100644 --- a/loader/dshow/graph.h +++ b/loader/dshow/graph.h @@ -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); -- cgit v1.2.3 From 49471eaa3d8acdbfc4a95cecd030428b64190b90 Mon Sep 17 00:00:00 2001 From: sesse Date: Tue, 9 Mar 2010 13:18:52 +0000 Subject: Add copyright headers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30873 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dshow/graph.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'loader/dshow/graph.h') diff --git a/loader/dshow/graph.h b/loader/dshow/graph.h index 45697d5e8b..f3ad68db46 100644 --- a/loader/dshow/graph.h +++ b/loader/dshow/graph.h @@ -1,6 +1,26 @@ #ifndef MPLAYER_GRAPH_H #define MPLAYER_GRAPH_H +/* + * Copyright 2010 Steinar H. Gunderson + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + / + #include "interfaces.h" #include "cmediasample.h" -- cgit v1.2.3 From 4abf80e24c825a0f5a0d9f26009f19c5e039ba6b Mon Sep 17 00:00:00 2001 From: sesse Date: Tue, 9 Mar 2010 13:19:25 +0000 Subject: Fix a syntax error in graph.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30874 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dshow/graph.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'loader/dshow/graph.h') diff --git a/loader/dshow/graph.h b/loader/dshow/graph.h index f3ad68db46..7667f5a39e 100644 --- a/loader/dshow/graph.h +++ b/loader/dshow/graph.h @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - / + */ #include "interfaces.h" #include "cmediasample.h" -- cgit v1.2.3