# HG changeset patch
# User giacomo
# Date 1169233540 28800
# Node ID 65408c59b42480f9f9d45a84a7822ec0f11e3990
# Parent  1e5cb7a00cb0b12fcd7a0147dbd41482023452e8
[svn] - sid plugin: removed plugin option to check files by content, that kind of option is handled by the player

diff -r 1e5cb7a00cb0 -r 65408c59b424 ChangeLog
--- a/ChangeLog	Fri Jan 19 10:55:44 2007 -0800
+++ b/ChangeLog	Fri Jan 19 11:05:40 2007 -0800
@@ -1,3 +1,16 @@
+2007-01-19 18:55:44 +0000  Giacomo Lozito <james@develia.org>
+  revision [1010]
+  - added is_our_file_from_vfs function to sid, for both libsidplay v1 and v2
+  trunk/src/sid/xmms-sid.c     |   23 +++++++++++++++++++++--
+  trunk/src/sid/xmms-sid.h     |    3 +++
+  trunk/src/sid/xs_init.c      |    4 ++--
+  trunk/src/sid/xs_sidplay1.cc |    9 ++++++++-
+  trunk/src/sid/xs_sidplay1.h  |    1 +
+  trunk/src/sid/xs_sidplay2.cc |   10 ++++++++--
+  trunk/src/sid/xs_sidplay2.h  |    1 +
+  7 files changed, 44 insertions(+), 7 deletions(-)
+
+
 2007-01-19 17:56:06 +0000  Giacomo Lozito <james@develia.org>
   revision [1008]
   - modified the sid plugin to use vfs, for both libsidplay v1 and v2; still requires testing and some work in the is_our_file part
diff -r 1e5cb7a00cb0 -r 65408c59b424 src/sid/xs_config.c
--- a/src/sid/xs_config.c	Fri Jan 19 10:55:44 2007 -0800
+++ b/src/sid/xs_config.c	Fri Jan 19 11:05:40 2007 -0800
@@ -80,7 +80,6 @@
 { CTYPE_STR,	&xs_cfg.hvscPath,		"hvscPath" },
 
 { CTYPE_INT,	&xs_cfg.subsongControl,		"subsongControl" },
-{ CTYPE_BOOL,	&xs_cfg.detectMagic,		"detectMagic" },
 
 { CTYPE_BOOL,	&xs_cfg.titleOverride,		"titleOverride" },
 { CTYPE_STR,	&xs_cfg.titleFormat,		"titleFormat" },
@@ -142,8 +141,6 @@
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_popup",	&xs_cfg.subsongControl,		XS_SSC_POPUP },
 { WTYPE_BGROUP,	CTYPE_INT,	"cfg_subctrl_patch",	&xs_cfg.subsongControl,		XS_SSC_PATCH },
 
-{ WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_detectmagic",	&xs_cfg.detectMagic,		0 },
-
 { WTYPE_BUTTON,	CTYPE_BOOL,	"cfg_ftitle_override",	&xs_cfg.titleOverride,		0 },
 { WTYPE_TEXT,	CTYPE_STR,	"cfg_ftitle_format",	&xs_cfg.titleFormat,		0 },
 
@@ -228,8 +225,6 @@
 	xs_cfg.subsongControl = XS_SSC_POPUP;
 #endif
 
-	xs_cfg.detectMagic = FALSE;
-
 #ifdef HAVE_XMMSEXTRA
 	xs_cfg.titleOverride = FALSE;
 #else
diff -r 1e5cb7a00cb0 -r 65408c59b424 src/sid/xs_config.h
--- a/src/sid/xs_config.h	Fri Jan 19 10:55:44 2007 -0800
+++ b/src/sid/xs_config.h	Fri Jan 19 11:05:40 2007 -0800
@@ -105,7 +105,6 @@
 	gchar		*hvscPath;		/* Path-prefix for HVSC */
 
 	gint		subsongControl;
-	gboolean	detectMagic;
 
 	gboolean	titleOverride;		/* TRUE if XMMS titles are overriden */
 	gchar		*titleFormat;
diff -r 1e5cb7a00cb0 -r 65408c59b424 src/sid/xs_interface.c
--- a/src/sid/xs_interface.c	Fri Jan 19 10:55:44 2007 -0800
+++ b/src/sid/xs_interface.c	Fri Jan 19 11:05:40 2007 -0800
@@ -178,9 +178,6 @@
   GtkObject *cfg_subauto_mintime_adj;
   GtkWidget *cfg_subauto_mintime;
   GtkWidget *label53;
-  GtkWidget *frame22;
-  GtkWidget *vbox22;
-  GtkWidget *cfg_detectmagic;
   GtkWidget *label3;
   GtkWidget *hbuttonbox1;
   GtkWidget *cfg_ok;
@@ -1465,33 +1462,6 @@
   gtk_box_pack_start (GTK_BOX (hbox20), label53, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label53), 0, 0.5);
 
-  frame22 = gtk_frame_new ("Miscellaneous options: ");
-  gtk_widget_set_name (frame22, "frame22");
-  gtk_widget_ref (frame22);
-  g_object_set_data_full (G_OBJECT (xs_configwin), "frame22", frame22,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame22);
-  gtk_box_pack_start (GTK_BOX (vbox19), frame22, FALSE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (frame22), 4);
-
-  vbox22 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_name (vbox22, "vbox22");
-  gtk_widget_ref (vbox22);
-  g_object_set_data_full (G_OBJECT (xs_configwin), "vbox22", vbox22,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox22);
-  gtk_container_add (GTK_CONTAINER (frame22), vbox22);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox22), 2);
-
-  cfg_detectmagic = gtk_check_button_new_with_label ("Detect file by contents (slower)");
-  gtk_widget_set_name (cfg_detectmagic, "cfg_detectmagic");
-  gtk_widget_ref (cfg_detectmagic);
-  g_object_set_data_full (G_OBJECT (xs_configwin), "cfg_detectmagic", cfg_detectmagic,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (cfg_detectmagic);
-  gtk_box_pack_start (GTK_BOX (vbox22), cfg_detectmagic, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_detectmagic, "Determine if file is a SID-tune by checking the file contents. If NOT selected, filetype is determined by checking filename extension (.sid, .dat, ...)", NULL);
-
   label3 = gtk_label_new ("Misc");
   gtk_widget_set_name (label3, "label3");
   gtk_widget_ref (label3);