diff xmms-sid.glade @ 7:e5c49367b899

Updated to 0.8
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 03 Jun 2003 11:25:05 +0000
parents 183e7cbc1036
children 82f79aad24c2
line wrap: on
line diff
--- a/xmms-sid.glade	Tue Jun 03 11:19:04 2003 +0000
+++ b/xmms-sid.glade	Tue Jun 03 11:25:05 2003 +0000
@@ -2,20 +2,28 @@
 <GTK-Interface>
 
 <project>
-  <name>paske</name>
-  <program_name>paske</program_name>
+  <name>xmms-sid</name>
+  <program_name>xmms-sid</program_name>
   <directory></directory>
   <source_directory>src</source_directory>
   <pixmaps_directory>pixmaps</pixmaps_directory>
   <language>C</language>
   <gnome_support>False</gnome_support>
   <gettext_support>False</gettext_support>
+  <use_widget_names>True</use_widget_names>
+  <output_build_files>False</output_build_files>
+  <main_source_file>xs_interface.c</main_source_file>
+  <main_header_file>xs_interface.h</main_header_file>
+  <handler_source_file>xs_genui.c</handler_source_file>
+  <handler_header_file>xs_genui.h</handler_header_file>
+  <support_source_file>xs_glade.c</support_source_file>
+  <support_header_file>xs_glade.h</support_header_file>
 </project>
 
 <widget>
   <class>GtkWindow</class>
-  <name>sid_configwin</name>
-  <title>xmms-sid configuration</title>
+  <name>xs_configwin</name>
+  <title>XMMS-SID configuration</title>
   <type>GTK_WINDOW_DIALOG</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
@@ -35,7 +43,7 @@
       <name>cfg_notebook</name>
       <can_focus>True</can_focus>
       <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
+      <show_border>False</show_border>
       <tab_pos>GTK_POS_TOP</tab_pos>
       <scrollable>False</scrollable>
       <tab_hborder>2</tab_hborder>
@@ -80,19 +88,21 @@
 	    <widget>
 	      <class>GtkVBox</class>
 	      <name>vbox9</name>
+	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>0</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_res_8bit</name>
+		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>8-bit</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>resolution</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -101,13 +111,14 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_res_16bit</name>
+		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>16-bit</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>resolution</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -131,19 +142,21 @@
 	    <widget>
 	      <class>GtkVBox</class>
 	      <name>vbox10</name>
+	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>0</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_chn_mono</name>
+		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>Mono</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>channels</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -152,13 +165,14 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_chn_stereo</name>
+		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>Stereo</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>channels</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -167,13 +181,14 @@
 	      <widget>
 		<class>GtkRadioButton</class>
 		<name>cfg_chn_autopan</name>
+		<border_width>2</border_width>
 		<can_focus>True</can_focus>
 		<label>Autopanning</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>channels</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -206,6 +221,7 @@
 	    <widget>
 	      <class>GtkHBox</class>
 	      <name>hbox4</name>
+	      <border_width>4</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>0</spacing>
 
@@ -213,11 +229,6 @@
 		<class>GtkSpinButton</class>
 		<name>cfg_samplerate</name>
 		<can_focus>True</can_focus>
-		<signal>
-		  <name>changed</name>
-		  <handler>on_cfg_samplerate_changed</handler>
-		  <last_modification_time>Mon, 18 Sep 2000 17:52:20 GMT</last_modification_time>
-		</signal>
 		<climb_rate>1</climb_rate>
 		<digits>0</digits>
 		<numeric>False</numeric>
@@ -258,22 +269,110 @@
 	</widget>
 
 	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>cfg_checkfilecontent</name>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>toggled</name>
-	    <handler>on_cfg_checkfilecontent_toggled</handler>
-	    <last_modification_time>Mon, 18 Sep 2000 17:51:55 GMT</last_modification_time>
-	  </signal>
-	  <label>Determine filetype by contents (slower)</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
+	  <class>GtkFrame</class>
+	  <name>frame27</name>
+	  <border_width>4</border_width>
+	  <label>Oversampling:</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
+	    <expand>True</expand>
+	    <fill>True</fill>
 	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox27</name>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_oversample</name>
+	      <border_width>4</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Use oversampling</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox16</name>
+	      <border_width>4</border_width>
+	      <homogeneous>False</homogeneous>
+	      <spacing>4</spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label42</name>
+		<label>Oversampling factor:</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0.5</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>cfg_oversample_factor</name>
+		<can_focus>True</can_focus>
+		<climb_rate>1</climb_rate>
+		<digits>0</digits>
+		<numeric>False</numeric>
+		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		<snap>False</snap>
+		<wrap>False</wrap>
+		<value>1</value>
+		<lower>2</lower>
+		<upper>8</upper>
+		<step>1</step>
+		<page>1</page>
+		<page_size>1</page_size>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label43</name>
+		<label>Larger values require
+more CPU-power.</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0.5</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+	    </widget>
+	  </widget>
 	</widget>
       </widget>
 
