Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a

capital letter are reserved for the system, those starting with _ are
reserved at the file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2

8 files changed, 30 insertions, 30 deletions

diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c
index 83a90659ba..398cd86f51 100644
--- a/loader/dmo/DMO_AudioDecoder.c
+++ b/loader/dmo/DMO_AudioDecoder.c
@@ -13,7 +13,7 @@
 #include "DMO_Filter.h"
 #include "DMO_AudioDecoder.h"
 
-struct _DMO_AudioDecoder
+struct DMO_AudioDecoder
 { 
     DMO_MEDIA_TYPE m_sOurType, m_sDestType;
     DMO_Filter* m_pDMO_Filter;
diff --git a/loader/dmo/DMO_AudioDecoder.h b/loader/dmo/DMO_AudioDecoder.h
index c2202b4a31..9ad00d1193 100644
--- a/loader/dmo/DMO_AudioDecoder.h
+++ b/loader/dmo/DMO_AudioDecoder.h
@@ -1,7 +1,7 @@
 #ifndef AVIFILE_DMO_AUDIODECODER_H
 #define AVIFILE_DMO_AUDIODECODER_H
 
-typedef struct _DMO_AudioDecoder DMO_AudioDecoder;
+typedef struct DMO_AudioDecoder DMO_AudioDecoder;
 
 //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
 DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels);
diff --git a/loader/dmo/DMO_Filter.h b/loader/dmo/DMO_Filter.h
index ee7a38b1c7..090bc2f4c0 100644
--- a/loader/dmo/DMO_Filter.h
+++ b/loader/dmo/DMO_Filter.h
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-typedef struct _DMO_Filter
+typedef struct DMO_Filter
 {
     int m_iHandle;
     IDMOVideoOutputOptimizations* m_pOptim;
@@ -17,7 +17,7 @@ typedef struct _DMO_Filter
     AM_MEDIA_TYPE *m_pOurType, *m_pDestType;
 } DMO_Filter;
 
