ref: 233ca4b6e61450f6acddd4ba0a3fae5d93b2ee7b
parent: a78f38542dd5f4774ed651eb26218f53001fc6d4
author: menno <menno>
date: Mon Jan 21 12:04:27 EST 2002
Forgot something :-)
--- a/common/faad/filestream.c
+++ b/common/faad/filestream.c
@@ -16,7 +16,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: filestream.c,v 1.1 2002/01/14 19:15:49 menno Exp $
+** $Id: filestream.c,v 1.2 2002/01/21 17:04:27 menno Exp $
**/
/* Not very portable yet */
@@ -33,8 +33,8 @@
#define CommonExit(A) MessageBox(NULL, A, "FAAD Plugin", MB_OK)
int winsock_init=0; // 0=winsock not initialized, 1=success
-long local_buffer_size = 64;
-long stream_buffer_size = 128;
+long m_local_buffer_size = 64;
+long m_stream_buffer_size = 128;
FILE_STREAM *open_filestream(char *filename)
{@@ -42,7 +42,7 @@
if(StringComp(filename,"http://", 7) == 0)
{- fs = (FILE_STREAM *)LocalAlloc(LPTR, sizeof(FILE_STREAM) + stream_buffer_size * 1024);
+ fs = (FILE_STREAM *)LocalAlloc(LPTR, sizeof(FILE_STREAM) + m_stream_buffer_size * 1024);
if(fs == NULL)
return NULL;
@@ -59,7 +59,7 @@
}
else
{- fs = (FILE_STREAM*)LocalAlloc(LPTR, sizeof(FILE_STREAM) + local_buffer_size * 1024);
+ fs = (FILE_STREAM*)LocalAlloc(LPTR, sizeof(FILE_STREAM) + m_local_buffer_size * 1024);
if(fs == NULL)
return NULL;
@@ -92,9 +92,9 @@
fs->buffer_offset = 0;
if(fs->http)
- fs->buffer_length = recv(fs->inetStream, fs->data, stream_buffer_size * 1024, 0);
+ fs->buffer_length = recv(fs->inetStream, fs->data, m_stream_buffer_size * 1024, 0);
else
- ReadFile(fs->stream, fs->data, local_buffer_size * 1024, &fs->buffer_length, 0);
+ ReadFile(fs->stream, fs->data, m_local_buffer_size * 1024, &fs->buffer_length, 0);
if(fs->buffer_length <= 0)
{--- a/common/faad/filestream.h
+++ b/common/faad/filestream.h
@@ -16,7 +16,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: filestream.h,v 1.1 2002/01/14 19:15:49 menno Exp $
+** $Id: filestream.h,v 1.2 2002/01/21 17:04:27 menno Exp $
**/
#ifndef FILESTREAM_H
@@ -33,8 +33,8 @@
int http_file_length;
} FILE_STREAM;
-extern long local_buffer_size;
-extern long stream_buffer_size;
+extern long m_local_buffer_size;
+extern long m_stream_buffer_size;
FILE_STREAM *open_filestream(char *filename);
int read_byte_filestream(FILE_STREAM *fs);
--- a/common/faad/id3v2tag.c
+++ b/common/faad/id3v2tag.c
@@ -1,23 +1,23 @@
/*
- * FAAD - Freeware Advanced Audio Decoder
- * Copyright (C) 2001 Menno Bakker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * $Id: id3v2tag.c,v 1.1 2002/01/14 19:15:49 menno Exp $
- */
+** FAAD - Freeware Advanced Audio Decoder
+** Copyright (C) 2002 M. Bakker
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+**
+** $Id: id3v2tag.c,v 1.2 2002/01/21 17:04:27 menno Exp $
+**/
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
--- a/common/faad/id3v2tag.h
+++ b/common/faad/id3v2tag.h
@@ -1,23 +1,23 @@
/*
- * FAAD - Freeware Advanced Audio Decoder
- * Copyright (C) 2001 Menno Bakker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * $Id: id3v2tag.h,v 1.1 2002/01/14 19:15:49 menno Exp $
- */
+** FAAD - Freeware Advanced Audio Decoder
+** Copyright (C) 2002 M. Bakker
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+**
+** $Id: id3v2tag.h,v 1.2 2002/01/21 17:04:27 menno Exp $
+**/
#ifndef __ID3V2TAG_H__
#define __ID3V2TAG_H__