@@ -297,6 +396,74 @@
 	<spacing>0</spacing>
 
 	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame26</name>
+	  <border_width>4</border_width>
+	  <label>Emulation library selection: </label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox26</name>
+	    <border_width>2</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_emu_sidplay1</name>
+	      <tooltip>Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though.</tooltip>
+	      <can_focus>True</can_focus>
+	      <label>SIDPlay 1 (frame-based)</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>emulator</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_emu_sidplay2</name>
+	      <tooltip>Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation.</tooltip>
+	      <can_focus>True</can_focus>
+	      <label>SIDPlay 2 (cycle-based)</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>emulator</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_emu_sidplay2_opt</name>
+	      <can_focus>True</can_focus>
+	      <label>Use SIDPlay2 optimization mode (faster, not accurate)</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
 	  <class>GtkHBox</class>
 	  <name>hbox1</name>
 	  <homogeneous>False</homogeneous>
@@ -323,19 +490,20 @@
 	    <widget>
 	      <class>GtkVBox</class>
 	      <name>vbox4</name>
+	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>0</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
-		<name>cfg_clock_pal</name>
+		<name>cfg_emu_clock_pal</name>
 		<can_focus>True</can_focus>
-		<label>PAL</label>
+		<label>PAL (50 Hz)</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>speed</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -343,14 +511,14 @@
 
 	      <widget>
 		<class>GtkRadioButton</class>
-		<name>cfg_clock_ntsc</name>
+		<name>cfg_emu_clock_ntsc</name>
 		<can_focus>True</can_focus>
-		<label>NTSC</label>
+		<label>NTSC (60 Hz)</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>speed</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -358,18 +526,13 @@
 
 	      <widget>
 		<class>GtkCheckButton</class>
-		<name>cfg_clock_force</name>
+		<name>cfg_emu_clock_force</name>
 		<can_focus>True</can_focus>
-		<signal>
-		  <name>toggled</name>
-		  <handler>on_cfg_clock_force_toggled</handler>
-		  <last_modification_time>Mon, 18 Sep 2000 17:51:45 GMT</last_modification_time>
-		</signal>
 		<label>Force speed</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -381,7 +544,7 @@
 	    <class>GtkFrame</class>
 	    <name>frame3</name>
 	    <border_width>4</border_width>
-	    <label>Waveforms:</label>
+	    <label>SID Type: </label>
 	    <label_xalign>0</label_xalign>
 	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	    <child>
@@ -393,19 +556,20 @@
 	    <widget>
 	      <class>GtkVBox</class>
 	      <name>vbox3</name>
+	      <border_width>2</border_width>
 	      <homogeneous>False</homogeneous>
 	      <spacing>0</spacing>
 
 	      <widget>
 		<class>GtkRadioButton</class>
-		<name>cfg_wav_mos6581</name>
+		<name>cfg_emu_mos6581</name>
 		<can_focus>True</can_focus>
 		<label>MOS 6581</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>waveforms</group>
 		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -413,33 +577,14 @@
 
 	      <widget>
 		<class>GtkRadioButton</class>
-		<name>cfg_wav_mos8580</name>
+		<name>cfg_emu_mos8580</name>
 		<can_focus>True</can_focus>
 		<label>MOS 8580</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>waveforms</group>
 		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>cfg_emufilters</name>
-		<can_focus>True</can_focus>
-		<signal>
-		  <name>toggled</name>
-		  <handler>on_cfg_emufilters_toggled</handler>
-		  <last_modification_time>Mon, 18 Sep 2000 17:51:41 GMT</last_modification_time>
-		</signal>
-		<label>Emulate filters</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
+		  <padding>2</padding>
 		  <expand>False</expand>
 		  <fill>False</fill>
 		</child>
@@ -464,19 +609,20 @@
 	  <widget>
 	    <class>GtkVBox</class>
 	    <name>vbox5</name>
+	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
 	    <spacing>0</spacing>
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_mem_banksw</name>
+	      <name>cfg_emu_mem_banksw</name>
 	      <can_focus>True</can_focus>
 	      <label>Bank switching</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <group>memorymode</group>
 	      <child>
-		<padding>0</padding>
+		<padding>2</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -484,14 +630,14 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_mem_transrom</name>
+	      <name>cfg_emu_mem_transrom</name>
 	      <can_focus>True</can_focus>
 	      <label>Transparent ROM</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <group>memorymode</group>
 	      <child>
-		<padding>0</padding>
+		<padding>2</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -499,14 +645,14 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_mem_playsid</name>
+	      <name>cfg_emu_mem_playsid</name>
 	      <can_focus>True</can_focus>
 	      <label>PlaySID environment</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <group>memorymode</group>
 	      <child>
-		<padding>0</padding>
+		<padding>2</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
@@ -529,16 +675,327 @@
       </widget>
 
       <widget>
