changeset 1577:bdf7935a2e26

Move xs_tuneinfo_*() function prototypes to xs_slsup.h
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 03 Sep 2007 08:45:00 +0300
parents 716bbba83929
children 6d90d40ca0c8
files src/sid/xmms-sid.h src/sid/xs_sidplay1.h src/sid/xs_sidplay2.h src/sid/xs_slsup.h
diffstat 4 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/sid/xmms-sid.h	Mon Sep 03 08:43:47 2007 +0300
+++ b/src/sid/xmms-sid.h	Mon Sep 03 08:45:00 2007 +0300
@@ -35,7 +35,7 @@
 /* #define to enable spurious debugging messages for development
  * purposes. Output goes to stderr. See also DEBUG_NP below.
  */
-#undef DEBUG
+#define DEBUG
 
 /* Define to ISO C99 macro for debugging instead of varargs function.
  * This provides more useful information, but is incompatible with
@@ -170,14 +170,6 @@
 Tuple *	xs_get_song_tuple(gchar *);
 void	xs_about(void);
 
-
-t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,
-		gint nsubTunes, gint startTune, const gchar * sidName,
-		const gchar * sidComposer, const gchar * sidCopyright,
-		gint loadAddr, gint initAddr, gint playAddr,
-		gint dataFileLen, const gchar *sidFormat, gint sidModel);
-void	xs_tuneinfo_free(t_xs_tuneinfo *);
-
 void	xs_error(const char *, ...);
 
 
--- a/src/sid/xs_sidplay1.h	Mon Sep 03 08:43:47 2007 +0300
+++ b/src/sid/xs_sidplay1.h	Mon Sep 03 08:45:00 2007 +0300
@@ -3,6 +3,7 @@
 
 #include "xs_player.h"
 #include "xs_support.h"
+#include "xs_slsup.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,7 +16,7 @@
 guint		xs_sidplay1_fillbuffer(t_xs_status *, gchar *, guint);
 gboolean	xs_sidplay1_load(t_xs_status *, gchar *);
 void		xs_sidplay1_delete(t_xs_status *);
-t_xs_tuneinfo*	xs_sidplay1_getinfo(gchar *);
+t_xs_tuneinfo*	xs_sidplay1_getinfo(const gchar *);
 gboolean	xs_sidplay1_updateinfo(t_xs_status *);
 
 #ifdef __cplusplus
--- a/src/sid/xs_sidplay2.h	Mon Sep 03 08:43:47 2007 +0300
+++ b/src/sid/xs_sidplay2.h	Mon Sep 03 08:45:00 2007 +0300
@@ -3,6 +3,7 @@
 
 #include "xs_player.h"
 #include "xs_support.h"
+#include "xs_slsup.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,7 +16,7 @@
 guint		xs_sidplay2_fillbuffer(t_xs_status *, gchar *, guint);
 gboolean	xs_sidplay2_load(t_xs_status *, gchar *);
 void		xs_sidplay2_delete(t_xs_status *);
-t_xs_tuneinfo*	xs_sidplay2_getinfo(gchar *);
+t_xs_tuneinfo*	xs_sidplay2_getinfo(const gchar *);
 gboolean	xs_sidplay2_updateinfo(t_xs_status *);
 void		xs_sidplay2_flush(t_xs_status *);
 
--- a/src/sid/xs_slsup.h	Mon Sep 03 08:43:47 2007 +0300
+++ b/src/sid/xs_slsup.h	Mon Sep 03 08:45:00 2007 +0300
@@ -17,6 +17,13 @@
 void		xs_songlen_close(void);
 t_xs_sldb_node *xs_songlen_get(const gchar *);
 
+t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,
+		gint nsubTunes, gint startTune, const gchar * sidName,
+		const gchar * sidComposer, const gchar * sidCopyright,
+		gint loadAddr, gint initAddr, gint playAddr,
+		gint dataFileLen, const gchar *sidFormat, gint sidModel);
+void	xs_tuneinfo_free(t_xs_tuneinfo *);
+
 
 #ifdef __cplusplus
 }