From e9d3fc29c17ce3cb3f609e65de4b4852681ae4ef Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Sun, 16 Sep 2001 23:13:45 +0000 Subject: Update docs. Fixed some warnings. configure.in is ready for 0.9.1. CVS patchset: 646 CVS date: 2001/09/16 23:13:45 --- configure.in | 6 +- doc/man/en/man3/Makefile.am | 16 +- doc/man/en/man3/ao_driver_t.3 | 19 + doc/man/en/man3/autoplay_group.3 | 2 +- doc/man/en/man3/browse_group.3 | 2 +- doc/man/en/man3/build_info.3 | 10 +- doc/man/en/man3/cfg_data_t.3 | 2 +- doc/man/en/man3/config_group.3 | 6 +- doc/man/en/man3/config_values_s.3 | 2 +- doc/man/en/man3/config_values_t.3 | 2 +- doc/man/en/man3/demux_strategy.3 | 2 +- doc/man/en/man3/event_group.3 | 2 +- doc/man/en/man3/loadplugins_group.3 | 8 +- doc/man/en/man3/mrl_t.3 | 2 +- doc/man/en/man3/mrl_types.3 | 2 +- doc/man/en/man3/status_group.3 | 16 +- doc/man/en/man3/ui_callbacks.3 | 2 +- doc/man/en/man3/version_group.3 | 10 +- doc/man/en/man3/video_cap.3 | 2 +- doc/man/en/man3/video_group.3 | 2 +- doc/man/en/man3/video_prop.3 | 16 +- doc/man/en/man3/video_ratio.3 | 2 +- doc/man/en/man3/visual_types.3 | 2 +- doc/man/en/man3/vo_driver_s.3 | 2 +- doc/man/en/man3/vo_driver_t.3 | 2 +- doc/man/en/man3/vo_frame_t.3 | 2 +- doc/man/en/man3/vo_overlay_t.3 | 2 +- doc/man/en/man3/xine.h.3 | 72 ++- doc/man/en/man3/xine_api.3 | 2 +- doc/man/en/man3/xine_init.3 | 8 +- doc/man/en/man3/xine_management.3 | 235 +++++++- doc/man/en/man3/xine_t.3 | 2 +- doc/man/en/man3/xine_version.3 | 2 +- doc/xine-lib-API/html/annotated.html | 4 +- doc/xine-lib-API/html/files.html | 2 +- doc/xine-lib-API/html/functions.html | 2 +- doc/xine-lib-API/html/globals.html | 49 +- doc/xine-lib-API/html/group__autoplay__group.html | 2 +- doc/xine-lib-API/html/group__browse__group.html | 2 +- doc/xine-lib-API/html/group__build__info.html | 10 +- doc/xine-lib-API/html/group__config__group.html | 8 +- doc/xine-lib-API/html/group__demux__strategy.html | 2 +- doc/xine-lib-API/html/group__event__group.html | 2 +- .../html/group__loadplugins__group.html | 8 +- doc/xine-lib-API/html/group__mrl__types.html | 2 +- doc/xine-lib-API/html/group__status__group.html | 43 +- doc/xine-lib-API/html/group__ui__callbacks.html | 2 +- doc/xine-lib-API/html/group__version__group.html | 10 +- doc/xine-lib-API/html/group__video__cap.html | 2 +- doc/xine-lib-API/html/group__video__group.html | 2 +- doc/xine-lib-API/html/group__video__prop.html | 37 +- doc/xine-lib-API/html/group__video__ratio.html | 2 +- doc/xine-lib-API/html/group__visual__types.html | 2 +- doc/xine-lib-API/html/group__xine__api.html | 2 +- doc/xine-lib-API/html/group__xine__init.html | 8 +- doc/xine-lib-API/html/group__xine__management.html | 538 +++++++++++++++-- doc/xine-lib-API/html/group__xine__version.html | 2 +- doc/xine-lib-API/html/index.html | 2 +- doc/xine-lib-API/html/modules.html | 2 +- doc/xine-lib-API/html/structcfg__data__t.html | 2 +- doc/xine-lib-API/html/structconfig__values__s.html | 2 +- doc/xine-lib-API/html/structconfig__values__t.html | 2 +- doc/xine-lib-API/html/structmrl__t.html | 2 +- doc/xine-lib-API/html/structvo__driver__s.html | 2 +- doc/xine-lib-API/html/structvo__driver__t.html | 2 +- doc/xine-lib-API/html/structvo__frame__t.html | 2 +- doc/xine-lib-API/html/structvo__overlay__t.html | 2 +- doc/xine-lib-API/html/structxine__t.html | 2 +- doc/xine-lib-API/html/xine_8h-source.html | 645 +++++++++++---------- doc/xine-lib-API/html/xine_8h.html | 99 ++-- include/xine.h.tmpl.in | 104 +++- misc/xine-lib.spec.in | 104 ++-- src/demuxers/demux_qt.c | 17 +- src/libffmpeg/libavcodec/idct_mmx.c | 3 + src/liblpcm/xine_decoder.c | 4 +- src/libvfill/xine_decoder.c | 2 - src/libw32dll/w32codec.c | 12 +- src/libw32dll/wine/debugtools.h | 30 +- src/libw32dll/wine/driver.c | 3 +- src/libw32dll/wine/ext.c | 8 +- src/libw32dll/wine/module.c | 10 +- src/libw32dll/wine/pe_image.c | 23 +- src/libw32dll/wine/registry.c | 5 +- src/libw32dll/wine/resource.c | 4 +- src/libw32dll/wine/win32.c | 24 +- src/video_out/yuv2rgb.c | 4 +- 86 files changed, 1615 insertions(+), 715 deletions(-) create mode 100644 doc/man/en/man3/ao_driver_t.3 diff --git a/configure.in b/configure.in index f0c9467d0..a3efef431 100644 --- a/configure.in +++ b/configure.in @@ -25,10 +25,10 @@ dnl set XINE_BIN_AGE _and_ XINE_IFACE_AGE to 0. dnl XINE_MAJOR=0 XINE_MINOR=9 -XINE_SUB=0 +XINE_SUB=1 XINE_PRE= -XINE_IFACE_AGE=0 -XINE_BIN_AGE=0 +XINE_IFACE_AGE=1 +XINE_BIN_AGE=1 AC_SUBST(XINE_MAJOR) AC_SUBST(XINE_MINOR) diff --git a/doc/man/en/man3/Makefile.am b/doc/man/en/man3/Makefile.am index 36ce3bf4b..b896db733 100644 --- a/doc/man/en/man3/Makefile.am +++ b/doc/man/en/man3/Makefile.am @@ -1,11 +1,11 @@ -man_MANS = ao_functions_t.3 demux_strategy.3 video_cap.3 vo_overlay_t.3 \ - autoplay_group.3 event_group.3 video_group.3 xine.h.3 \ - browse_group.3 loadplugins_group.3 video_prop.3 xine_api.3 \ - build_info.3 mrl_t.3 video_ratio.3 xine_init.3 \ - cfg_data_t.3 mrl_types.3 visual_types.3 xine_management.3 \ - config_group.3 status_group.3 vo_driver_s.3 xine_t.3 \ - config_values_s.3 ui_callbacks.3 vo_driver_t.3 xine_version.3 \ - config_values_t.3 version_group.3 vo_frame_t.3 +man_MANS = \ + ao_driver_t.3 config_values_s.3 status_group.3 visual_types.3 xine_init.3 \ + ao_functions_t.3 config_values_t.3 ui_callbacks.3 vo_driver_s.3 xine_management.3 \ + autoplay_group.3 demux_strategy.3 version_group.3 vo_driver_t.3 xine_t.3 \ + browse_group.3 event_group.3 video_cap.3 vo_frame_t.3 xine_version.3 \ + build_info.3 loadplugins_group.3 video_group.3 vo_overlay_t.3 \ + cfg_data_t.3 mrl_t.3 video_prop.3 xine.h.3 \ + config_group.3 mrl_types.3 video_ratio.3 xine_api.3 EXTRA_DIST = $(man_MANS) diff --git a/doc/man/en/man3/ao_driver_t.3 b/doc/man/en/man3/ao_driver_t.3 new file mode 100644 index 000000000..f7095d252 --- /dev/null +++ b/doc/man/en/man3/ao_driver_t.3 @@ -0,0 +1,19 @@ +.TH "ao_driver_t" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.ad l +.nh +.SH NAME +ao_driver_t \- +.SH SYNOPSIS +.br +.PP +\fC#include \fP +.PP +.SH "DETAILED DESCRIPTION" +.PP +Opaque data type. +.PP + + +.SH "AUTHOR" +.PP +Generated automatically by Doxygen for XINE, A Free Video Player Project - API reference from the source code. \ No newline at end of file diff --git a/doc/man/en/man3/autoplay_group.3 b/doc/man/en/man3/autoplay_group.3 index 8bbd0928b..8bb024057 100644 --- a/doc/man/en/man3/autoplay_group.3 +++ b/doc/man/en/man3/autoplay_group.3 @@ -1,4 +1,4 @@ -.TH "Autoplay support" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Autoplay support" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/browse_group.3 b/doc/man/en/man3/browse_group.3 index f298ad931..6a1c5c5c3 100644 --- a/doc/man/en/man3/browse_group.3 +++ b/doc/man/en/man3/browse_group.3 @@ -1,4 +1,4 @@ -.TH "Browsing support" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Browsing support" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/build_info.3 b/doc/man/en/man3/build_info.3 index 832472bb8..c771f8b2e 100644 --- a/doc/man/en/man3/build_info.3 +++ b/doc/man/en/man3/build_info.3 @@ -1,4 +1,4 @@ -.TH "Build informations" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Build informations" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,10 +10,10 @@ Build informations \- .RI "#define \fBXINE_BUILD_CC\fP 'gcc version 2.95.3 20010315 (release)'" .br .ti -1c -.RI "#define \fBXINE_BUILD_OS\fP 'Linux 2.4.5 i686'" +.RI "#define \fBXINE_BUILD_OS\fP 'Linux 2.4.8 i686'" .br .ti -1c -.RI "#define \fBXINE_BUILD_DATE\fP 'Thu 26 Jul 2001 09:17:10'" +.RI "#define \fBXINE_BUILD_DATE\fP 'Mon 17 Sep 2001 00:59:15'" .br .in -1c .SH "DEFINE DOCUMENTATION" @@ -21,9 +21,9 @@ Build informations \- .SS "#define XINE_BUILD_CC 'gcc version 2.95.3 20010315 (release)'" .PP Compiler used to build xine-lib -.SS "#define XINE_BUILD_DATE 'Thu 26 Jul 2001 09:17:10'" +.SS "#define XINE_BUILD_DATE 'Mon 17 Sep 2001 00:59:15'" .PP Build time -.SS "#define XINE_BUILD_OS 'Linux 2.4.5 i686'" +.SS "#define XINE_BUILD_OS 'Linux 2.4.8 i686'" .PP OS used to build xine-lib \ No newline at end of file diff --git a/doc/man/en/man3/cfg_data_t.3 b/doc/man/en/man3/cfg_data_t.3 index 5f0c8d1bd..5c1d916f2 100644 --- a/doc/man/en/man3/cfg_data_t.3 +++ b/doc/man/en/man3/cfg_data_t.3 @@ -1,4 +1,4 @@ -.TH "cfg_data_t" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "cfg_data_t" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/config_group.3 b/doc/man/en/man3/config_group.3 index e5758dd4a..1c8cbc551 100644 --- a/doc/man/en/man3/config_group.3 +++ b/doc/man/en/man3/config_group.3 @@ -1,4 +1,4 @@ -.TH "Configuration structure type." 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Configuration structure type." 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME @@ -7,7 +7,7 @@ Configuration structure type. \- .in +1c .ti -1c -.RI "struct \fBao_functions_t\fP" +.RI "struct \fBao_driver_t\fP" .br .ti -1c .RI "struct \fBcfg_data_t\fP" @@ -33,7 +33,7 @@ Configuration structure type. \- .RI "typedef void \fBxine_t\fP" .br .ti -1c -.RI "typedef void \fBao_functions_t\fP" +.RI "typedef void \fBao_driver_t\fP" .br .ti -1c .RI "typedef void \fBcfg_data_t\fP" diff --git a/doc/man/en/man3/config_values_s.3 b/doc/man/en/man3/config_values_s.3 index 4827ca6a2..9cfa54912 100644 --- a/doc/man/en/man3/config_values_s.3 +++ b/doc/man/en/man3/config_values_s.3 @@ -1,4 +1,4 @@ -.TH "config_values_s" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "config_values_s" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/config_values_t.3 b/doc/man/en/man3/config_values_t.3 index 407bbf4ad..9eb6f79c2 100644 --- a/doc/man/en/man3/config_values_t.3 +++ b/doc/man/en/man3/config_values_t.3 @@ -1,4 +1,4 @@ -.TH "config_values_t" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "config_values_t" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/demux_strategy.3 b/doc/man/en/man3/demux_strategy.3 index 05c31b2ae..b0cc0fe02 100644 --- a/doc/man/en/man3/demux_strategy.3 +++ b/doc/man/en/man3/demux_strategy.3 @@ -1,4 +1,4 @@ -.TH "Possible demuxer guessing strategy." 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Possible demuxer guessing strategy." 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/event_group.3 b/doc/man/en/man3/event_group.3 index 618fda4e6..c7950fc15 100644 --- a/doc/man/en/man3/event_group.3 +++ b/doc/man/en/man3/event_group.3 @@ -1,4 +1,4 @@ -.TH "Sending events" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Sending events" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/loadplugins_group.3 b/doc/man/en/man3/loadplugins_group.3 index 2ecb90d0d..62367dac3 100644 --- a/doc/man/en/man3/loadplugins_group.3 +++ b/doc/man/en/man3/loadplugins_group.3 @@ -1,4 +1,4 @@ -.TH "Loading plugins" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Loading plugins" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME @@ -33,7 +33,7 @@ Loading plugins \- .br .RI "\fIgenerate a list of all available audio output plugins.\fP" .ti -1c -.RI "\fBao_functions_t\fP* \fBxine_load_audio_output_plugin\fP (\fBconfig_values_t\fP *config, char *id)" +.RI "\fBao_driver_t\fP* \fBxine_load_audio_output_plugin\fP (\fBconfig_values_t\fP *config, char *id)" .br .RI "\fIload a specific audio output plugin.\fP" .in -1c @@ -77,7 +77,7 @@ Valid visual types .TP \fB\fIvisual_type\fP\fP -.SS "\fBao_functions_t\fP * xine_load_audio_output_plugin (\fBconfig_values_t\fP * config, char * id)" +.SS "\fBao_driver_t\fP * xine_load_audio_output_plugin (\fBconfig_values_t\fP * config, char * id)" .PP load a specific audio output plugin. .PP @@ -92,7 +92,7 @@ driver name. .PP \fBSee also: \fP .in +1c -\fBao_functions_t\fP +\fBao_driver_t\fP .PP \fBParameters: \fP .in +1c diff --git a/doc/man/en/man3/mrl_t.3 b/doc/man/en/man3/mrl_t.3 index 9707972b8..15f6116db 100644 --- a/doc/man/en/man3/mrl_t.3 +++ b/doc/man/en/man3/mrl_t.3 @@ -1,4 +1,4 @@ -.TH "mrl_t" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "mrl_t" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/mrl_types.3 b/doc/man/en/man3/mrl_types.3 index ffb74ecea..11fca13e8 100644 --- a/doc/man/en/man3/mrl_types.3 +++ b/doc/man/en/man3/mrl_types.3 @@ -1,4 +1,4 @@ -.TH "Types of available mrls" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Types of available mrls" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/status_group.3 b/doc/man/en/man3/status_group.3 index 0f2fd2aeb..3e72f8455 100644 --- a/doc/man/en/man3/status_group.3 +++ b/doc/man/en/man3/status_group.3 @@ -1,4 +1,4 @@ -.TH "Player status constants" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Player status constants" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME @@ -13,21 +13,11 @@ Player status constants \- .RI "#define \fBXINE_PLAY\fP 1" .br .ti -1c -.RI "#define \fBXINE_PAUSE\fP 2" -.br -.ti -1c -.RI "#define \fBXINE_QUIT\fP 3" +.RI "#define \fBXINE_QUIT\fP 2" .br .in -1c .SH "DEFINE DOCUMENTATION" .PP -.SS "#define XINE_PAUSE 2" -.PP -Pause status. -.PP -\fBSee also: \fP -.in +1c -\fBxine_get_status\fP() .SS "#define XINE_PLAY 1" .PP Play status. @@ -35,7 +25,7 @@ Play status. \fBSee also: \fP .in +1c \fBxine_get_status\fP() -.SS "#define XINE_QUIT 3" +.SS "#define XINE_QUIT 2" .PP Quit status. .PP diff --git a/doc/man/en/man3/ui_callbacks.3 b/doc/man/en/man3/ui_callbacks.3 index 821783948..fb2e980aa 100644 --- a/doc/man/en/man3/ui_callbacks.3 +++ b/doc/man/en/man3/ui_callbacks.3 @@ -1,4 +1,4 @@ -.TH "UI communication callbacks." 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "UI communication callbacks." 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/version_group.3 b/doc/man/en/man3/version_group.3 index 021ffb1f7..e778dacb1 100644 --- a/doc/man/en/man3/version_group.3 +++ b/doc/man/en/man3/version_group.3 @@ -1,4 +1,4 @@ -.TH "Version constants" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Version constants" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,10 +10,10 @@ Version constants \- .RI "#define \fBXINE_MAJOR_VERSION\fP 0" .br .ti -1c -.RI "#define \fBXINE_MINOR_VERSION\fP 5" +.RI "#define \fBXINE_MINOR_VERSION\fP 9" .br .ti -1c -.RI "#define \fBXINE_SUB_VERSION\fP 0" +.RI "#define \fBXINE_SUB_VERSION\fP 1" .br .in -1c .SH "DEFINE DOCUMENTATION" @@ -21,9 +21,9 @@ Version constants \- .SS "#define XINE_MAJOR_VERSION 0" .PP Major version constant. -.SS "#define XINE_MINOR_VERSION 5" +.SS "#define XINE_MINOR_VERSION 9" .PP Minor version constant. -.SS "#define XINE_SUB_VERSION 0" +.SS "#define XINE_SUB_VERSION 1" .PP Sub version constant. \ No newline at end of file diff --git a/doc/man/en/man3/video_cap.3 b/doc/man/en/man3/video_cap.3 index 22348a7e6..e1efb4632 100644 --- a/doc/man/en/man3/video_cap.3 +++ b/doc/man/en/man3/video_cap.3 @@ -1,4 +1,4 @@ -.TH "video driver capabilities" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "video driver capabilities" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/video_group.3 b/doc/man/en/man3/video_group.3 index 5e676d934..a963991a8 100644 --- a/doc/man/en/man3/video_group.3 +++ b/doc/man/en/man3/video_group.3 @@ -1,4 +1,4 @@ -.TH "Video." 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Video." 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/video_prop.3 b/doc/man/en/man3/video_prop.3 index f4964e411..9f2e65ada 100644 --- a/doc/man/en/man3/video_prop.3 +++ b/doc/man/en/man3/video_prop.3 @@ -1,4 +1,4 @@ -.TH "Constants for the get/set properties functions." 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Constants for the get/set properties functions." 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME @@ -28,12 +28,15 @@ Constants for the get/set properties functions. \- .RI "#define \fBVO_PROP_COLORKEY\fP 6" .br .ti -1c -.RI "#define \fBVO_NUM_PROPERTIES\fP 7" +.RI "#define \fBVO_PROP_SOFT_DEINTERLACE\fP 7" +.br +.ti -1c +.RI "#define \fBVO_NUM_PROPERTIES\fP 8" .br .in -1c .SH "DEFINE DOCUMENTATION" .PP -.SS "#define VO_NUM_PROPERTIES 7" +.SS "#define VO_NUM_PROPERTIES 8" .PP Number of available properties property. .PP @@ -88,4 +91,11 @@ Saturation property. .PP \fBSee also: \fP .in +1c +\fBvo_driver_t\fP +.SS "#define VO_PROP_SOFT_DEINTERLACE 7" +.PP +Software deinterlacing (BOB) property. +.PP +\fBSee also: \fP +.in +1c \fBvo_driver_t\fP \ No newline at end of file diff --git a/doc/man/en/man3/video_ratio.3 b/doc/man/en/man3/video_ratio.3 index 96993b9ea..6eb5bf05f 100644 --- a/doc/man/en/man3/video_ratio.3 +++ b/doc/man/en/man3/video_ratio.3 @@ -1,4 +1,4 @@ -.TH "Possible ratios for the VO_PROP_ASPECT_RATIO call" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Possible ratios for the VO_PROP_ASPECT_RATIO call" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/visual_types.3 b/doc/man/en/man3/visual_types.3 index cb34ce52e..5b25e3400 100644 --- a/doc/man/en/man3/visual_types.3 +++ b/doc/man/en/man3/visual_types.3 @@ -1,4 +1,4 @@ -.TH "Valid visual types" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "Valid visual types" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/vo_driver_s.3 b/doc/man/en/man3/vo_driver_s.3 index da2c2ed78..5fbe486e3 100644 --- a/doc/man/en/man3/vo_driver_s.3 +++ b/doc/man/en/man3/vo_driver_s.3 @@ -1,4 +1,4 @@ -.TH "vo_driver_s" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "vo_driver_s" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/vo_driver_t.3 b/doc/man/en/man3/vo_driver_t.3 index 686a5da8c..0226a1521 100644 --- a/doc/man/en/man3/vo_driver_t.3 +++ b/doc/man/en/man3/vo_driver_t.3 @@ -1,4 +1,4 @@ -.TH "vo_driver_t" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "vo_driver_t" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/vo_frame_t.3 b/doc/man/en/man3/vo_frame_t.3 index b330f8693..d6cd13292 100644 --- a/doc/man/en/man3/vo_frame_t.3 +++ b/doc/man/en/man3/vo_frame_t.3 @@ -1,4 +1,4 @@ -.TH "vo_frame_t" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "vo_frame_t" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/vo_overlay_t.3 b/doc/man/en/man3/vo_overlay_t.3 index 7fa6822ca..5878848c9 100644 --- a/doc/man/en/man3/vo_overlay_t.3 +++ b/doc/man/en/man3/vo_overlay_t.3 @@ -1,4 +1,4 @@ -.TH "vo_overlay_t" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "vo_overlay_t" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/doc/man/en/man3/xine.h.3 b/doc/man/en/man3/xine.h.3 index 36f7fd604..5d01ab22b 100644 --- a/doc/man/en/man3/xine.h.3 +++ b/doc/man/en/man3/xine.h.3 @@ -1,4 +1,4 @@ -.TH "xine.h" 3 "26 Jul 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- +.TH "xine.h" 3 "17 Sep 2001" "XINE, A Free Video Player Project - API reference" \" -*- nroff -*- .ad l .nh .SH NAME @@ -29,10 +29,10 @@ xine.h \- .RI "#define \fBXINE_BUILD_CC\fP 'gcc version 2.95.3 20010315 (release)'" .br .ti -1c -.RI "#define \fBXINE_BUILD_OS\fP 'Linux 2.4.5 i686'" +.RI "#define \fBXINE_BUILD_OS\fP 'Linux 2.4.8 i686'" .br .ti -1c -.RI "#define \fBXINE_BUILD_DATE\fP 'Thu 26 Jul 2001 09:17:10'" +.RI "#define \fBXINE_BUILD_DATE\fP 'Mon 17 Sep 2001 00:59:15'" .br .ti -1c .RI "#define \fBXINE_STOP\fP 0" @@ -41,19 +41,16 @@ xine.h \- .RI "#define \fBXINE_PLAY\fP 1" .br .ti -1c -.RI "#define \fBXINE_PAUSE\fP 2" -.br -.ti -1c -.RI "#define \fBXINE_QUIT\fP 3" +.RI "#define \fBXINE_QUIT\fP 2" .br .ti -1c .RI "#define \fBXINE_MAJOR_VERSION\fP 0" .br .ti -1c -.RI "#define \fBXINE_MINOR_VERSION\fP 5" +.RI "#define \fBXINE_MINOR_VERSION\fP 9" .br .ti -1c -.RI "#define \fBXINE_SUB_VERSION\fP 0" +.RI "#define \fBXINE_SUB_VERSION\fP 1" .br .ti -1c .RI "#define \fBVO_CAP_HUE\fP 0x00000010" @@ -92,7 +89,10 @@ xine.h \- .RI "#define \fBVO_PROP_COLORKEY\fP 6" .br .ti -1c -.RI "#define \fBVO_NUM_PROPERTIES\fP 7" +.RI "#define \fBVO_PROP_SOFT_DEINTERLACE\fP 7" +.br +.ti -1c +.RI "#define \fBVO_NUM_PROPERTIES\fP 8" .br .ti -1c .RI "#define \fBASPECT_AUTO\fP 0" @@ -119,6 +119,24 @@ xine.h \- .RI "#define \fBDEMUX_EXTENSION_STRATEGY\fP 3" .br .ti -1c +.RI "#define \fBSPEED_PAUSE\fP 0" +.br +.ti -1c +.RI "#define \fBSPEED_SLOW_4\fP 1" +.br +.ti -1c +.RI "#define \fBSPEED_SLOW_2\fP 2" +.br +.ti -1c +.RI "#define \fBSPEED_NORMAL\fP 4" +.br +.ti -1c +.RI "#define \fBSPEED_FAST_2\fP 8" +.br +.ti -1c +.RI "#define \fBSPEED_FAST_4\fP 16" +.br +.ti -1c .RI "#define \fBmrl_unknown\fP (0 << 0)" .br .ti -1c @@ -210,7 +228,7 @@ xine.h \- .RI "typedef void \fBxine_t\fP" .br .ti -1c -.RI "typedef void \fBao_functions_t\fP" +.RI "typedef void \fBao_driver_t\fP" .br .ti -1c .RI "typedef void \fBcfg_data_t\fP" @@ -262,7 +280,7 @@ xine.h \- .br .RI "\fIConfiguration file initialisation.\fP" .ti -1c -.RI "\fBxine_t\fP* \fBxine_init\fP (\fBvo_driver_t\fP *vo, \fBao_functions_t\fP *ao, \fBconfig_values_t\fP *config, \fBgui_stream_end_cb_t\fP stream_end_cb, \fBgui_get_next_mrl_cb_t\fP get_next_mrl_cb, \fBgui_branched_cb_t\fP branched_cb)" +.RI "\fBxine_t\fP* \fBxine_init\fP (\fBvo_driver_t\fP *vo, \fBao_driver_t\fP *ao, \fBconfig_values_t\fP *config, \fBgui_stream_end_cb_t\fP stream_end_cb, \fBgui_get_next_mrl_cb_t\fP get_next_mrl_cb, \fBgui_branched_cb_t\fP branched_cb)" .br .RI "\fIInitialisation of xine.\fP" .ti -1c @@ -270,13 +288,25 @@ xine.h \- .br .RI "\fIDe-initialisation of xine.\fP" .ti -1c -.RI "void \fBxine_play\fP (\fBxine_t\fP *self, char *MRL, int pos)" +.RI "void \fBxine_play\fP (\fBxine_t\fP *self, char *MRL, int start_pos, int start_time)" .br .RI "\fIStart to play a stream.\fP" .ti -1c -.RI "void \fBxine_pause\fP (\fBxine_t\fP *self)" +.RI "void \fBxine_set_speed\fP (\fBxine_t\fP *self, int speed)" +.br +.RI "\fISet playback speed.\fP" +.ti -1c +.RI "int \fBxine_get_speed\fP (\fBxine_t\fP *self)" +.br +.RI "\fIGet the playback speed.\fP" +.ti -1c +.RI "void \fBxine_set_av_offset\fP (\fBxine_t\fP *self, int offset_pts)" .br -.RI "\fIPause toggle.\fP" +.RI "\fISet audio/video sync.\fP" +.ti -1c +.RI "int \fBxine_get_av_offset\fP (\fBxine_t\fP *self)" +.br +.RI "\fIGet audio/video sync.\fP" .ti -1c .RI "void \fBxine_stop\fP (\fBxine_t\fP *self)" .br @@ -294,6 +324,14 @@ xine.h \- .br .RI "\fIGet current position.\fP" .ti -1c +.RI "int \fBxine_get_current_time\fP (\fBxine_t\fP *self)" +.br +.RI "\fIget current pos in seconds.\fP" +.ti -1c +.RI "int \fBxine_get_stream_length\fP (\fBxine_t\fP *self)" +.br +.RI "\fIestimate length of input stream in seconds.\fP" +.ti -1c .RI "int \fBxine_get_audio_channel\fP (\fBxine_t\fP *self)" .br .RI "\fIGet current audio channel.\fP" @@ -338,7 +376,7 @@ xine.h \- .br .RI "\fIgenerate a list of all available audio output plugins.\fP" .ti -1c -.RI "\fBao_functions_t\fP* \fBxine_load_audio_output_plugin\fP (\fBconfig_values_t\fP *config, char *id)" +.RI "\fBao_driver_t\fP* \fBxine_load_audio_output_plugin\fP (\fBconfig_values_t\fP *config, char *id)" .br .RI "\fIload a specific audio output plugin.\fP" .ti -1c @@ -363,7 +401,7 @@ Guenter Bartsch , Siegfried Langauf Main Page   Modules   Data Structures   File List   Data Fields   Globals  