+	<class>GtkFrame</class>
+	<name>frame17</name>
+	<border_width>4</border_width>
+	<label>SID Emulation Filter Settings: </label>
+	<label_xalign>0</label_xalign>
+	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+
+	<widget>
+	  <class>GtkVBox</class>
+	  <name>vbox25</name>
+	  <homogeneous>False</homogeneous>
+	  <spacing>0</spacing>
+
+	  <widget>
+	    <class>GtkCheckButton</class>
+	    <name>cfg_emu_filters</name>
+	    <border_width>4</border_width>
+	    <can_focus>True</can_focus>
+	    <label>Emulate filters</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkHBox</class>
+	    <name>hbox8</name>
+	    <border_width>4</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+	    <child>
+	      <padding>0</padding>
+	      <expand>True</expand>
+	      <fill>True</fill>
+	    </child>
+
+	    <widget>
+	      <class>GtkFrame</class>
+	      <name>cfg_frm1</name>
+	      <border_width>2</border_width>
+	      <width>56</width>
+	      <height>152</height>
+	      <label>FS</label>
+	      <label_xalign>0</label_xalign>
+	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	      <child>
+		<padding>0</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkVScale</class>
+		<name>cfg_emu_filt_fs</name>
+		<can_focus>True</can_focus>
+		<draw_value>True</draw_value>
+		<value_pos>GTK_POS_TOP</value_pos>
+		<digits>1</digits>
+		<policy>GTK_UPDATE_CONTINUOUS</policy>
+		<value>0</value>
+		<lower>0</lower>
+		<upper>1000</upper>
+		<step>1</step>
+		<page>100</page>
+		<page_size>0</page_size>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GtkFrame</class>
+	      <name>cfg_frm2</name>
+	      <border_width>2</border_width>
+	      <width>48</width>
+	      <height>152</height>
+	      <label>FM</label>
+	      <label_xalign>0</label_xalign>
+	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	      <child>
+		<padding>0</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkVScale</class>
+		<name>cfg_emu_filt_fm</name>
+		<can_focus>True</can_focus>
+		<draw_value>True</draw_value>
+		<value_pos>GTK_POS_TOP</value_pos>
+		<digits>1</digits>
+		<policy>GTK_UPDATE_CONTINUOUS</policy>
+		<value>0</value>
+		<lower>0</lower>
+		<upper>100</upper>
+		<step>1</step>
+		<page>10</page>
+		<page_size>0</page_size>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GtkFrame</class>
+	      <name>frame12</name>
+	      <border_width>2</border_width>
+	      <width>48</width>
+	      <height>152</height>
+	      <label>FT</label>
+	      <label_xalign>0</label_xalign>
+	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	      <child>
+		<padding>0</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkVScale</class>
+		<name>cfg_emu_filt_ft</name>
+		<can_focus>True</can_focus>
+		<draw_value>True</draw_value>
+		<value_pos>GTK_POS_TOP</value_pos>
+		<digits>2</digits>
+		<policy>GTK_UPDATE_CONTINUOUS</policy>
+		<value>0</value>
+		<lower>0</lower>
+		<upper>1</upper>
+		<step>0.01</step>
+		<page>0.1</page>
+		<page_size>0</page_size>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GtkVBox</class>
+	      <name>vbox17</name>
+	      <border_width>4</border_width>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkButton</class>
+		<name>cfg_filt_reset</name>
+		<width>120</width>
+		<height>32</height>
+		<can_focus>True</can_focus>
+		<signal>
+		  <name>clicked</name>
+		  <handler>cfg_filt_reset_clicked</handler>
+		  <last_modification_time>Mon, 18 Sep 2000 20:21:27 GMT</last_modification_time>
+		</signal>
+		<label>Reset values</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label9</name>
+		<width>136</width>
+		<height>104</height>
+		<label>These sliders affect the emulated SID's filter values. (Defaults are what the libsidplay sets them on init.)</label>
+		<justify>GTK_JUSTIFY_LEFT</justify>
+		<wrap>True</wrap>
+		<xalign>0.5</xalign>
+		<yalign>7.45058e-09</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+	    </widget>
+	  </widget>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label24</name>
+	<label>Filters</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
 	<class>GtkVBox</class>
-	<name>vbox7</name>
+	<name>vbox20</name>
 	<homogeneous>False</homogeneous>
 	<spacing>0</spacing>
 
 	<widget>
 	  <class>GtkFrame</class>
-	  <name>frame7</name>
+	  <name>frame21</name>
 	  <border_width>4</border_width>
-	  <label>STIL Configuration:</label>
+	  <label>Maximum playtime check: </label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox21</name>
+	    <border_width>2</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_sld_usemaxtime</name>
+	      <can_focus>True</can_focus>
+	      <label>Play for specified time (max). Can be combined with
+automatic song-length detection mechanisms below.</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>2</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox14</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>2</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label37</name>
+		<label>Playtime: </label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>cfg_sld_maxtime</name>
+		<can_focus>True</can_focus>
+		<climb_rate>1</climb_rate>
+		<digits>0</digits>
+		<numeric>False</numeric>
+		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		<snap>False</snap>
+		<wrap>False</wrap>
+		<value>60</value>
+		<lower>1</lower>
+		<upper>32767</upper>
+		<step>1</step>
+		<page>60</page>
+		<page_size>60</page_size>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label36</name>
+		<label>seconds</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame18</name>
+	  <border_width>4</border_width>
+	  <label>Song-length detection: </label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
@@ -549,19 +1006,385 @@
 
 	  <widget>
 	    <class>GtkVBox</class>
