# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1169696525 0
# Node ID ba98fdac6307be949ce9f4b97bc06046c99ae726
# Parent  08038c16193688e553d525f4ac97e96f1da742db
Moved some things to xs_support.h; t_xs_subtuneinfo.tuneSpeed is now the
assumed (if known) freq (Hz) of the currently playing tune;
plrUpdateSIDInfo() added;


diff -r 08038c161936 -r ba98fdac6307 src/xmms-sid.h
--- a/src/xmms-sid.h	Thu Jan 25 03:41:04 2007 +0000
+++ b/src/xmms-sid.h	Thu Jan 25 03:42:05 2007 +0000
@@ -23,17 +23,7 @@
 #ifndef _XMMS_SID_H
 #define _XMMS_SID_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#else
-#define assert(x) /* stub */
-#endif
-
-#include <glib.h>
+#include "xs_support.h"
 #include <pthread.h>
 
 #ifdef __cplusplus
@@ -152,8 +142,8 @@
 /* Plugin-wide typedefs
  */
 typedef struct {
-	gint		tuneSpeed;
-	gint		tuneLength;
+	gint		tuneSpeed,
+			tuneLength;
 	gboolean	tunePlayed;
 } t_xs_subtuneinfo;
 
@@ -178,7 +168,7 @@
 
 typedef struct {
 	gint		plrIdent;
-	gboolean	(*plrIsOurFile)(gchar *);
+	gboolean	(*plrIsOurFile)(t_xs_file *);
 	gboolean	(*plrInit)(struct t_xs_status *);
 	void		(*plrClose)(struct t_xs_status *);
 	gboolean	(*plrInitSong)(struct t_xs_status *);
@@ -186,6 +176,7 @@
 	gboolean	(*plrLoadSID)(struct t_xs_status *, gchar *);
 	void		(*plrDeleteSID)(struct t_xs_status *);
 	t_xs_tuneinfo*	(*plrGetSIDInfo)(gchar *);
+	gboolean	(*plrUpdateSIDInfo)(struct t_xs_status *);
 } t_xs_player;
 
 
@@ -238,7 +229,7 @@
 		const gchar * sidComposer, const gchar * sidCopyright,
 		gint loadAddr, gint initAddr, gint playAddr,
 		gint dataFileLen, const gchar *sidFormat,
-		gint sidModel, gint songSpeed, gint clockSpeed);
+		gint sidModel);
 void	xs_tuneinfo_free(t_xs_tuneinfo *);
 
 void	xs_error(const char *, ...);