-typedef struct _CMediaBuffer CMediaBuffer;
+typedef struct CMediaBuffer CMediaBuffer;
 
 /**
  * Create DMO_Filter object - similar syntax as for DS_Filter
diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c
index 89017453eb..2304917145 100644
--- a/loader/dmo/DMO_VideoDecoder.c
+++ b/loader/dmo/DMO_VideoDecoder.c
@@ -17,7 +17,7 @@
 
 #include "DMO_VideoDecoder.h"
 
-struct _DMO_VideoDecoder
+struct DMO_VideoDecoder
 {
     IVideoDecoder iv;
     
@@ -54,9 +54,9 @@ struct _DMO_VideoDecoder
 
 //int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this){return this->m_Caps;}
 
-typedef struct _ct ct;
+typedef struct ct ct;
 
-struct _ct {
+struct ct {
     fourcc_t fcc;
     unsigned int bits;
     const GUID* subtype;
diff --git a/loader/dmo/DMO_VideoDecoder.h b/loader/dmo/DMO_VideoDecoder.h
index 1f48523a1e..53d971d762 100644
--- a/loader/dmo/DMO_VideoDecoder.h
+++ b/loader/dmo/DMO_VideoDecoder.h
@@ -1,7 +1,7 @@
 #ifndef AVIFILE_DMO_VIDEODECODER_H
 #define AVIFILE_DMO_VIDEODECODER_H
 
-typedef struct _DMO_VideoDecoder DMO_VideoDecoder;
+typedef struct DMO_VideoDecoder DMO_VideoDecoder;
 
 int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this);
 
diff --git a/loader/dmo/buffer.c b/loader/dmo/buffer.c
index 3d53c3ce99..0a74fe6c8a 100644
--- a/loader/dmo/buffer.c
+++ b/loader/dmo/buffer.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-struct _CMediaBuffer
+struct CMediaBuffer
 {
     IMediaBuffer_vt* vt;
     DECLARE_IUNKNOWN();
diff --git a/loader/dmo/dmo.h b/loader/dmo/dmo.h
index bd94e75022..845a853e5c 100644
--- a/loader/dmo/dmo.h
+++ b/loader/dmo/dmo.h
@@ -16,14 +16,14 @@ typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;
 
 
 
-enum _DMO_INPUT_DATA_BUFFER_FLAGS
+enum DMO_INPUT_DATA_BUFFER_FLAGS
 {
     DMO_INPUT_DATA_BUFFERF_SYNCPOINT	= 0x1,
     DMO_INPUT_DATA_BUFFERF_TIME		= 0x2,
     DMO_INPUT_DATA_BUFFERF_TIMELENGTH	= 0x4
 };
 
-enum _DMO_OUTPUT_DATA_BUFFER_FLAGS
+enum DMO_OUTPUT_DATA_BUFFER_FLAGS
 {
     DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT	= 0x1,
     DMO_OUTPUT_DATA_BUFFERF_TIME	= 0x2,
@@ -31,12 +31,12 @@ enum _DMO_OUTPUT_DATA_BUFFER_FLAGS
     DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE	= 0x1000000
 };
 
-enum _DMO_INPUT_STATUS_FLAGS
+enum DMO_INPUT_STATUS_FLAGS
 {
     DMO_INPUT_STATUSF_ACCEPT_DATA	= 0x1
 };
 
-enum _DMO_INPUT_STREAM_INFO_FLAGS
+enum DMO_INPUT_STREAM_INFO_FLAGS
 {
     DMO_INPUT_STREAMF_WHOLE_SAMPLES	= 0x1,
     DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER	= 0x2,
@@ -44,7 +44,7 @@ enum _DMO_INPUT_STREAM_INFO_FLAGS
     DMO_INPUT_STREAMF_HOLDS_BUFFERS	= 0x8
 };
 
-enum _DMO_OUTPUT_STREAM_INFO_FLAGS
+enum DMO_OUTPUT_STREAM_INFO_FLAGS
 {
     DMO_OUTPUT_STREAMF_WHOLE_SAMPLES	= 0x1,
     DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER	= 0x2,
@@ -53,18 +53,18 @@ enum _DMO_OUTPUT_STREAM_INFO_FLAGS
     DMO_OUTPUT_STREAMF_OPTIONAL		= 0x10
 };
 
-enum _DMO_SET_TYPE_FLAGS
+enum DMO_SET_TYPE_FLAGS
 {
     DMO_SET_TYPEF_TEST_ONLY		= 0x1,
     DMO_SET_TYPEF_CLEAR			= 0x2
 };
 
-enum _DMO_PROCESS_OUTPUT_FLAGS
+enum DMO_PROCESS_OUTPUT_FLAGS
 {
     DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER	= 0x1
 };
 
-enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS
+enum DMO_VIDEO_OUTPUT_STREAM_FLAGS
 {
     DMO_VOSF_NEEDS_PREVIOUS_SAMPLE	= 0x1
 };
diff --git a/loader/dmo/dmo_interfaces.h b/loader/dmo/dmo_interfaces.h
index 474dc06ceb..01ccc2e339 100644
--- a/loader/dmo/dmo_interfaces.h
+++ b/loader/dmo/dmo_interfaces.h
@@ -6,7 +6,7 @@
 /*
  * IMediaBuffer interface
  */
-typedef struct _IMediaBuffer IMediaBuffer;
+typedef struct IMediaBuffer IMediaBuffer;
 typedef struct IMediaBuffer_vt
 {
     INHERIT_IUNKNOWN();
@@ -19,10 +19,10 @@ typedef struct IMediaBuffer_vt
 					    /* [out] */ char** ppBuffer,
 					    /* [out] */ unsigned long* pcbLength);
 } IMediaBuffer_vt;