+	    <name>vbox18</name>
+	    <border_width>2</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_sld_none</name>
+	      <border_width>2</border_width>
+	      <tooltip>No automatic song-length detection. (See also Maximum playtime check)</tooltip>
+	      <can_focus>True</can_focus>
+	      <label>No song-length detection</label>
+	      <active>True</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>songlength</group>
+	      <child>
+		<padding>2</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHSeparator</class>
+	      <name>hseparator1</name>
+	      <child>
+		<padding>2</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_sld_maxsilence</name>
+	      <border_width>2</border_width>
+	      <tooltip>Detect possible end of song with silence timing.</tooltip>
+	      <can_focus>True</can_focus>
+	      <label>Maximum silence time</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>songlength</group>
+	      <child>
+		<padding>2</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkTable</class>
+	      <name>table3</name>
+	      <border_width>2</border_width>
+	      <rows>2</rows>
+	      <columns>3</columns>
+	      <homogeneous>False</homogeneous>
+	      <row_spacing>4</row_spacing>
+	      <column_spacing>4</column_spacing>
+	      <child>
+		<padding>2</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label29</name>
+		<label>Silence:</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label30</name>
+		<label>Amplitude: </label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<focus_target>cfg_sld_percentage</focus_target>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label31</name>
+		<label>seconds</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>2</left_attach>
+		  <right_attach>3</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label32</name>
+		<label>%</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<focus_target>cfg_sld_percentage</focus_target>
+		<child>
+		  <left_attach>2</left_attach>
+		  <right_attach>3</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>cfg_sld_silencetime</name>
+		<can_focus>True</can_focus>
+		<climb_rate>1</climb_rate>
+		<digits>0</digits>
+		<numeric>False</numeric>
+		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		<snap>False</snap>
+		<wrap>False</wrap>
+		<value>30</value>
+		<lower>0</lower>
+		<upper>180</upper>
+		<step>1</step>
+		<page>15</page>
+		<page_size>15</page_size>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkSpinButton</class>
+		<name>cfg_sld_percentage</name>
+		<can_focus>True</can_focus>
+		<climb_rate>1</climb_rate>
+		<digits>0</digits>
+		<numeric>False</numeric>
+		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		<snap>False</snap>
+		<wrap>False</wrap>
+		<value>1</value>
+		<lower>0</lower>
+		<upper>100</upper>
+		<step>1</step>
+		<page>10</page>
+		<page_size>10</page_size>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHSeparator</class>
+	      <name>hseparator3</name>
+	      <child>
+		<padding>2</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_sld_database</name>
+	      <border_width>2</border_width>
+	      <tooltip>This option enables using of XSIDPLAY compatible HVSC Song-length database. (See documentation for more information)</tooltip>
+	      <can_focus>True</can_focus>
+	      <label>Song-length database (XSIDPLAY-compatible)</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>songlength</group>
+	      <child>
+		<padding>2</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox13</name>
+	      <border_width>2</border_width>
+	      <homogeneous>False</homogeneous>
+	      <spacing>4</spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label33</name>
+		<label>DB-filename: </label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0.5</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkEntry</class>
+		<name>cfg_sld_dbpath</name>
+		<tooltip>Database path and filename</tooltip>
+		<can_focus>True</can_focus>
+		<editable>True</editable>
+		<text_visible>True</text_visible>
+		<text_max_length>0</text_max_length>
+		<text></text>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkButton</class>
+		<name>cfg_sld_dbbrowse</name>
+		<tooltip>Browse for database-file</tooltip>
+		<can_focus>True</can_focus>
+		<signal>
+		  <name>clicked</name>
+		  <handler>cfg_sld_dbbrowse_clicked</handler>
+		  <last_modification_time>Sat, 18 Aug 2001 23:38:10 GMT</last_modification_time>
+		</signal>
+		<label>Browse</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+	      </widget>
+	    </widget>
+	  </widget>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label26</name>
+	<label>Songlength</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
+	<class>GtkVBox</class>
+	<name>vbox19</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame7</name>
+	  <border_width>4</border_width>
+	  <label>STIL-database configuration: </label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
 	    <name>vbox8</name>
-	    <homogeneous>False</homogeneous>
+	    <border_width>4</border_width>
+	    <homogeneous>True</homogeneous>
 	    <spacing>0</spacing>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>cfg_stil_use</name>
+	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
 	      <label>Use STIL information database</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <child>
-		<padding>0</padding>
+		<padding>2</padding>
 		<expand>True</expand>
 		<fill>False</fill>
 	      </child>
