From 04efc58c21ec343998bb65c3a653698e6be901ff Mon Sep 17 00:00:00 2001 From: Tim Champagne Date: Mon, 26 May 2003 17:00:11 +0000 Subject: Get asf plugin to build in Win32. Also starting to clean up some Win32 code (more to come). CVS patchset: 4947 CVS date: 2003/05/26 17:00:11 --- src/demuxers/asfheader.h | 17 +++++++++++------ src/demuxers/demux_asf.c | 14 +++++++------- src/input/mms.c | 15 ++++++++------- src/input/mmsh.c | 15 ++++++++------- 4 files changed, 34 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h index d6745970b..095a1a573 100644 --- a/src/demuxers/asfheader.h +++ b/src/demuxers/asfheader.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: asfheader.h,v 1.1 2002/12/12 22:40:06 tmattern Exp $ + * $Id: asfheader.h,v 1.2 2003/05/26 17:00:11 tchamp Exp $ * * demultiplexer for asf streams * @@ -98,13 +98,18 @@ #define ASF_MAX_NUM_STREAMS 23 -typedef struct { - uint32_t v1; - uint16_t v2; - uint16_t v3; - uint8_t v4[8]; +#ifndef GUID_DEFINED +#define GUID_DEFINED + +typedef struct _GUID { /* size is 16 */ + uint32_t Data1; + uint16_t Data2; + uint16_t Data3; + uint8_t Data4[8]; } GUID; +#endif /* !GUID_DEFINED */ + static const struct { const char* name; diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index e43dc40ea..39796a3a3 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_asf.c,v 1.116 2003/05/24 14:11:24 tmattern Exp $ + * $Id: demux_asf.c,v 1.117 2003/05/26 17:00:12 tchamp Exp $ * * demultiplexer for asf streams * @@ -243,11 +243,11 @@ static int get_guid (demux_asf_t *this) { int i; GUID g; - g.v1 = get_le32(this); - g.v2 = get_le16(this); - g.v3 = get_le16(this); + g.Data1 = get_le32(this); + g.Data2 = get_le16(this); + g.Data3 = get_le16(this); for(i = 0; i < 8; i++) { - g.v4[i] = get_byte(this); + g.Data4[i] = get_byte(this); } for (i = 1; i < GUID_END; i++) { @@ -262,8 +262,8 @@ static int get_guid (demux_asf_t *this) { if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) printf ("demux_asf: unknown GUID: 0x%x, 0x%x, 0x%x, " "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n", - g.v1, g.v2, g.v3, - g.v4[0], g.v4[1], g.v4[2], g.v4[3], g.v4[4], g.v4[5], g.v4[6], g.v4[7]); + g.Data1, g.Data2, g.Data3, + g.Data4[0], g.Data4[1], g.Data4[2], g.Data4[3], g.Data4[4], g.Data4[5], g.Data4[6], g.Data4[7]); return GUID_ERROR; } diff --git a/src/input/mms.c b/src/input/mms.c index 1ddbb851f..b727b2b04 100644 --- a/src/input/mms.c +++ b/src/input/mms.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: mms.c,v 1.27 2003/04/26 17:53:16 tmattern Exp $ + * $Id: mms.c,v 1.28 2003/05/26 17:00:13 tchamp Exp $ * * MMS over TCP protocol * based on work from major mms @@ -215,11 +215,11 @@ static int get_guid (unsigned char *buffer, int offset) { int i; GUID g; - g.v1 = get_32(buffer, offset); - g.v2 = get_16(buffer, offset + 4); - g.v3 = get_16(buffer, offset + 6); + g.Data1 = get_32(buffer, offset); + g.Data2 = get_16(buffer, offset + 4); + g.Data3 = get_16(buffer, offset + 6); for(i = 0; i < 8; i++) { - g.v4[i] = buffer[offset + 8 + i]; + g.Data4[i] = buffer[offset + 8 + i]; } for (i = 1; i < GUID_END; i++) { @@ -233,8 +233,9 @@ static int get_guid (unsigned char *buffer, int offset) { printf ("libmms: unknown GUID: 0x%x, 0x%x, 0x%x, " "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n", - g.v1, g.v2, g.v3, - g.v4[0], g.v4[1], g.v4[2], g.v4[3], g.v4[4], g.v4[5], g.v4[6], g.v4[7]); + g.Data1, g.Data2, g.Data3, + g.Data4[0], g.Data4[1], g.Data4[2], g.Data4[3], + g.Data4[4], g.Data4[5], g.Data4[6], g.Data4[7]); return GUID_ERROR; } diff --git a/src/input/mmsh.c b/src/input/mmsh.c index ed7d7a028..2ff02a87f 100644 --- a/src/input/mmsh.c +++ b/src/input/mmsh.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: mmsh.c,v 1.16 2003/04/26 13:26:28 tmattern Exp $ + * $Id: mmsh.c,v 1.17 2003/05/26 17:00:14 tchamp Exp $ * * MMS over HTTP protocol * written by Thibaut Mattern @@ -274,11 +274,11 @@ static int get_guid (unsigned char *buffer, int offset) { int i; GUID g; - g.v1 = get_32(buffer, offset); - g.v2 = get_16(buffer, offset + 4); - g.v3 = get_16(buffer, offset + 6); + g.Data1 = get_32(buffer, offset); + g.Data2 = get_16(buffer, offset + 4); + g.Data3 = get_16(buffer, offset + 6); for(i = 0; i < 8; i++) { - g.v4[i] = buffer[offset + 8 + i]; + g.Data4[i] = buffer[offset + 8 + i]; } for (i = 1; i < GUID_END; i++) { @@ -292,8 +292,9 @@ static int get_guid (unsigned char *buffer, int offset) { printf ("libmmsh: unknown GUID: 0x%x, 0x%x, 0x%x, " "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n", - g.v1, g.v2, g.v3, - g.v4[0], g.v4[1], g.v4[2], g.v4[3], g.v4[4], g.v4[5], g.v4[6], g.v4[7]); + g.Data1, g.Data2, g.Data3, + g.Data4[0], g.Data4[1], g.Data4[2], g.Data4[3], + g.Data4[4], g.Data4[5], g.Data4[6], g.Data4[7]); return GUID_ERROR; } -- cgit v1.2.3