Rename the flac combined plugin sources so that they are listed together in a by-name listing.

--HG--
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c

4 files changed, 3 insertions, 31 deletions

diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 4ed0f756d..cf88795ba 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -24,7 +24,7 @@ xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS)
 xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS)
 xineplug_wavpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers
 
-xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c demux_flac.h
+xineplug_flac_la_SOURCES = flac_demuxer.c flac_decoder.c
 xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS)
 xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS)
 
diff --git a/src/combined/demux_flac.h b/src/combined/demux_flac.h
deleted file mode 100644
index 6086781d1..000000000
--- a/src/combined/demux_flac.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
- * Copyright (C) 2000-2003 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.2 2003/12/09 00:02:32 f1rmb Exp $
- */
-
-#ifndef HAVE_DEMUX_FLAC_H
-#define HAVE_DEMUX_FLAC_H
-
-void *demux_flac_init_class (xine_t *xine, void *data);
-
-#endif
diff --git a/src/combined/decoder_flac.c b/src/combined/flac_decoder.c
index 52fbde49f..babfde6ae 100644
--- a/src/combined/decoder_flac.c
+++ b/src/combined/flac_decoder.c
@@ -48,8 +48,6 @@
 #include "audio_out.h"
 #include "buffer.h"
 
-#include "demux_flac.h"
-
 typedef struct {
   audio_decoder_class_t   decoder_class;
 } flac_class_t;
@@ -409,6 +407,8 @@ init_plugin (xine_t *xine, void *data) {
     return this;
 }
 
+void *demux_flac_init_class (xine_t *xine, void *data);
+
 static uint32_t audio_types[] = { 
   BUF_AUDIO_FLAC, 0
  };
diff --git a/src/combined/demux_flac.c b/src/combined/flac_demuxer.c
index 43ee17d5c..43ee17d5c 100644
--- a/src/combined/demux_flac.c
+++ b/src/combined/flac_demuxer.c