summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/xine-engine/Makefile.am2
-rw-r--r--src/xine-engine/audio_decoder.c4
-rw-r--r--src/xine-engine/io_helper.c2
-rw-r--r--src/xine-engine/load_plugins.c3
-rw-r--r--src/xine-engine/locale.c48
-rw-r--r--src/xine-engine/osd.c2
-rw-r--r--src/xine-engine/resample.c3
-rw-r--r--src/xine-engine/video_decoder.c4
-rw-r--r--src/xine-utils/color.c18
-rw-r--r--src/xine-utils/memcpy.c2
-rw-r--r--src/xine-utils/utils.c4
-rw-r--r--src/xine-utils/xmlparser.c6
12 files changed, 27 insertions, 71 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 9e488dbf1..62fa0ad8a 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -12,7 +12,7 @@ NVTVCLIENT_LIB = $(top_builddir)/src/xine-engine/nvtv/libnvclient.la
libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
load_plugins.c video_decoder.c buffer_types.c \
audio_decoder.c video_out.c audio_out.c resample.c events.c \
- video_overlay.c osd.c scratch.c locale.c demux.c vo_scale.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
# FIXME: these are currently unused:
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 869b92c13..1946b3dd0 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.107 2003/06/22 17:10:41 mroi Exp $
+ * $Id: audio_decoder.c,v 1.108 2003/07/27 12:47:23 hadess Exp $
*
*
* functions that implement audio decoding
@@ -40,7 +40,7 @@
#define LOG
*/
-void *audio_decoder_loop (void *stream_gen) {
+static void *audio_decoder_loop (void *stream_gen) {
buf_element_t *buf;
xine_stream_t *stream = (xine_stream_t *) stream_gen;
diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c
index 60a24c685..c47177f75 100644
--- a/src/xine-engine/io_helper.c
+++ b/src/xine-engine/io_helper.c
@@ -151,7 +151,7 @@ int xio_select (xine_stream_t *stream, int fd, int state, int timeout_msec) {
}
-off_t xio_rw_abort(xine_stream_t *stream, int fd, int cmd, char *buf, off_t todo) {
+static off_t xio_rw_abort(xine_stream_t *stream, int fd, int cmd, char *buf, off_t todo) {
off_t ret = -1;
off_t total = 0;
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 1f6e6155b..16d7ca4b1 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.154 2003/05/31 13:33:10 miguelfreitas Exp $
+ * $Id: load_plugins.c,v 1.155 2003/07/27 12:47:23 hadess Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -40,6 +40,7 @@
#include <ctype.h>
#include <signal.h>
+#define XINE_ENABLE_EXPERIMENTAL_FEATURES 1
#include "xine_internal.h"
#include "xine_plugin.h"
#include "plugin_catalog.h"
diff --git a/src/xine-engine/locale.c b/src/xine-engine/locale.c
deleted file mode 100644
index 0c79b24d5..000000000
--- a/src/xine-engine/locale.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2000-2002 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
- *
- * $Id: locale.c,v 1.3 2002/10/23 17:12:31 guenter Exp $
- *
- * intl init.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "xine_internal.h"
-
-#define XINE_LOCALE_LOG
-
-char *xine_set_locale(void) {
- char *cur_locale = NULL;
-
- if(setlocale (LC_ALL,"") == NULL) {
-#ifdef XINE_LOCALE_LOG
- printf("xine-lib: locale not supported by C library\n");
-#endif
- /* xine_log(this, XINE_LOG_INTERNAL, "xine-lib: locale not supported by C library"); */
- return NULL;
- }
-
- cur_locale = setlocale(LC_ALL, NULL);
-
- return cur_locale;
-}
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index a280d4002..45abf28dd 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -965,7 +965,7 @@ static int osd_get_text_size(osd_object_t *osd, const char *text, int *width, in
#ifdef HAVE_FT2
if (osd->ft2 && osd->ft2->useme) {
- int first = 1, bottom = 0, top = 0;
+ int first = 1;
FT_GlyphSlot slot = osd->ft2->face->glyph;
while (*text) {
diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c
index d7f0dec90..a9de42e27 100644
--- a/src/xine-engine/resample.c
+++ b/src/xine-engine/resample.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: resample.c,v 1.5 2002/12/11 16:22:05 miguelfreitas Exp $
+ * $Id: resample.c,v 1.6 2003/07/27 12:47:23 hadess Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -25,6 +25,7 @@
#endif
#include <inttypes.h>
+#include "resample.h"
/* contributed by paul flinders */
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index bc6f3cd9e..4a96fc827 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.135 2003/06/22 17:10:41 mroi Exp $
+ * $Id: video_decoder.c,v 1.136 2003/07/27 12:47:23 hadess Exp $
*
*/
@@ -54,7 +54,7 @@ static void update_spu_decoder (xine_stream_t *stream, int type) {
return ;
}
-void *video_decoder_loop (void *stream_gen) {
+static void *video_decoder_loop (void *stream_gen) {
buf_element_t *buf;
xine_stream_t *stream = (xine_stream_t *) stream_gen;
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index 6815bdef1..b44507091 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -61,7 +61,7 @@
* instructions), these macros will automatically map to those special
* instructions.
*
- * $Id: color.c,v 1.20 2003/07/12 04:34:39 miguelfreitas Exp $
+ * $Id: color.c,v 1.21 2003/07/27 12:47:23 hadess Exp $
*/
#include "xine_internal.h"
@@ -202,7 +202,7 @@ void free_yuv_planes(yuv_planes_t *yuv_planes) {
*
* YUY2 map: Y0 U0 Y1 V1 Y2 U2 Y3 V3
*/
-void yuv444_to_yuy2_c(yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
+static void yuv444_to_yuy2_c(yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
int pitch) {
int row_ptr, pixel_ptr;
@@ -316,7 +316,7 @@ void yuv444_to_yuy2_c(yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
* enough.
*
*/
-void yuv444_to_yuy2_mmx(yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
+static void yuv444_to_yuy2_mmx(yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
int pitch) {
#ifdef ARCH_X86
int h, i, j, k;
@@ -570,7 +570,7 @@ static void upsample_c_plane_c(unsigned char *src, int src_width,
* yuv9_to_yv12_c
*
*/
-void yuv9_to_yv12_c
+static void yuv9_to_yv12_c
(unsigned char *y_src, int y_src_pitch, unsigned char *y_dest, int y_dest_pitch,
unsigned char *u_src, int u_src_pitch, unsigned char *u_dest, int u_dest_pitch,
unsigned char *v_src, int v_src_pitch, unsigned char *v_dest, int v_dest_pitch,
@@ -599,7 +599,7 @@ void yuv9_to_yv12_c
* yuv411_to_yv12_c
*
*/
-void yuv411_to_yv12_c
+static void yuv411_to_yv12_c
(unsigned char *y_src, int y_src_pitch, unsigned char *y_dest, int y_dest_pitch,
unsigned char *u_src, int u_src_pitch, unsigned char *u_dest, int u_dest_pitch,
unsigned char *v_src, int v_src_pitch, unsigned char *v_dest, int v_dest_pitch,
@@ -670,7 +670,7 @@ void yuv411_to_yv12_c
* original conversion routine from Videolan project
* changed to support interlaced frames and use simple mean interpolation [MF]
*****************************************************************************/
-void yv12_to_yuy2_c
+static void yv12_to_yuy2_c
(unsigned char *y_src, int y_src_pitch,
unsigned char *u_src, int u_src_pitch,
unsigned char *v_src, int v_src_pitch,
@@ -834,7 +834,7 @@ do {
#endif
-void yv12_to_yuy2_mmxext
+static void yv12_to_yuy2_mmxext
(unsigned char *y_src, int y_src_pitch,
unsigned char *u_src, int u_src_pitch,
unsigned char *v_src, int v_src_pitch,
@@ -960,7 +960,7 @@ void yv12_to_yuy2_mmxext
*p_y1++ = *p_line1++; *p_y2++ = *p_line2++; \
*p_v++ = (*p_line1++ + *p_line2++)>>1;
-void yuy2_to_yv12_c
+static void yuy2_to_yv12_c
(unsigned char *yuy2_map, int yuy2_pitch,
unsigned char *y_dst, int y_dst_pitch,
unsigned char *u_dst, int u_dst_pitch,
@@ -1053,7 +1053,7 @@ do {
#endif
-void yuy2_to_yv12_mmxext
+static void yuy2_to_yv12_mmxext
(unsigned char *yuy2_map, int yuy2_pitch,
unsigned char *y_dst, int y_dst_pitch,
unsigned char *u_dst, int u_dst_pitch,
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index 68094364f..b6326a696 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -302,7 +302,7 @@ static void * mmx_memcpy(void * to, const void * from, size_t len)
return retval;
}
-void * mmx2_memcpy(void * to, const void * from, size_t len)
+static void * mmx2_memcpy(void * to, const void * from, size_t len)
{
void *retval;
size_t i;
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 6c7c382c6..02c9b1ef6 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.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: utils.c,v 1.16 2003/07/16 22:11:14 jstembridge Exp $
+ * $Id: utils.c,v 1.17 2003/07/27 12:47:23 hadess Exp $
*
*/
#define _POSIX_PTHREAD_SEMANTICS 1 /* for 5-arg getpwuid_r on solaris */
@@ -26,6 +26,8 @@
#include "config.h"
#endif
+#include "xineutils.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index 7fc178947..df9c65a09 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -18,7 +18,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: xmlparser.c,v 1.4 2003/07/19 00:22:43 tmattern Exp $
+ * $Id: xmlparser.c,v 1.5 2003/07/27 12:47:23 hadess Exp $
*
*/
@@ -94,7 +94,7 @@ void xml_parser_init(char * buf, int size, int mode) {
xml_parser_mode = mode;
}
-void xml_parser_free_props(xml_property_t *current_property) {
+static void xml_parser_free_props(xml_property_t *current_property) {
if (current_property) {
if (!current_property->next) {
free_xml_property(current_property);
@@ -129,7 +129,7 @@ void xml_parser_free_tree(xml_node_t *current_node) {
#define STATE_NODE 1
#define STATE_COMMENT 7
-int xml_parser_get_node (xml_node_t *current_node, char *root_name, int rec) {
+static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int rec) {
char tok[TOKEN_SIZE];
char property_name[TOKEN_SIZE];
char node_name[TOKEN_SIZE];
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 20:51:26 +0000