Update win32 MSVC build:

  * internal names cleanup
  * http input plugin uses http_helper.c
  * fix change in audio_directx
  * MSVC stoped compile xineui because of 'this', mysterious
  * change non-constand array lengths to malloc/free,
    it good for such old compilers as my MSVC 6.0
  * change lprintf macro for MSVC to compile again
    (I don't know, how use variable number of macro arguments  in MSVC...)
  * merge compiling of xine-utils and xine-engine

CVS patchset: 5902
CVS date: 2003/12/13 11:35:07

6 files changed, 17 insertions, 14 deletions

diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index c4de81cff..98dc0aca1 100755
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -20,7 +20,7 @@
  * audio_directx_out.c, direct sound audio output plugin for xine
  * by Matthew Grooms <elon@altavista.com>
  *
- * $Id: audio_directx_out.c,v 1.6 2003/12/05 15:54:56 f1rmb Exp $
+ * $Id: audio_directx_out.c,v 1.7 2003/12/13 11:35:07 valtri Exp $
  */
 
 typedef unsigned char boolean;
@@ -782,7 +782,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   lprintf("open_plugin(%08x, %08x) Enter\n", (unsigned long)class_gen, (unsigned long)data);
   lprintf("open_plugin: ao_directx=%08x\n", (unsigned long)ao_directx);
 
-  ao_driverx->xine                              = class->xine;
+  ao_directx->xine                              = class->xine;
 
   ao_directx->ao_driver.get_capabilities        = ao_directx_get_capabilities;
   ao_directx->ao_driver.get_property	        = ao_directx_get_property;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index e22a94035..93e47aa29 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
  *
  * input plugin for http network streams
  *
- * $Id: input_http.c,v 1.77 2003/12/04 21:19:03 tmattern Exp $
+ * $Id: input_http.c,v 1.78 2003/12/13 11:35:07 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -898,7 +898,7 @@ static void *init_class (xine_t *xine, void *data) {
 
     if((proxy_env = getenv("http_proxy")) && (strlen(proxy_env))) {
       int   proxy_port = DEFAULT_HTTP_PORT;
-      char  http_proxy[strlen(proxy_env + 1)];
+      char  *http_proxy = xine_xmalloc(strlen(proxy_env + 1));
       char *p;
       
       if(!strncmp(proxy_env, "http://", 7))
@@ -915,6 +915,8 @@ static void *init_class (xine_t *xine, void *data) {
       this->proxyhost_env                   = strdup(http_proxy);
       this->proxyhost                       = this->proxyhost_env;
       this->proxyport = this->proxyport_env = proxy_port;
+
+      free(http_proxy);
     }
   }
 
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index dec8eb50f..aa0693722 100755
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -20,7 +20,7 @@
  * video_out_directx.c, direct draw video output plugin for xine
  * by Matthew Grooms <elon@altavista.com>
  *
- * $Id: video_out_directx.c,v 1.12 2003/12/05 15:55:03 f1rmb Exp $
+ * $Id: video_out_directx.c,v 1.13 2003/12/13 11:35:07 valtri Exp $
  */
 
 typedef unsigned char boolean;
@@ -839,7 +839,7 @@ static vo_frame_t * win32_alloc_frame( vo_driver_t * vo_driver )
   win32_driver_t *win32_driver = (win32_driver_t *)vo_driver;
   win32_frame_t  *win32_frame;
 
-  win32_frame = ( win32_frame_t * ) xine_malloc( sizeof( win32_frame_t ) );
+  win32_frame = ( win32_frame_t * ) xine_xmalloc( sizeof( win32_frame_t ) );
   if (!win32_frame)
     return NULL;
 
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 009037c70..4860ed27f 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.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: buffer.h,v 1.126 2003/11/20 00:42:14 tmattern Exp $
+ * $Id: buffer.h,v 1.127 2003/12/13 11:35:07 valtri Exp $
  *
  *
  * contents:
@@ -463,7 +463,7 @@ struct fifo_buffer_s
    * buffer allocation functions
    */
 
-  buf_element_t *(*buffer_pool_alloc) (fifo_buffer_t *this);
+  buf_element_t *(*buffer_pool_alloc) (fifo_buffer_t *self);
 
 
   /*
@@ -471,7 +471,7 @@ struct fifo_buffer_s
    */
 
   /* the same as buffer_pool_alloc but may fail if none is available */
-  buf_element_t *(*buffer_pool_try_alloc) (fifo_buffer_t *this);
+  buf_element_t *(*buffer_pool_try_alloc) (fifo_buffer_t *self);
 
   /* the same as put but insert at the head of the fifo */
   void (*insert) (fifo_buffer_t *fifo, buf_element_t *buf);
diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c
index 5221cd034..fb2a087f6 100644
--- a/src/xine-engine/info_helper.c
+++ b/src/xine-engine/info_helper.c
@@ -20,7 +20,7 @@
  * stream metainfo helper functions
  * hide some xine engine details from demuxers and reduce code duplication
  *
- * $Id: info_helper.c,v 1.6 2003/11/16 23:33:48 f1rmb Exp $ 
+ * $Id: info_helper.c,v 1.7 2003/12/13 11:35:08 valtri Exp $ 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -224,10 +224,11 @@ void _x_meta_info_set(xine_stream_t *stream, int info, const char *str) {
 void _x_meta_info_n_set(xine_stream_t *stream, int info, const char *buf, int len) {
   pthread_mutex_lock(&stream->meta_mutex);
   if(__meta_valid(info) && len) {
-    char str[len + 1];
+    char *str = xine_xmalloc(len + 1);
     
     snprintf(str, len + 1 , "%s", buf);
-    __meta_info_set_unlocked(stream, info, (const char *) &str[0]);
+    __meta_info_set_unlocked(stream, info, (const char *) &str[0]);

+	free(str);
   }
   pthread_mutex_unlock(&stream->meta_mutex);
 }
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 348904991..64a252f32 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.74 2003/12/13 01:47:35 f1rmb Exp $
+ * $Id: xineutils.h,v 1.75 2003/12/13 11:35:08 valtri Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -903,7 +903,7 @@ void xine_hexdump (const char *buf, int length);
     #define lprintf(fmt, args...)     do {} while(0)
   #else
   #ifdef _MSC_VER
-    #define lprintf                   do {} while(0)
+    #define lprintf
   #else
     #define lprintf(...)              do {} while(0)
   #endif /* _MSC_VER */