-struct _IMediaBuffer { IMediaBuffer_vt* vt; };
+struct IMediaBuffer { IMediaBuffer_vt* vt; };
 
 
-typedef struct _DMO_OUTPUT_DATA_BUFFER
+typedef struct DMO_OUTPUT_DATA_BUFFER
 {
     IMediaBuffer *pBuffer;
     unsigned long dwStatus;
@@ -34,7 +34,7 @@ typedef struct _DMO_OUTPUT_DATA_BUFFER
 /*
  * IMediaObject interface
  */
-typedef struct _IMediaObject IMediaObject;
+typedef struct IMediaObject IMediaObject;
 typedef struct IMediaObject_vt
 {
     INHERIT_IUNKNOWN();
@@ -106,12 +106,12 @@ typedef struct IMediaObject_vt
 				       /* [out] */ unsigned long *pdwStatus);
     HRESULT STDCALL ( *Lock )(IMediaObject * This, long bLock);
 } IMediaObject_vt;
-struct _IMediaObject { IMediaObject_vt* vt; };
+struct IMediaObject { IMediaObject_vt* vt; };
 
 /*
  * IEnumDMO interface
  */
-typedef struct _IEnumDMO IEnumDMO;
+typedef struct IEnumDMO IEnumDMO;
 typedef struct IEnumDMO_vt
 {
     INHERIT_IUNKNOWN();
@@ -127,12 +127,12 @@ typedef struct IEnumDMO_vt
     HRESULT STDCALL ( *Clone )(IEnumDMO * This,
 			       /* [out] */ IEnumDMO **ppEnum);
 } IEnumDMO_vt;
-struct _IEnumDMO { IEnumDMO_vt* vt; };
+struct IEnumDMO { IEnumDMO_vt* vt; };
 
 /*
  * IMediaObjectInPlace interface
  */
-typedef struct _IMediaObjectInPlace IMediaObjectInPlace;
+typedef struct IMediaObjectInPlace IMediaObjectInPlace;
 typedef struct IMediaObjectInPlace_vt
 {
     INHERIT_IUNKNOWN();
@@ -148,13 +148,13 @@ typedef struct IMediaObjectInPlace_vt
 				    /* [out] */ REFERENCE_TIME *pLatencyTime);
 
 } IMediaObjectInPlace_vt;
-struct _IMediaObjectInPlace { IMediaObjectInPlace_vt* vt; };
+struct IMediaObjectInPlace { IMediaObjectInPlace_vt* vt; };
 
 
 /*
  * IDMOQualityControl interface
  */
-typedef struct _IDMOQualityControl IDMOQualityControl;
+typedef struct IDMOQualityControl IDMOQualityControl;
 typedef struct IDMOQualityControl_vt
 {
     INHERIT_IUNKNOWN();
@@ -166,12 +166,12 @@ typedef struct IDMOQualityControl_vt
     HRESULT STDCALL ( *GetStatus )(IDMOQualityControl * This,
 				   /* [out] */ unsigned long *pdwFlags);
 } IDMOQualityControl_vt;
-struct _IDMOQualityControl { IDMOQualityControl_vt* vt; };
+struct IDMOQualityControl { IDMOQualityControl_vt* vt; };
 
 /*
  * IDMOVideoOutputOptimizations  interface
  */
-typedef struct _IDMOVideoOutputOptimizations  IDMOVideoOutputOptimizations;
+typedef struct IDMOVideoOutputOptimizations  IDMOVideoOutputOptimizations;
 typedef struct IDMOVideoOutputOptimizations_vt
 {
     INHERIT_IUNKNOWN();
@@ -189,6 +189,6 @@ typedef struct IDMOVideoOutputOptimizations_vt
 						      unsigned long ulOutputStreamIndex,
 						      unsigned long *pdwRequestedFeatures);
 } IDMOVideoOutputOptimizations_vt;
-struct _IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; };
+struct IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; };
 
 #endif /* DMO_INTERFACE_H */