summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/combined/Makefile.am11
-rw-r--r--src/combined/nsf_combined.c46
-rw-r--r--src/combined/nsf_decoder.c (renamed from src/libxineadec/nsf.c)29
-rw-r--r--src/combined/nsf_demuxer.c (renamed from src/demuxers/demux_nsf.c)1
-rw-r--r--src/demuxers/Makefile.am2
-rw-r--r--src/demuxers/group_audio.c5
-rw-r--r--src/demuxers/group_audio.h1
-rw-r--r--src/libxineadec/Makefile.am9
8 files changed, 58 insertions, 46 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index ed513cd4d..fef159564 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -11,7 +11,11 @@ if ENABLE_LIBFLAC
xineplug_flac = xineplug_flac.la
endif
-xineplug_LTLIBRARIES = $(xineplug_wavpack) $(xineplug_flac)
+$(top_builddir)/contrib/nosefart/libnosefart.la:
+ $(MAKE) -C $(top_builddir)/contrib/nosefart
+
+xineplug_LTLIBRARIES = $(xineplug_wavpack) $(xineplug_flac) \
+ xineplug_nsf.la
xineplug_wavpack_la_SOURCES = demux_wavpack.c decoder_wavpack.c combined_wavpack.c combined_wavpack.h
xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS)
@@ -21,3 +25,8 @@ 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_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_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 --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c
new file mode 100644
index 000000000..855b8d2a5
--- /dev/null
+++ b/src/combined/nsf_combined.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2007 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: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $
+ */
+
+#include "xine_internal.h"
+
+void *decoder_nsf_init_plugin (xine_t *xine, void *data);
+void *demux_nsf_init_plugin (xine_t *xine, void *data);
+
+static const demuxer_info_t demux_info_nsf = {
+ 10 /* priority */
+};
+
+static uint32_t audio_types[] = {
+ BUF_AUDIO_NSF,
+ 0
+};
+
+static const decoder_info_t decoder_info_nsf = {
+ audio_types, /* supported types */
+ 5 /* priority */
+};
+
+const plugin_info_t xine_plugin_info[] EXPORTED = {
+ { PLUGIN_DEMUX, 26, "nsfdemux", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin },
+ { PLUGIN_AUDIO_DECODER, 15, "nsfdec", XINE_VERSION_CODE, &decoder_info_nsf, decoder_nsf_init_plugin },
+ { PLUGIN_NONE, 0, NULL, 0, NULL, NULL }
+};
diff --git a/src/libxineadec/nsf.c b/src/combined/nsf_decoder.c
index 4af6fe878..e8b5dd96a 100644
--- a/src/libxineadec/nsf.c
+++ b/src/combined/nsf_decoder.c
@@ -253,7 +253,7 @@ static void dispose_class (audio_decoder_class_t *this_gen) {
/* This function allocates a private audio decoder class and initializes
* the class's member functions. */
-static void *init_plugin (xine_t *xine, void *data) {
+void *decoder_nsf_init_plugin (xine_t *xine, void *data) {
nsf_class_t *this ;
@@ -266,30 +266,3 @@ static void *init_plugin (xine_t *xine, void *data) {
return this;
}
-
-/* This is a list of all of the internal xine audio buffer types that
- * this decoder is able to handle. Check src/xine-engine/buffer.h for a
- * list of valid buffer types (and add a new one if the one you need does
- * not exist). Terminate the list with a 0. */
-static uint32_t audio_types[] = {
- BUF_AUDIO_NSF,
- 0
-};
-
-/* This data structure combines the list of supported xine buffer types and
- * the priority that the plugin should be given with respect to other
- * plugins that handle the same buffer type. A plugin with priority (n+1)
- * will be used instead of a plugin with priority (n). */
-static const decoder_info_t dec_info_audio = {
- audio_types, /* supported types */
- 5 /* priority */
-};
-
-/* The plugin catalog entry. This is the only information that this plugin
- * will export to the public. */
-const plugin_info_t xine_plugin_info[] EXPORTED = {
- /* { type, API version, "name", version, special_info, init_function }, */
- { PLUGIN_AUDIO_DECODER, 15, "nsf", XINE_VERSION_CODE, &dec_info_audio, &init_plugin },
- { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-
diff --git a/src/demuxers/demux_nsf.c b/src/combined/nsf_demuxer.c
index 7408274d5..b598b9e1c 100644
--- a/src/demuxers/demux_nsf.c
+++ b/src/combined/nsf_demuxer.c
@@ -53,7 +53,6 @@
#include "compat.h"
#include "demux.h"
#include "bswap.h"
-#include "group_audio.h"
#define NSF_HEADER_SIZE 0x80
#define NSF_SAMPLERATE 44100
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index b1e747bcc..b57dc7369 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -111,7 +111,7 @@ xineplug_dmx_games_la_SOURCES = group_games.c demux_eawve.c \
xineplug_dmx_games_la_LIBADD = $(XINE_LIB)
xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \
- demux_cdda.c demux_mpgaudio.c demux_nsf.c \
+ demux_cdda.c demux_mpgaudio.c \
demux_realaudio.c demux_snd.c demux_voc.c \
demux_vox.c demux_wav.c demux_ac3.c id3.c \
demux_aac.c demux_mod.c demux_flac.c \
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index b8f0e1ed4..4635ec4a6 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -71,10 +71,6 @@ static const demuxer_info_t demux_info_mpc = {
0 /* priority */
};
-static const demuxer_info_t demux_info_nsf = {
- 10 /* priority */
-};
-
static const demuxer_info_t demux_info_realaudio = {
10 /* priority */
};
@@ -120,7 +116,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
{ PLUGIN_DEMUX, 26, "flac", XINE_VERSION_CODE, &demux_info_flac, demux_flac_init_plugin },
{ PLUGIN_DEMUX, 26, "mp3", XINE_VERSION_CODE, &demux_info_mpgaudio, demux_mpgaudio_init_class },
{ PLUGIN_DEMUX, 26, "mpc", XINE_VERSION_CODE, &demux_info_mpc, demux_mpc_init_plugin },
- { PLUGIN_DEMUX, 26, "nsf", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin },
{ PLUGIN_DEMUX, 26, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin },
{ PLUGIN_DEMUX, 26, "shn", XINE_VERSION_CODE, &demux_info_shn, demux_shn_init_plugin },
{ PLUGIN_DEMUX, 26, "snd", XINE_VERSION_CODE, &demux_info_snd, demux_snd_init_plugin },
diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h
index 7f1fccc5e..e5456aab6 100644
--- a/src/demuxers/group_audio.h
+++ b/src/demuxers/group_audio.h
@@ -34,7 +34,6 @@ void *demux_dts_init_plugin (xine_t *xine, void *data);
void *demux_flac_init_plugin (xine_t *xine, void *data);
void *demux_mpgaudio_init_class (xine_t *xine, void *data);
void *demux_mpc_init_plugin (xine_t *xine, void *data);
-void *demux_nsf_init_plugin (xine_t *xine, void *data);
void *demux_realaudio_init_plugin (xine_t *xine, void *data);
void *demux_shn_init_plugin (xine_t *xine, void *data);
void *demux_snd_init_plugin (xine_t *xine, void *data);
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 6ea2171ee..3bc08f320 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -29,12 +29,8 @@ $(top_builddir)/contrib/libmpcdec/libmpcdec.la:
$(top_builddir)/contrib/libdca/libdca.la:
$(MAKE) -C $(top_builddir)/contrib/libdca
-$(top_builddir)/contrib/nosefart/libnosefart.la:
- $(MAKE) -C $(top_builddir)/contrib/nosefart
-
xineplug_LTLIBRARIES = \
xineplug_decode_gsm610.la \
- xineplug_decode_nsf.la \
xineplug_decode_lpcm.la \
$(vorbis_module) \
$(speex_module) \
@@ -44,11 +40,6 @@ xineplug_LTLIBRARIES = \
xineplug_decode_gsm610_la_SOURCES = gsm610.c
xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la
-xineplug_decode_nsf_la_SOURCES = nsf.c
-xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/nosefart/libnosefart.la -lm
-xineplug_decode_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
-xineplug_decode_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER -I$(top_srcdir)/contrib/nosefart
-
xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c
xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 11:40:55 +0000