From 162053c1e9e40f223e498dd0630487db86f68543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 7 Apr 2007 19:13:16 +0200 Subject: Revert changeset 8383: variable-sized structures and arrays don't seem to get along that well. --- src/xine-engine/buffer_types.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xine-engine') diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 4a71a99c2..2d455b67c 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -49,13 +49,13 @@ typedef struct video_db_s { uint32_t fourcc[20]; uint32_t buf_type; - const char name[]; + const char *name; } video_db_t; typedef struct audio_db_s { uint32_t formattag[10]; uint32_t buf_type; - const char name[]; + const char *name; } audio_db_t; -- cgit v1.2.3 From 13ef1266e96335725e4b00cbe84753cfb1d9c52c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 7 Apr 2007 18:34:07 +0100 Subject: Use CC_ATTRIBUTE_FORMAT; replace __attribute((format(printf, ...))) accordingly. --- src/xine-engine/broadcaster.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/xine-engine') diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 8ab661d3e..30cdadc7c 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -137,10 +137,7 @@ static int sock_data_write(xine_t *xine, int socket, char *buf, int len) { return wlen; } -static int -#ifdef __GNUC__ -__attribute__((format (printf, 3, 4))) -#endif +static int XINE_FORMAT_PRINTF(3, 4) sock_string_write(xine_t *xine, int socket, char *msg, ...) { char buf[_BUFSIZ]; va_list args; @@ -182,10 +179,7 @@ static void broadcaster_data_write(broadcaster_t *this, char *buf, int len) { } } -static void -#ifdef __GNUC__ -__attribute__((format (printf, 2, 3))) -#endif +static void XINE_FORMAT_PRINTF(2, 3) broadcaster_string_write(broadcaster_t *this, char *msg, ...) { char buf[_BUFSIZ]; va_list args; -- cgit v1.2.3 From b56784ba37622f28147b6a10c7ba77f9c9fbf2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 7 Apr 2007 20:12:19 +0200 Subject: video_overlay_s uses C's inheritance-like definition, so the first field has to be video_overlay. --- src/xine-engine/video_overlay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xine-engine') diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index 04a3034a3..7bd9292c8 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -49,10 +49,10 @@ typedef struct video_overlay_showing_s { typedef struct video_overlay_s { - xine_t *xine; - video_overlay_manager_t video_overlay; + xine_t *xine; + pthread_mutex_t events_mutex; video_overlay_events_t events[MAX_EVENTS]; pthread_mutex_t objects_mutex; -- cgit v1.2.3