- almost finalize headers refactoring needed for MSVC frontends (and for other

   poor platforms, of course)
 - fix a bug in generated xine-config for WIN32 and make it relocateable
   under Windows
 - MSVC port: update, fix some warnings, remove old unneeded files
 - improve function for getting runtime directory, it will need next fix
   yet (bug probably due to active volume drives)

CVS patchset: 7001
CVS date: 2004/09/26 22:54:51

11 files changed, 43 insertions, 38 deletions

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
  */