headers cleanup

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

4 files changed, 60 insertions, 64 deletions

diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c
index c7461eb742..4237d60fe4 100644
--- a/loader/dshow/DS_AudioDecoder.c
+++ b/loader/dshow/DS_AudioDecoder.c
@@ -5,7 +5,26 @@
 
 *********************************************************/
 
+#ifndef NOAVIFILE_HEADERS
+#include "audiodecoder.h"
+#include "except.h"
+#else
+#include "libwin32.h"
+#endif
+
+#include "DS_Filter.h"
+
+struct _DS_AudioDecoder
+{ 
+    WAVEFORMATEX in_fmt;
+    AM_MEDIA_TYPE m_sOurType, m_sDestType;
+    DS_Filter* m_pDS_Filter;
+    char* m_sVhdr;
+    char* m_sVhdr2;
+};
+
 #include "DS_AudioDecoder.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -122,12 +141,12 @@ void DS_AudioDecoder_Destroy(DS_AudioDecoder *this)
     free(this);
 }
 
-int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, uint_t in_size,
-			     void* out_data, uint_t out_size,
-			     uint_t* size_read, uint_t* size_written)
+int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, unsigned int in_size,
+			     void* out_data, unsigned int out_size,
+			     unsigned int* size_read, unsigned int* size_written)
 {
-    uint_t written = 0;
-    uint_t read = 0;
+    unsigned int written = 0;
+    unsigned int read = 0;
         
     if (!in_data || !out_data)
 	return -1;
@@ -137,7 +156,7 @@ int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, uint_t i
     in_size -= in_size%this->in_fmt.nBlockAlign;
     while (in_size>0)
     {
-	uint_t frame_size = 0;
+	unsigned int frame_size = 0;
 	char* frame_pointer;
 	IMediaSample* sample=0;
 	char* ptr;
diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h
index bd180d4d19..9628f65d28 100644
--- a/loader/dshow/DS_AudioDecoder.h
+++ b/loader/dshow/DS_AudioDecoder.h
@@ -1,37 +1,17 @@
 #ifndef AVIFILE_DS_AUDIODECODER_H
 #define AVIFILE_DS_AUDIODECODER_H
 
-#ifndef NOAVIFILE_HEADERS
-#include "audiodecoder.h"
-#include "except.h"
-#else
-#include "libwin32.h"
-#endif
-#include "DS_Filter.h"
-
-typedef struct _DS_AudioDecoder
-{ 
-    WAVEFORMATEX in_fmt;
-    AM_MEDIA_TYPE m_sOurType, m_sDestType;
-    DS_Filter* m_pDS_Filter;
-    char* m_sVhdr;
-    char* m_sVhdr2;
-}DS_AudioDecoder;
-
-#ifndef uint_t
-#define uint_t int
-#endif
+typedef struct _DS_AudioDecoder DS_AudioDecoder;
 
 //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
 DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf);
 
 void DS_AudioDecoder_Destroy(DS_AudioDecoder *this);
 
-int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, uint_t in_size,
-			     void* out_data, uint_t out_size,
-			     uint_t* size_read, uint_t* size_written);
+int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, unsigned int in_size,
+			     void* out_data, unsigned int out_size,
+			     unsigned int* size_read, unsigned int* size_written);
 
 int DS_AudioDecoder_GetSrcSize(DS_AudioDecoder *this, int dest_size);
 
-
 #endif // AVIFILE_DS_AUDIODECODER_H
diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c
index b99799f55a..d21834f1e9 100644
--- a/loader/dshow/DS_VideoDecoder.c
+++ b/loader/dshow/DS_VideoDecoder.c
@@ -8,7 +8,31 @@
 #include "guids.h"
 #include "interfaces.h"
 
+#ifndef NOAVIFILE_HEADERS
+#include "videodecoder.h"
+#else
+#include "libwin32.h"
+#endif
+#include "DS_Filter.h"
+
+struct _DS_VideoDecoder
+{
+    IVideoDecoder iv;
+    
+    DS_Filter* m_pDS_Filter;
+    AM_MEDIA_TYPE m_sOurType, m_sDestType;
+    VIDEOINFOHEADER* m_sVhdr;
+    VIDEOINFOHEADER* m_sVhdr2;
+    int m_Caps;//CAPS m_Caps;                // capabilities of DirectShow decoder
+    int m_iLastQuality;         // remember last quality as integer
+    int m_iMinBuffers;
+    int m_iMaxAuto;
+    int m_bIsDivX;             // for speed
+    int m_bIsDivX4;            // for speed
+};
+
 #include "DS_VideoDecoder.h"
+
 #include "../wine/winerror.h"
 
 #ifndef NOAVIFILE_HEADERS
@@ -380,7 +404,7 @@ int DS_VideoDecoder_DecodeInternal(DS_VideoDecoder *this, const void* src, int s
  * bits == 0   - leave unchanged
  */
 //int SetDestFmt(DS_VideoDecoder * this, int bits = 24, fourcc_t csp = 0);
-int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, fourcc_t csp)
+int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp)
 {
     HRESULT result;
     int should_test=1;
@@ -584,7 +608,7 @@ int DS_VideoDecoder_SetDirection(DS_VideoDecoder *this, int d)
     return 0;
 }
 
-HRESULT DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value)
+int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value)
 {
 /*
     if (m_bIsDivX4)
@@ -693,7 +717,7 @@ HRESULT DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* v
     return 0;
 }
 
-HRESULT DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value)
+int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value)
 {
 /*
     if (m_bIsDivX4)
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index e205a8d2a1..82e76f66a9 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.h
@@ -1,30 +1,7 @@
 #ifndef AVIFILE_DS_VIDEODECODER_H
 #define AVIFILE_DS_VIDEODECODER_H
 
-#ifndef NOAVIFILE_HEADERS
-#include "videodecoder.h"
-#else
-#include "libwin32.h"
-#endif
-#include "DS_Filter.h"
-
-typedef struct _DS_VideoDecoder
-{
-    IVideoDecoder iv;
-    
-    DS_Filter* m_pDS_Filter;
-    AM_MEDIA_TYPE m_sOurType, m_sDestType;
-    VIDEOINFOHEADER* m_sVhdr;
-    VIDEOINFOHEADER* m_sVhdr2;
-    int m_Caps;//CAPS m_Caps;                // capabilities of DirectShow decoder
-    int m_iLastQuality;         // remember last quality as integer
-    int m_iMinBuffers;
-    int m_iMaxAuto;
-    int m_bIsDivX;             // for speed
-    int m_bIsDivX4;            // for speed
-}DS_VideoDecoder;
-
-
+typedef struct _DS_VideoDecoder DS_VideoDecoder;
 
 int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this);
 
@@ -42,14 +19,10 @@ int DS_VideoDecoder_DecodeInternal(DS_VideoDecoder *this, const void* src, int s
  * bits == 0   - leave unchanged
  */
 //int SetDestFmt(DS_VideoDecoder * this, int bits = 24, fourcc_t csp = 0);
-int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, fourcc_t csp);
-
-
+int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp);
 int DS_VideoDecoder_SetDirection(DS_VideoDecoder *this, int d);
-
-HRESULT DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
-
-HRESULT DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
+int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
+int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
 
 
 #endif /* AVIFILE_DS_VIDEODECODER_H */