Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AMSTREAM]

Browse source 
* 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=61702
This commit is contained in:
Amine Khaldi 2014-01-19 10:43:28 +00:00
parent 8a219f31b4
commit eba2e22634
6 changed files with 8 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/directx/wine/amstream/amstream.c
View file

@ -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
*/ */
#include <wine/debug.h>
#define COBJMACROS
//#include "winbase.h"
//#include "wingdi.h"
#include "amstream_private.h" #include "amstream_private.h"
#include <amstream.h>
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct { typedef struct {
IAMMultiMediaStream IAMMultiMediaStream_iface; IAMMultiMediaStream IAMMultiMediaStream_iface;

14
reactos/dll/directx/wine/amstream/amstream_private.h
View file

@ -23,17 +23,13 @@
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define COBJMACROS
//#include <stdarg.h>
//#include "windef.h"
//#include "winbase.h"
//#include "wtypes.h"
//#include "wingdi.h"
//#include "winuser.h"
#include <dshow.h> #include <dshow.h>
#include <mmstream.h> #include <amstream.h>
#include <austream.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;

9
reactos/dll/directx/wine/amstream/audiodata.c
View file

@ -18,17 +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
*/ */
#include "wine/debug.h"
#define COBJMACROS
#include "winbase.h"
#include "amstream_private.h" #include "amstream_private.h"
#include "amstream.h"
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct { typedef struct {
IAudioData IAudioData_iface; IAudioData IAudioData_iface;
LONG ref; LONG ref;

22
reactos/dll/directx/wine/amstream/main.c
View file

@ -18,29 +18,9 @@
* 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 WIN32_NO_STATUS
#define WIN32_LEAN_AND_MEAN
//#include <stdarg.h>
//#include <string.h>
#define COBJMACROS
//#include "windef.h"
//#include "winbase.h"
//#include "winuser.h"
//#include "winerror.h"
//#include <ole2.h>
#include <objbase.h>
#include <rpcproxy.h>
#include "amstream_private.h" #include "amstream_private.h"
#include <amstream.h>
#include <wine/debug.h> #include <rpcproxy.h>
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
static HINSTANCE instance; static HINSTANCE instance;
static DWORD dll_ref = 0; static DWORD dll_ref = 0;

14
reactos/dll/directx/wine/amstream/mediastream.c
View file

@ -18,19 +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
*/ */
#include <wine/debug.h> #include "amstream_private.h"
#define COBJMACROS
//#include "winbase.h"
//#include "wingdi.h"
//#include "amstream_private.h"
#include <amstream.h>
//#include "ddstream.h"
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample); static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample);
static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample); static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample);

15
reactos/dll/directx/wine/amstream/mediastreamfilter.c
View file

@ -18,23 +18,10 @@
* 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 <wine/debug.h> #include "amstream_private.h"
#define COBJMACROS
//#include "winbase.h"
//#include "wingdi.h"
#include <dshow.h>
#include <wine/strmbase.h> #include <wine/strmbase.h>
//#include "amstream_private.h"
#include <amstream.h>
//#include "ddstream.h"
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct MediaStreamFilter_InputPin typedef struct MediaStreamFilter_InputPin
{ {
BaseInputPin pin; BaseInputPin pin;