mirror of
https://github.com/reactos/reactos.git
synced 2024-08-27 13:48:42 +00:00
[STRMBASE]
* Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61333
This commit is contained in:
parent
c5510e9936
commit
8d2caa099b
10
reactos/lib/3rdparty/strmbase/audio.c
vendored
10
reactos/lib/3rdparty/strmbase/audio.c
vendored
|
@ -18,15 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
|
|
||||||
|
|
||||||
static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface)
|
static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface)
|
||||||
{
|
{
|
||||||
|
|
9
reactos/lib/3rdparty/strmbase/dispatch.c
vendored
9
reactos/lib/3rdparty/strmbase/dispatch.c
vendored
|
@ -18,14 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid)
|
HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid)
|
||||||
{
|
{
|
||||||
|
|
23
reactos/lib/3rdparty/strmbase/dllfunc.c
vendored
23
reactos/lib/3rdparty/strmbase/dllfunc.c
vendored
|
@ -18,29 +18,8 @@
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include "strmbase_private.h"
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "wingdi.h"
|
|
||||||
#include "winerror.h"
|
|
||||||
#include "winreg.h"
|
|
||||||
#include "objbase.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "strmif.h"
|
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
extern const int g_cTemplates;
|
extern const int g_cTemplates;
|
||||||
extern const FactoryTemplate g_Templates[];
|
extern const FactoryTemplate g_Templates[];
|
||||||
|
|
8
reactos/lib/3rdparty/strmbase/enumpins.c
vendored
8
reactos/lib/3rdparty/strmbase/enumpins.c
vendored
|
@ -19,13 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
typedef struct IEnumPinsImpl
|
typedef struct IEnumPinsImpl
|
||||||
{
|
{
|
||||||
|
|
11
reactos/lib/3rdparty/strmbase/filter.c
vendored
11
reactos/lib/3rdparty/strmbase/filter.c
vendored
|
@ -18,16 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface)
|
static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface)
|
||||||
{
|
{
|
||||||
|
|
9
reactos/lib/3rdparty/strmbase/mediatype.c
vendored
9
reactos/lib/3rdparty/strmbase/mediatype.c
vendored
|
@ -18,15 +18,8 @@
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
#include "dshow.h"
|
|
||||||
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src)
|
HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src)
|
||||||
{
|
{
|
||||||
|
|
13
reactos/lib/3rdparty/strmbase/outputqueue.c
vendored
13
reactos/lib/3rdparty/strmbase/outputqueue.c
vendored
|
@ -18,18 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/list.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
enum {SAMPLE_PACKET, EOS_PACKET};
|
enum {SAMPLE_PACKET, EOS_PACKET};
|
||||||
|
|
||||||
|
|
12
reactos/lib/3rdparty/strmbase/pin.c
vendored
12
reactos/lib/3rdparty/strmbase/pin.c
vendored
|
@ -19,17 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static const IPinVtbl InputPin_Vtbl;
|
static const IPinVtbl InputPin_Vtbl;
|
||||||
static const IPinVtbl OutputPin_Vtbl;
|
static const IPinVtbl OutputPin_Vtbl;
|
||||||
|
|
12
reactos/lib/3rdparty/strmbase/pospass.c
vendored
12
reactos/lib/3rdparty/strmbase/pospass.c
vendored
|
@ -20,17 +20,7 @@
|
||||||
*/
|
*/
|
||||||
/* FIXME: critical sections */
|
/* FIXME: critical sections */
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static const IMediaSeekingVtbl IMediaSeekingPassThru_Vtbl;
|
static const IMediaSeekingVtbl IMediaSeekingPassThru_Vtbl;
|
||||||
static const IMediaPositionVtbl IMediaPositionPassThru_Vtbl;
|
static const IMediaPositionVtbl IMediaPositionPassThru_Vtbl;
|
||||||
|
|
11
reactos/lib/3rdparty/strmbase/qualitycontrol.c
vendored
11
reactos/lib/3rdparty/strmbase/qualitycontrol.c
vendored
|
@ -23,19 +23,8 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "strmbase_private.h"
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc);
|
|
||||||
|
|
||||||
HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) {
|
HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) {
|
||||||
QualityControlImpl *This;
|
QualityControlImpl *This;
|
||||||
*ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl));
|
*ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl));
|
||||||
|
|
10
reactos/lib/3rdparty/strmbase/renderer.c
vendored
10
reactos/lib/3rdparty/strmbase/renderer.c
vendored
|
@ -18,18 +18,8 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include "strmbase_private.h"
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
|
static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
|
||||||
static const WCHAR wcsAltInputPinName[] = {'I','n',0};
|
static const WCHAR wcsAltInputPinName[] = {'I','n',0};
|
||||||
|
|
||||||
|
|
12
reactos/lib/3rdparty/strmbase/seeking.c
vendored
12
reactos/lib/3rdparty/strmbase/seeking.c
vendored
|
@ -20,17 +20,7 @@
|
||||||
*/
|
*/
|
||||||
/* FIXME: critical sections */
|
/* FIXME: critical sections */
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface)
|
static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface)
|
||||||
{
|
{
|
||||||
|
|
20
reactos/lib/3rdparty/strmbase/strmbase_private.h
vendored
20
reactos/lib/3rdparty/strmbase/strmbase_private.h
vendored
|
@ -18,6 +18,26 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#define WIN32_NO_STATUS
|
||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
|
#define COBJMACROS
|
||||||
|
#define NONAMELESSSTRUCT
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
|
||||||
|
#include <dshow.h>
|
||||||
|
|
||||||
|
#include <wine/list.h>
|
||||||
|
#include <wine/strmbase.h>
|
||||||
|
#include <wine/unicode.h>
|
||||||
|
|
||||||
|
#include <wine/debug.h>
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
||||||
|
|
||||||
/* Quality Control */
|
/* Quality Control */
|
||||||
typedef struct QualityControlImpl {
|
typedef struct QualityControlImpl {
|
||||||
IQualityControl IQualityControl_iface;
|
IQualityControl IQualityControl_iface;
|
||||||
|
|
18
reactos/lib/3rdparty/strmbase/transform.c
vendored
18
reactos/lib/3rdparty/strmbase/transform.c
vendored
|
@ -18,27 +18,9 @@
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "amvideo.h"
|
|
||||||
#include "strmif.h"
|
|
||||||
#include "vfw.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "strmbase_private.h"
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
|
static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
|
||||||
static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0};
|
static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0};
|
||||||
|
|
||||||
|
|
12
reactos/lib/3rdparty/strmbase/video.c
vendored
12
reactos/lib/3rdparty/strmbase/video.c
vendored
|
@ -18,17 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface)
|
static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface)
|
||||||
{
|
{
|
||||||
|
|
12
reactos/lib/3rdparty/strmbase/window.c
vendored
12
reactos/lib/3rdparty/strmbase/window.c
vendored
|
@ -18,17 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#include "strmbase_private.h"
|
||||||
|
|
||||||
#include "dshow.h"
|
|
||||||
#include "wine/debug.h"
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/strmbase.h"
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
|
||||||
|
|
||||||
static inline BaseControlWindow *impl_from_IVideoWindow( IVideoWindow *iface)
|
static inline BaseControlWindow *impl_from_IVideoWindow( IVideoWindow *iface)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue