From ebdf62cd13f7976890cbf3703571fc55a20df47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 1 Sep 2004 18:19:49 +0000 Subject: Improvements and implementing Michael's suggestions: - new flags added at the end, so the users can override them properly - removed X11 libs and cflags from xine-config and libxine.pc - removed replacing for setenv (thanks to Robin for the hint) - better way for temporary disabling of w32dll module - data directories will be different on Windows - force installing catalogs with translation into XINE_LOCALEDIR - timer linked in xine-engine (just central place for linking such stuff) - adjusted load_plugins and remove reduntant WIN32 conditionals - removed unused $(lib_thr) CVS patchset: 6927 CVS date: 2004/09/01 18:19:49 --- configure.ac | 54 ++++--- misc/libxine.pc.in | 4 +- misc/xine-config.in | 4 +- po/Makefile.in.in | 2 +- src/Makefile.am | 6 +- src/xine-engine/Makefile.am | 18 +-- src/xine-engine/audio_out.c | 10 +- src/xine-engine/load_plugins.c | 34 +++-- src/xine-utils/Makefile.am | 11 -- src/xine-utils/utils.c | 4 +- src/xine-utils/xineutils.h | 15 +- win32/contrib/Makefile.am | 7 +- win32/contrib/pthreads/Makefile.am | 3 +- win32/libxine.def | 304 ++++++++++++++++++------------------- 14 files changed, 229 insertions(+), 247 deletions(-) diff --git a/configure.ac b/configure.ac index 2a7d85d17..f1db75684 100644 --- a/configure.ac +++ b/configure.ac @@ -210,8 +210,8 @@ case "$host" in THREAD_CFLAGS_CONFIG=" " THREAD_LIBS_CONFIG=" " WIN32_CPPFLAGS='-I$(top_srcdir)/win32/include -I$(top_srcdir)/win32/contrib/dirent -I$(top_srcdir)/win32/contrib/timer' - CFLAGS="$CFLAGS -DHAVE_NANOSLEEP" - LIBS="$LIBS -lwinmm -lwsock32" + CFLAGS="-DHAVE_NANOSLEEP $CFLAGS" + LIBS="-lwinmm -lwsock32 $LIBS" GOOM_LIBS="-liberty" need_internal_zlib=yes @@ -436,6 +436,7 @@ AC_SUBST(ZLIB_LIBS_CONFIG) dnl --------------------------------------------- dnl Check for OpenGL & [GLut | GLU] dnl --------------------------------------------- + AM_PATH_OPENGL() @@ -1419,14 +1420,9 @@ dnl Some extra checks. dnl --------------------------------------------- AC_CHECK_LIB(posix4, sched_get_priority_min) -AC_CHECK_FUNCS([vsscanf sigaction sigset getpwuid_r nanosleep strsep strpbrk basename hstrerror memset]) -AC_CHECK_FUNC(setenv, [ - AC_DEFINE(HAVE_SETENV, 1, [Define this if you have setenv function]) - ac_have_setenv=yes -]) +AC_CHECK_FUNCS([vsscanf sigaction sigset getpwuid_r nanosleep strsep strpbrk basename hstrerror memset setenv]) AC_FUNC_FSEEKO AC_CHECK_HEADERS(byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h sys/times.h sys/ioctl.h) -AM_CONDITIONAL(HAVE_SETENV, test x$ac_have_setenv = "xyes") dnl --------------------------------------------- @@ -1626,6 +1622,9 @@ case "$host_or_hostalias" in enable_w32dll="yes" case "$host_or_hostalias" in + *-*-mingw*) + enable_w32dll="no" + ;; *-*-cygwin) enable_w32dll="no" LIBS="$LIBS @INTLLIBS@" @@ -1898,21 +1897,36 @@ fi if test "x$exec_prefix" = xNONE; then exec_prefix='${prefix}' fi -XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB" -eval XINE_PLUGINPATH=`eval echo "$XINE_PLUGINDIR"` -AC_DEFINE_UNQUOTED(XINE_PLUGINDIR,"$XINE_PLUGINPATH",[Define this to plugins directory location]) +if test x"$SYS" = "xmingw32" -o x"$SYS" = "xcygwin"; then + dnl installation directories + eval XINE_PLUGINDIR="${bindir}/plugins" + eval XINE_FONTDIR="${bindir}/fonts" + eval XINE_LOCALEDIR="${bindir}/locale" + dnl directories from xine-config + XINE_PLUGINPATH="\`basedir \$0\`/plugins" + XINE_FONTPATH="\`basedir \$0\`/fonts" + XINE_LOCALEPATH="\`basedir \$0\`/locale" + dnl runtime directories + AC_DEFINE(XINE_PLUGINDIR,[exec_path_append_subdir("plugins")],[Define this to plugins directory location]) + AC_DEFINE(XINE_FONTDIR,[exec_path_append_subdir("fonts")],[Define this to osd fonts dir location]) + AC_DEFINE(XINE_LOCALEDIR,[exec_path_append_subdir("locale")],[Path where catalog files will be.]) +else + dnl installation directories + XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB" + XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts" + XINE_LOCALEDIR="${datadir}/locale" + dnl directories from xine-config and runtime directories + eval XINE_PLUGINPATH=`eval echo "$XINE_PLUGINDIR"` + eval XINE_FONTPATH="$XINE_FONTDIR" + eval XINE_LOCALEPATH="$XINE_LOCALEDIR" + dnl defining runtime directories + AC_DEFINE_UNQUOTED(XINE_PLUGINDIR,"$XINE_PLUGINPATH",[Define this to plugins directory location]) + AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location]) + AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog files will be.]) +fi AC_SUBST(XINE_PLUGINPATH) - -XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts" -eval XINE_FONTPATH="$XINE_FONTDIR" -AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location]) AC_SUBST(XINE_FONTPATH) - -XINE_LOCALEDIR="${datadir}/locale" -eval XINE_LOCALEPATH="$XINE_LOCALEDIR" -AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog files will be.]) AC_SUBST(XINE_LOCALEPATH) - AC_SUBST(XINE_PLUGINDIR) AC_SUBST(XINE_FONTDIR) AC_SUBST(XINE_LOCALEDIR) diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index adef34f11..88d922b74 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -7,5 +7,5 @@ Name: libxine Description: The xine engine library Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ Requires: -Libs: -L${libdir} -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @EXTRA_X_LIBS@ @LIBICONV@ -Cflags: -I${includedir} @THREAD_CFLAGS_CONFIG@ @EXTRA_X_CFLAGS@ +Libs: -L${libdir} -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@ +Cflags: -I${includedir} @THREAD_CFLAGS_CONFIG@ diff --git a/misc/xine-config.in b/misc/xine-config.in index db6c7ec7e..90bcdc4c1 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -100,11 +100,11 @@ if test "$echo_acflags" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@ @THREAD_CFLAGS_CONFIG@ @EXTRA_X_CFLAGS@ + echo -I@includedir@ @THREAD_CFLAGS_CONFIG@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @EXTRA_X_LIBS@ @LIBICONV@ + echo -L@libdir@ -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" diff --git a/po/Makefile.in.in b/po/Makefile.in.in index c97225676..150427916 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -24,7 +24,7 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ datadir = @datadir@ -localedir = $(datadir)/locale +localedir = @XINE_LOCALEDIR@ gettextsrcdir = $(datadir)/gettext/po install_sh = @install_sh@ mkdir_p = @mkdir_p@ diff --git a/src/Makefile.am b/src/Makefile.am index d63729331..f35db8cb7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,5 @@ include $(top_srcdir)/misc/Makefile.common -if !WIN32 - w32dll = libw32dll -endif - # Order is important be careful changing SUBDIRS SUBDIRS = \ xine-utils \ @@ -21,7 +17,7 @@ SUBDIRS = \ libsputext \ libdts \ libmad \ - $(w32dll) \ + libw32dll \ liblpcm \ libxinevdec \ libxineadec \ diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 07d7f9806..6c22f2481 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -9,16 +9,15 @@ XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la -SETENV_LIB = $(top_builddir)/win32/contrib/libsetenv.la +TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la if !HAVE_ZLIB zlib_lib = $(INTERNAL_ZLIB_LIB) endif if WIN32 -if !HAVE_SETENV -setenv_lib = $(SETENV_LIB) -endif dirent_lib = $(DIRENT_LIB) pthread_lib = $(INTERNAL_PTHREAD_LIB) +timer_lib = $(TIMER_LIB) +def_ldflags="-Wl,--output-def,libxine.def" endif libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ @@ -32,14 +31,13 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ EXTRA_DIST = lrb.c lrb.h libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_lib) \ - $(dirent_lib) $(pthread_lib) \ - $(setenv_lib) + $(dirent_lib) $(pthread_lib) $(timer_lib) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ - $(dirent_lib) $(setenv_lib) + $(dirent_lib) $(timer_lib) libxine_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags) include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ @@ -65,5 +63,5 @@ $(INTERNAL_ZLIB_LIB): $(DIRENT_LIB): $(MAKE) -C $(top_builddir)/win32/contrib libdirent.la -$(SETENV_LIB): - $(MAKE) -C $(top_builddir)/win32/contrib libsetenv.la +$(TIMER_LIB): + $(MAKE) -C $(top_builddir)/win32/contrib libtimer.la diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 381d33aef..a91911f74 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.183 2004/08/02 12:51:11 miguelfreitas Exp $ + * $Id: audio_out.c,v 1.184 2004/09/01 18:19:50 valtri Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe @@ -450,7 +450,7 @@ static void ao_fill_gap (aos_t *this, int64_t pts_len) { num_frames = pts_len * this->frames_per_kpts / 1024; xprintf (this->xine, XINE_VERBOSITY_DEBUG, - "inserting %" PRId64 " 0-frames to fill a gap of %" PRId64 " pts\n", num_frames, pts_len); + "audio_out: inserting %" PRId64 " 0-frames to fill a gap of %" PRId64 " pts\n", num_frames, pts_len); if ((this->output.mode == AO_CAP_MODE_A52) || (this->output.mode == AO_CAP_MODE_AC5)) { write_pause_burst(this,num_frames); @@ -1274,7 +1274,7 @@ static int ao_change_settings(aos_t *this, uint32_t bits, uint32_t rate, int mod if ( output_sample_rate == 0) { this->driver_open = 0; - xprintf (this->xine, XINE_VERBOSITY_DEBUG, "open failed!\n"); + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: open failed!\n"); return 0; } else { this->driver_open = 1; @@ -1452,7 +1452,7 @@ static void ao_close(xine_audio_port_t *this_gen, xine_stream_t *stream) { /* close driver if no streams left */ if (!cur && !this->grab_only) { - xprintf (this->xine, XINE_VERBOSITY_DEBUG, "no streams left, closing driver\n"); + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: no streams left, closing driver\n"); if (this->audio_loop_running) { /* make sure there are no more buffers on queue */ @@ -2056,7 +2056,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, _x_abort(); } else - xprintf (this->xine, XINE_VERBOSITY_DEBUG, "thread created\n"); + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: thread created\n"); pthread_attr_destroy(&pth_attrs); } diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index b85b1920a..8faddd427 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.185 2004/08/28 20:03:42 valtri Exp $ + * $Id: load_plugins.c,v 1.186 2004/09/01 18:19:50 valtri Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -512,7 +512,7 @@ static void collect_plugins(xine_t *this, char *path){ printf("load_plugins: %s not cached\n", str); #endif - if(!info && !(lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL))) { + if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { char *error = dlerror(); /* too noisy -- but good to catch unresolved references */ xprintf(this, XINE_VERBOSITY_LOG, @@ -636,7 +636,7 @@ static void *_load_plugin_class(xine_t *this, void *lib; - if(!(lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL))) { + if((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { char *error = dlerror(); xine_log (this, XINE_LOG_PLUGIN, @@ -979,33 +979,33 @@ static void load_cached_catalog (xine_t *this) { */ void _x_scan_plugins (xine_t *this) { - const char *homedir; - char *plugindir; - char *pluginpath; + char *homedir, *plugindir, *pluginpath; int i,j; int lenpluginpath; lprintf("_x_scan_plugins()\n"); -/* TODO - This needs to be fixed for WIN32 */ -#ifndef WIN32 if (this == NULL || this->config == NULL) { fprintf(stderr, "%s(%s@%d): parameter should be non null, exiting\n", __FILE__, __XINE_FUNCTION__, __LINE__); _x_abort(); } -#endif - homedir = xine_get_homedir(); + homedir = strdup(xine_get_homedir()); this->plugin_catalog = _new_catalog(); load_cached_catalog (this); - if ( !(pluginpath = getenv("XINE_PLUGIN_PATH")) ){ -#ifndef WIN32 - pluginpath = "~/.xine/plugins:" XINE_PLUGINDIR; -#else - pluginpath = XINE_PLUGINDIR; -#endif + if ((pluginpath = getenv("XINE_PLUGIN_PATH")) != NULL) { + pluginpath = strdup(pluginpath); + } else { + char *str1, *str2; + int len; + + str1 = "~/.xine/plugins"; + str2 = XINE_PLUGINDIR; + len = strlen(str1) + strlen(str2) + 2; + pluginpath = xine_xmalloc(len); + snprintf(pluginpath, len, "%s:%s", str1, str2); } plugindir = xine_xmalloc(strlen(pluginpath)+strlen(homedir)+2); j=0; @@ -1029,6 +1029,8 @@ void _x_scan_plugins (xine_t *this) { } } free(plugindir); + free(pluginpath); + free(homedir); save_catalog (this); diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 3fefad590..99b819044 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -9,12 +9,6 @@ if PPC_ARCH pppc_files = ppcasm_string.S endif -if WIN32 -TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la -else -#lib_thr = $(THREAD_LIBS) -endif - AM_CFLAGS = $(X_CFLAGS) libxineutils_la_SOURCES = $(pppc_files) \ @@ -30,9 +24,6 @@ libxineutils_la_SOURCES = $(pppc_files) \ xmllexer.c \ xine_buffer.c -libxineutils_la_DEPENDENCIES = $(TIMER_LIB) -libxineutils_la_LIBADD = $(lib_thr) $(TIMER_LIB) - include_HEADERS = \ attributes.h \ compat.h \ @@ -43,5 +34,3 @@ include_HEADERS = \ noinst_HEADERS = ppcasm_string.h xine_check.h -$(TIMER_LIB): - $(MAKE) -C $(top_builddir)/win32/contrib libtimer.la diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index 70bb406fa..52364b397 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.30 2004/08/27 19:33:37 valtri Exp $ + * $Id: utils.c,v 1.31 2004/09/01 18:19:51 valtri Exp $ * */ #define _POSIX_PTHREAD_SEMANTICS 1 /* for 5-arg getpwuid_r on solaris */ @@ -259,7 +259,7 @@ void *xine_xmalloc_aligned(size_t alignment, size_t size, void **base) { return ptr; } -#if defined(WIN32) +#if defined(__CYGWIN__) || defined(WIN32) /* Ridiculous hack to return valid xine support * directories. These should be read from diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 77a9c9217..fffc2b304 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.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: xineutils.h,v 1.90 2004/08/27 19:33:37 valtri Exp $ + * $Id: xineutils.h,v 1.91 2004/09/01 18:19:51 valtri Exp $ * */ #ifndef XINEUTILS_H @@ -55,17 +55,6 @@ extern "C" { #include #include -#ifdef WIN32 -/* Ridiculous hack to return valid xine support - * directories. These should be read from - * a registry entry set at install time. - */ - /* -# define XINE_PLUGINDIR exec_path_append_subdir( "plugins" ) -# define XINE_FONTDIR exec_path_append_subdir( "plugins" ) -# define XINE_LOCALEDIR exec_path_append_subdir( "plugins" )*/ -#endif - /* * debugable mutexes */ @@ -1120,7 +1109,7 @@ char *xine_basename (char *name); */ const char *xine_hstrerror(int err); -#ifdef WIN32 +#if defined(__CYGWIN__) || defined(WIN32) char *exec_path_append_subdir(char * string); #endif diff --git a/win32/contrib/Makefile.am b/win32/contrib/Makefile.am index 135485199..ce9fd2d17 100644 --- a/win32/contrib/Makefile.am +++ b/win32/contrib/Makefile.am @@ -5,15 +5,10 @@ SUBDIRS = zlib pthreads noinst_HEADERS = dirent/dirent.h timer/timer.h if WIN32 -if !HAVE_SETENV -libsetenv = libsetenv.la -endif win32libs = libtimer.la libdirent.la endif -noinst_LTLIBRARIES = $(libsetenv) $(win32libs) - -libsetenv_la_SOURCES = setenv.c +noinst_LTLIBRARIES = $(win32libs) libtimer_la_SOURCES = timer/timer.c diff --git a/win32/contrib/pthreads/Makefile.am b/win32/contrib/pthreads/Makefile.am index dc55b0107..a8dfb0cb2 100644 --- a/win32/contrib/pthreads/Makefile.am +++ b/win32/contrib/pthreads/Makefile.am @@ -1,7 +1,6 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -#AM_CLFAGS = -I. -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C -AM_CPPFLAGS = -D__CLEANUP_C +AM_CPPFLAGS = -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTIRS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw diff --git a/win32/libxine.def b/win32/libxine.def index c8fc3c7e7..8727f87f3 100644 --- a/win32/libxine.def +++ b/win32/libxine.def @@ -1,9 +1,10 @@ -;------------------------------------------------------------ -; LIBXINE DLL DEFINITIONS FILE - +;------------------------------------------------------------ +; LIBXINE DLL DEFINITIONS FILE + EXPORTS - + ;---- xine-utils ---- +gettimeofday xine_mm_accel xine_fast_memcpy xine_probe_fast_memcpy @@ -58,121 +59,121 @@ lexer_init lexer_get_token ;---- xine-engine ---- -xine_init -xine_exit -xine_play -xine_stop -xine_eject - -xine_open -xine_close -xine_new -xine_dispose -xine_stream_new -xine_stream_master_slave - -xine_trick_mode -xine_engine_set_param -xine_engine_get_param - -xine_get_status -_x_get_audio_channel -xine_get_audio_lang -;get_audio_decoder -;xine_get_spu_channel -xine_get_spu_lang -;xine_select_spu_channel -_x_get_spu_decoder -xine_get_browsable_input_plugin_ids -xine_get_browse_mrls -xine_get_autoplay_input_plugin_ids -xine_get_autoplay_mrls -xine_get_file_extensions -xine_get_mime_types -xine_get_demux_for_mime_type -xine_get_input_plugin_description -xine_list_video_output_plugins -xine_list_audio_output_plugins -xine_get_current_frame - -xine_get_meta_info - -xine_open_video_driver -xine_open_audio_driver -xine_close_audio_driver -xine_close_video_driver - -xine_log -xine_get_log -xine_get_error -xine_port_send_gui_data - -xine_get_version_string -xine_get_version -xine_check_version -xine_set_param -xine_get_param - -xine_get_current_frame -xine_get_current_vpts -;xine_get_current_info -xine_get_stream_info -xine_get_pos_length - -;xine_set_speed - -xine_post_init -xine_list_post_plugins -xine_list_post_plugins_typed -xine_post_list_inputs -xine_post_list_outputs -xine_post_input -xine_post_output -xine_post_wire -xine_post_wire_video_port -xine_post_wire_audio_port -xine_get_video_source -xine_get_audio_source -xine_post_dispose - -xine_get_log_section_count -xine_get_log_names -xine_register_log_cb - -xine_event_create_listener_thread -xine_event_new_queue -xine_event_send -xine_event_free -xine_event_get -xine_event_wait -xine_event_dispose_queue - -xine_osd_new -xine_osd_draw_point -xine_osd_draw_line -xine_osd_draw_rect -xine_osd_draw_text -xine_osd_draw_bitmap -xine_osd_get_text_size -xine_osd_set_font -xine_osd_set_encoding -xine_osd_set_position -xine_osd_show -xine_osd_hide -xine_osd_clear -xine_osd_set_text_palette -xine_osd_get_palette -xine_osd_set_palette -xine_osd_free - -xine_tvmode_init -xine_tvmode_use -xine_tvmode_set_tvsystem -xine_tvmode_switch -xine_tvmode_size -xine_tvmode_exit - -_x_handle_stream_end +xine_init +xine_exit +xine_play +xine_stop +xine_eject + +xine_open +xine_close +xine_new +xine_dispose +xine_stream_new +xine_stream_master_slave + +xine_trick_mode +xine_engine_set_param +xine_engine_get_param + +xine_get_status +_x_get_audio_channel +xine_get_audio_lang +;get_audio_decoder +;xine_get_spu_channel +xine_get_spu_lang +;xine_select_spu_channel +_x_get_spu_decoder +xine_get_browsable_input_plugin_ids +xine_get_browse_mrls +xine_get_autoplay_input_plugin_ids +xine_get_autoplay_mrls +xine_get_file_extensions +xine_get_mime_types +xine_get_demux_for_mime_type +xine_get_input_plugin_description +xine_list_video_output_plugins +xine_list_audio_output_plugins +xine_get_current_frame + +xine_get_meta_info + +xine_open_video_driver +xine_open_audio_driver +xine_close_audio_driver +xine_close_video_driver + +xine_log +xine_get_log +xine_get_error +xine_port_send_gui_data + +xine_get_version_string +xine_get_version +xine_check_version +xine_set_param +xine_get_param + +xine_get_current_frame +xine_get_current_vpts +;xine_get_current_info +xine_get_stream_info +xine_get_pos_length + +;xine_set_speed + +xine_post_init +xine_list_post_plugins +xine_list_post_plugins_typed +xine_post_list_inputs +xine_post_list_outputs +xine_post_input +xine_post_output +xine_post_wire +xine_post_wire_video_port +xine_post_wire_audio_port +xine_get_video_source +xine_get_audio_source +xine_post_dispose + +xine_get_log_section_count +xine_get_log_names +xine_register_log_cb + +xine_event_create_listener_thread +xine_event_new_queue +xine_event_send +xine_event_free +xine_event_get +xine_event_wait +xine_event_dispose_queue + +xine_osd_new +xine_osd_draw_point +xine_osd_draw_line +xine_osd_draw_rect +xine_osd_draw_text +xine_osd_draw_bitmap +xine_osd_get_text_size +xine_osd_set_font +xine_osd_set_encoding +xine_osd_set_position +xine_osd_show +xine_osd_hide +xine_osd_clear +xine_osd_set_text_palette +xine_osd_get_palette +xine_osd_set_palette +xine_osd_free + +xine_tvmode_init +xine_tvmode_use +xine_tvmode_set_tvsystem +xine_tvmode_switch +xine_tvmode_size +xine_tvmode_exit + +_x_handle_stream_end _x_message _x_find_input_plugin _x_find_demux_plugin @@ -186,7 +187,7 @@ _x_audio_decoder_init _x_audio_decoder_shutdown _x_extra_info_reset _x_extra_info_merge -_x_get_current_info +_x_get_current_info _x_demux_flush_engine _x_demux_control_nop @@ -215,39 +216,39 @@ _x_set_speed _x_select_spu_channel _x_get_audio_channel _x_get_spu_channel - -xine_config_register_string -xine_config_register_range -xine_config_register_enum -xine_config_register_num -xine_config_register_bool -xine_config_get_first_entry -xine_config_get_next_entry -xine_config_lookup_entry -xine_config_update_entry -xine_config_load -xine_config_save -xine_config_reset -xine_config_update_entry - -_x_fourcc_to_buf_video + +xine_config_register_string +xine_config_register_range +xine_config_register_enum +xine_config_register_num +xine_config_register_bool +xine_config_get_first_entry +xine_config_get_next_entry +xine_config_lookup_entry +xine_config_update_entry +xine_config_load +xine_config_save +xine_config_reset +xine_config_update_entry + +_x_fourcc_to_buf_video _x_buf_video_name _x_formattag_to_buf_audio -_x_buf_audio_name -_x_bmiheader_le2me -_x_waveformatex_le2me - -_x_vo_scale_init -_x_vo_scale_compute_output_size -_x_vo_scale_compute_ideal_size -_x_vo_scale_aspect_ratio_name - -_x_io_select -_x_io_tcp_connect -_x_io_tcp_read -_x_io_tcp_write -_x_io_file_read -_x_io_file_write +_x_buf_audio_name +_x_bmiheader_le2me +_x_waveformatex_le2me + +_x_vo_scale_init +_x_vo_scale_compute_output_size +_x_vo_scale_compute_ideal_size +_x_vo_scale_aspect_ratio_name + +_x_io_select +_x_io_tcp_connect +_x_io_tcp_read +_x_io_tcp_write +_x_io_file_read +_x_io_file_write _x_stream_info_set @@ -284,4 +285,3 @@ v_b_table yv12_to_yv12 yuy2_to_yuy2 - -- cgit v1.2.3