diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2003-12-13 11:35:07 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2003-12-13 11:35:07 +0000 |
| commit | 6e8e94faf64728ff0124b0ccbe67071264153ec6 (patch) | |
| tree | 5e07043ebcb9a0150272024b70498042870a0e97 /src/xine-engine | |
| parent | d8a33d0e2516597b8a337ad65a9c9526d07fed28 (diff) | |
| download | xine-lib-6e8e94faf64728ff0124b0ccbe67071264153ec6.tar.gz xine-lib-6e8e94faf64728ff0124b0ccbe67071264153ec6.tar.bz2 | |
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
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer.h | 6 | ||||
| -rw-r--r-- | src/xine-engine/info_helper.c | 7 |
2 files changed, 7 insertions, 6 deletions
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); } |