@@ -615,7 +1438,7 @@
 		  <editable>True</editable>
 		  <text_visible>True</text_visible>
 		  <text_max_length>0</text_max_length>
-		  <text>homoa</text>
+		  <text>/home/C64Music/DOCUMENTS/STIL.txt</text>
 		</widget>
 	      </widget>
 
@@ -640,7 +1463,7 @@
 		  <can_focus>True</can_focus>
 		  <signal>
 		    <name>clicked</name>
-		    <handler>on_cfg_stil_browse_clicked</handler>
+		    <handler>cfg_stil_browse_clicked</handler>
 		    <last_modification_time>Mon, 18 Sep 2000 17:51:32 GMT</last_modification_time>
 		  </signal>
 		  <label>Browse</label>
@@ -653,63 +1476,50 @@
 
 	<widget>
 	  <class>GtkFrame</class>
-	  <name>frame9</name>
+	  <name>frame22</name>
 	  <border_width>4</border_width>
-	  <label>Songname (Fileinfo) format:</label>
+	  <label>Miscellaneous options: </label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 
 	  <widget>
 	    <class>GtkVBox</class>
-	    <name>vbox11</name>
+	    <name>vbox22</name>
 	    <homogeneous>False</homogeneous>
 	    <spacing>0</spacing>
 
 	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment3</name>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>0.96</xscale>
-	      <yscale>1</yscale>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_finfo_usecolor</name>
+	      <border_width>2</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Use text coloring in fileinformation dialog</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<name>cfg_songnameformat</name>
-		<can_focus>True</can_focus>
-		<editable>True</editable>
-		<text_visible>True</text_visible>
-		<text_max_length>0</text_max_length>
-		<text></text>
-	      </widget>
 	    </widget>
 
 	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label7</name>
-	      <label>%1 - Composer
-%2 - Song name (title)
-%3 - Copyright</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.04</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_detectmagic</name>
+	      <border_width>2</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Determine filetype by contents (slower)</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
 	      <child>
 		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
+		<expand>False</expand>
+		<fill>False</fill>
 	      </child>
 	    </widget>
 	  </widget>
@@ -720,7 +1530,7 @@
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
 	<name>label3</name>
-	<label>STIL</label>
+	<label>Misc</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -730,125 +1540,118 @@
       </widget>
 
       <widget>
-	<class>GtkFixed</class>
-	<name>fixed1</name>
-	<tooltip>Reset filter to default values</tooltip>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>cfg_filt_reset</name>
-	  <x>224</x>
-	  <y>16</y>
-	  <width>120</width>
-	  <height>32</height>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_cfg_filt_reset_clicked</handler>
-	    <last_modification_time>Mon, 18 Sep 2000 20:21:27 GMT</last_modification_time>
-	  </signal>
-	  <label>Reset values</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
+	<class>GtkFrame</class>
+	<name>frame16</name>
+	<border_width>4</border_width>
+	<label>Song name/title format: </label>
+	<label_xalign>0</label_xalign>
+	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 
 	<widget>
-	  <class>GtkLabel</class>
-	  <name>label9</name>
-	  <x>224</x>
-	  <y>56</y>
-	  <width>136</width>
-	  <height>104</height>
-	  <label>These sliders affect the emulated SID's filter values.
-Defaults are what the libsidplay sets them on init.</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>7.45058e-09</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
+	  <class>GtkVBox</class>
+	  <name>vbox16</name>
+	  <border_width>4</border_width>
+	  <homogeneous>False</homogeneous>
+	  <spacing>0</spacing>
 
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame12</name>
-	  <x>160</x>
-	  <y>16</y>
-	  <width>48</width>
-	  <height>152</height>
-	  <label>FT</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <widget>
+	    <class>GtkCheckButton</class>
+	    <name>cfg_ftitle_override</name>
+	    <can_focus>True</can_focus>
+	    <label>Override generic XMMS titles</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <child>
+	      <padding>2</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkEntry</class>
+	    <name>cfg_ftitle_format</name>
+	    <can_focus>True</can_focus>
+	    <editable>True</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text>%1 : %2 (C) %3 [%5 %6 by %8] -- %9</text>
+	    <child>
+	      <padding>2</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
 
 	  <widget>
-	    <class>GtkVScale</class>
-	    <name>cfg_filt_ft</name>
-	    <can_focus>True</can_focus>
-	    <draw_value>True</draw_value>
-	    <value_pos>GTK_POS_TOP</value_pos>
-	    <digits>2</digits>
-	    <policy>GTK_UPDATE_CONTINUOUS</policy>
-	    <value>0</value>
-	    <lower>0</lower>
-	    <upper>1</upper>
-	    <step>0.01</step>
-	    <page>0.1</page>
-	    <page_size>0</page_size>
+	    <class>GtkHBox</class>
+	    <name>hbox9</name>
+	    <homogeneous>True</homogeneous>
+	    <spacing>0</spacing>
+	    <child>
+	      <padding>2</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label7</name>
+	      <label>%1 - Composer
+%2 - Song name (title)
+%3 - Copyright
+%4 - SID File Type
+%5 - Subtune number</label>
+	      <justify>GTK_JUSTIFY_LEFT</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.04</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label25</name>
+	      <label>%6 - STIL Title
+%7 - STIL Name
+%8 - STIL Artist
+%9 - STIL Comment</label>
+	      <justify>GTK_JUSTIFY_LEFT</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.04</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
 	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>cfg_frm2</name>
-	  <x>88</x>
-	  <y>16</y>
-	  <width>48</width>
-	  <height>152</height>
-	  <label>FM</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 
 	  <widget>
-	    <class>GtkVScale</class>
-	    <name>cfg_filt_fm</name>
-	    <can_focus>True</can_focus>
-	    <draw_value>True</draw_value>
-	    <value_pos>GTK_POS_TOP</value_pos>
-	    <digits>1</digits>
-	    <policy>GTK_UPDATE_CONTINUOUS</policy>
-	    <value>0</value>
-	    <lower>0</lower>
-	    <upper>100</upper>
-	    <step>1</step>
-	    <page>10</page>
-	    <page_size>0</page_size>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>cfg_frm1</name>
-	  <x>16</x>
-	  <y>16</y>
-	  <width>56</width>
-	  <height>152</height>
-	  <label>FS</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-	  <widget>
-	    <class>GtkVScale</class>
-	    <name>cfg_filt_fs</name>
-	    <can_focus>True</can_focus>
-	    <draw_value>True</draw_value>
-	    <value_pos>GTK_POS_TOP</value_pos>
-	    <digits>1</digits>
-	    <policy>GTK_UPDATE_CONTINUOUS</policy>
-	    <value>0</value>
-	    <lower>0</lower>
-	    <upper>1000</upper>
-	    <step>1</step>
-	    <page>100</page>
-	    <page_size>0</page_size>
+	    <class>GtkLabel</class>
+	    <name>label34</name>
+	    <label>(STIL-entries are only available if
+database support is turned on)</label>
+	    <justify>GTK_JUSTIFY_FILL</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
 	  </widget>
 	</widget>
       </widget>
@@ -856,8 +1659,8 @@
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>label6</name>
-	<label>Filters</label>
+	<name>label23</name>
+	<label>Title</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -891,7 +1694,7 @@
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>on_cfg_ok_clicked</handler>
+	  <handler>cfg_ok_clicked</handler>
 	  <last_modification_time>Mon, 18 Sep 2000 17:49:51 GMT</last_modification_time>
 	</signal>
 	<label>OK</label>
@@ -906,7 +1709,7 @@
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>on_cfg_cancel_clicked</handler>
+	  <handler>cfg_cancel_clicked</handler>
 	  <last_modification_time>Mon, 18 Sep 2000 17:49:57 GMT</last_modification_time>
 	</signal>
 	<label>Cancel</label>
@@ -918,26 +1721,54 @@
 
 <widget>
   <class>GtkWindow</class>
-  <name>sid_aboutwin</name>
-  <title>About xmms-sid</title>
+  <name>xs_aboutwin</name>
+  <title>About XMMS-SID</title>
   <type>GTK_WINDOW_DIALOG</type>
   <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
+  <modal>True</modal>
+  <default_width>300</default_width>
   <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
+  <allow_grow>True</allow_grow>
   <auto_shrink>False</auto_shrink>
 
   <widget>
     <class>GtkVBox</class>
-    <name>vbox12</name>
+    <name>about_vbox1</name>
     <homogeneous>False</homogeneous>
     <spacing>0</spacing>
 
     <widget>
-      <class>GtkHBox</class>
-      <name>hbox5</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
+      <class>GtkFrame</class>
+      <name>about_frame</name>
+      <border_width>4</border_width>
+      <label_xalign>0</label_xalign>
+      <shadow_type>GTK_SHADOW_OUT</shadow_type>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+      </child>
+
+      <widget>
+	<class>GtkPixmap</class>
+	<name>about_pixmap</name>
+	<filename>xmms-sid-logo.xpm</filename>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>6</ypad>
+	<build_insensitive>True</build_insensitive>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkScrolledWindow</class>
+      <name>about_scrwin</name>
+      <border_width>8</border_width>
+      <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
+      <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
+      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
       <child>
 	<padding>0</padding>
 	<expand>True</expand>
@@ -945,76 +1776,67 @@
       </child>
 
       <widget>
-	<class>GtkFrame</class>
-	<name>frame13</name>
-	<border_width>4</border_width>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
+	<class>GtkText</class>
+	<name>about_text</name>
+	<height>100</height>
+	<can_focus>True</can_focus>
+	<editable>True</editable>
+	<text>Programming and design
+	Matti 'ccr/TNSP' Hämäläinen
+
+libSIDPlay created by
+	Michael Schwendt
+
+Original programming and design
+	Willem Monsuwe
 
