[AMSTREAM]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 19 Jan 2014 10:43:28 +0000 (10:43 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 19 Jan 2014 10:43:28 +0000 (10:43 +0000)
* 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

reactos/dll/directx/wine/amstream/amstream.c
reactos/dll/directx/wine/amstream/amstream_private.h
reactos/dll/directx/wine/amstream/audiodata.c
reactos/dll/directx/wine/amstream/main.c
reactos/dll/directx/wine/amstream/mediastream.c
reactos/dll/directx/wine/amstream/mediastreamfilter.c

index dbf781f..7abc815 100644 (file)
  * 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.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
 
 typedef struct {
     IAMMultiMediaStream IAMMultiMediaStream_iface;
index 479246f..83218ce 100644 (file)
 
 #define WIN32_NO_STATUS
 #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 <mmstream.h>
-#include <austream.h>
+#include <amstream.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(amstream);
 
 HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
index 3a62a9f..c4f9b74 100644 (file)
  * 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.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
-
 typedef struct {
     IAudioData IAudioData_iface;
     LONG ref;
index fbe472b..edba626 100644 (file)
  * 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.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 static DWORD dll_ref = 0;
index ef8b6f8..8b9fe3b 100644 (file)
  * 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.h>
-
-//#include "ddstream.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+#include "amstream_private.h"
 
 static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample);
 static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample);
index 8e89488..3ec6fcf 100644 (file)
  * 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 <dshow.h>
+#include "amstream_private.h"
 
 #include <wine/strmbase.h>
 
-//#include "amstream_private.h"
-#include <amstream.h>
-
-//#include "ddstream.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
-
 typedef struct MediaStreamFilter_InputPin
 {
     BaseInputPin pin;