diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/input/input_plugin.h | 7 | ||||
-rw-r--r-- | src/libffmpeg/video_decoder.c | 6 | ||||
-rw-r--r-- | src/libffmpeg/xine_decoder.h | 16 | ||||
-rw-r--r-- | src/xine-engine/audio_decoder.h | 8 | ||||
-rw-r--r-- | src/xine-engine/audio_out.c | 9 | ||||
-rw-r--r-- | src/xine-engine/audio_out.h | 8 | ||||
-rw-r--r-- | src/xine-engine/buffer.h | 7 | ||||
-rw-r--r-- | src/xine-engine/configfile.h | 5 | ||||
-rw-r--r-- | src/xine-engine/input_rip.c | 11 | ||||
-rw-r--r-- | src/xine-engine/metronom.h | 6 | ||||
-rw-r--r-- | src/xine-engine/spu_decoder.h | 4 | ||||
-rw-r--r-- | src/xine-engine/video_decoder.h | 8 | ||||
-rw-r--r-- | src/xine-engine/video_out.h | 9 | ||||
-rw-r--r-- | src/xine-engine/xine_internal.h | 6 | ||||
-rw-r--r-- | src/xine-utils/utils.c | 64 | ||||
-rw-r--r-- | src/xine-utils/xine_buffer.h | 10 | ||||
-rw-r--r-- | src/xine-utils/xineutils.h | 15 |
17 files changed, 110 insertions, 89 deletions
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 3fd97d7bc..fccc267fd 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,20 +17,21 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_plugin.h,v 1.57 2004/07/20 00:50:11 rockyb Exp $ + * $Id: input_plugin.h,v 1.58 2004/09/26 22:54:52 valtri Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H #define HAVE_INPUT_PLUGIN_H -#include <inttypes.h> #include <sys/types.h> #ifdef XINE_COMPILE +# include <inttypes.h> # include "xineutils.h" # include "buffer.h" # include "configfile.h" #else +# include <xine/os_types.h> # include <xine/xineutils.h> # include <xine/buffer.h> # include <xine/configfile.h> diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index a74886fab..a589ea949 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.34 2004/09/22 20:29:14 miguelfreitas Exp $ + * $Id: video_decoder.c,v 1.35 2004/09/26 22:54:52 valtri Exp $ * * xine video decoder plugin using ffmpeg * @@ -721,6 +721,8 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen; int i, codec_type; uint8_t *ffbuf = this->buf; + AVRational avr00 = {0, 0}; + lprintf ("processing packet type = %08x, len = %d, decoder_flags=%08x\n", buf->type, buf->size, buf->decoder_flags); @@ -1036,7 +1038,7 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { lprintf ("got a picture\n"); - if(av_cmp_q(this->context->sample_aspect_ratio, (AVRational){0,0})) { + if(av_cmp_q(this->context->sample_aspect_ratio, avr00)) { this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) * (double)this->bih.biWidth / (double)this->bih.biHeight; _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, diff --git a/src/libffmpeg/xine_decoder.h b/src/libffmpeg/xine_decoder.h index 3119a41db..9005b602e 100644 --- a/src/libffmpeg/xine_decoder.h +++ b/src/libffmpeg/xine_decoder.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.h,v 1.3 2004/08/16 15:31:23 mroi Exp $ + * $Id: xine_decoder.h,v 1.4 2004/09/26 22:54:52 valtri Exp $ * */ @@ -28,18 +28,6 @@ #include "config.h" #endif -#ifdef _MSC_VER -/* ffmpeg has own definitions of those types */ -# undef int8_t -# undef uint8_t -# undef int16_t -# undef uint16_t -# undef int32_t -# undef uint32_t -# undef int64_t -# undef uint64_t -#endif - #ifdef HAVE_FFMPEG # include <avcodec.h> #else @@ -50,6 +38,8 @@ # undef malloc # undef free # undef realloc +# undef printf +# undef fprintf #endif typedef struct ff_codec_s { diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index 0d385ef5e..a88b02dc8 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.h,v 1.12 2004/01/12 17:35:19 miguelfreitas Exp $ + * $Id: audio_decoder.h,v 1.13 2004/09/26 22:54:52 valtri Exp $ * * xine audio decoder plugin interface * @@ -26,11 +26,11 @@ #ifndef HAVE_AUDIO_DECODER_H #define HAVE_AUDIO_DECODER_H -#include <inttypes.h> - #ifdef XINE_COMPILE +# include <inttypes.h> # include "buffer.h" #else +# include <xine/os_types.h> # include <xine/buffer.h> #endif diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index a91911f74..2fa7980c2 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.184 2004/09/01 18:19:50 valtri Exp $ + * $Id: audio_out.c,v 1.185 2004/09/26 22:54:52 valtri Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -869,7 +869,12 @@ static int resample_rate_adjust(aos_t *this, int64_t gap, audio_buffer_t *buf) { #endif /* we want to add factor * num_frames to each buffer */ diff = gap_diff; +#if _MSCVER <= 1200 + /* ugly hack needed by old Visual C++ 6.0 */ + duration = (int64_t)info->window_duration; +#else duration = info->window_duration; +#endif factor = diff / duration + info->last_factor; info->last_factor = factor; @@ -1977,7 +1982,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, this->eq_j = 2; this->eq_k = 1; - bzero (this->eq_data_history, sizeof(sXYData) * EQ_BANDS * EQ_CHANNELS); + memset (this->eq_data_history, 0, sizeof(sXYData) * EQ_BANDS * EQ_CHANNELS); /* * pre-allocate memory for samples diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index 0d75c92ea..1b28416de 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.h,v 1.72 2004/07/06 22:53:23 miguelfreitas Exp $ + * $Id: audio_out.h,v 1.73 2004/09/26 22:54:52 valtri Exp $ */ #ifndef HAVE_AUDIO_OUT_H #define HAVE_AUDIO_OUT_H @@ -26,13 +26,13 @@ extern "C" { #endif -#include <inttypes.h> - #if defined(XINE_COMPILE) +#include <inttypes.h> #include "metronom.h" #include "configfile.h" #include "xineutils.h" #else +#include <xine/os_types.h> #include <xine/metronom.h> #include <xine/configfile.h> #include <xine/xineutils.h> diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 2c0aca28b..45aceb43e 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -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: buffer.h,v 1.143 2004/09/09 06:29:20 athp Exp $ + * $Id: buffer.h,v 1.144 2004/09/26 22:54:52 valtri Exp $ * * * contents: @@ -44,12 +44,13 @@ extern "C" { #include <stdio.h> #include <pthread.h> -#include <inttypes.h> #include <sys/types.h> #ifdef XINE_COMPILE +# include <inttypes.h> # include "attributes.h" #else +# include <xine/os_types.h> # include <xine/attributes.h> #endif diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index 781cf14af..1884f1252 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -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: configfile.h,v 1.34 2004/05/07 14:38:14 mroi Exp $ + * $Id: configfile.h,v 1.35 2004/09/26 22:54:52 valtri Exp $ * * config file management * @@ -30,7 +30,6 @@ extern "C" { #endif -#include <inttypes.h> #include <pthread.h> #ifdef XINE_COMPILE diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c index d09b64c3d..18088ea87 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.c @@ -29,7 +29,7 @@ * - it's possible speeder saving streams in the xine without playing: * xine stream_mrl#save:file.raw\;noaudio\;novideo * - * $Id: input_rip.c,v 1.24 2004/09/20 19:30:05 valtri Exp $ + * $Id: input_rip.c,v 1.25 2004/09/26 22:54:52 valtri Exp $ */ /* TODO: @@ -58,8 +58,13 @@ #define LOG */ -#define CLR_FAIL "\e[1;31m" -#define CLR_RST "\e[0;39m" +#ifdef WIN32 +# define CLR_FAIL "" +# define CLR_RST "" +#else +# define CLR_FAIL "\e[1;31m" +# define CLR_RST "\e[0;39m" +#endif #include "xine_internal.h" diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index cf582850a..78834e02a 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -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: metronom.h,v 1.61 2004/08/02 12:51:21 miguelfreitas Exp $ + * $Id: metronom.h,v 1.62 2004/09/26 22:54:52 valtri Exp $ * * metronom: general pts => virtual calculation/assoc * @@ -47,8 +47,6 @@ extern "C" { #endif -#include <inttypes.h> -#include <sys/time.h> #include <pthread.h> #ifdef XINE_COMPILE diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h index 24afd745b..eaa2f8ec2 100644 --- a/src/xine-engine/spu_decoder.h +++ b/src/xine-engine/spu_decoder.h @@ -24,11 +24,11 @@ #ifndef HAVE_SPU_API_H #define HAVE_SPU_API_H -#include <inttypes.h> - #ifdef XINE_COMPILE +# include <inttypes.h> # include "buffer.h" #else +# include <xine/os_types.h> # include <xine/buffer.h> #endif diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index 224a3e6b8..42120b724 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.h,v 1.13 2004/01/12 17:35:19 miguelfreitas Exp $ + * $Id: video_decoder.h,v 1.14 2004/09/26 22:54:52 valtri Exp $ * * xine video decoder plugin interface * @@ -26,11 +26,11 @@ #ifndef HAVE_VIDEO_DECODER_H #define HAVE_VIDEO_DECODER_H -#include <inttypes.h> - #ifdef XINE_COMPILE +# include <inttypes.h> # include "buffer.h" #else +# include <xine/os_types.h> # include <xine/buffer.h> #endif diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 0b70998e2..c96307471 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.h,v 1.109 2004/09/22 20:29:17 miguelfreitas Exp $ + * $Id: video_out.h,v 1.110 2004/09/26 22:54:52 valtri Exp $ * * * xine version of video_out.h @@ -43,6 +43,8 @@ extern "C" { #include "config.h" #endif +#include <pthread.h> + #ifdef XINE_COMPILE # include "xine.h" # include "buffer.h" @@ -51,9 +53,6 @@ extern "C" { # include <xine/buffer.h> #endif -#include <inttypes.h> -#include <pthread.h> - typedef struct vo_frame_s vo_frame_t; typedef struct vo_driver_s vo_driver_t; diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index fa302dfc3..488df397b 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -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: xine_internal.h,v 1.159 2004/08/02 12:51:21 miguelfreitas Exp $ + * $Id: xine_internal.h,v 1.160 2004/09/26 22:54:52 valtri Exp $ * */ @@ -28,8 +28,6 @@ extern "C" { #endif -#include <inttypes.h> - /* * include public part of xine header */ diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index fff4f028d..a26b83b46 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: utils.c,v 1.34 2004/09/20 19:30:05 valtri Exp $ + * $Id: utils.c,v 1.35 2004/09/26 22:54:53 valtri Exp $ * */ #define _POSIX_PTHREAD_SEMANTICS 1 /* for 5-arg getpwuid_r on solaris */ @@ -28,6 +28,9 @@ #include "xineutils.h" #include "xineintl.h" +#ifdef _MSC_VER +#include "xine_internal.h" +#endif #include <errno.h> #include <pwd.h> @@ -267,33 +270,37 @@ void *xine_xmalloc_aligned(size_t alignment, size_t size, void **base) { */ char *exec_path_append_subdir(char *string) { - static char tmp_win32_path[1024]; - char *tmpchar; - char *cmdline; + static char tmp_win32_path[1024] = "\0"; char *back_slash; char *fore_slash; char *last_slash; - /* get program exec command line */ - cmdline = GetCommandLine(); + /* first run - fill out dll path */ + if (!*tmp_win32_path) { + char *tmpchar; + char *cmdline; - /* check for " at beginning of string */ - if( *cmdline == '\"' ) { - /* copy command line, skip first quote */ - strncpy(tmp_win32_path, cmdline + 1, sizeof(tmp_win32_path)); - tmp_win32_path[sizeof(tmp_win32_path) - 1] = '\0'; + /* get program exec command line */ + cmdline = GetCommandLine(); - /* terminate at second set of quotes */ - tmpchar = strchr(tmp_win32_path, '\"'); - if (tmpchar) *tmpchar = 0; - } else { - /* copy command line */ - strncpy(tmp_win32_path, cmdline, sizeof(tmp_win32_path)); - tmp_win32_path[sizeof(tmp_win32_path) - 1] = '\0'; + /* check for " at beginning of string */ + if( *cmdline == '\"' ) { + /* copy command line, skip first quote */ + strncpy(tmp_win32_path, cmdline + 1, sizeof(tmp_win32_path)); + tmp_win32_path[sizeof(tmp_win32_path) - 1] = '\0'; - /* terminate at first space */ - tmpchar = strchr(tmp_win32_path, ' '); - if (tmpchar) *tmpchar = 0; + /* terminate at second set of quotes */ + tmpchar = strchr(tmp_win32_path, '\"'); + if (tmpchar) *tmpchar = 0; + } else { + /* copy command line */ + strncpy(tmp_win32_path, cmdline, sizeof(tmp_win32_path)); + tmp_win32_path[sizeof(tmp_win32_path) - 1] = '\0'; + + /* terminate at first space */ + tmpchar = strchr(tmp_win32_path, ' '); + if (tmpchar) *tmpchar = 0; + } } /* find the last occurance of a back @@ -554,3 +561,18 @@ const char *xine_guess_spu_encoding(void) { return "iso-8859-1"; } + + +#ifdef _MSC_VER +void xine_xprintf(xine_t *xine, int verbose, const char *fmt, ...) { + char message[256]; + va_list ap; + + if (xine && xine->verbosity >= verbose) { + va_start(ap, fmt); + vsnprintf(message, sizeof(message), fmt, ap); + va_end(ap); + xine_log(xine, XINE_LOG_TRACE, "%s", message); + } +} +#endif diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h index 98b68fd2f..80f09a77e 100644 --- a/src/xine-utils/xine_buffer.h +++ b/src/xine-utils/xine_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -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: xine_buffer.h,v 1.3 2003/12/09 00:02:39 f1rmb Exp $ + * $Id: xine_buffer.h,v 1.4 2004/09/26 22:54:53 valtri Exp $ * * * generic dynamic buffer functions. The goals @@ -52,7 +52,11 @@ #ifndef HAVE_XINE_BUFFER_H #define HAVE_XINE_BUFFER_H -#include <inttypes.h> +#ifdef XINE_COMPILE +# include <inttypes.h> +#else +# include <xine/os_types.h> +#endif /* * returns an initialized pointer to a buffer. diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 6a4be56bf..8e45d150a 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xineutils.h,v 1.93 2004/09/20 19:30:05 valtri Exp $ + * $Id: xineutils.h,v 1.94 2004/09/26 22:54:53 valtri Exp $ * */ #ifndef XINEUTILS_H @@ -30,16 +30,17 @@ extern "C" { #include <stdlib.h> #include <string.h> #include <stdarg.h> -#include <inttypes.h> #include <pthread.h> #ifdef XINE_COMPILE +# include <inttypes.h> # include "attributes.h" # include "compat.h" # include "xmlparser.h" # include "xine_buffer.h" # include "configfile.h" #else +# include <xine/os_types.h> # include <xine/attributes.h> # include <xine/compat.h> # include <xine/xmlparser.h> @@ -849,7 +850,7 @@ void xine_hexdump (const char *buf, int length); #define lprintf(fmt, args...) do {} while(0) #else #ifdef _MSC_VER - #define lprintf +void __inline lprintf(const char * fmt, ...) {}; #else #define lprintf(...) do {} while(0) #endif /* _MSC_VER */ @@ -893,12 +894,8 @@ void xine_hexdump (const char *buf, int length); } while(0) #else #ifdef _MSC_VER - #define xprintf(xine, verbose, fmtargs) \ - do { \ - if((xine) && (xine)->verbosity >= verbose){ \ - xine_log(xine, XINE_LOG_TRACE, fmtargs); \ - } \ - } while(0) +void xine_xprintf(xine_t *xine, int verbose, const char *fmt, ...); + #define xprintf xine_xprintf #else #define xprintf(xine, verbose, ...) \ do { \ |