From e1f238b9b1cccad4627be4716320e767b621289d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Mon, 2 Oct 2006 15:56:03 +0000
Subject: build cdio for builddir != . update for attic platforms (mainly older
 MinGW) unsupported attributes not used (fixes warnings) added check for
 sentinel attribute enabled TrueSpeech codec

CVS patchset: 8327
CVS date: 2006/10/02 15:56:03
---
 src/input/vcd/libcdio/Makefile.am | 2 +-
 src/xine-engine/buffer_types.c    | 9 ++++++++-
 src/xine-engine/info_helper.h     | 6 +-----
 src/xine-engine/xine_internal.h   | 8 ++------
 src/xine-utils/attributes.h       | 7 ++++++-
 5 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am
index a0127da9b..c7415e787 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/src/input/vcd/libcdio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = cdio MSWindows image
 
-INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 libcdio_SRCS = \
 	_cdio_bsdi.c \
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index f1d631874..ea8d58842 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.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: buffer_types.c,v 1.105 2006/08/02 06:19:12 tmmm Exp $
+ * $Id: buffer_types.c,v 1.106 2006/10/02 15:56:06 valtri Exp $
  *
  *
  * contents:
@@ -1100,6 +1100,13 @@ static audio_db_t audio_db[] = {
   BUF_AUDIO_ALAC,
   "Apple Lossless Audio Codec"
 },
+{
+  {
+    0x22,
+  },
+  BUF_AUDIO_TRUESPEECH,
+  "Truespeech"
+},
 {
   {
     0
diff --git a/src/xine-engine/info_helper.h b/src/xine-engine/info_helper.h
index 7eaa93f9c..a21372e22 100644
--- a/src/xine-engine/info_helper.h
+++ b/src/xine-engine/info_helper.h
@@ -123,11 +123,7 @@ void _x_meta_info_set_generic(xine_stream_t *stream, int info, const char *str,
  *   ...           one or more meta info, followed by a NULL pointer
  *
  */
-void _x_meta_info_set_multi(xine_stream_t *stream, int info, ...)
-#ifdef __GNUC__
-__attribute__((sentinel))
-#endif
- XINE_PROTECTED;
+void _x_meta_info_set_multi(xine_stream_t *stream, int info, ...) XINE_SENTINEL XINE_PROTECTED;
 
 /*
  * set a stream meta info
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 4a6e6b138..8ee5d8219 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.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: xine_internal.h,v 1.178 2006/09/26 05:48:16 dgp85 Exp $
+ * $Id: xine_internal.h,v 1.179 2006/10/02 15:56:06 valtri Exp $
  *
  */
 
@@ -360,11 +360,7 @@ void _x_handle_stream_end      (xine_stream_t *stream, int non_user) XINE_PROTEC
 
 /* report message to UI. usually these are async errors */
 
-int _x_message(xine_stream_t *stream, int type, ...)
-#ifdef __GNUC__
-__attribute__((sentinel))
-#endif
-XINE_PROTECTED;
+int _x_message(xine_stream_t *stream, int type, ...) XINE_SENTINEL XINE_PROTECTED;
 
 /* flush the message queues */
 
diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h
index 4bf5a21af..dd70d4309 100644
--- a/src/xine-utils/attributes.h
+++ b/src/xine-utils/attributes.h
@@ -53,5 +53,10 @@
 # define XINE_PROTECTED
 #endif
 
-#endif /* ATTRIBUTE_H_ */
+#ifdef SUPPORT_ATTRIBUTE_SENTINEL
+# define XINE_SENTINEL __attribute__((sentinel))
+#else
+# define XINE_SENTINEL
+#endif
 
+#endif /* ATTRIBUTE_H_ */
-- 
cgit v1.2.3