- removed xine-engine/locale.c as it is unused, fix static functions in the

engine and the utils, removed unused variables

CVS patchset: 5219
CVS date: 2003/07/27 12:47:23

8 files changed, 11 insertions, 57 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;