-	<widget>
-	  <class>GtkPixmap</class>
-	  <name>pixmap1</name>
-	  <filename>xmms-sid-logo.xpm</filename>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>4</xpad>
-	  <ypad>4</ypad>
-	  <build_insensitive>True</build_insensitive>
-	</widget>
-      </widget>
+&quot;XMMS-SID Theme&quot;-song (SIDtune)
+	Peter 'Brite-Lite' Halin of Dekadence
+	(C) Copyright 2002 Dekadence
+	http://www.dekadence64.org/
+
+Thanks and greetings ...
+	JaMZ, MdX, fgcl, Sindrom,
+	Ssadistik, Delfine, Viznut, at,
+	Feenix, juhas, Loop, Nrg, ytti ...
 
-      <widget>
-	<class>GtkLabel</class>
-	<name>label10</name>
-	<label>XMMS-SID SIDPlay plugin
-for X MultiMedia System
-by Willem Monsuwe and
-Matti &quot;ccr&quot; Hämäläinen.</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>8</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
+	PwP, iSO, Byterapers, Fairlight,
+	mfx, Unique, Static, Dekadence,
+	Mass, PHn, tAAt ...
+
+Special thanks
+	- All the betatesters.
+	- All the users! Hey it's you!
+	- And others ...
+</text>
       </widget>
     </widget>
 
     <widget>
-      <class>GtkHButtonBox</class>
-      <name>hbuttonbox2</name>
-      <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-      <spacing>30</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
+      <class>GtkAlignment</class>
+      <name>alignment6</name>
+      <border_width>8</border_width>
+      <xalign>0.5</xalign>
+      <yalign>0.5</yalign>
+      <xscale>0.18</xscale>
+      <yscale>1</yscale>
       <child>
 	<padding>0</padding>
-	<expand>True</expand>
+	<expand>False</expand>
 	<fill>True</fill>
       </child>
 
       <widget>
 	<class>GtkButton</class>
-	<name>about_ok</name>
+	<name>about_close</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>on_about_ok_clicked</handler>
+	  <handler>about_ok_clicked</handler>
 	  <last_modification_time>Tue, 19 Sep 2000 19:57:12 GMT</last_modification_time>
 	</signal>
-	<label>OK</label>
+	<label>Close</label>
 	<relief>GTK_RELIEF_NORMAL</relief>
       </widget>
     </widget>
@@ -1023,10 +1845,10 @@
 
 <widget>
   <class>GtkWindow</class>
-  <name>sid_fileinfowin</name>
+  <name>xs_fileinfowin</name>
   <width>400</width>
   <height>350</height>
-  <title>xmms-sid fileinfo</title>
+  <title>XMMS-SID fileinfo</title>
   <type>GTK_WINDOW_DIALOG</type>
   <position>GTK_WIN_POS_MOUSE</position>
   <modal>False</modal>
@@ -1319,7 +2141,7 @@
 	    <can_focus>True</can_focus>
 	    <signal>
 	      <name>clicked</name>
-	      <handler>on_fileinfo_sub_tune_clicked</handler>
+	      <handler>fileinfo_sub_tune_clicked</handler>
 	      <last_modification_time>Mon, 06 Nov 2000 23:36:32 GMT</last_modification_time>
 	    </signal>
 	    <items>Main tune
@@ -1341,11 +2163,11 @@
 	  <class>GtkTable</class>
 	  <name>table2</name>
 	  <border_width>4</border_width>
-	  <rows>2</rows>
+	  <rows>3</rows>
 	  <columns>2</columns>
 	  <homogeneous>False</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
+	  <row_spacing>2</row_spacing>
+	  <column_spacing>4</column_spacing>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -1451,6 +2273,56 @@
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label41</name>
+	    <label>Length:</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkEntry</class>
+	    <name>fileinfo_sub_length</name>
+	    <can_focus>True</can_focus>
+	    <editable>False</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text></text>
+	    <child>
+	      <left_attach>1</left_attach>
+	      <right_attach>2</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>True</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
 	</widget>
 
 	<widget>
@@ -1497,9 +2369,10 @@
 	<can_default>True</can_default>
 	<has_default>True</has_default>
 	<can_focus>True</can_focus>
+	<has_focus>True</has_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>on_fileinfo_ok_clicked</handler>
+	  <handler>fileinfo_ok_clicked</handler>
 	  <last_modification_time>Mon, 06 Nov 2000 23:04:15 GMT</last_modification_time>
 	</signal>
 	<label>Close</label>
@@ -1510,10 +2383,166 @@
 </widget>
 
 <widget>
