# HG changeset patch
# User Diego 'Flameeyes' Pettenò <[EMAIL PROTECTED]>
# Date 1181383519 -7200
# Node ID ab9cf365e250793ca2fbbc6bd5aeb9d706d00d49
# Parent 7435a7f7aca78809a58c71a5859bf44b3a7cd7d1
Add an nsf_combined.h header file with declarations of decoder_nsf_init_plugin
and demux_nsf_init_plugin.
diff -r ab9cf365e250793ca2fbbc6bd5aeb9d706d00d49 -r
7435a7f7aca78809a58c71a5859bf44b3a7cd7d1 src/combined/Makefile.am
--- a/src/combined/Makefile.am Sat Jun 09 12:05:19 2007 +0200
+++ b/src/combined/Makefile.am Sat Jun 09 11:49:35 2007 +0200
@@ -28,7 +28,7 @@ xineplug_flac_la_LIBADD = $(XINE_LIB) $(
xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS)
xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS)
-xineplug_nsf_la_SOURCES = nsf_decoder.c nsf_demuxer.c nsf_combined.c
+xineplug_nsf_la_SOURCES = nsf_decoder.c nsf_demuxer.c nsf_combined.c
nsf_combined.h
xineplug_nsf_la_LIBADD = $(XINE_LIB)
$(top_builddir)/contrib/nosefart/libnosefart.la -lm
xineplug_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
xineplug_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER
-I$(top_srcdir)/contrib/nosefart -I$(top_srcdir)/src/demuxers
diff -r ab9cf365e250793ca2fbbc6bd5aeb9d706d00d49 -r
7435a7f7aca78809a58c71a5859bf44b3a7cd7d1 src/combined/nsf_combined.c
--- a/src/combined/nsf_combined.c Sat Jun 09 12:05:19 2007 +0200
+++ b/src/combined/nsf_combined.c Sat Jun 09 11:49:35 2007 +0200
@@ -21,9 +21,7 @@
*/
#include "xine_internal.h"
-
-void *decoder_nsf_init_plugin (xine_t *xine, void *data);
-void *demux_nsf_init_plugin (xine_t *xine, void *data);
+#include "nsf_combined.h"
static const demuxer_info_t demux_info_nsf = {
10 /* priority */
diff -r ab9cf365e250793ca2fbbc6bd5aeb9d706d00d49 -r
7435a7f7aca78809a58c71a5859bf44b3a7cd7d1 src/combined/nsf_decoder.c
--- a/src/combined/nsf_decoder.c Sat Jun 09 12:05:19 2007 +0200
+++ b/src/combined/nsf_decoder.c Sat Jun 09 11:49:35 2007 +0200
@@ -38,6 +38,8 @@
/* Nosefart includes */
#include "types.h"
#include "nsf.h"
+
+#include "nsf_combined.h"
typedef struct {
audio_decoder_class_t decoder_class;
diff -r ab9cf365e250793ca2fbbc6bd5aeb9d706d00d49 -r
7435a7f7aca78809a58c71a5859bf44b3a7cd7d1 src/combined/nsf_demuxer.c
--- a/src/combined/nsf_demuxer.c Sat Jun 09 12:05:19 2007 +0200
+++ b/src/combined/nsf_demuxer.c Sat Jun 09 11:49:35 2007 +0200
@@ -53,6 +53,8 @@
#include "compat.h"
#include "demux.h"
#include "bswap.h"
+
+#include "nsf_combined.h"
#define NSF_HEADER_SIZE 0x80
#define NSF_SAMPLERATE 44100
diff -r ab9cf365e250793ca2fbbc6bd5aeb9d706d00d49 -r
7435a7f7aca78809a58c71a5859bf44b3a7cd7d1 src/combined/nsf_combined.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/combined/nsf_combined.h Sat Jun 09 11:49:35 2007 +0200
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2000-2001 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
+ */
+
+void *decoder_nsf_init_plugin (xine_t *xine, void *data);
+void *demux_nsf_init_plugin (xine_t *xine, void *data);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
