[MPlayer-cvslog] r30594 - in trunk: libmpcodecs/ad_mp3lib.c libmpcodecs/ad_mp3lib.h mp3lib/sr1.c

[diego]

Author: diego
Date: Tue Feb 16 14:16:17 2010
New Revision: 30594

Log:
Add header file for mplayer_audio_read() instead of forward declaring it.

Added:
   trunk/libmpcodecs/ad_mp3lib.h
Modified:
   trunk/libmpcodecs/ad_mp3lib.c
   trunk/mp3lib/sr1.c

Modified: trunk/libmpcodecs/ad_mp3lib.c
==============================================================================
--- trunk/libmpcodecs/ad_mp3lib.c	Tue Feb 16 14:10:24 2010	(r30593)
+++ trunk/libmpcodecs/ad_mp3lib.c	Tue Feb 16 14:16:17 2010	(r30594)
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "ad_internal.h"
+#include "ad_mp3lib.h"
 
 static const ad_info_t info =
 {

Added: trunk/libmpcodecs/ad_mp3lib.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpcodecs/ad_mp3lib.h	Tue Feb 16 14:16:17 2010	(r30594)
@@ -0,0 +1,24 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer 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.
+ *
+ * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_AD_MP3LIB_H
+#define MPLAYER_AD_MP3LIB_H
+
+int mplayer_audio_read(char *buf, int size);
+
+#endif /* MPLAYER_AD_MP3LIB_H */

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	Tue Feb 16 14:10:24 2010	(r30593)
+++ trunk/mp3lib/sr1.c	Tue Feb 16 14:16:17 2010	(r30594)
@@ -20,7 +20,7 @@
 #include "cpudetect.h"
 //#include "liba52/mm_accel.h"
 #include "mp_msg.h"
-
+#include "libmpcodecs/ad_mp3lib.h"
 #include "libvo/fastmemcpy.h"
 
 #include "libavutil/common.h"
@@ -55,8 +55,6 @@ static long outscale = 32768;
 #include "tabinit.c"
 
 #if 1
-int mplayer_audio_read(char *buf,int size);
-
 LOCAL int mp3_read(char *buf,int size){
 //  int len=fread(buf,1,size,mp3_file);
   int len=mplayer_audio_read(buf,size);