From d0087dc319f03511bf7492c96fed483a9471bc20 Mon Sep 17 00:00:00 2001 From: Thibaut Mattern Date: Sun, 19 Oct 2003 19:45:03 +0000 Subject: Rename meta_helper info_helper. Add a function to set integer stream infos. CVS patchset: 5547 CVS date: 2003/10/19 19:45:03 --- src/xine-engine/Makefile.am | 4 +-- src/xine-engine/info_helper.c | 71 +++++++++++++++++++++++++++++++++++++++++ src/xine-engine/info_helper.h | 65 +++++++++++++++++++++++++++++++++++++ src/xine-engine/meta_helper.c | 68 --------------------------------------- src/xine-engine/meta_helper.h | 54 ------------------------------- src/xine-engine/xine_internal.h | 6 ++-- 6 files changed, 141 insertions(+), 127 deletions(-) create mode 100644 src/xine-engine/info_helper.c create mode 100644 src/xine-engine/info_helper.h delete mode 100644 src/xine-engine/meta_helper.c delete mode 100644 src/xine-engine/meta_helper.h diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 799a0963a..b1b76cf6e 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -12,7 +12,7 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ audio_decoder.c video_out.c audio_out.c resample.c events.c \ video_overlay.c osd.c scratch.c demux.c vo_scale.c \ xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ - input_rip.c meta_helper.c + input_rip.c info_helper.c # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h @@ -29,7 +29,7 @@ include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ plugin_catalog.h audio_decoder.h video_decoder.h post.h \ - io_helper.h broadcaster.h meta_helper.h + io_helper.h broadcaster.h info_helper.h noinst_HEADERS = bswap.h diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c new file mode 100644 index 000000000..39f5671c3 --- /dev/null +++ b/src/xine-engine/info_helper.c @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2000-2003 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * stream metainfo helper functions + * hide some xine engine details from demuxers and reduce code duplication + * + * $id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include "info_helper.h" + +/* Remove trailing separator chars (\n,\r,\t, space,...) + * at the end of the string + */ +static void chomp (char *str) { + int i, len; + + len = strlen(str); + i = len - 1; + + while (((unsigned char)str[i] <= 32) && (i >= 0)) { + str[i] = 0; + i--; + } +} + +void xine_set_stream_info(xine_stream_t *stream, int info, int value) { + stream->stream_info [info] = value; +} + +void xine_set_meta_info(xine_stream_t *stream, int info, char *str) { + if (stream->meta_info [info]) + free(stream->meta_info [info]); + stream->meta_info [info] = strdup(str); + chomp(stream->meta_info [info]); +} + +void xine_set_meta_info2(xine_stream_t *stream, int info, char *buf, int len) { + char *tmp; + + if (stream->meta_info [info]) + free(stream->meta_info [info]); + + tmp = malloc(len + 1); + xine_fast_memcpy(tmp, buf, len); + tmp[len] = '\0'; + + stream->meta_info [info] = tmp; + chomp(stream->meta_info [info]); +} diff --git a/src/xine-engine/info_helper.h b/src/xine-engine/info_helper.h new file mode 100644 index 000000000..11d74465c --- /dev/null +++ b/src/xine-engine/info_helper.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2000-2003 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * stream metainfo helper functions + * hide some xine engine details from demuxers and reduce code duplication + * + * $id$ + */ + +#ifndef INFO_HELPER_H +#define INFO_HELPER_H + +#include "xine_internal.h" + +/* + * set a stream info + * + * params : + * *stream the xine stream + * info stream info id (see xine.h, XINE_STREAM_INFO_*) + * value the value to assign + * + */ +void xine_set_stream_info(xine_stream_t *stream, int info, int value); + +/* + * set a stream meta info + * + * params : + * *stream the xine stream + * info meta info id (see xine.h, XINE_META_INFO_*) + * *str null-terminated string + * + */ +void xine_set_meta_info(xine_stream_t *stream, int info, char *str); + +/* + * set a stream meta info + * + * params : + * *stream the xine stream + * info meta info id (see xine.h, XINE_META_INFO_*) + * *buf char buffer (not a null-terminated string) + * len length of the metainfo + * + */ +void xine_set_meta_info2(xine_stream_t *stream, int info, char *buf, int len); + +#endif /* INFO_HELPER_H */ diff --git a/src/xine-engine/meta_helper.c b/src/xine-engine/meta_helper.c deleted file mode 100644 index da9970e99..000000000 --- a/src/xine-engine/meta_helper.c +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2000-2003 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * stream metainfo helper functions - * hide some xine engine details from demuxers and reduce code duplication - * - * $id$ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include "meta_helper.h" - -/* Remove trailing separator chars (\n,\r,\t, space,...) - * at the end of the string - */ -static void chomp (char *str) { - int i, len; - - len = strlen(str); - i = len - 1; - - while (((unsigned char)str[i] <= 32) && (i >= 0)) { - str[i] = 0; - i--; - } -} - - -void xine_set_meta_info(xine_stream_t *stream, int info, char *str) { - if (stream->meta_info [info]) - free(stream->meta_info [info]); - stream->meta_info [info] = strdup(str); - chomp(stream->meta_info [info]); -} - -void xine_set_meta_info2(xine_stream_t *stream, int info, char *buf, int len) { - char *tmp; - - if (stream->meta_info [info]) - free(stream->meta_info [info]); - - tmp = malloc(len + 1); - xine_fast_memcpy(tmp, buf, len); - tmp[len] = '\0'; - - stream->meta_info [info] = tmp; - chomp(stream->meta_info [info]); -} diff --git a/src/xine-engine/meta_helper.h b/src/xine-engine/meta_helper.h deleted file mode 100644 index e83e2aeea..000000000 --- a/src/xine-engine/meta_helper.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2000-2003 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * stream metainfo helper functions - * hide some xine engine details from demuxers and reduce code duplication - * - * $id$ - */ - -#ifndef META_HELPER_H -#define META_HELPER_H - -#include "xine_internal.h" - -/* - * set a stream meta info - * - * params : - * *stream the xine stream - * info meta info id (see xine.h) - * *str null-terminated string - * - */ -void xine_set_meta_info(xine_stream_t *stream, int info, char *str); - -/* - * set a stream meta info - * - * params : - * *stream the xine stream - * info meta info id (see xine.h) - * *buf char buffer (not a null-terminated string) - * len length of the metainfo - * - */ -void xine_set_meta_info2(xine_stream_t *stream, int info, char *buf, int len); - -#endif /* META_HELPER_H */ diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 1692b6ba7..332d8f75c 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.141 2003/10/18 19:19:52 tmattern Exp $ + * $Id: xine_internal.h,v 1.142 2003/10/19 19:45:03 tmattern Exp $ * */ @@ -55,7 +55,7 @@ typedef struct extra_info_s extra_info_t; # include "scratch.h" # include "broadcaster.h" # include "io_helper.h" -# include "meta_helper.h" +# include "info_helper.h" #else # include # include @@ -72,7 +72,7 @@ typedef struct extra_info_s extra_info_t; # include # include # include -# include +# include #endif -- cgit v1.2.3