XINE, A Free Video Player Project - API reference Data Structures

Here are the data structures with brief descriptions: -
Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/files.html b/doc/xine-lib-API/html/files.html index db96ed098..db58b6824 100644 --- a/doc/xine-lib-API/html/files.html +++ b/doc/xine-lib-API/html/files.html @@ -10,7 +10,7 @@ Main Page   Modules   Data Structures   File List   Data Fields   Globals  

XINE, A Free Video Player Project - API reference File List

Here is a list of all documented files with brief descriptions: -
Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/functions.html b/doc/xine-lib-API/html/functions.html index 83f056865..d72e77fe1 100644 --- a/doc/xine-lib-API/html/functions.html +++ b/doc/xine-lib-API/html/functions.html @@ -32,7 +32,7 @@ : mrl_t
  • type : mrl_t
  • update_frame_format : vo_driver_s -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/globals.html b/doc/xine-lib-API/html/globals.html index 45f2a01ca..f8e21e1b2 100644 --- a/doc/xine-lib-API/html/globals.html +++ b/doc/xine-lib-API/html/globals.html @@ -43,7 +43,13 @@ : xine.h
  • mrl_vcd : xine.h
  • MRL_ZERO : xine.h
  • MRLS_DUPLICATE -: xine.h
  • VISUAL_TYPE_AA +: xine.h
  • SPEED_FAST_2 +: xine.h
  • SPEED_FAST_4 +: xine.h
  • SPEED_NORMAL +: xine.h
  • SPEED_PAUSE +: xine.h
  • SPEED_SLOW_2 +: xine.h
  • SPEED_SLOW_4 +: xine.h
  • VISUAL_TYPE_AA : xine.h
  • VISUAL_TYPE_FB : xine.h
  • VISUAL_TYPE_GTK : xine.h
  • VISUAL_TYPE_X11 @@ -53,31 +59,36 @@ : xine.h
  • VO_CAP_HUE : xine.h
  • VO_CAP_SATURATION : xine.h
  • VO_NUM_PROPERTIES -: xine.h
  • VO_PROP_ASPECT_RATIO +: xine.h
  • VO_PROP_ASPECT_RATIO : xine.h
  • VO_PROP_BRIGHTNESS : xine.h
  • VO_PROP_COLORKEY : xine.h
  • VO_PROP_CONTRAST : xine.h
  • VO_PROP_HUE : xine.h
  • VO_PROP_INTERLACED : xine.h
  • VO_PROP_SATURATION -: xine.h
  • XINE_BUILD_CC +: xine.h
  • VO_PROP_SOFT_DEINTERLACE +: xine.h
  • XINE_BUILD_CC : xine.h
  • XINE_BUILD_DATE : xine.h
  • XINE_BUILD_OS : xine.h
  • xine_check_version() : xine.h
  • xine_eject() -: xine.h
  • xine_exit() +: xine.h
  • xine_exit() : xine.h
  • xine_get_audio_channel() -: xine.h
  • xine_get_autoplay_input_plugin_ids() +: xine.h
  • xine_get_autoplay_input_plugin_ids() : xine.h
  • xine_get_autoplay_mrls() -: xine.h
  • xine_get_browsable_input_plugin_ids() +: xine.h
  • xine_get_av_offset() +: xine.h
  • xine_get_browsable_input_plugin_ids() : xine.h
  • xine_get_browse_mrls() : xine.h
  • xine_get_current_position() -: xine.h
  • xine_get_major_version() +: xine.h
  • xine_get_current_time() +: xine.h
  • xine_get_major_version() : xine.h
  • xine_get_minor_version() +: xine.h
  • xine_get_speed() : xine.h
  • xine_get_spu_channel() -: xine.h
  • xine_get_status() -: xine.h
  • xine_get_str_version() -: xine.h
  • xine_get_sub_version() +: xine.h
  • xine_get_status() +: xine.h
  • xine_get_str_version() +: xine.h
  • xine_get_stream_length() +: xine.h
  • xine_get_sub_version() : xine.h
  • xine_init() : xine.h
  • xine_list_audio_output_plugins() : xine.h
  • xine_list_video_output_plugins() @@ -85,23 +96,23 @@ : xine.h
  • xine_load_video_output_plugin() : xine.h
  • XINE_MAJOR_VERSION : xine.h
  • XINE_MINOR_VERSION -: xine.h
  • XINE_PAUSE -: xine.h
  • xine_pause() : xine.h
  • XINE_PLAY : xine.h
  • xine_play() : xine.h
  • XINE_PLUGINDIR : xine.h
  • XINE_QUIT -: xine.h
  • xine_register_event_listener() +: xine.h
  • xine_register_event_listener() : xine.h
  • xine_remove_event_listener() : xine.h
  • xine_select_audio_channel() -: xine.h
  • xine_select_spu_channel() -: xine.h
  • xine_send_event() -: xine.h
  • XINE_SKINDIR -: xine.h
  • XINE_STOP +: xine.h
  • xine_select_spu_channel() +: xine.h
  • xine_send_event() +: xine.h
  • xine_set_av_offset() +: xine.h
  • xine_set_speed() +: xine.h
  • XINE_SKINDIR : xine.h
  • xine_stop() -: xine.h
  • XINE_SUB_VERSION +: xine.h
  • XINE_STOP +: xine.h
  • XINE_SUB_VERSION : xine.h -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__autoplay__group.html b/doc/xine-lib-API/html/group__autoplay__group.html index 8a2ac229c..8a02cc18c 100644 --- a/doc/xine-lib-API/html/group__autoplay__group.html +++ b/doc/xine-lib-API/html/group__autoplay__group.html @@ -140,7 +140,7 @@ MRL list. -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__browse__group.html b/doc/xine-lib-API/html/group__browse__group.html index e693bb0e9..1caa7c8c4 100644 --- a/doc/xine-lib-API/html/group__browse__group.html +++ b/doc/xine-lib-API/html/group__browse__group.html @@ -276,7 +276,7 @@ start_mrl on success, NULL on failure. -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__build__info.html b/doc/xine-lib-API/html/group__build__info.html index 47d1cc38b..c42c682d4 100644 --- a/doc/xine-lib-API/html/group__build__info.html +++ b/doc/xine-lib-API/html/group__build__info.html @@ -13,9 +13,9 @@ #define XINE_BUILD_CC   "gcc version 2.95.3 20010315 (release)" -#define XINE_BUILD_OS   "Linux 2.4.5 i686" +#define XINE_BUILD_OS   "Linux 2.4.8 i686" -#define XINE_BUILD_DATE   "Thu 26 Jul 2001 09:17:10" +#define XINE_BUILD_DATE   "Mon 17 Sep 2001 00:59:15"

    Define Documentation

    @@ -48,7 +48,7 @@ Compiler used to build xine-lib
    -#define XINE_BUILD_DATE   "Thu 26 Jul 2001 09:17:10" +#define XINE_BUILD_DATE   "Mon 17 Sep 2001 00:59:15"
    @@ -71,7 +71,7 @@ Build time
    -#define XINE_BUILD_OS   "Linux 2.4.5 i686" +#define XINE_BUILD_OS   "Linux 2.4.8 i686"
    @@ -87,7 +87,7 @@ Build time OS used to build xine-lib -

    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__config__group.html b/doc/xine-lib-API/html/group__config__group.html index c3415eb01..38e92b9fe 100644 --- a/doc/xine-lib-API/html/group__config__group.html +++ b/doc/xine-lib-API/html/group__config__group.html @@ -10,7 +10,7 @@ Main Page   Modules   Data Structures   File List   Data Fields   Globals  

    Configuration structure type.

    - + @@ -20,14 +20,14 @@ - +

    Data Structures

    struct  ao_functions_t
    struct  ao_driver_t
    struct  cfg_data_t
    struct  config_values_s
    struct  config_values_s

    Typedefs

    typedef void xine_t
    -typedef void ao_functions_t
    +typedef void ao_driver_t
    typedef void cfg_data_t
    typedef struct config_values_s config_values_t
    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__demux__strategy.html b/doc/xine-lib-API/html/group__demux__strategy.html index e496bd94a..accbd1ff9 100644 --- a/doc/xine-lib-API/html/group__demux__strategy.html +++ b/doc/xine-lib-API/html/group__demux__strategy.html @@ -123,7 +123,7 @@ Recognize by extension then by content.
    config_values_t
    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__event__group.html b/doc/xine-lib-API/html/group__event__group.html index 4e4fbd6d5..ade35d187 100644 --- a/doc/xine-lib-API/html/group__event__group.html +++ b/doc/xine-lib-API/html/group__event__group.html @@ -277,7 +277,7 @@ FILLME. -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__loadplugins__group.html b/doc/xine-lib-API/html/group__loadplugins__group.html index e4e3eb992..40142faf3 100644 --- a/doc/xine-lib-API/html/group__loadplugins__group.html +++ b/doc/xine-lib-API/html/group__loadplugins__group.html @@ -25,7 +25,7 @@ char** xine_list_audio_output_plugins (void)  generate a list of all available audio output plugins.

    -ao_functions_t* xine_load_audio_output_plugin (config_values_t *config, char *id) +ao_driver_t* xine_load_audio_output_plugin (config_values_t *config, char *id)  load a specific audio output plugin.

    Detailed Description

    @@ -143,7 +143,7 @@ a list of available video output plugins for the specified visual type - the lis
    -ao_functions_t * xine_load_audio_output_plugin ( +ao_driver_t * xine_load_audio_output_plugin ( config_values_t * config, @@ -182,7 +182,7 @@ driver name.
    See also:
    -ao_functions_t
    +ao_driver_t
    Parameters:
    config @@ -278,7 +278,7 @@ visual type dependant data pointer.
    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__mrl__types.html b/doc/xine-lib-API/html/group__mrl__types.html index 231128681..4caa13a4f 100644 --- a/doc/xine-lib-API/html/group__mrl__types.html +++ b/doc/xine-lib-API/html/group__mrl__types.html @@ -474,7 +474,7 @@ VCD mrl type.
    mrl_t
    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__status__group.html b/doc/xine-lib-API/html/group__status__group.html index c48f13f26..e788da053 100644 --- a/doc/xine-lib-API/html/group__status__group.html +++ b/doc/xine-lib-API/html/group__status__group.html @@ -14,37 +14,10 @@ #define XINE_STOP   0 #define XINE_PLAY   1 - -#define XINE_PAUSE   2 - -#define XINE_QUIT   3 + +#define XINE_QUIT   2

    Define Documentation

    -

    - - - - -
    - - -
    -#define XINE_PAUSE   2 -
    -
    - - - - - -
    -   - - -

    -Pause status.

    -See also:
    -xine_get_status()

    @@ -67,17 +40,17 @@ Pause status.

    Play status.

    See also:
    -xine_get_status()
    +xine_get_status()
    -

    +

    @@ -92,7 +65,7 @@ Play status.

    Quit status.

    See also:
    -xine_get_status()
    +xine_get_status()
    -#define XINE_QUIT   3 +#define XINE_QUIT   2

    @@ -117,10 +90,10 @@ Quit status.

    Stop status.

    See also:
    -xine_get_status()
    +xine_get_status()
    -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__ui__callbacks.html b/doc/xine-lib-API/html/group__ui__callbacks.html index 5e4f6d650..274c34d3f 100644 --- a/doc/xine-lib-API/html/group__ui__callbacks.html +++ b/doc/xine-lib-API/html/group__ui__callbacks.html @@ -102,7 +102,7 @@ Notify UI when the stream is finished.
    xine_init()
    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__version__group.html b/doc/xine-lib-API/html/group__version__group.html index 88c3da9eb..643a47283 100644 --- a/doc/xine-lib-API/html/group__version__group.html +++ b/doc/xine-lib-API/html/group__version__group.html @@ -13,9 +13,9 @@ #define XINE_MAJOR_VERSION   0 -#define XINE_MINOR_VERSION   5 +#define XINE_MINOR_VERSION   9 -#define XINE_SUB_VERSION   0 +#define XINE_SUB_VERSION   1

    Define Documentation

    @@ -48,7 +48,7 @@ Major version constant.
    -#define XINE_MINOR_VERSION   5 +#define XINE_MINOR_VERSION   9
    @@ -71,7 +71,7 @@ Minor version constant.
    -#define XINE_SUB_VERSION   0 +#define XINE_SUB_VERSION   1
    @@ -87,7 +87,7 @@ Minor version constant. Sub version constant. -

    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__video__cap.html b/doc/xine-lib-API/html/group__video__cap.html index 980d9a6b2..c03e12945 100644 --- a/doc/xine-lib-API/html/group__video__cap.html +++ b/doc/xine-lib-API/html/group__video__cap.html @@ -137,7 +137,7 @@ Driver can set HUE value. Driver can set SATURATION value. -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__video__group.html b/doc/xine-lib-API/html/group__video__group.html index 8c5c1e566..c5f45c20b 100644 --- a/doc/xine-lib-API/html/group__video__group.html +++ b/doc/xine-lib-API/html/group__video__group.html @@ -28,7 +28,7 @@ typedef void vo_overlay_t typedef struct vo_driver_s vo_driver_t -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__video__prop.html b/doc/xine-lib-API/html/group__video__prop.html index dc5fb4246..607fae9c0 100644 --- a/doc/xine-lib-API/html/group__video__prop.html +++ b/doc/xine-lib-API/html/group__video__prop.html @@ -24,18 +24,20 @@ #define VO_PROP_BRIGHTNESS   5 #define VO_PROP_COLORKEY   6 - -#define VO_NUM_PROPERTIES   7 + +#define VO_PROP_SOFT_DEINTERLACE   7 + +#define VO_NUM_PROPERTIES   8

    Define Documentation

    -

    +

    @@ -228,7 +230,32 @@ Saturation property.
    vo_driver_t
    -#define VO_NUM_PROPERTIES   7 +#define VO_NUM_PROPERTIES   8
    -

    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +

    + + + + +
    + + +
    +#define VO_PROP_SOFT_DEINTERLACE   7 +
    +
    + + + + + +
    +   + + +

    +Software deinterlacing (BOB) property.

    +See also:
    +vo_driver_t
    +

    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__video__ratio.html b/doc/xine-lib-API/html/group__video__ratio.html index 9f41c3472..92040e715 100644 --- a/doc/xine-lib-API/html/group__video__ratio.html +++ b/doc/xine-lib-API/html/group__video__ratio.html @@ -123,7 +123,7 @@ Set aspect ration to 4:3.
    VO_PROP_ASPECT_RATIO
    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__visual__types.html b/doc/xine-lib-API/html/group__visual__types.html index 0856dd2e1..d023492a9 100644 --- a/doc/xine-lib-API/html/group__visual__types.html +++ b/doc/xine-lib-API/html/group__visual__types.html @@ -120,7 +120,7 @@ X11 visual type.
    xine_list_video_output_plugins, xine_load_video_output_plugin
    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__xine__api.html b/doc/xine-lib-API/html/group__xine__api.html index 3c1b39ffc..4a884144a 100644 --- a/doc/xine-lib-API/html/group__xine__api.html +++ b/doc/xine-lib-API/html/group__xine__api.html @@ -21,7 +21,7 @@ Version constants Player status constants -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__xine__init.html b/doc/xine-lib-API/html/group__xine__init.html index 164a46b8c..bfe100a03 100644 --- a/doc/xine-lib-API/html/group__xine__init.html +++ b/doc/xine-lib-API/html/group__xine__init.html @@ -18,7 +18,7 @@ config_values_t* config_file_init (char *filename)  Configuration file initialisation.

    -xine_t* xine_init (vo_driver_t *vo, ao_functions_t *ao, config_values_t *config, gui_stream_end_cb_t stream_end_cb, gui_get_next_mrl_cb_t get_next_mrl_cb, gui_branched_cb_t branched_cb) +xine_t* xine_init (vo_driver_t *vo, ao_driver_t *ao, config_values_t *config, gui_stream_end_cb_t stream_end_cb, gui_get_next_mrl_cb_t get_next_mrl_cb, gui_branched_cb_t branched_cb)  Initialisation of xine.

    void xine_exit (xine_t *self) @@ -145,7 +145,7 @@ Nothing
    -ao_functions_t * ao, +ao_driver_t * ao, @@ -213,7 +213,7 @@ called if seamless branch was taken Returns:
    Current xine engine configuration
    See also:
    -vo_driver_t, ao_functions_t, config_values_t, gui_stream_end_cb_t, gui_get_next_mrl_cb_t, gui_branched_cb_t
    +vo_driver_t, ao_driver_t, config_values_t, gui_stream_end_cb_t, gui_get_next_mrl_cb_t, gui_branched_cb_t
    Warning:
    This function should be called before any other xine_*() function.

    @@ -242,7 +242,7 @@ This function should be called before any other xine_*() function.

    -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__xine__management.html b/doc/xine-lib-API/html/group__xine__management.html index 0741a0136..7bd36d803 100644 --- a/doc/xine-lib-API/html/group__xine__management.html +++ b/doc/xine-lib-API/html/group__xine__management.html @@ -9,40 +9,219 @@
    Main Page   Modules   Data Structures   File List   Data Fields   Globals  

    Engine management

    + + + + + + + +void  - - - + + + + + + + + + - + - + - + - + + + + + - + - + - +

    Defines

    +#define SPEED_PAUSE   0
    +#define SPEED_SLOW_4   1
    +#define SPEED_SLOW_2   2
    +#define SPEED_NORMAL   4
    +#define SPEED_FAST_2   8
    +#define SPEED_FAST_4   16

    Functions

    -void xine_play (xine_t *self, char *MRL, int pos)
    xine_play (xine_t *self, char *MRL, int start_pos, int start_time)
     Start to play a stream.

    -void xine_pause (xine_t *self)
     Pause toggle.

    -void xine_stop (xine_t *self)
    +void xine_set_speed (xine_t *self, int speed)
     Set playback speed.

    +int xine_get_speed (xine_t *self)
     Get the playback speed.

    +void xine_set_av_offset (xine_t *self, int offset_pts)
     Set audio/video sync.

    +int xine_get_av_offset (xine_t *self)
     Get audio/video sync.

    +void xine_stop (xine_t *self)
     Stop playing.

    -int xine_eject (xine_t *self)
    +int xine_eject (xine_t *self)
     Eject media.

    -int xine_get_status (xine_t *self)
    +int xine_get_status (xine_t *self)
     Get current xine status.

    -int xine_get_current_position (xine_t *self)
    +int xine_get_current_position (xine_t *self)
     Get current position.

    -int xine_get_audio_channel (xine_t *self)
    +int xine_get_current_time (xine_t *self)
     get current pos in seconds.

    +int xine_get_stream_length (xine_t *self)
     estimate length of input stream in seconds.

    +int xine_get_audio_channel (xine_t *self)
     Get current audio channel.

    -void xine_select_audio_channel (xine_t *self, int channel)
    +void xine_select_audio_channel (xine_t *self, int channel)
     Set audio channel.

    -int xine_get_spu_channel (xine_t *self)
    +int xine_get_spu_channel (xine_t *self)
     Get current sub-title channel.

    -void xine_select_spu_channel (xine_t *self, int channel)
    +void xine_select_spu_channel (xine_t *self, int channel)
     Set sub-title channel.

    +

    Define Documentation

    +

    + + + + +
    + + +
    +#define SPEED_FAST_2   8 +
    +
    + + + + + +
    +   + + +

    +Playback at 200% speed.

    +See also:
    +xine_set_speed(), xine_get_speed()
    +

    + + + + +
    + + +
    +#define SPEED_FAST_4   16 +
    +
    + + + + + +
    +   + + +

    +Playback at 400% speed.

    +See also:
    +xine_set_speed(), xine_get_speed()
    +

    + + + + +
    + + +
    +#define SPEED_NORMAL   4 +
    +
    + + + + + +
    +   + + +

    +Playback at 100% speed.

    +See also:
    +xine_set_speed(), xine_get_speed()
    +

    + + + + +
    + + +
    +#define SPEED_PAUSE   0 +
    +
    + + + + + +
    +   + + +

    +Playback pause.

    +See also:
    +xine_set_speed(), xine_get_speed()
    +

    + + + + +
    + + +
    +#define SPEED_SLOW_2   2 +
    +
    + + + + + +
    +   + + +

    +Playback at 50% speed.

    +See also:
    +xine_set_speed(), xine_get_speed()
    +

    + + + + +
    + + +
    +#define SPEED_SLOW_4   1 +
    +
    + + + + + +
    +   + + +

    +Playback at 25% speed.

    +See also:
    +xine_set_speed(), xine_get_speed()

    Function Documentation

    -

    +

    @@ -91,7 +270,7 @@ Current xine engine configuration ( see xin
    -

    +

    @@ -140,7 +319,56 @@ Current audio chennel
    -

    +

    + + + + +
    + + + + + + +
    +int xine_get_av_offset ( + +xine_t * self ) +
    +
    + + + + + +
    +   + + +

    +Get audio/video sync. +

    +

    +Parameters:
    + + +
    self +  +Current xine engine configuration ( see xine_init() )
    +
    +Returns:
    +Current audio/video offset. +

    +

    Return the current audio/video sync offset ( see xine_set_av_offset() ).
    +Parameters:
    + + +
    self +  +
    +
    +

    @@ -189,7 +417,105 @@ Current position ( 0..65535 )
    -

    +

    + + + + +
    + + + + + + +
    +int xine_get_current_time ( + +xine_t * self ) +
    +
    + + + + + +
    +   + + +

    +get current pos in seconds. +

    +

    +Parameters:
    + + +
    self +  +Current xine engine configuration ( see xine_init() )
    +
    +Returns:
    +current position measured in seconds from the beginning of the stream +

    +

    get current position measured in seconds from the beginning of the stream
    +Parameters:
    + + +
    self +  +
    +
    +

    + + + + +
    + + + + + + +
    +int xine_get_speed ( + +xine_t * self ) +
    +
    + + + + + +
    +   + + +

    +Get the playback speed. +

    +

    +Parameters:
    + + +
    self +  +Current xine engine configuration ( see xine_init() )
    +
    +Returns:
    +speed value ( see SPEED_PAUSE, SPEED_SLOW_4, SPEED_SLOW_2, SPEED_NORMAL, SPEED_FAST_2, SPEED_FAST_4 ) +

    +

    Get the current speed playback. Possible values are SPEED_PAUSE, SPEED_SLOW_4, SPEED_SLOW_2, SPEED_NORMAL, SPEED_FAST_2, SPEED_FAST_4.
    +Parameters:
    + + +
    self +  +
    +
    +

    @@ -238,7 +564,7 @@ Current sub-title channel
    -

    +

    @@ -287,14 +613,14 @@ Current status ( see Player status constants
    -

    +

    -void xine_pause ( +int xine_get_stream_length ( xine_t * self ) @@ -313,7 +639,7 @@ void xine_pause (

    -Pause toggle. +estimate length of input stream in seconds.

    Parameters:
    @@ -324,9 +650,9 @@ Current xine engine configuration ( see xin
    Returns:
    -Nothing +length of input stream in seconds or 0 if stream is not seekable

    -

    Toggle pause mode.
    +
    estimate length of input stream in seconds
    Parameters:
    + + + + @@ -385,15 +717,18 @@ Current xine engine configuration ( see xin - + +position measured in seconds from stream start
    self @@ -358,7 +684,13 @@ char * MRL,
    -int pos ) +int start_pos, +
    +int start_time )
    MRL   Media Resource Location to open
    pos +
    start_pos +  +position in input source (0..65535)
    start_time   -Start from position (0..65535)
    Returns:
    Nothing

    -

    Open a stream and play it
    +
    Open a stream and play it. If both start position parameters are !=0 start_pos will be used for non-seekable streams both values will be ignored
    Parameters:
    - +
    self @@ -402,14 +737,17 @@ Nothing
    MRL  
    pos +
    start_pos +  +
    start_time  
    -

    +

    @@ -467,7 +805,7 @@ Nothing
    -

    +

    @@ -525,7 +863,129 @@ Nothing
    -

    +

    + + + + +
    + + + + + + + + + + +
    +void xine_set_av_offset ( + +xine_t * self, +
    +int offset_pts ) +
    +
    + + + + + +
    +   + + +

    +Set audio/video sync. +

    +

    +Parameters:
    + + + +
    self +  +Current xine engine configuration ( see xine_init() )
    offset_pts +  +New pts.
    +
    +Returns:
    +Nothing +

    +

    Set audio/video sync offset, according to offset_pts value ( see xine_get_av_offset() ).
    +Parameters:
    + + + +
    self +  +
    offset_pts +  +
    +
    +

    + + + + +
    + + + + + + + + + + +
    +void xine_set_speed ( + +xine_t * self, +
    +int speed ) +
    +
    + + + + + +
    +   + + +

    +Set playback speed. +

    +

    +Parameters:
    + + + +
    self +  +Current xine engine configuration ( see xine_init() )
    speed +  +Desired playback speed ( see SPEED_PAUSE, SPEED_SLOW_4, SPEED_SLOW_2, SPEED_NORMAL, SPEED_FAST_2, SPEED_FAST_4 )
    +
    +Returns:
    +Nothing +

    +

    Set the playback speed to desired speed, according of SPEED_x constant.
    +Parameters:
    + + + +
    self +  +
    speed +  +
    +
    +

    @@ -574,7 +1034,7 @@ Nothing
    -

    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/group__xine__version.html b/doc/xine-lib-API/html/group__xine__version.html index 88a8c0b72..60d0f5411 100644 --- a/doc/xine-lib-API/html/group__xine__version.html +++ b/doc/xine-lib-API/html/group__xine__version.html @@ -260,7 +260,7 @@ return version information. sub version. -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/index.html b/doc/xine-lib-API/html/index.html index 799f3f007..26dd353fc 100644 --- a/doc/xine-lib-API/html/index.html +++ b/doc/xine-lib-API/html/index.html @@ -10,7 +10,7 @@ Main Page   Modules   Data Structures   File List   Data Fields   Globals  

    XINE, A Free Video Player Project - API reference Documentation

    -

    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/modules.html b/doc/xine-lib-API/html/modules.html index cad612429..97e3e52ad 100644 --- a/doc/xine-lib-API/html/modules.html +++ b/doc/xine-lib-API/html/modules.html @@ -40,7 +40,7 @@
  • Sending events -
    Generated at Thu Jul 26 11:29:46 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structcfg__data__t.html b/doc/xine-lib-API/html/structcfg__data__t.html index 2d84c47a5..a3fec6dac 100644 --- a/doc/xine-lib-API/html/structcfg__data__t.html +++ b/doc/xine-lib-API/html/structcfg__data__t.html @@ -17,7 +17,7 @@ Opaque data type.

    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structconfig__values__s.html b/doc/xine-lib-API/html/structconfig__values__s.html index bab56ad69..3b8ef62ed 100644 --- a/doc/xine-lib-API/html/structconfig__values__s.html +++ b/doc/xine-lib-API/html/structconfig__values__s.html @@ -210,7 +210,7 @@ Set string values in configuration file.
    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structconfig__values__t.html b/doc/xine-lib-API/html/structconfig__values__t.html index 1578c9efd..8301d5704 100644 --- a/doc/xine-lib-API/html/structconfig__values__t.html +++ b/doc/xine-lib-API/html/structconfig__values__t.html @@ -24,7 +24,7 @@ Data type of structure config_

    The documentation for this struct was generated from the following file:     -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structmrl__t.html b/doc/xine-lib-API/html/structmrl__t.html index 52a4c077b..f753c32c8 100644 --- a/doc/xine-lib-API/html/structmrl__t.html +++ b/doc/xine-lib-API/html/structmrl__t.html @@ -156,7 +156,7 @@ match to mrl_type enum
    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structvo__driver__s.html b/doc/xine-lib-API/html/structvo__driver__s.html index 55829ca6d..151b6949f 100644 --- a/doc/xine-lib-API/html/structvo__driver__s.html +++ b/doc/xine-lib-API/html/structvo__driver__s.html @@ -299,7 +299,7 @@ Check if the given image fullfills the format specified (re-)allocate memory if
    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structvo__driver__t.html b/doc/xine-lib-API/html/structvo__driver__t.html index bcbd8e454..adfcc48a7 100644 --- a/doc/xine-lib-API/html/structvo__driver__t.html +++ b/doc/xine-lib-API/html/structvo__driver__t.html @@ -24,7 +24,7 @@ structure vo_driver_s.

    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structvo__frame__t.html b/doc/xine-lib-API/html/structvo__frame__t.html index 64d62e794..2cd6e7307 100644 --- a/doc/xine-lib-API/html/structvo__frame__t.html +++ b/doc/xine-lib-API/html/structvo__frame__t.html @@ -19,7 +19,7 @@ Opaque data type.

    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structvo__overlay__t.html b/doc/xine-lib-API/html/structvo__overlay__t.html index 71eb5f694..1fbecdc88 100644 --- a/doc/xine-lib-API/html/structvo__overlay__t.html +++ b/doc/xine-lib-API/html/structvo__overlay__t.html @@ -19,7 +19,7 @@ Opaque data type.

    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/structxine__t.html b/doc/xine-lib-API/html/structxine__t.html index 3d930fc98..e70e71f94 100644 --- a/doc/xine-lib-API/html/structxine__t.html +++ b/doc/xine-lib-API/html/structxine__t.html @@ -19,7 +19,7 @@ Opaque data type.

    The documentation for this struct was generated from the following file: -
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/xine_8h-source.html b/doc/xine-lib-API/html/xine_8h-source.html index f5f081660..6c1903a65 100644 --- a/doc/xine-lib-API/html/xine_8h-source.html +++ b/doc/xine-lib-API/html/xine_8h-source.html @@ -10,7 +10,7 @@ Main Page   Modules   Data Structures   File List   Data Fields   Globals  

    xine.h

    Go to the documentation of this file.
    00001 /* !! DO NO EDIT THIS FILE, it is automatically generated */
 00031 /*
-00032  * $Id: xine_8h-source.html,v 1.1 2001/07/26 11:12:26 f1rmb Exp $
+00032  * $Id: xine_8h-source.html,v 1.2 2001/09/16 23:13:45 f1rmb Exp $
 00033  *
 00034  */
 00035 
@@ -25,319 +25,350 @@
 00044 #include <unistd.h>
 00045 #include <sys/types.h>
 00046 
-00047 #ifndef DOC_HIDDEN
-00048 #include <xine/events.h>
+00047 #ifndef XINE_COMPILE
+00048 #include <xine/video_out.h>
 00049 #endif
 00050 
-00055 #define XINE_SKINDIR    "/usr/local/share/xine/skins"
-00056 
-00066 #define XINE_BUILD_CC      "gcc version 2.95.3 20010315 (release)"
-00067 
-00070 #define XINE_BUILD_OS      "Linux 2.4.5 i686"
+00051 #ifndef DOC_HIDDEN
+00052 #include <xine/events.h>
+00053 #endif
+00054 
+00059 #define XINE_SKINDIR    "/usr/local/share/xine/skins"
+00060 
+00070 #define XINE_BUILD_CC      "gcc version 2.95.3 20010315 (release)"
 00071 
-00074 #define XINE_BUILD_DATE    "Thu 26 Jul 2001 09:17:10"
+00074 #define XINE_BUILD_OS      "Linux 2.4.8 i686"
 00075 
-00093 #define XINE_STOP      0
-00094 
-00099 #define XINE_PLAY      1
-00100 
-00105 #define XINE_PAUSE     2
-00106 
-00111 #define XINE_QUIT      3
-00112 
-00124 #define XINE_MAJOR_VERSION 0
-00125 
-00129 #define XINE_MINOR_VERSION 5
-00130 
-00134 #define XINE_SUB_VERSION   0
-00135 
-00150 char *xine_get_str_version(void);
-00151 
-00159 int xine_get_major_version(void);
-00160 
-00168 int xine_get_minor_version(void);
-00169 
-00177 int xine_get_sub_version(void);
-00178 
-00189 int xine_check_version(int major, int minor, int sub);
-00190 
-00207 #define VO_CAP_HUE          0x00000010
-00208 
-00212 #define VO_CAP_SATURATION   0x00000020
-00213 
-00217 #define VO_CAP_BRIGHTNESS   0x00000040
-00218 
-00222 #define VO_CAP_CONTRAST     0x00000080
-00223 
-00227 #define VO_CAP_COLORKEY     0x00000100
-00228 
-00241 #define VO_PROP_INTERLACED      0
-00242 
-00247 #define VO_PROP_ASPECT_RATIO    1
-00248 
-00253 #define VO_PROP_HUE             2
-00254 
-00259 #define VO_PROP_SATURATION      3
-00260 
-00265 #define VO_PROP_CONTRAST        4
-00266 
-00271 #define VO_PROP_BRIGHTNESS      5
-00272 
-00277 #define VO_PROP_COLORKEY        6
-00278 
-00283 #define VO_NUM_PROPERTIES       7
-00284 
-00298 #define ASPECT_AUTO        0
-00299 
-00304 #define ASPECT_ANAMORPHIC  1
-00305 
-00310 #define ASPECT_FULL        2
-00311 
-00316 #define ASPECT_DVB         3
-00317 
-00325 typedef void vo_frame_t;
-00331 typedef void vo_overlay_t;
-00332 
-00338 typedef struct vo_driver_s vo_driver_t;
-00339 
-00344 struct vo_driver_s {
-00349   uint32_t (*get_capabilities) (vo_driver_t *self);
-00354   vo_frame_t* (*alloc_frame) (vo_driver_t *self);
-00359   void (*update_frame_format) (vo_driver_t *self, vo_frame_t *img,
-00360                                uint32_t width, uint32_t height, 
-00361                                int ratio_code, int format);
-00365   void (*display_frame) (vo_driver_t *self, vo_frame_t *vo_img);
-00369   void (*overlay_blend) (vo_driver_t *self, vo_frame_t *vo_img, vo_overlay_t *overlay);
-00377   int (*get_property) (vo_driver_t *self, int property);
-00382   int (*set_property) (vo_driver_t *self, 
-00383                        int property, int value);
-00388   void (*get_property_min_max) (vo_driver_t *self,
-00389                                 int property, int *min, int *max);
-00396   int (*gui_data_exchange) (vo_driver_t *self, int data_type,
-00397                             void *data);
-00401   void (*exit) (vo_driver_t *self);
-00402 
-00403 };
-00404 
-00422 typedef void xine_t;
-00427 typedef void ao_functions_t;
-00432 typedef void cfg_data_t;
-00438 typedef struct config_values_s config_values_t;
-00444 struct config_values_s {
-00448   char* (*lookup_str) (config_values_t *self,
-00449                        char *key, char *str_default);
-00453   int (*lookup_int) (config_values_t *self,
-00454                      char *key, int n_default);
-00458   void (*set_str) (config_values_t *self,
-00459                    char *key, char *value) ;
-00463   void (*set_int) (config_values_t *self,
-00464                    char *key, int value) ;
-00468   void (*save) (config_values_t *self);
-00474   void (*read) (config_values_t *self, char *filename);
-00478   cfg_data_t *data;
-00479 };
-00480 
-00494 config_values_t *config_file_init (char *filename);
-00495 
-00506 typedef void (*gui_stream_end_cb_t) (int nStatus);
-00511 typedef char* (*gui_get_next_mrl_cb_t) (void);
-00516 typedef void (*gui_branched_cb_t) (void);
-00517 
-00532 #define DEMUX_DEFAULT_STRATEGY    0
-00533 
-00538 #define DEMUX_REVERT_STRATEGY     1
-00539 
-00544 #define DEMUX_CONTENT_STRATEGY    2
-00545 
-00550 #define DEMUX_EXTENSION_STRATEGY  3
-00551 
-00572 xine_t *xine_init (vo_driver_t *vo, 
-00573                    ao_functions_t *ao,
-00574                    config_values_t *config,
-00575                    gui_stream_end_cb_t stream_end_cb,
-00576                    gui_get_next_mrl_cb_t get_next_mrl_cb,
-00577                    gui_branched_cb_t branched_cb);
-00578 
-00588 void xine_exit (xine_t *self);
-00589 
-00607 void xine_play (xine_t *self, char *MRL, int pos);
-00608 
-00617 void xine_pause (xine_t *self);
+00078 #define XINE_BUILD_DATE    "Mon 17 Sep 2001 00:59:15"
+00079 
+00097 #define XINE_STOP      0
+00098 
+00103 #define XINE_PLAY      1
+00104 
+00109 #define XINE_QUIT      2
+00110 
+00122 #define XINE_MAJOR_VERSION 0
+00123 
+00127 #define XINE_MINOR_VERSION 9
+00128 
+00132 #define XINE_SUB_VERSION   1
+00133 
+00148 char *xine_get_str_version(void);
+00149 
+00157 int xine_get_major_version(void);
+00158 
+00166 int xine_get_minor_version(void);
+00167 
+00175 int xine_get_sub_version(void);
+00176 
+00187 int xine_check_version(int major, int minor, int sub);
+00188 
+00205 #define VO_CAP_HUE          0x00000010
+00206 
+00210 #define VO_CAP_SATURATION   0x00000020
+00211 
+00215 #define VO_CAP_BRIGHTNESS   0x00000040
+00216 
+00220 #define VO_CAP_CONTRAST     0x00000080
+00221 
+00225 #define VO_CAP_COLORKEY     0x00000100
+00226 
+00239 #define VO_PROP_INTERLACED        0
+00240 
+00245 #define VO_PROP_ASPECT_RATIO      1
+00246 
+00251 #define VO_PROP_HUE               2
+00252 
+00257 #define VO_PROP_SATURATION        3
+00258 
+00263 #define VO_PROP_CONTRAST          4
+00264 
+00269 #define VO_PROP_BRIGHTNESS        5
+00270 
+00275 #define VO_PROP_COLORKEY          6
+00276 
+00281 #define VO_PROP_SOFT_DEINTERLACE  7
+00282 
+00287 #define VO_NUM_PROPERTIES         8
+00288 
+00302 #define ASPECT_AUTO        0
+00303 
+00308 #define ASPECT_ANAMORPHIC  1
+00309 
+00314 #define ASPECT_FULL        2
+00315 
+00320 #define ASPECT_DVB         3
+00321 
+00324 #ifdef DOC_HIDDEN
+00325 
+00330 typedef void vo_frame_t;
+00336 typedef void vo_overlay_t;
+00337 
+00343 typedef struct vo_driver_s vo_driver_t;
+00344 
+00349 struct vo_driver_s {
+00354   uint32_t (*get_capabilities) (vo_driver_t *self);
+00359   vo_frame_t* (*alloc_frame) (vo_driver_t *self);
+00364   void (*update_frame_format) (vo_driver_t *self, vo_frame_t *img,
+00365                                uint32_t width, uint32_t height, 
+00366                                int ratio_code, int format);
+00370   void (*display_frame) (vo_driver_t *self, vo_frame_t *vo_img);
+00374   void (*overlay_blend) (vo_driver_t *self, vo_frame_t *vo_img, vo_overlay_t *overlay);
+00382   int (*get_property) (vo_driver_t *self, int property);
+00387   int (*set_property) (vo_driver_t *self, 
+00388                        int property, int value);
+00393   void (*get_property_min_max) (vo_driver_t *self,
+00394                                 int property, int *min, int *max);
+00401   int (*gui_data_exchange) (vo_driver_t *self, int data_type,
+00402                             void *data);
+00406   void (*exit) (vo_driver_t *self);
+00407 
+00408 };
+00409 #endif
+00410 
+00427 typedef void xine_t;
+00432 typedef void ao_driver_t;
+00438 #ifdef DOC_HIDDEN
+00439 typedef void cfg_data_t;
+00445 typedef struct config_values_s config_values_t;
+00451 struct config_values_s {
+00455   char* (*lookup_str) (config_values_t *self,
+00456                        char *key, char *str_default);
+00460   int (*lookup_int) (config_values_t *self,
+00461                      char *key, int n_default);
+00465   void (*set_str) (config_values_t *self,
+00466                    char *key, char *value) ;
+00470   void (*set_int) (config_values_t *self,
+00471                    char *key, int value) ;
+00475   void (*save) (config_values_t *self);
+00481   void (*read) (config_values_t *self, char *filename);
+00485   cfg_data_t *data;
+00486 };
+00487 #endif
+00488 
+00501 config_values_t *config_file_init (char *filename);
+00502 
+00513 typedef void (*gui_stream_end_cb_t) (int nStatus);
+00518 typedef char* (*gui_get_next_mrl_cb_t) (void);
+00523 typedef void (*gui_branched_cb_t) (void);
+00524 
+00539 #define DEMUX_DEFAULT_STRATEGY    0
+00540 
+00545 #define DEMUX_REVERT_STRATEGY     1
+00546 
+00551 #define DEMUX_CONTENT_STRATEGY    2
+00552 
+00557 #define DEMUX_EXTENSION_STRATEGY  3
+00558 
+00579 xine_t *xine_init (vo_driver_t *vo, 
+00580                    ao_driver_t *ao,
+00581                    config_values_t *config,
+00582                    gui_stream_end_cb_t stream_end_cb,
+00583                    gui_get_next_mrl_cb_t get_next_mrl_cb,
+00584                    gui_branched_cb_t branched_cb);
+00585 
+00595 void xine_exit (xine_t *self);
+00596 
+00617 void xine_play (xine_t *self, char *MRL, int start_pos, int start_time);
 00618 
-00627 void xine_stop (xine_t *self);
-00628 
-00637 int xine_eject(xine_t *self);
-00638 
-00647 int xine_get_status (xine_t *self);
-00648 
-00657 int xine_get_current_position (xine_t *self);
-00658 
-00667 int xine_get_audio_channel (xine_t *self);
-00668 
-00677 void xine_select_audio_channel (xine_t *self, int channel);
-00678 
-00687 int xine_get_spu_channel (xine_t *self);
+00629 void xine_set_speed (xine_t *self, int speed);
+00630 
+00639 int xine_get_speed (xine_t *self);
+00640 
+00646 #define SPEED_PAUSE   0
+00647 
+00652 #define SPEED_SLOW_4  1
+00653 
+00658 #define SPEED_SLOW_2  2
+00659 
+00664 #define SPEED_NORMAL  4
+00665 
+00670 #define SPEED_FAST_2  8
+00671 
+00676 #define SPEED_FAST_4 16
+00677 
+00687 void xine_set_av_offset (xine_t *self, int offset_pts);
 00688 
-00697 void xine_select_spu_channel (xine_t *self, int channel);
+00697 int xine_get_av_offset (xine_t *self);
 00698 
-00715 char **xine_get_browsable_input_plugin_ids (xine_t *self) ;
-00716 
-00729 #define mrl_unknown        (0 << 0)
-00730 
-00735 #define mrl_dvd            (1 << 0)
-00736 
-00741 #define mrl_vcd            (1 << 1)
-00742 
-00747 #define mrl_net            (1 << 2)
-00748 
-00753 #define mrl_rtp            (1 << 3)
-00754 
-00759 #define mrl_stdin          (1 << 4)
-00760 
-00765 #define mrl_file           (1 << 5)
-00766 
-00771 #define mrl_file_fifo      (1 << 6)
-00772 
-00777 #define mrl_file_chardev   (1 << 7)
-00778 
-00783 #define mrl_file_directory (1 << 8)
-00784 
-00789 #define mrl_file_blockdev  (1 << 9)
-00790 
-00795 #define mrl_file_normal    (1 << 10)
-00796 
-00801 #define mrl_file_symlink   (1 << 11)
-00802 
-00807 #define mrl_file_sock      (1 << 12)
-00808 
-00813 #define mrl_file_exec      (1 << 13)
-00814 
-00819 #define mrl_file_backup    (1 << 14)
-00820 
-00825 #define mrl_file_hidden    (1 << 15)
-00826 
-00834 #define MRL_ZERO(m) {                                                         \
-00835   if((m)) {                                                                   \
-00836     if((m)->origin)                                                           \
-00837       free((m)->origin);                                                      \
-00838     if((m)->mrl)                                                              \
-00839       free((m)->mrl);                                                         \
-00840     if((m)->link)                                                             \
-00841       free((m)->link);                                                        \
-00842     (m)->origin = NULL;                                                       \
-00843     (m)->mrl    = NULL;                                                       \
-00844     (m)->link   = NULL;                                                       \
-00845     (m)->type   = 0;                                                          \
-00846     (m)->size   = (off_t) 0;                                                  \
-00847   }                                                                           \
-00848 }
-00849 
-00855 #define MRL_DUPLICATE(s, d) {                                                 \
-00856   assert((s) != NULL);                                                        \
-00857   assert((d) != NULL);                                                        \
-00858                                                                               \
-00859   if((s)->origin) {                                                           \
-00860     if((d)->origin) {                                                         \
-00861       (d)->origin = (char *) realloc((d)->origin, strlen((s)->origin) + 1);   \
-00862       sprintf((d)->origin, "%s", (s)->origin);                                \
-00863     }                                                                         \
-00864     else                                                                      \
-00865       (d)->origin = strdup((s)->origin);                                      \
-00866   }                                                                           \
-00867   else                                                                        \
-00868     (d)->origin = NULL;                                                       \
-00869                                                                               \
-00870   if((s)->mrl) {                                                              \
-00871     if((d)->mrl) {                                                            \
-00872       (d)->mrl = (char *) realloc((d)->mrl, strlen((s)->mrl) + 1);            \
-00873       sprintf((d)->mrl, "%s", (s)->mrl);                                      \
-00874     }                                                                         \
-00875     else                                                                      \
-00876       (d)->mrl = strdup((s)->mrl);                                            \
-00877   }                                                                           \
-00878   else                                                                        \
-00879     (d)->mrl = NULL;                                                          \
-00880                                                                               \
-00881   if((s)->link) {                                                             \
-00882     if((d)->link) {                                                           \
-00883       (d)->link = (char *) realloc((d)->link, strlen((s)->link) + 1);         \
-00884       sprintf((d)->link, "%s", (s)->link);                                    \
-00885     }                                                                         \
-00886     else                                                                      \
-00887       (d)->link = strdup((s)->link);                                          \
-00888   }                                                                           \
-00889   else                                                                        \
-00890     (d)->link = NULL;                                                         \
-00891                                                                               \
-00892   (d)->type = (s)->type;                                                      \
-00893   (d)->size = (s)->size;                                                      \
-00894 }
-00895 
-00901 #define MRLS_DUPLICATE(s, d) {                                                \
-00902   int i = 0;                                                                  \
-00903                                                                               \
-00904   assert((s) != NULL);                                                        \
-00905   assert((d) != NULL);                                                        \
-00906                                                                               \
-00907   while((s) != NULL) {                                                        \
-00908     d[i] = (mrl_t *) malloc(sizeof(mrl_t));                                   \
-00909     MRL_DUPLICATE(s[i], d[i]);                                                \
-00910     i++;                                                                      \
-00911   }                                                                           \
-00912 }
-00913 
-00919 typedef struct {
-00921   char         *origin;
-00923   char         *mrl;
-00925   char         *link;
-00927   uint32_t      type;
-00929   off_t         size;
-00930 } mrl_t;
-00931 
-00949 mrl_t **xine_get_browse_mrls (xine_t *self, char *plugin_id, char *start_mrl, int *num_mrls);
-00950 
-00966 char **xine_get_autoplay_input_plugin_ids (xine_t *self) ;
-00967 
-00978 char **xine_get_autoplay_mrls (xine_t *self, char *plugin_id, int *num_mrls);
-00979 
-00993 #define XINE_PLUGINDIR  "/usr/local/lib/xine/plugins"
-00994 
-01005 #define VISUAL_TYPE_X11   1
-01006 
-01011 #define VISUAL_TYPE_AA    2
-01012 
-01017 #define VISUAL_TYPE_FB    3
-01018 
-01023 #define VISUAL_TYPE_GTK   4
-01024 
-01034 char **xine_list_video_output_plugins (int visual_type);
-01035 
-01045 vo_driver_t *xine_load_video_output_plugin(config_values_t *config,
-01046                                            char *id, int visual_type, void *visual);
-01047 
-01053 char **xine_list_audio_output_plugins (void);
-01054 
-01062 ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, char *id);
-01063 
-01073 #ifdef DOC_HIDDEN
-01074 
-01078 typedef void event_t;
-01079 #endif
-01080 
-01085 typedef void (*event_listener_t) (xine_t *xine, event_t *event, void *data);
-01086 
-01095 int xine_register_event_listener(xine_t *self, event_listener_t listener);
-01096 
-01105 int xine_remove_event_listener(xine_t *self, event_listener_t listener);
-01106 
-01115 void xine_send_event(xine_t *self, event_t *event, void *data);
-01116 
-01121 #ifdef __cplusplus
-01122 }
-01123 #endif
-01124 
-01125 #endif
-
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by +00707 void xine_stop (xine_t *self); +00708 +00717 int xine_eject(xine_t *self); +00718 +00727 int xine_get_status (xine_t *self); +00728 +00737 int xine_get_current_position (xine_t *self); +00738 +00747 int xine_get_current_time (xine_t *self); +00748 +00757 int xine_get_stream_length (xine_t *self); +00758 +00767 int xine_get_audio_channel (xine_t *self); +00768 +00777 void xine_select_audio_channel (xine_t *self, int channel); +00778 +00787 int xine_get_spu_channel (xine_t *self); +00788 +00797 void xine_select_spu_channel (xine_t *self, int channel); +00798 +00815 char **xine_get_browsable_input_plugin_ids (xine_t *self) ; +00816 +00829 #define mrl_unknown (0 << 0) +00830 +00835 #define mrl_dvd (1 << 0) +00836 +00841 #define mrl_vcd (1 << 1) +00842 +00847 #define mrl_net (1 << 2) +00848 +00853 #define mrl_rtp (1 << 3) +00854 +00859 #define mrl_stdin (1 << 4) +00860 +00865 #define mrl_file (1 << 5) +00866 +00871 #define mrl_file_fifo (1 << 6) +00872 +00877 #define mrl_file_chardev (1 << 7) +00878 +00883 #define mrl_file_directory (1 << 8) +00884 +00889 #define mrl_file_blockdev (1 << 9) +00890 +00895 #define mrl_file_normal (1 << 10) +00896 +00901 #define mrl_file_symlink (1 << 11) +00902 +00907 #define mrl_file_sock (1 << 12) +00908 +00913 #define mrl_file_exec (1 << 13) +00914 +00919 #define mrl_file_backup (1 << 14) +00920 +00925 #define mrl_file_hidden (1 << 15) +00926 +00934 #define MRL_ZERO(m) { \ +00935 if((m)) { \ +00936 if((m)->origin) \ +00937 free((m)->origin); \ +00938 if((m)->mrl) \ +00939 free((m)->mrl); \ +00940 if((m)->link) \ +00941 free((m)->link); \ +00942 (m)->origin = NULL; \ +00943 (m)->mrl = NULL; \ +00944 (m)->link = NULL; \ +00945 (m)->type = 0; \ +00946 (m)->size = (off_t) 0; \ +00947 } \ +00948 } +00949 +00955 #define MRL_DUPLICATE(s, d) { \ +00956 assert((s) != NULL); \ +00957 assert((d) != NULL); \ +00958 \ +00959 if((s)->origin) { \ +00960 if((d)->origin) { \ +00961 (d)->origin = (char *) realloc((d)->origin, strlen((s)->origin) + 1); \ +00962 sprintf((d)->origin, "%s", (s)->origin); \ +00963 } \ +00964 else \ +00965 (d)->origin = strdup((s)->origin); \ +00966 } \ +00967 else \ +00968 (d)->origin = NULL; \ +00969 \ +00970 if((s)->mrl) { \ +00971 if((d)->mrl) { \ +00972 (d)->mrl = (char *) realloc((d)->mrl, strlen((s)->mrl) + 1); \ +00973 sprintf((d)->mrl, "%s", (s)->mrl); \ +00974 } \ +00975 else \ +00976 (d)->mrl = strdup((s)->mrl); \ +00977 } \ +00978 else \ +00979 (d)->mrl = NULL; \ +00980 \ +00981 if((s)->link) { \ +00982 if((d)->link) { \ +00983 (d)->link = (char *) realloc((d)->link, strlen((s)->link) + 1); \ +00984 sprintf((d)->link, "%s", (s)->link); \ +00985 } \ +00986 else \ +00987 (d)->link = strdup((s)->link); \ +00988 } \ +00989 else \ +00990 (d)->link = NULL; \ +00991 \ +00992 (d)->type = (s)->type; \ +00993 (d)->size = (s)->size; \ +00994 } +00995 +01001 #define MRLS_DUPLICATE(s, d) { \ +01002 int i = 0; \ +01003 \ +01004 assert((s) != NULL); \ +01005 assert((d) != NULL); \ +01006 \ +01007 while((s) != NULL) { \ +01008 d[i] = (mrl_t *) malloc(sizeof(mrl_t)); \ +01009 MRL_DUPLICATE(s[i], d[i]); \ +01010 i++; \ +01011 } \ +01012 } +01013 +01019 typedef struct { +01021 char *origin; +01023 char *mrl; +01025 char *link; +01027 uint32_t type; +01029 off_t size; +01030 } mrl_t; +01031 +01048 mrl_t **xine_get_browse_mrls (xine_t *self, char *plugin_id, char *start_mrl, int *num_mrls); +01049 +01065 char **xine_get_autoplay_input_plugin_ids (xine_t *self) ; +01066 +01077 char **xine_get_autoplay_mrls (xine_t *self, char *plugin_id, int *num_mrls); +01078 +01092 #define XINE_PLUGINDIR "/usr/local/lib/xine/plugins" +01093 +01104 #define VISUAL_TYPE_X11 1 +01105 +01110 #define VISUAL_TYPE_AA 2 +01111 +01116 #define VISUAL_TYPE_FB 3 +01117 +01122 #define VISUAL_TYPE_GTK 4 +01123 +01133 char **xine_list_video_output_plugins (int visual_type); +01134 +01144 vo_driver_t *xine_load_video_output_plugin(config_values_t *config, +01145 char *id, int visual_type, void *visual); +01146 +01152 char **xine_list_audio_output_plugins (void); +01153 +01161 ao_driver_t *xine_load_audio_output_plugin(config_values_t *config, char *id); +01162 +01171 #ifdef DOC_HIDDEN +01172 +01176 typedef void event_t; +01177 #endif +01178 +01183 typedef void (*event_listener_t) (xine_t *xine, event_t *event, void *data); +01184 +01193 int xine_register_event_listener(xine_t *self, event_listener_t listener); +01194 +01203 int xine_remove_event_listener(xine_t *self, event_listener_t listener); +01204 +01213 void xine_send_event(xine_t *self, event_t *event, void *data); +01214 +01219 #ifdef __cplusplus +01220 } +01221 #endif +01222 +01223 #endif +
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by doxygen1.2.8 written by Dimitri van Heesch, diff --git a/doc/xine-lib-API/html/xine_8h.html b/doc/xine-lib-API/html/xine_8h.html index b2dbe1ccf..e7f997129 100644 --- a/doc/xine-lib-API/html/xine_8h.html +++ b/doc/xine-lib-API/html/xine_8h.html @@ -20,23 +20,21 @@ #define XINE_BUILD_CC   "gcc version 2.95.3 20010315 (release)" -#define XINE_BUILD_OS   "Linux 2.4.5 i686" +#define XINE_BUILD_OS   "Linux 2.4.8 i686" -#define XINE_BUILD_DATE   "Thu 26 Jul 2001 09:17:10" +#define XINE_BUILD_DATE   "Mon 17 Sep 2001 00:59:15" #define XINE_STOP   0 #define XINE_PLAY   1 - -#define XINE_PAUSE   2 - -#define XINE_QUIT   3 + +#define XINE_QUIT   2 #define XINE_MAJOR_VERSION   0 -#define XINE_MINOR_VERSION   5 +#define XINE_MINOR_VERSION   9 -#define XINE_SUB_VERSION   0 +#define XINE_SUB_VERSION   1 #define VO_CAP_HUE   0x00000010 @@ -61,8 +59,10 @@ #define VO_PROP_BRIGHTNESS   5 #define VO_PROP_COLORKEY   6 - -#define VO_NUM_PROPERTIES   7 + +#define VO_PROP_SOFT_DEINTERLACE   7 + +#define VO_NUM_PROPERTIES   8 #define ASPECT_AUTO   0 @@ -79,6 +79,18 @@ #define DEMUX_CONTENT_STRATEGY   2 #define DEMUX_EXTENSION_STRATEGY   3 + +#define SPEED_PAUSE   0 + +#define SPEED_SLOW_4   1 + +#define SPEED_SLOW_2   2 + +#define SPEED_NORMAL   4 + +#define SPEED_FAST_2   8 + +#define SPEED_FAST_4   16 #define mrl_unknown   (0 << 0) @@ -138,8 +150,8 @@ typedef void vo_overlay_t typedef struct vo_driver_s vo_driver_t typedef void xine_t - -typedef void ao_functions_t + +typedef void ao_driver_t typedef void cfg_data_t @@ -174,40 +186,55 @@ int config_values_t* config_file_init (char *filename)  Configuration file initialisation.

    -xine_t* xine_init (vo_driver_t *vo, ao_functions_t *ao, config_values_t *config, gui_stream_end_cb_t stream_end_cb, gui_get_next_mrl_cb_t get_next_mrl_cb, gui_branched_cb_t branched_cb) +xine_t* xine_init (vo_driver_t *vo, ao_driver_t *ao, config_values_t *config, gui_stream_end_cb_t stream_end_cb, gui_get_next_mrl_cb_t get_next_mrl_cb, gui_branched_cb_t branched_cb)  Initialisation of xine.

    void xine_exit (xine_t *self)  De-initialisation of xine.

    -void xine_play (xine_t *self, char *MRL, int pos) +void xine_play (xine_t *self, char *MRL, int start_pos, int start_time)  Start to play a stream.

    - -void xine_pause (xine_t *self) - Pause toggle.

    - -void xine_stop (xine_t *self) + +void xine_set_speed (xine_t *self, int speed) + Set playback speed.

    + +int xine_get_speed (xine_t *self) + Get the playback speed.

    + +void xine_set_av_offset (xine_t *self, int offset_pts) + Set audio/video sync.

    + +int xine_get_av_offset (xine_t *self) + Get audio/video sync.

    + +void xine_stop (xine_t *self)  Stop playing.

    - -int xine_eject (xine_t *self) + +int xine_eject (xine_t *self)  Eject media.

    - -int xine_get_status (xine_t *self) + +int xine_get_status (xine_t *self)  Get current xine status.

    - -int xine_get_current_position (xine_t *self) + +int xine_get_current_position (xine_t *self)  Get current position.

    - -int xine_get_audio_channel (xine_t *self) + +int xine_get_current_time (xine_t *self) + get current pos in seconds.

    + +int xine_get_stream_length (xine_t *self) + estimate length of input stream in seconds.

    + +int xine_get_audio_channel (xine_t *self)  Get current audio channel.

    - -void xine_select_audio_channel (xine_t *self, int channel) + +void xine_select_audio_channel (xine_t *self, int channel)  Set audio channel.

    - -int xine_get_spu_channel (xine_t *self) + +int xine_get_spu_channel (xine_t *self)  Get current sub-title channel.

    - -void xine_select_spu_channel (xine_t *self, int channel) + +void xine_select_spu_channel (xine_t *self, int channel)  Set sub-title channel.

    char** xine_get_browsable_input_plugin_ids (xine_t *self) @@ -231,7 +258,7 @@ char** xine_list_audio_output_plugins (void)  generate a list of all available audio output plugins.

    -ao_functions_t* xine_load_audio_output_plugin (config_values_t *config, char *id) +ao_driver_t* xine_load_audio_output_plugin (config_values_t *config, char *id)  load a specific audio output plugin.

    int xine_register_event_listener (xine_t *self, event_listener_t listener) @@ -250,7 +277,7 @@ void guenter@users.sourceforge.net> , Siegfried Langauf <siggi@users.sourceforge.net> , Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
    Date:
    -25/07/2001 +16/09/2001

    API of XINE library. 
        Copyright (C) 2000-2001 the xine project
@@ -297,7 +324,7 @@ Guenter Bartsch <guenter@users
 Skin file location     
   
 
-
    Generated at Thu Jul 26 11:29:45 2001 for XINE, A Free Video Player Project - API reference by
+
    Generated at Mon Sep 17 01:05:55 2001 for XINE, A Free Video Player Project - API reference by
 
 doxygen1.2.8 written by Dimitri van Heesch,
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index 5a3e66326..e088a505e 100644
--- a/include/xine.h.tmpl.in
+++ b/include/xine.h.tmpl.in
@@ -3,7 +3,7 @@
  * \author Guenter Bartsch 
  * \author Siegfried Langauf 
  * \author Daniel Caujolle-Bert 
- * \date 25/07/2001
+ * \date 16/09/2001
  *
  * API of XINE library.
  \verbatim
@@ -28,7 +28,7 @@
  \endverbatim
  */
 /*
- * $Id: xine.h.tmpl.in,v 1.40 2001/09/01 14:32:59 guenter Exp $
+ * $Id: xine.h.tmpl.in,v 1.41 2001/09/16 23:13:45 f1rmb Exp $
  *
  */
 
@@ -235,49 +235,55 @@ int xine_check_version(int major, int minor, int sub);
  * Interleave property.
  * \sa vo_driver_t
  */
-#define VO_PROP_INTERLACED      0
+#define VO_PROP_INTERLACED        0
 /**
  * \def VO_PROP_ASPECT_RATIO
  * Aspect ratio property.
  * \sa vo_driver_t, video_ratio
  */
-#define VO_PROP_ASPECT_RATIO    1
+#define VO_PROP_ASPECT_RATIO      1
 /**
  * \def VO_PROP_HUE
  * Hue property.
  * \sa vo_driver_t
  */
-#define VO_PROP_HUE             2
+#define VO_PROP_HUE               2
 /**
  * \def VO_PROP_SATURATION
  * Saturation property.
  * \sa vo_driver_t
  */
-#define VO_PROP_SATURATION      3
+#define VO_PROP_SATURATION        3
 /**
  * \def VO_PROP_CONTRAST
  * Contrast property.
  * \sa vo_driver_t
  */
-#define VO_PROP_CONTRAST        4
+#define VO_PROP_CONTRAST          4
 /**
  * \def VO_PROP_BRIGHTNESS
  * Brightness property.
  * \sa vo_driver_t
  */
-#define VO_PROP_BRIGHTNESS      5
+#define VO_PROP_BRIGHTNESS        5
 /**
  * \def VO_PROP_COLORKEY
  * Colorkey property.
  * \sa vo_driver_t
  */
-#define VO_PROP_COLORKEY        6
+#define VO_PROP_COLORKEY          6
+/**
+ * \def VO_PROP_SOFT_DEINTERLACE
+ * Software deinterlacing (BOB) property.
+ * \sa vo_driver_t
+ */
+#define VO_PROP_SOFT_DEINTERLACE  7
 /**
  * \def VO_NUM_PROPERTIES
  * Number of available properties property.
  * \sa vo_driver_t
  */
-#define VO_NUM_PROPERTIES       7
+#define VO_NUM_PROPERTIES         8
 
                /** @} end of video_prop */
 
@@ -594,7 +600,7 @@ void xine_exit (xine_t *self);
 	   * @{
 	   */
 /**
- * \fn void xine_play (xine_t *self, char *MRL, int pos)
+ * \fn void xine_play (xine_t *self, char *MRL, int start_pos, int start_time)
  * \brief Start to play a stream
  * \param self Current xine engine configuration ( #see xine_init() )
  * \param MRL Media Resource Location to open
@@ -609,28 +615,85 @@ void xine_exit (xine_t *self);
  */
 void xine_play (xine_t *self, char *MRL, int start_pos, int start_time);
 
-/*
- * set playback speed
+/**
+ * \fn void xine_set_speed (xine_t *self, int speed)
+ * \brief Set playback speed.
+ * \param self Current xine engine configuration ( #see xine_init() )
+ * \param speed Desired playback speed ( #see SPEED_PAUSE, SPEED_SLOW_4, SPEED_SLOW_2, SPEED_NORMAL, SPEED_FAST_2, SPEED_FAST_4 )
+ * \return Nothing
+ *
+ * Set the playback speed to desired speed, according of SPEED_x constant.
  *
- * constants see below
  */
+void xine_set_speed (xine_t *self, int speed);
 
-void xine_set_speed (xine_t *this, int speed);
-int xine_get_speed (xine_t *this);
+/**
+ * \fn xine_get_speed (xine_t *self)
+ * \brief Get the playback speed.
+ * \param self Current xine engine configuration ( #see xine_init() )
+ * \return speed value ( #see SPEED_PAUSE, SPEED_SLOW_4, SPEED_SLOW_2, SPEED_NORMAL, SPEED_FAST_2, SPEED_FAST_4 )
+ *
+ * Get the current speed playback. Possible values are SPEED_PAUSE, SPEED_SLOW_4, SPEED_SLOW_2, SPEED_NORMAL, SPEED_FAST_2, SPEED_FAST_4.
+ */
+int xine_get_speed (xine_t *self);
 
+/**
+ * \def SPEED_PAUSE
+ * Playback pause.
+ * \sa xine_set_speed(), xine_get_speed()
+ */
 #define SPEED_PAUSE   0
+/**
+ * \def SPEED_SLOW_4
+ * Playback at 25% speed.
+ *\sa xine_set_speed(), xine_get_speed()
+ */
 #define SPEED_SLOW_4  1
+/**
+ * \def SPEED_SLOW_2
+ * Playback at 50% speed.
+ * \sa xine_set_speed(), xine_get_speed()
+ */
 #define SPEED_SLOW_2  2
+/**
+ * \def SPEED_NORMAL
+ * Playback at 100% speed.
+ * \sa xine_set_speed(), xine_get_speed()
+ */ 
 #define SPEED_NORMAL  4
+/**
+ * \def SPEED_FAST_2
+ * Playback at 200% speed.
+ * \sa xine_set_speed(), xine_get_speed()
+ */
 #define SPEED_FAST_2  8
+/**
+ * \def SPEED_FAST_4
+ * Playback at 400% speed.
+ * \sa xine_set_speed(), xine_get_speed()
+ */
 #define SPEED_FAST_4 16
 
-/*
- * manually adjust a/v sync
+/**
+ * \fn void xine_set_av_offset (xine_t *self, int offset_pts)
+ * \brief Set audio/video sync.
+ * \param self Current xine engine configuration ( #see xine_init() )
+ * \param offset_pts New pts.
+ * \return Nothing
+ *
+ * Set audio/video sync offset, according to offset_pts value ( #see xine_get_av_offset() ).
  */
+void xine_set_av_offset (xine_t *self, int offset_pts);
 
-void xine_set_av_offset (xine_t *this, int offset_pts);
-int xine_get_av_offset (xine_t *this);
+/**
+ * \fn int xine_get_av_offset (xine_t *self)
+ * \brief Get audio/video sync.
+ * \param self Current xine engine configuration ( #see xine_init() )
+ * \return Current audio/video offset.
+ *
+ * Return the current audio/video sync offset ( #see xine_set_av_offset() ).
+ */
+int xine_get_av_offset (xine_t *self);
 
 /**
  * \fn void xine_stop (xine_t *self)
@@ -981,7 +1044,6 @@ typedef struct {
  * returns  if  is a valid MRL, not a directory
  * returns NULL if  is an invalid MRL, not even a directory.
  */
-
 mrl_t **xine_get_browse_mrls (xine_t *self, char *plugin_id, char *start_mrl, int *num_mrls);
 
           /** @} end of browse_group */
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 1ade8069f..b9a9aa5ea 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -1,7 +1,7 @@
 # Note that this is NOT a relocatable package
 %define ver     @SPEC_VERSION@
 %define rel     0
-%define prefix  @prefix@
+%define prefix  /usr
 %define name    @PACKAGE@
 
 Name:        %{name}
@@ -19,47 +19,47 @@ BuildRoot:   /tmp/%{name}-root
 @HAVE_OSS_TRUE@%package oss
 @HAVE_OSS_TRUE@Summary:     XINE - oss support.
 @HAVE_OSS_TRUE@Group:       Development/Libraries
-@HAVE_OSS_TRUE@Requires:    xine-lib >= 0.9.0
+@HAVE_OSS_TRUE@Requires:    xine-lib >= %{ver}
 
 @HAVE_ALSA05_TRUE@%package alsa05
 @HAVE_ALSA05_TRUE@Summary:     XINE - alsa 0.5.x support.
 @HAVE_ALSA05_TRUE@Group:       Development/Libraries
-@HAVE_ALSA05_TRUE@Requires:    xine-lib >= 0.9.0
+@HAVE_ALSA05_TRUE@Requires:    xine-lib >= %{ver}
 
 @HAVE_ALSA09_TRUE@%package alsa09
 @HAVE_ALSA09_TRUE@Summary:     XINE - alsa >= 0.9.x support.
 @HAVE_ALSA09_TRUE@Group:       Development/Libraries
-@HAVE_ALSA09_TRUE@Requires:    xine-lib >= 0.9.0
+@HAVE_ALSA09_TRUE@Requires:    xine-lib >= %{ver}
 
 @HAVE_ARTS_TRUE@%package arts
 @HAVE_ARTS_TRUE@Summary:     XINE - arts support.
 @HAVE_ARTS_TRUE@Group:       Development/Libraries
-@HAVE_ARTS_TRUE@Requires:    xine-lib >= 0.9.0
+@HAVE_ARTS_TRUE@Requires:    xine-lib >= %{ver}
 
 @HAVE_ESD_TRUE@%package esd
 @HAVE_ESD_TRUE@Summary:     XINE - esd support.
 @HAVE_ESD_TRUE@Group:       Development/Libraries
-@HAVE_ESD_TRUE@Requires:    xine-lib >= 0.9.0, libesd
+@HAVE_ESD_TRUE@Requires:    xine-lib >= %{ver}, esound
 
 @HAVE_DXR3_TRUE@%package dxr3
 @HAVE_DXR3_TRUE@Summary:     XINE - DXR3 support.
 @HAVE_DXR3_TRUE@Group:       Development/Libraries
-@HAVE_DXR3_TRUE@Requires:    xine-lib >= 0.9.0
+@HAVE_DXR3_TRUE@Requires:    xine-lib >= %{ver}
 
 @HAVE_XV_TRUE@%package xv
 @HAVE_XV_TRUE@Summary:     XINE - XFree XVideo support.
 @HAVE_XV_TRUE@Group:       Development/Libraries
-@HAVE_XV_TRUE@Requires:    xine-lib >= 0.9.0
+@HAVE_XV_TRUE@Requires:    xine-lib >= %{ver}
 
 @HAVE_AA_TRUE@%package aa
 @HAVE_AA_TRUE@Summary:     XINE - Ascii Art support.
 @HAVE_AA_TRUE@Group:       Development/Libraries
-@HAVE_AA_TRUE@Requires:    xine-lib >= 0.9.0, libaa
+@HAVE_AA_TRUE@Requires:    xine-lib >= %{ver}, aalib
 
 @W32DLL_DEP@%package w32dll
 @W32DLL_DEP@Summary:     XINE - win32dll decoder support.
 @W32DLL_DEP@Group:       Development/Libraries
-@W32DLL_DEP@Requires:    xine-lib >= 0.9.0
+@W32DLL_DEP@Requires:    xine-lib >= %{ver}
 
 %package docs
 Summary:     XINE - html API documentation.
@@ -91,6 +91,16 @@ xine 
 플레이어는 mpeg-2 와 mpeg 1 스트림을 지원하며, 현재는 지원하지
 않지만 나중에는 mpeg-4 와 다른 형식의 동영상도 지원할 예정입니다.
 
+%description -l pt
+O xine � um leitor de v�deo livre ao abrigo da GPL para sistemas tipo 
+Unix. L� ficheiros MPEG-2 e MPEG-1, bem como AVIs que contenham
+MS MPEG-4 / OpenDivX Video.
+
+O xine l� o conte�do v�deo e �udio e sincroniza-os em tempo-real. As 
+necessidades de processador dependem das propriedades de cada ficheiro.
+Em princ�pio, um sistema equipado com um Pentium-II a 400 MHz consegue 
+ler qualquer v�deo com m�ximo desempenho.
+
 @HAVE_OSS_TRUE@%description oss
 @HAVE_OSS_TRUE@audio plugin with oss support.
 
@@ -140,38 +150,39 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{prefix}/bin/xine-config
-%{prefix}/man/man3/xine-lib.3
-%{prefix}/man/man3/ao_functions_t.3
-%{prefix}/man/man3/demux_strategy.3
-%{prefix}/man/man3/video_cap.3
-%{prefix}/man/man3/vo_overlay_t.3
-%{prefix}/man/man3/autoplay_group.3
-%{prefix}/man/man3/event_group.3
-%{prefix}/man/man3/video_group.3
-%{prefix}/man/man3/xine.h.3
-%{prefix}/man/man3/browse_group.3
-%{prefix}/man/man3/loadplugins_group.3
-%{prefix}/man/man3/video_prop.3
-%{prefix}/man/man3/xine_api.3
-%{prefix}/man/man3/build_info.3
-%{prefix}/man/man3/mrl_t.3
-%{prefix}/man/man3/video_ratio.3
-%{prefix}/man/man3/xine_init.3
-%{prefix}/man/man3/cfg_data_t.3
-%{prefix}/man/man3/mrl_types.3
-%{prefix}/man/man3/visual_types.3
-%{prefix}/man/man3/xine_management.3
-%{prefix}/man/man3/config_group.3
-%{prefix}/man/man3/status_group.3
-%{prefix}/man/man3/vo_driver_s.3
-%{prefix}/man/man3/xine_t.3
-%{prefix}/man/man3/config_values_s.3
-%{prefix}/man/man3/ui_callbacks.3
-%{prefix}/man/man3/vo_driver_t.3
-%{prefix}/man/man3/xine_version.3
-%{prefix}/man/man3/config_values_t.3
-%{prefix}/man/man3/version_group.3
-%{prefix}/man/man3/vo_frame_t.3
+%{prefix}/man/man3/xine-lib.3*
+%{prefix}/man/man3/ao_driver_t.3*
+%{prefix}/man/man3/ao_functions_t.3*
+%{prefix}/man/man3/demux_strategy.3*
+%{prefix}/man/man3/video_cap.3*
+%{prefix}/man/man3/vo_overlay_t.3*
+%{prefix}/man/man3/autoplay_group.3*
+%{prefix}/man/man3/event_group.3*
+%{prefix}/man/man3/video_group.3*
+%{prefix}/man/man3/xine.h.3*
+%{prefix}/man/man3/browse_group.3*
+%{prefix}/man/man3/loadplugins_group.3*
+%{prefix}/man/man3/video_prop.3*
+%{prefix}/man/man3/xine_api.3*
+%{prefix}/man/man3/build_info.3*
+%{prefix}/man/man3/mrl_t.3*
+%{prefix}/man/man3/video_ratio.3*
+%{prefix}/man/man3/xine_init.3*
+%{prefix}/man/man3/cfg_data_t.3*
+%{prefix}/man/man3/mrl_types.3*
+%{prefix}/man/man3/visual_types.3*
+%{prefix}/man/man3/xine_management.3*
+%{prefix}/man/man3/config_group.3*
+%{prefix}/man/man3/status_group.3*
+%{prefix}/man/man3/vo_driver_s.3*
+%{prefix}/man/man3/xine_t.3*
+%{prefix}/man/man3/config_values_s.3*
+%{prefix}/man/man3/ui_callbacks.3*
+%{prefix}/man/man3/vo_driver_t.3*
+%{prefix}/man/man3/xine_version.3*
+%{prefix}/man/man3/config_values_t.3*
+%{prefix}/man/man3/version_group.3*
+%{prefix}/man/man3/vo_frame_t.3*
 %{prefix}/include/xine/*.h
 %{prefix}/include/xine.h
 # input plugins
@@ -202,6 +213,8 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/xine/plugins/xineplug_dmx_mpeg_pes.so
 %{prefix}/lib/xine/plugins/xineplug_dmx_mpeg_ts.la
 %{prefix}/lib/xine/plugins/xineplug_dmx_mpeg_ts.so
+%{prefix}/lib/xine/plugins/xineplug_dmx_qt.la
+%{prefix}/lib/xine/plugins/xineplug_dmx_qt.so
 # decoder plugins
 %{prefix}/lib/xine/plugins/xineplug_decode_a52.la
 %{prefix}/lib/xine/plugins/xineplug_decode_a52.so
@@ -232,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 # lib and logo.
 %{prefix}/lib/libxine*.la
 %{prefix}/lib/libxine*.so*
-%{prefix}/share/xine/skins/*
+%{prefix}/share/xine/skins/xine_logo.png
 
 @HAVE_OSS_TRUE@%files oss
 @HAVE_OSS_TRUE@%defattr(-,root,root)
@@ -290,6 +303,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Sep 16 2001 Daniel Caujolle-Bert 
+- Merge patch from Jos� Carlos Monteiro :
+  - Filelist and other minor updates,
+  - Fixed some SuSE compatibility issues,
+  - Added Portuguese summary.
+* Sun Sep 16 2001 Daniel Caujolle-Bert 
 - Add missing files.
 * Sun Aug 19 2001 Matthias Dahl 
 - The usual update to the filelist :)
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index c7f2e0e79..18eeaaaaa 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.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: demux_qt.c,v 1.3 2001/09/11 23:02:47 guenter Exp $
+ * $Id: demux_qt.c,v 1.4 2001/09/16 23:13:45 f1rmb Exp $
  *
  * demultiplexer for quicktime streams, based on:
  *
@@ -1221,6 +1221,7 @@ static int quicktime_read_udta(quicktime_t *file, quicktime_udta_t *udta, quickt
   return result;
 }
 
+#if 0
 static int quicktime_set_udta_string(char **string, int *size, char *new_string)
 {
   if(*size) free(*string);
@@ -1229,6 +1230,7 @@ static int quicktime_set_udta_string(char **string, int *size, char *new_string)
   strcpy(*string, new_string);
   return 0;
 }
+#endif
 
 static int quicktime_ctab_init(quicktime_ctab_t *ctab)
 {
@@ -2714,6 +2716,7 @@ static int quicktime_read_trak(quicktime_t *file, quicktime_trak_t *trak, quickt
   return 0;
 }
 
+#if 0
 static longest quicktime_track_end(quicktime_trak_t *trak)
 {
 /* get the byte endpoint of the track in the file */
@@ -2753,6 +2756,7 @@ static longest quicktime_track_end(quicktime_trak_t *trak)
   
   return size;
 }
+#endif
 
 static long quicktime_sample_of_chunk(quicktime_trak_t *trak, long chunk)
 {
@@ -3015,6 +3019,7 @@ static long quicktime_offset_to_sample(quicktime_trak_t *trak, longest offset)
   return sample;
 }
 
+#if 0
 static int quicktime_update_tables(quicktime_t *file, 
 			    quicktime_trak_t *trak, 
 			    longest offset, 
@@ -3029,6 +3034,7 @@ static int quicktime_update_tables(quicktime_t *file,
   quicktime_update_stsc(&(trak->mdia.minf.stbl.stsc), chunk, samples);
   return 0;
 }
+#endif
 
 static int quicktime_trak_duration(quicktime_trak_t *trak, 
 			    long *duration, 
@@ -3583,7 +3589,7 @@ static long quicktime_frame_size(quicktime_t *file, long frame, int track)
   return bytes;
 }
 
-
+#if 0
 static longest quicktime_read_next_packet(quicktime_t *file, unsigned char *outbuf, int *isVideo, int *thetrak)
 {
   longest packet_start;
@@ -3642,8 +3648,7 @@ static longest quicktime_read_next_packet(quicktime_t *file, unsigned char *outb
 
   return 0;
 }
-
-
+#endif
 
 static long quicktime_read_frame(quicktime_t *file, unsigned char *video_buffer, int track)
 {
@@ -3984,7 +3989,7 @@ static void *demux_qt_loop (void *this_gen) {
 	buf->free_buffer (buf);
       } else {
 
-	int count;
+	/* int count; */
       
 	buf->PTS             = audio_pts;
 	buf->type            = this->audio_type;
@@ -4220,7 +4225,7 @@ static void demux_qt_start (demux_plugin_t *this_gen,
     return;
   }
 
-  printf ("demux_qt: video codec %s (%f fps), audio codec %s (%d Hz, %d bits)\n",
+  printf ("demux_qt: video codec %s (%f fps), audio codec %s (%ld Hz, %d bits)\n",
 	  quicktime_video_compressor (this->qt,0),
 	  quicktime_frame_rate (this->qt,0),
 	  quicktime_audio_compressor (this->qt,0),
diff --git a/src/libffmpeg/libavcodec/idct_mmx.c b/src/libffmpeg/libavcodec/idct_mmx.c
index 34c25b411..3c1a401e3 100644
--- a/src/libffmpeg/libavcodec/idct_mmx.c
+++ b/src/libffmpeg/libavcodec/idct_mmx.c
@@ -28,6 +28,9 @@
 
 #include "cpu_accel.h"
 
+#ifdef ATTR_ALIGN
+#undef ATTR_ALIGN
+#endif
 #define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
 
 #define ROW_SHIFT 11
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c
index 4b4ba8b5d..ef57b2738 100644
--- a/src/liblpcm/xine_decoder.c
+++ b/src/liblpcm/xine_decoder.c
@@ -17,14 +17,14 @@
  * 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_decoder.c,v 1.9 2001/09/11 14:10:04 jcdutton Exp $
+ * $Id: xine_decoder.c,v 1.10 2001/09/16 23:13:45 f1rmb Exp $
  * 
  * 31-8-2001 Added LPCM rate sensing.
  *   (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk
  *
  * stuff needed to turn libac3 into a xine decoder plugin
  */
-
+#define _XOPEN_SOURCE 500
 
 #include 
 #include 
diff --git a/src/libvfill/xine_decoder.c b/src/libvfill/xine_decoder.c
index 3b09bf2f2..13693a6dd 100644
--- a/src/libvfill/xine_decoder.c
+++ b/src/libvfill/xine_decoder.c
@@ -58,8 +58,6 @@ static void videofill_decode_data (video_decoder_t *this_gen, buf_element_t *buf
 
   videofill_decoder_t *this = (videofill_decoder_t *) this_gen;
   vo_frame_t *img, *last_img;
-  metronom_t *metronom;
-
 
   last_img = this->video_out->get_last_frame (this->video_out);
 
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index c59120382..bcea81196 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.23 2001/09/14 14:20:51 jcdutton Exp $
+ * $Id: w32codec.c,v 1.24 2001/09/16 23:13:45 f1rmb Exp $
  *
  * routines for using w32 codecs
  *
@@ -132,7 +132,13 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
   return NULL;
 }
 
+#ifdef IMGFMT_YUY2
+#undef IMGFMT_YUY2
+#endif
 #define IMGFMT_YUY2  mmioFOURCC('Y','U','Y','2')
+#ifdef IMGFMT_YV12
+#undef IMGFMT_YV12
+#endif
 #define IMGFMT_YV12  mmioFOURCC('Y','V','1','2')
 #define IMGFMT_32RGB mmioFOURCC( 32,'R','G','B')
 #define IMGFMT_24RGB mmioFOURCC( 24,'R','G','B')
@@ -188,7 +194,7 @@ static void w32v_init_codec (w32v_decoder_t *this, int buf_type) {
     return;
   }
 
-  printf ("w32codec: video output format: %.4s %08x\n",
+  printf ("w32codec: video output format: %.4s %08lx\n",
 	  (char*)&this->o_bih.biCompression,
 	  this->o_bih.biCompression);
 
@@ -295,7 +301,7 @@ static void w32v_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
 	    uint8_t   y,u,v;
 	    
 	    pixel = this->img_buffer + 2 * (row * this->o_bih.biWidth + col);
-	    out = img->base[0] + 2 * (row * this->o_bih.biWidth + col);
+	    out = (uint16_t *) img->base[0] + 2 * (row * this->o_bih.biWidth + col);
 	
 	    b = (*pixel & 0x003C) << 3;
 	    g = (*pixel & 0x03E0) >> 5 << 3;
diff --git a/src/libw32dll/wine/debugtools.h b/src/libw32dll/wine/debugtools.h
index 9290f5705..98e963246 100644
--- a/src/libw32dll/wine/debugtools.h
+++ b/src/libw32dll/wine/debugtools.h
@@ -70,13 +70,27 @@ extern int dbg_printf(const char *format, ...) __attribute__((format (printf,1,2
 extern int dbg_printf(const char *format, ...);
 #endif
 
-#define TRACE_(X) 
-#define WARN_(X) 
-#define WARN 
-#define ERR_(X) 
-#define ERR 
-#define FIXME_(X) 
-#define FIXME 
+#ifdef  __GNUC__
+#define TRACE_(X, Y...) 
+#define WARN_(X, Y...)
+#define WARN(X,Y...) 
+#define ERR(X,Y...) 
+#define FIXME(X,Y...)
+#define DPRINTF(X,Y...)
+#define MESSAGE(X,Y...)
+#define ERR_(X,Y...) 
+#define FIXME_(X,Y...) 
+#else
+#define WARN_(...) 
+#define WARN(...)
+#define TRACE_(...) 
+#define ERR(...) 
+#define FIXME(...)
+#define DPRINTF(...)
+#define MESSAGE(...)
+#define ERR_(...) 
+#define FIXME_(...) 
+#endif
 
 #define TRACE_ON(X) 1
 #define ERR_ON(X) 1
@@ -86,7 +100,5 @@ extern int dbg_printf(const char *format, ...);
 #define DEFAULT_DEBUG_CHANNEL(ch) \
     extern char dbch_##ch[]; static char * const __dbch_default = dbch_##ch;
 
-#define DPRINTF 
-#define MESSAGE 
 
 #endif  /* __WINE_DEBUGTOOLS_H */
diff --git a/src/libw32dll/wine/driver.c b/src/libw32dll/wine/driver.c
index 1a1c99bf7..08f5f745c 100644
--- a/src/libw32dll/wine/driver.c
+++ b/src/libw32dll/wine/driver.c
@@ -87,7 +87,6 @@ static NPDRVR DrvAlloc(HDRVR*lpDriver, LPUINT lpDrvResult)
                                                                                                                     
 static void DrvFree(HDRVR hDriver)
 {
-    int i;
     if(hDriver)
     	if(((DRVR*)hDriver)->hDriverModule)
     	if(((DRVR*)hDriver)->DriverProc)
@@ -113,7 +112,7 @@ char* win32_def_path  =NULL;  // must be set before calling DrvOpen() !!!
 HDRVR
 DrvOpen(LPARAM lParam2)
 {
-    ICOPEN *icopen=(ICOPEN*)lParam2;
+  //    ICOPEN *icopen=(ICOPEN*)lParam2;
     UINT uDrvResult;
     HDRVR hDriver;
     NPDRVR npDriver;
diff --git a/src/libw32dll/wine/ext.c b/src/libw32dll/wine/ext.c
index 865ff73d9..85adbc203 100644
--- a/src/libw32dll/wine/ext.c
+++ b/src/libw32dll/wine/ext.c
@@ -133,9 +133,9 @@ LPSTR WINAPI lstrcpynWtoA(LPSTR dest, LPCWSTR src, INT count)
 int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n)
 {
     if(s1==0)
-	return;
+	return 0;
     if(s2==0)
-        return;
+        return 0;
     while(n>0)
     {
 	if(*s1<*s2)
@@ -303,7 +303,7 @@ int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low )
       printf("offsets larger than 4Gb not supported\n");
     return munmap( start, size_low );
 }
-static int mapping_size=0;
+//static int mapping_size=0;
 
 struct file_mapping_s;
 typedef struct file_mapping_s
@@ -475,7 +475,7 @@ void* WINAPI VirtualAlloc(void* address, DWORD size, DWORD type,  DWORD protecti
     if(answer==(void*)-1)
     {
 	printf("Error no %d\n", errno);
-	printf("VirtualAlloc(0x%08X, %d) failed\n", address, size);
+	printf("VirtualAlloc(0x%08X, %ld) failed\n", (int) address, size);
 	return NULL;
     }
     else
diff --git a/src/libw32dll/wine/module.c b/src/libw32dll/wine/module.c
index 9b921b09b..0ceb50547 100644
--- a/src/libw32dll/wine/module.c
+++ b/src/libw32dll/wine/module.c
@@ -253,7 +253,7 @@ WINE_MODREF *MODULE32_LookupHMODULE(HMODULE m)
 	if(list==NULL)
 	    return NULL;
     }	
-    TRACE("LookupHMODULE hit %X\n", list->wm);
+    TRACE("LookupHMODULE hit %X\n", (int)list->wm);
     return list->wm;
 }    
 
@@ -290,7 +290,7 @@ static WIN_BOOL MODULE_InitDll( WINE_MODREF *wm, DWORD type, LPVOID lpReserved )
         break;
 
     default:
-        ERR("wine_modref type %d not handled.\n", wm->type );
+        ERR("wine_modref type %d not handled.\n", wm->type);
         retv = FALSE;
         break;
     }
@@ -425,7 +425,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
 	{
 		if ( !MODULE_DllProcessAttach( wm, NULL ) )
 		{
-			WARN_(module)("Attach failed for module '%s', \n", libname);
+			WARN_(module, "Attach failed for module '%s', \n", libname);
 			MODULE_FreeLibrary(wm);
 			SetLastError(ERROR_DLL_INIT_FAILED);
 			MODULE_RemoveFromList(wm);
@@ -590,9 +590,9 @@ FARPROC MODULE_GetProcAddress(
     FARPROC	retproc;
 
     if (HIWORD(function))
-	TRACE_(win32)("(%08lx,%s)\n",(DWORD)hModule,function);
+	TRACE_(win32,"(%08lx,%s)\n",(DWORD)hModule,function);
     else
-	TRACE_(win32)("(%08lx,%p)\n",(DWORD)hModule,function);
+	TRACE_(win32,"(%08lx,%p)\n",(DWORD)hModule,function);
     if (!wm) {
     	SetLastError(ERROR_INVALID_HANDLE);
         return (FARPROC)0;
diff --git a/src/libw32dll/wine/pe_image.c b/src/libw32dll/wine/pe_image.c
index 274813f13..095abf244 100644
--- a/src/libw32dll/wine/pe_image.c
+++ b/src/libw32dll/wine/pe_image.c
@@ -280,7 +280,7 @@ static DWORD fixup_imports( WINE_MODREF *wm )
      */
  
     for (i = 0, pe_imp = pem->pe_import; pe_imp->Name ; pe_imp++) {
-    	WINE_MODREF		*wmImp;
+      //    	WINE_MODREF		*wmImp;
 	IMAGE_IMPORT_BY_NAME	*pe_name;
 	PIMAGE_THUNK_DATA	import_list,thunk_list;
  	char			*name = (char *) RVA(pe_imp->Name);
@@ -381,7 +381,7 @@ static void do_relocations( unsigned int load_addr, IMAGE_BASE_RELOCATION *r )
 		char *page = (char*) RVA(r->VirtualAddress);
 		int count = (r->SizeOfBlock - 8)/2;
 		int i;
-		TRACE_(fixup)("%x relocations for page %lx\n",
+		TRACE_(fixup,"%x relocations for page %lx\n",
 			count, r->VirtualAddress);
 		
 		for(i=0;iOptionalHeader.ImageBase, vma_size );
-    TRACE_(segment)("Loading %s at %lx, range %x\n",
+    TRACE_(segment,"Loading %s at %lx, range %x\n",
                     filename, load_addr, vma_size );
 
 #if 0
@@ -622,7 +622,7 @@ HMODULE PE_LoadImage( int handle, LPCSTR filename, WORD *version )
                      0, 0, PROT_EXEC | PROT_WRITE | PROT_READ,
                      MAP_PRIVATE | MAP_FIXED ) != (void*)load_addr)
     {
-        ERR_(win32)( "Critical Error: failed to map PE header to necessary address.\n");	
+        ERR_(win32, "Critical Error: failed to map PE header to necessary address.\n");	
         goto error;
     }
 
@@ -640,7 +640,7 @@ HMODULE PE_LoadImage( int handle, LPCSTR filename, WORD *version )
                          MAP_PRIVATE | MAP_FIXED ) != (void*)RVA(pe_sec->VirtualAddress))
         {
             
-            ERR_(win32)( "Critical Error: failed to map PE section to necessary address.\n");
+            ERR_(win32, "Critical Error: failed to map PE section to necessary address.\n");
             goto error;
         }
         if ((pe_sec->SizeOfRawData < pe_sec->Misc.VirtualSize) &&
@@ -698,10 +698,7 @@ WINE_MODREF *PE_CreateModule( HMODULE hModule,
     IMAGE_EXPORT_DIRECTORY *pe_export = NULL;
     IMAGE_RESOURCE_DIRECTORY *pe_resource = NULL;
     WINE_MODREF *wm;
-    int	result;
-
-
-    
+    //    int	result;
 
     dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_EXPORT;
     if (dir->Size)
@@ -898,7 +895,7 @@ WIN_BOOL PE_InitDLL( WINE_MODREF *wm, DWORD type, LPVOID lpReserved )
 	if(entry==NULL)
 	    entry = (void*)RVA_PTR( wm->module,OptionalHeader.AddressOfEntryPoint );
         
-	TRACE_(relay)("CallTo32(entryproc=%p,module=%08x,type=%ld,res=%p)\n",
+	TRACE_(relay,"CallTo32(entryproc=%p,module=%08x,type=%ld,res=%p)\n",
                        entry, wm->module, type, lpReserved );
 	printf("Entering DllMain(");
 	switch(type)
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index aadf13f5b..53951831a 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -147,6 +147,7 @@ static void save_registry(void)
 	}
 	close(fd);
 }
+#if 0
 static reg_handle_t* find_handle_by_name(const char* name)
 {
 	reg_handle_t* t;
@@ -159,6 +160,7 @@ static reg_handle_t* find_handle_by_name(const char* name)
 	}
 	return 0;
 }
+#endif
 static struct reg_value* find_value_by_name(const char* name)
 {
 	int i;
@@ -268,6 +270,7 @@ static void init_registry()
 	insert_handle(HKEY_LOCAL_MACHINE, "HKLM");
 	insert_handle(HKEY_CURRENT_USER, "HKCU");
 }
+#if 0
 static reg_handle_t* find_handle_2(long key, const char* subkey)
 {
 	char* full_name;
@@ -287,7 +290,7 @@ static reg_handle_t* find_handle_2(long key, const char* subkey)
 	free(full_name);
 	return t;
 }
-
+#endif
 long RegOpenKeyExA(long key, const char* subkey, long reserved, long access, int* newkey)
 {
     char* full_name;
diff --git a/src/libw32dll/wine/resource.c b/src/libw32dll/wine/resource.c
index 5a5079eef..f99233805 100644
--- a/src/libw32dll/wine/resource.c
+++ b/src/libw32dll/wine/resource.c
@@ -106,7 +106,7 @@ static DWORD RES_SizeofResource( HMODULE hModule, HRSRC hRsrc)
 //    NE_MODULE *pModule = NE_GetPtr( hMod16 );
 //    WINE_MODREF *wm    = pModule && pModule->module32? 
 //                         MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
-    WINE_MODREF *wm = MODULE32_LookupHMODULE( hModule );
+    //    WINE_MODREF *wm = MODULE32_LookupHMODULE( hModule );
 
     if ( !hModule || !hRsrc ) return 0;
 
@@ -129,7 +129,7 @@ static HFILE RES_AccessResource( HMODULE hModule, HRSRC hRsrc )
 {
     HFILE hFile = HFILE_ERROR;
 
-    WINE_MODREF *wm = MODULE32_LookupHMODULE( hModule );
+    //    WINE_MODREF *wm = MODULE32_LookupHMODULE( hModule );
 
     if ( !hModule || !hRsrc ) return HFILE_ERROR;
 
diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c
index b4ec59ef3..a1bf4768f 100644
--- a/src/libw32dll/wine/win32.c
+++ b/src/libw32dll/wine/win32.c
@@ -13,6 +13,7 @@
 #include "win32.h"
 #include 
 #include 
+#include 
 #include 
 #ifdef HAVE_MALLOC_H
 #include 
@@ -387,7 +388,7 @@ void* WINAPI expCreateEventA(void* pSecAttr, char bManualReset,
 	{
 	    if(strcmp(pp->name, name)==0)
 		return pp->pm;
-	}while(pp=pp->prev);
+	} while((pp=pp->prev));
     }	
     pm=my_mreq(sizeof(pthread_mutex_t), 0);
     pthread_mutex_init(pm, NULL);
@@ -419,11 +420,13 @@ void* WINAPI expSetEvent(void* event)
 {
     dbgprintf("Trying to lock %X\n", event);
     pthread_mutex_lock(event);
+    return event;
 }
 void* WINAPI expResetEvent(void* event)
 {
     dbgprintf("Unlocking %X\n", event);
     pthread_mutex_unlock(event);    
+    return event;
 }
 
 void* WINAPI expWaitForSingleObject(void* object, int duration)
@@ -432,6 +435,7 @@ void* WINAPI expWaitForSingleObject(void* object, int duration)
     dbgprintf("WaitForSingleObject: duration %d\n", duration);
     pthread_mutex_lock(object);
     pthread_mutex_unlock(object);
+    return object;
 }    
 
 static BYTE PF[64] = {0,};
@@ -441,7 +445,7 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si)
     	/* FIXME: better values for the two entries below... */
 	static int cache = 0;
 	static SYSTEM_INFO cachedsi;
-	HKEY	xhkey=0,hkey;
+	HKEY	xhkey=0;
         dbgprintf("GetSystemInfo()\n");
 
 	if (cache) {
@@ -889,7 +893,7 @@ long WINAPI expReleaseSemaphore(long hsem, long increment, long* prev_count)
 // is greater than zero and nonsignaled when its count is equal to zero
 // Each time a waiting thread is released because of the semaphore's signaled
 // state, the count of the semaphore is decreased by one. 
-    struct sembuf buf[1];
+  //    struct sembuf buf[1];
     dbgprintf("ReleaseSemaphore\n");
     dbgprintf("WARNING: Unsupported call: ReleaseSemaphoreA\n");       
 /*    if(hsem==-1)return 0;
@@ -1148,7 +1152,7 @@ LPCSTR WINAPI expGetEnvironmentStrings()
 
 int WINAPI expGetStartupInfoA(STARTUPINFOA *s)
 {
-    int i;    
+  /*    int i;    */
     dbgprintf("GetStartupInfoA\n");
 /*    
     for(i=0; iwMinute = local_tm->tm_min;
     systime->wSecond = local_tm->tm_sec;
     systime->wMilliseconds = (tv.tv_usec / 1000) % 1000;
-    
+    return 0;
 }
 
 int WINAPI expGetEnvironmentVariableA(const char* name, char* field, int size)
 {
     dbgprintf("GetEnvironmentVariableA\n");
-    printf("%s %x %x\n", name, field, size);
+    printf("%s %x %x\n", name, *field, size);
     if(field)field[0]=0;
     return 0;
 }
@@ -1546,7 +1550,7 @@ int WINAPI expGetEnvironmentVariableA(const char* name, char* field, int size)
 //HDRVR WINAPI expOpenDriverW(LPCWSTR szDriverName, LPCWSTR szSectionName, LPARAM lParam2);
 HDRVR WINAPI expOpenDriver(LPCSTR szDriverName, LPCSTR szSectionName, LPARAM lParam2){
   printf("winmm32::OpenDriver() called\n");
-  return NULL;
+  return (HDRVR) NULL;
 }
 
 
@@ -1724,7 +1728,7 @@ void* LookupExternal(const char* library, int ordinal)
 	{
 	    if(ordinal!=libraries[i].exps[j].id)
 		continue;
-	    printf("Hit: 0x%08X\n", libraries[i].exps[j].func);
+	    printf("Hit: 0x%08X\n", (int) libraries[i].exps[j].func);
 	    return libraries[i].exps[j].func;
 	}
     }
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index b35aaebc4..672f45858 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -22,7 +22,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: yuv2rgb.c,v 1.15 2001/09/11 17:12:39 jkeil Exp $
+ * $Id: yuv2rgb.c,v 1.16 2001/09/16 23:13:45 f1rmb Exp $
  */
 
 #include "config.h"
@@ -767,9 +767,7 @@ static void yuv2rgb_c_16 (yuv2rgb_t *this, uint8_t * _dst,
 static void yuv2rgb_c_palette (yuv2rgb_t *this, uint8_t * _dst,
 			       uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
 {
-  int U, V, Y;
   uint8_t * py_1, * py_2, * pu, * pv;
-  uint8_t * r, * g, * b;
   uint8_t * dst_1, * dst_2;
   int width, height, dst_height;
   int dy;
-- 
cgit v1.2.3