[xine-cvs] CVS: xine-lib/src/libflac demux_flac.h,NONE,1.1 Makefile.am,1.3,1.4 decoder_flac.c,1.5,1.6 demux_flac.c,1.8,1.9

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-lib/src/libflac
In directory sc8-pr-cvs1:/tmp/cvs-serv11827/src/libflac

Modified Files:
	Makefile.am decoder_flac.c demux_flac.c 
Added Files:
	demux_flac.h 
Log Message:
Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).

--- NEW FILE: demux_flac.h ---
/* 
 * Copyright (C) 2000-2002 the xine project
 * 
 * This file is part of xine, a free video player.
 * 
 * xine 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.
 * 
 * xine 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: demux_flac.h,v 1.1 2003/08/25 21:51:42 f1rmb Exp $
 */

#ifndef HAVE_DEMUX_FLAC_H
#define HAVE_DEMUX_FLAC_H

void *demux_flac_init_class (xine_t *xine, void *data);

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libflac/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	14 May 2003 16:21:49 -0000	1.3
+++ Makefile.am	25 Aug 2003 21:51:41 -0000	1.4
@@ -13,3 +13,5 @@
 xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c
 xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS)
 xineplug_flac_la_LDFLAGS = -avoid-version -module -lFLAC @XINE_PLUGIN_MIN_SYMS@
+
+noinst_HEADERS = demux_flac.h
\ No newline at end of file

Index: decoder_flac.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libflac/decoder_flac.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- decoder_flac.c	25 Jul 2003 21:02:05 -0000	1.5
+++ decoder_flac.c	25 Aug 2003 21:51:42 -0000	1.6
@@ -39,6 +39,8 @@
 #define LOG 1
 */
 
+#include "demux_flac.h"
+
 typedef struct {
   audio_decoder_class_t   decoder_class;
 } flac_class_t;
@@ -419,9 +421,6 @@
   audio_types,         /* supported types */
   5                    /* priority        */
 };
-
-/* from demux_flac.c */
-void *demux_flac_init_class (xine_t *xine, void *data);
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  

Index: demux_flac.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libflac/demux_flac.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- demux_flac.c	25 Jul 2003 21:02:05 -0000	1.8
+++ demux_flac.c	25 Aug 2003 21:51:42 -0000	1.9
@@ -46,6 +46,8 @@
 #define LOG 1
 */
 
+#include "demux_flac.h"
+
 /* FLAC Demuxer plugin */
 typedef struct demux_flac_s {
   demux_plugin_t        demux_plugin;
@@ -660,14 +662,3 @@
 
     return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif