summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac9
-rw-r--r--src/demuxers/Makefile.am2
-rw-r--r--src/demuxers/demux_avi.c16
-rw-r--r--src/input/mms.c6
-rw-r--r--src/libffmpeg/Makefile.am2
-rw-r--r--src/libsputext/Makefile.am5
-rw-r--r--src/post/goom/filters.h10
-rw-r--r--src/xine-engine/Makefile.am2
-rw-r--r--src/xine-engine/osd.c25
-rw-r--r--win32/libxine.def2
10 files changed, 38 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac
index 923411e88..32d15e2e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,10 +479,8 @@ case "$host_or_hostalias" in
AC_CHECK_HEADER(/usr/local/include/iconv.h,
CFLAGS="-I/usr/local/include $CFLAGS"
LDFLAGS="-L/usr/local/lib $LDFLAGS"
- GICONV_BSD_LIBS="-liconv"
- no_BSDiconv="no",
- [ no_BSDiconv="yes"
- echo
+ LIBICONV="-liconv"
+ [ echo
echo "****************************************************************"
echo "* You need to install a recent version of the port 'libiconv' *"
echo "* (in /usr/ports/converters/libiconv). *"
@@ -498,11 +496,8 @@ case "$host_or_hostalias" in
;;
*)
- no_BSDiconv="no"
;;
esac
-AC_SUBST(GICONV_BSD_LIBS)
-AM_CONDITIONAL(HAVE_GICONV, test x$no_BSDiconv != "xyes")
AM_CONDITIONAL(PPC_ARCH, test x$ppc_arch = "xyes")
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index f577aab72..380c70d0e 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -149,4 +149,4 @@ xineplug_dmx_iff_la_LIBADD = $(XINE_LIB)
xineplug_dmx_iff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
include_HEADERS = demux.h
-noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h
+noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index e3f057c38..1037692c0 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_avi.c,v 1.194 2004/02/09 22:24:36 jstembridge Exp $
+ * $Id: demux_avi.c,v 1.195 2004/02/29 17:26:48 valtri Exp $
*
* demultiplexer for avi streams
*
@@ -1223,15 +1223,15 @@ static avi_t *AVI_init(demux_avi_t *this) {
chunk_start = en = malloc (AVI->video_superindex->aIndex[j].dwSize+hdrl_len);
if (this->input->seek(this->input, AVI->video_superindex->aIndex[j].qwOffset, SEEK_SET) == (off_t)-1) {
- lprintf("(%s) cannot seek to 0x%llx\n", __FILE__,
-(unsigned long long)AVI->video_superindex->aIndex[j].qwOffset);
+ lprintf("(%s) cannot seek to 0x%" PRIx64 "\n", __FILE__,
+ AVI->video_superindex->aIndex[j].qwOffset);
free(chunk_start);
continue;
}
if (this->input->read(this->input, en, AVI->video_superindex->aIndex[j].dwSize+hdrl_len) <= 0) {
- lprintf("(%s) cannot read from offset 0x%llx %ld bytes; broken (incomplete) file?\n",
- __FILE__, (unsigned long long)AVI->video_superindex->aIndex[j].qwOffset,
+ lprintf("(%s) cannot read from offset 0x%" PRIx64 " %ld bytes; broken (incomplete) file?\n",
+ __FILE__, AVI->video_superindex->aIndex[j].qwOffset,
(unsigned long)AVI->video_superindex->aIndex[j].dwSize+hdrl_len);
free(chunk_start);
continue;
@@ -1289,14 +1289,14 @@ static avi_t *AVI_init(demux_avi_t *this) {
chunk_start = en = malloc (AVI->audio[audtr]->audio_superindex->aIndex[j].dwSize+hdrl_len);
if (this->input->seek(this->input, AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (off_t)-1) {
- lprintf("(%s) cannot seek to 0x%llx\n", __FILE__, (unsigned long long)AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset);
+ lprintf("(%s) cannot seek to 0x%" PRIx64 "\n", __FILE__, AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset);
free(chunk_start);
continue;
}
if (this->input->read(this->input, en, AVI->audio[audtr]->audio_superindex->aIndex[j].dwSize+hdrl_len) <= 0) {
- lprintf("(%s) cannot read from offset 0x%llx; broken (incomplete) file?\n",
- __FILE__,(unsigned long long) AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset);
+ lprintf("(%s) cannot read from offset 0x%" PRIx64 "; broken (incomplete) file?\n",
+ __FILE__, AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset);
free(chunk_start);
continue;
}
diff --git a/src/input/mms.c b/src/input/mms.c
index 7c5afc13f..3fd7066f2 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: mms.c,v 1.40 2003/12/11 01:15:53 tmattern Exp $
+ * $Id: mms.c,v 1.41 2004/02/29 17:26:49 valtri Exp $
*
* MMS over TCP protocol
* based on work from major mms
@@ -46,7 +46,7 @@
#include <stdlib.h>
#include <time.h>
-#if !defined(_MSC_VER) && defined(HAVE_LANGINFO_CODESET)
+#if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET)
#define USE_ICONV
#include <iconv.h>
#include <locale.h>
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 4ba409023..c65d83dc3 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -23,7 +23,7 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c
xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
endif
-xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm \
+xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
$(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am
index ba385352e..99fbbd213 100644
--- a/src/libsputext/Makefile.am
+++ b/src/libsputext/Makefile.am
@@ -2,15 +2,12 @@ include $(top_srcdir)/misc/Makefile.common
libdir = $(XINE_PLUGINDIR)
-if HAVE_GICONV
sputext_decoder = xineplug_decode_sputext.la xineplug_dmx_sputext.la
-endif
lib_LTLIBRARIES = $(sputext_decoder)
xineplug_dmx_sputext_la_SOURCES = demux_sputext.c
-## libgiconv is only needed with FreeBSD
-xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(GICONV_BSD_LIBS)
+xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB)
xineplug_dmx_sputext_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_sputext_la_SOURCES = xine_decoder.c
diff --git a/src/post/goom/filters.h b/src/post/goom/filters.h
index 935d13574..2470fdb18 100644
--- a/src/post/goom/filters.h
+++ b/src/post/goom/filters.h
@@ -34,8 +34,8 @@ ZoomFilterData;
#define YONLY_MODE 8
#define SPEEDWAY_MODE 9
-void pointFilter (guint32 * pix1, Color c,
- float t1, float t2, float t3, float t4, guint32 cycle);
+void pointFilter (Uint * pix1, Color c,
+ float t1, float t2, float t3, float t4, Uint cycle);
/* filtre de zoom :
* le contenu de pix1 est copie dans pix2.
@@ -43,10 +43,10 @@ void pointFilter (guint32 * pix1, Color c,
* resx,resy : taille des buffers.
*/
-void zoomFilterFastRGB (guint32 * pix1,
- guint32 * pix2,
+void zoomFilterFastRGB (Uint * pix1,
+ Uint * pix2,
ZoomFilterData * zf,
- guint32 resx, guint32 resy,
+ Uint resx, Uint resy,
int switchIncr, float switchMult);
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index b1b76cf6e..120808132 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST = lrb.c lrb.h
libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB)
libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \
- -lm $(XINEUTILS_LIB) $(GICONV_BSD_LIBS) $(FT2_LIBS)
+ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS)
libxine_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 4e16f06e6..3d32d43a2 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -34,9 +34,9 @@
#include <dirent.h>
#include <errno.h>
-#ifndef _MSC_VER
-#include <iconv.h>
-#endif /* _MSC_VER */
+#ifdef HAVE_ICONV
+# include <iconv.h>
+#endif
#ifdef HAVE_LANGINFO_CODESET
#include <langinfo.h>
@@ -47,6 +47,7 @@
/*
#define LOG
*/
+#define LOG
#define XINE_ENGINE_INTERNAL
@@ -154,7 +155,7 @@ static osd_object_t *osd_new_object (osd_renderer_t *this, int width, int height
osd->handle = -1;
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
osd->cd = (iconv_t)-1;
osd->encoding = NULL;
#endif
@@ -835,7 +836,7 @@ static int osd_search(osd_fontchar_t *array, size_t n, uint16_t code) {
}
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
/*
* get next unicode value
*/
@@ -876,7 +877,7 @@ static uint16_t osd_iconv_getunicode(xine_t *xine,
* free iconv encoding
*/
static void osd_free_encoding(osd_object_t *osd) {
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
if (osd->cd != (iconv_t)-1) {
iconv_close(osd->cd);
osd->cd = (iconv_t)-1;
@@ -896,9 +897,10 @@ static void osd_free_encoding(osd_object_t *osd) {
* "" ... locale encoding
*/
static int osd_set_encoding (osd_object_t *osd, const char *encoding) {
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
osd_free_encoding(osd);
+ lprintf("osd=%p, encoding=%s\n", osd, encoding ? (encoding[0] ? encoding : "locale") : "no conversion");
if (!encoding) return 1;
if (!encoding[0]) {
#ifdef HAVE_LANGINFO_CODESET
@@ -910,6 +912,7 @@ static int osd_set_encoding (osd_object_t *osd, const char *encoding) {
#else
return 0;
#endif
+ lprintf("locale encoding='%s'\n", osd, encoding);
}
/* prepare conversion to UCS-2 */
@@ -923,7 +926,7 @@ static int osd_set_encoding (osd_object_t *osd, const char *encoding) {
return 1;
#else
return encoding == NULL;
-#endif /* _MSC_VER */
+#endif /* HAVE_ICONV */
}
@@ -976,7 +979,7 @@ static int osd_render_text (osd_object_t *osd, int x1, int y1,
inbytesleft = strlen(text);
while( inbytesleft ) {
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
unicode = osd_iconv_getunicode(this->stream->xine, osd->cd, osd->encoding,
(char **)&inbuf, &inbytesleft);
#else
@@ -1119,7 +1122,7 @@ static int osd_get_text_size(osd_object_t *osd, const char *text, int *width, in
inbytesleft = strlen(text);
while( inbytesleft ) {
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
unicode = osd_iconv_getunicode(this->stream->xine, osd->cd, osd->encoding,
(char **)&inbuf, &inbytesleft);
#else
diff --git a/win32/libxine.def b/win32/libxine.def
index 742a01ffe..c8fc3c7e7 100644
--- a/win32/libxine.def
+++ b/win32/libxine.def
@@ -198,6 +198,8 @@ _x_demux_start_thread
_x_demux_stop_thread
_x_demux_read_header
_x_demux_check_extension
+_x_demux_send_data
+_x_demux_read_send_data
_x_read_abort
_x_action_pending
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:24:19 +0000