+  <class>GtkWindow</class>
+  <name>xs_songcontrolwin</name>
+  <title>XMMS-SID</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <allow_shrink>False</allow_shrink>
+  <allow_grow>False</allow_grow>
+  <auto_shrink>False</auto_shrink>
+
+  <widget>
+    <class>GtkFrame</class>
+    <name>frame25</name>
+    <border_width>2</border_width>
+    <label_xalign>0</label_xalign>
+    <shadow_type>GTK_SHADOW_OUT</shadow_type>
+
+    <widget>
+      <class>GtkVBox</class>
+      <name>vbox24</name>
+      <border_width>4</border_width>
+      <homogeneous>True</homogeneous>
+      <spacing>0</spacing>
+
+      <widget>
+	<class>GtkHBox</class>
+	<name>hbox15</name>
+	<homogeneous>False</homogeneous>
+	<spacing>4</spacing>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>True</fill>
+	</child>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>ctrl_song_prev</name>
+	  <can_focus>True</can_focus>
+	  <signal>
+	    <name>clicked</name>
+	    <handler>ctrl_song_prev</handler>
+	    <last_modification_time>Tue, 23 Apr 2002 21:25:08 GMT</last_modification_time>
+	  </signal>
+	  <label> &lt; </label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkHScale</class>
+	  <name>ctrl_song_current</name>
+	  <can_focus>True</can_focus>
+	  <draw_value>True</draw_value>
+	  <value_pos>GTK_POS_TOP</value_pos>
+	  <digits>0</digits>
+	  <policy>GTK_UPDATE_CONTINUOUS</policy>
+	  <value>1</value>
+	  <lower>1</lower>
+	  <upper>6</upper>
+	  <step>0</step>
+	  <page>0</page>
+	  <page_size>0</page_size>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>ctrl_song_next</name>
+	  <can_focus>True</can_focus>
+	  <signal>
+	    <name>clicked</name>
+	    <handler>ctrl_song_next</handler>
+	    <last_modification_time>Tue, 23 Apr 2002 21:25:28 GMT</last_modification_time>
+	  </signal>
+	  <label> &gt; </label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkEntry</class>
+	<name>ctrl_song_name</name>
+	<can_focus>True</can_focus>
+	<editable>False</editable>
+	<text_visible>True</text_visible>
+	<text_max_length>0</text_max_length>
+	<text>paski</text>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>True</fill>
+	</child>
+      </widget>
+    </widget>
+  </widget>
+</widget>
+
+<widget>
   <class>GtkFileSelection</class>
-  <name>fileselection1</name>
+  <name>xs_dbfileselector</name>
   <border_width>10</border_width>
-  <title>Select STIL DataBase File</title>
+  <title>Select HVSC song-length database</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>True</modal>
+  <allow_shrink>False</allow_shrink>
+  <allow_grow>True</allow_grow>
+  <auto_shrink>False</auto_shrink>
+  <show_file_op_buttons>True</show_file_op_buttons>
+
+  <widget>
+    <class>GtkButton</class>
+    <child_name>FileSel:ok_button</child_name>
+    <name>ok_button2</name>
+    <can_default>True</can_default>
+    <can_focus>True</can_focus>
+    <signal>
+      <name>clicked</name>
+      <handler>songlensel_ok_button_clicked</handler>
+      <last_modification_time>Sat, 19 Oct 2002 22:50:48 GMT</last_modification_time>
+    </signal>
+    <label>OK</label>
+    <relief>GTK_RELIEF_NORMAL</relief>
+  </widget>
+
+  <widget>
+    <class>GtkButton</class>
+    <child_name>FileSel:cancel_button</child_name>
+    <name>cancel_button2</name>
+    <can_default>True</can_default>
+    <can_focus>True</can_focus>
+    <signal>
+      <name>clicked</name>
+      <handler>songlensel_cancel_button_clicked</handler>
+      <last_modification_time>Sat, 19 Oct 2002 22:50:54 GMT</last_modification_time>
+    </signal>
+    <label>Cancel</label>
+    <relief>GTK_RELIEF_NORMAL</relief>
+  </widget>
+</widget>
+
+<widget>
+  <class>GtkFileSelection</class>
+  <name>xs_stilfileselector</name>
+  <border_width>10</border_width>
+  <title>Select STIL-database </title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
@@ -1525,20 +2554,30 @@
   <widget>
     <class>GtkButton</class>
     <child_name>FileSel:ok_button</child_name>
-    <name>ok_button1</name>
+    <name>ok_button3</name>
     <can_default>True</can_default>
     <can_focus>True</can_focus>
-    <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+    <signal>
+      <name>clicked</name>
+      <handler>stilsel_ok_button_clicked</handler>
+      <last_modification_time>Sat, 19 Oct 2002 22:50:38 GMT</last_modification_time>
+    </signal>
+    <label>OK</label>
     <relief>GTK_RELIEF_NORMAL</relief>
   </widget>
 
   <widget>
     <class>GtkButton</class>
     <child_name>FileSel:cancel_button</child_name>
-    <name>cancel_button1</name>
+    <name>cancel_button3</name>
     <can_default>True</can_default>
     <can_focus>True</can_focus>
-    <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+    <signal>
+      <name>clicked</name>
+      <handler>stilsel_cancel_button_clicked</handler>
+      <last_modification_time>Sat, 19 Oct 2002 22:51:00 GMT</last_modification_time>
+    </signal>
+    <label>Cancel</label>
     <relief>GTK_RELIEF_NORMAL</relief>
   </widget>
 </widget>