diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-10-02 15:56:03 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-10-02 15:56:03 +0000 |
| commit | e1f238b9b1cccad4627be4716320e767b621289d (patch) | |
| tree | 7aaa4538c811dce87fcc4908dc5fef268fa207e9 /src/xine-engine | |
| parent | 6822d8e82afac62170ddb7e88f4fb26c2adbb3a6 (diff) | |
| download | xine-lib-e1f238b9b1cccad4627be4716320e767b621289d.tar.gz xine-lib-e1f238b9b1cccad4627be4716320e767b621289d.tar.bz2 | |
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
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer_types.c | 9 | ||||
| -rw-r--r-- | src/xine-engine/info_helper.h | 6 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 8 |
3 files changed, 11 insertions, 12 deletions
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: @@ -1102,6 +1102,13 @@ static audio_db_t audio_db[] = { }, { { + 0x22, + }, + BUF_AUDIO_TRUESPEECH, + "Truespeech" +}, +{ + { 0 }, BUF_AUDIO_MPC, 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 */ |