Mercurial > hg > xmms-sid

changeset 83:77371e84bf33 dev-0_8_0b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed interface to include new settings
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 03 Oct 2003 03:14:05 +0000
parents f1899e4d255d
children b6966a2447bc
files xmms-sid.glade
diffstat 1 files changed, 378 insertions(+), 345 deletions(-) [+]
line wrap: on
line diff
--- a/xmms-sid.glade	Fri Oct 03 03:14:03 2003 +0000
+++ b/xmms-sid.glade	Fri Oct 03 03:14:05 2003 +0000
@@ -214,7 +214,7 @@
 	  <widget>
 	    <class>GtkAlignment</class>
 	    <name>alignment4</name>
-	    <border_width>4</border_width>
+	    <border_width>2</border_width>
 	    <xalign>0.04</xalign>
 	    <yalign>0</yalign>
 	    <xscale>0.12</xscale>
@@ -238,7 +238,7 @@
 		<wrap>False</wrap>
 		<value>44100</value>
 		<lower>4000</lower>
-		<upper>48000</upper>
+		<upper>128000</upper>
 		<step>100</step>
 		<page>1000</page>
 		<page_size>0</page_size>
@@ -373,6 +373,48 @@
 		</child>
 	      </widget>
 	    </widget>
+
+	    <widget>
+	      <class>GtkHSeparator</class>
+	      <name>hseparator1</name>
+	      <child>
+		<padding>4</padding>
+		<expand>True</expand>
+		<fill>True</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_overfilter_average</name>
+	      <border_width>2</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Averaging filter</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>overfilter</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_overfilter_sinc</name>
+	      <border_width>2</border_width>
+	      <can_focus>True</can_focus>
+	      <label>Sinc lowpass filter (CPU-intensive)</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>overfilter</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
 	  </widget>
 	</widget>
       </widget>
@@ -405,8 +447,8 @@
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
+	    <expand>False</expand>
+	    <fill>False</fill>
 	  </child>
 
 	  <widget>
@@ -422,6 +464,11 @@
 	      <border_width>2</border_width>
 	      <tooltip>Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though.</tooltip>
 	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_emu_sidplay1_toggled</handler>
+		<last_modification_time>Mon, 15 Sep 2003 12:12:50 GMT</last_modification_time>
+	      </signal>
 	      <label>SIDPlay 1 (frame-based)</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
@@ -439,6 +486,11 @@
 	      <border_width>2</border_width>
 	      <tooltip>Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation.</tooltip>
 	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_emu_sidplay2_toggled</handler>
+		<last_modification_time>Mon, 15 Sep 2003 12:13:00 GMT</last_modification_time>
+	      </signal>
 	      <label>SIDPlay 2 (cycle-based)</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
@@ -451,13 +503,20 @@
 	    </widget>
 
 	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>cfg_emu_sidplay2_opt</name>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_emu_nanosid</name>
 	      <border_width>2</border_width>
+	      <tooltip>Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation.</tooltip>
 	      <can_focus>True</can_focus>
-	      <label>SIDPlay 2 optimization mode (faster, inaccurate)</label>
+	      <signal>
+		<name>toggled</name>
+		<handler>xs_cfg_emu_nanosid_toggled</handler>
+		<last_modification_time>Mon, 15 Sep 2003 12:13:09 GMT</last_modification_time>
+	      </signal>
+	      <label>NanoSID</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
+	      <group>emulator</group>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
@@ -468,6 +527,108 @@
 	</widget>
 
 	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame1</name>
+	  <border_width>4</border_width>
+	  <label>Memory Mode:</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox5</name>
+	    <border_width>2</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_emu_mem_real</name>
+	      <can_focus>True</can_focus>
+	      <label>Real C64 (SIDPlay 2 only)</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>memorymode</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <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>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <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>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <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>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label2</name>
+	<label>Emu#1</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>vbox29</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+
+	<widget>
 	  <class>GtkHBox</class>
 	  <name>hbox1</name>
 	  <homogeneous>False</homogeneous>
@@ -601,32 +762,31 @@
 
 	<widget>
 	  <class>GtkFrame</class>
-	  <name>frame1</name>
+	  <name>cfg_sidplay2_grp</name>
 	  <border_width>4</border_width>
-	  <label>Memory Mode:</label>
+	  <label>SIDPlay 2 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>vbox5</name>
-	    <border_width>2</border_width>
+	    <name>vbox30</name>
 	    <homogeneous>False</homogeneous>
 	    <spacing>0</spacing>
 
 	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_mem_real</name>
+	      <class>GtkCheckButton</class>
+	      <name>cfg_emu_sidplay2_opt</name>
+	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
-	      <label>Real C64 (SIDPlay 2 only)</label>
+	      <label>Optimization mode (faster, inaccurate)</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
-	      <group>memorymode</group>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
@@ -636,12 +796,13 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_mem_banksw</name>
+	      <name>cfg_emu_sidplay2_resid</name>
+	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
-	      <label>Bank switching</label>
+	      <label>reSID-emulation</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
-	      <group>memorymode</group>
+	      <group>emutype</group>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
@@ -651,27 +812,13 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_mem_transrom</name>
+	      <name>cfg_emu_sidplay2_hardsid</name>
+	      <border_width>2</border_width>
 	      <can_focus>True</can_focus>
-	      <label>Transparent ROM</label>
+	      <label>HardSID</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
-	      <group>memorymode</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <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>
+	      <group>emutype</group>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
@@ -685,8 +832,8 @@
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>label2</name>
-	<label>Emulation</label>
+	<name>label48</name>
+	<label>Emu#2</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -714,6 +861,11 @@
 	    <name>cfg_emu_filters</name>
 	    <border_width>2</border_width>
 	    <can_focus>True</can_focus>
+	    <signal>
+	      <name>toggled</name>
+	      <handler>xs_cfg_emu_filters_toggled</handler>
+	      <last_modification_time>Mon, 15 Sep 2003 12:30:11 GMT</last_modification_time>
+	    </signal>
 	    <label>Emulate filters</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
@@ -738,7 +890,7 @@
 
 	    <widget>
 	      <class>GtkFrame</class>
-	      <name>cfg_frm1</name>
+	      <name>cfg_frm_fs</name>
 	      <border_width>2</border_width>
 	      <width>56</width>
 	      <height>152</height>
@@ -770,7 +922,7 @@
 
 	    <widget>
 	      <class>GtkFrame</class>
-	      <name>cfg_frm2</name>
+	      <name>cfg_frm_fm</name>
 	      <border_width>2</border_width>
 	      <width>48</width>
 	      <height>152</height>
@@ -802,7 +954,7 @@
 
 	    <widget>
 	      <class>GtkFrame</class>
-	      <name>frame12</name>
+	      <name>cfg_frm_ft</name>
 	      <border_width>2</border_width>
 	      <width>48</width>
 	      <height>152</height>
@@ -1130,35 +1282,95 @@
 	    </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>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>GtkFrame</class>
-	  <name>frame27</name>
-	  <border_width>4</border_width>
-	  <label>Silence detection: </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>
+	  <class>GtkVBox</class>
+	  <name>vbox16</name>
+	  <border_width>2</border_width>
+	  <homogeneous>False</homogeneous>
+	  <spacing>0</spacing>
 
 	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox28</name>
-	    <border_width>2</border_width>
-	    <homogeneous>False</homogeneous>
+	    <class>GtkCheckButton</class>
+	    <name>cfg_ftitle_override</name>
+	    <can_focus>True</can_focus>
+	    <signal>
+	      <name>toggled</name>
+	      <handler>xs_cfg_ftitle_override_toggled</handler>
+	      <last_modification_time>Sat, 20 Sep 2003 01:09:48 GMT</last_modification_time>
+	    </signal>
+	    <label>Override generic XMMS titles</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <child>
+	      <padding>0</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>GtkHBox</class>
+	    <name>hbox9</name>
+	    <homogeneous>True</homogeneous>
 	    <spacing>0</spacing>
+	    <child>
+	      <padding>2</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
 
 	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>cfg_silence_enable</name>
-	      <border_width>2</border_width>
-	      <can_focus>True</can_focus>
-	      <label>Check for silence before stopping</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
+	      <class>GtkLabel</class>
+	      <name>cfg_ftitle_desc1</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>
@@ -1167,144 +1379,42 @@
 	    </widget>
 
 	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox17</name>
-	      <border_width>2</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>2</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label44</name>
-		<label>Minimum silent time: </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_silence_min</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>10</lower>
-		<upper>1000</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label45</name>
-		<label>ms</label>
-		<justify>GTK_JUSTIFY_LEFT</justify>
-		<wrap>False</wrap>
-		<xalign>0</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox18</name>
-	      <border_width>2</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
+	      <class>GtkLabel</class>
+	      <name>cfg_ftitle_desc2</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>
-		<class>GtkLabel</class>
-		<name>label46</name>
-		<label>Max check length: </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>
-		<class>GtkSpinButton</class>
-		<name>cfg_silence_max</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>1000</value>
-		<lower>1000</lower>
-		<upper>10000</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label47</name>
-		<label>ms</label>
-		<justify>GTK_JUSTIFY_LEFT</justify>
-		<wrap>False</wrap>
-		<xalign>0</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>cfg_ftitle_desc3</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>
@@ -1312,8 +1422,8 @@
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
-	<name>label26</name>
-	<label>Songlength</label>
+	<name>label23</name>
+	<label>Title</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -1344,7 +1454,7 @@
 	  <widget>
 	    <class>GtkVBox</class>
 	    <name>vbox8</name>
-	    <border_width>4</border_width>
+	    <border_width>2</border_width>
 	    <homogeneous>True</homogeneous>
 	    <spacing>0</spacing>
 
@@ -1449,6 +1559,73 @@
 
 	<widget>
 	  <class>GtkFrame</class>
+	  <name>frame28</name>
+	  <border_width>4</border_width>
+	  <label>Sub-song control: </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>vbox31</name>
+	    <border_width>2</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_subsong_none</name>
+	      <can_focus>True</can_focus>
+	      <label>Disabled</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>subsong</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_subsong_popup</name>
+	      <can_focus>True</can_focus>
+	      <label>Pop-up via seekbar</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>subsong</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>cfg_subsong_patch</name>
+	      <can_focus>True</can_focus>
+	      <label>Song-position patch</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>subsong</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
 	  <name>frame22</name>
 	  <border_width>4</border_width>
 	  <label>Miscellaneous options: </label>
@@ -1456,13 +1633,14 @@
 	  <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>vbox22</name>
+	    <border_width>2</border_width>
 	    <homogeneous>False</homogeneous>
 	    <spacing>0</spacing>
 
@@ -1480,21 +1658,6 @@
 		<fill>False</fill>
 	      </child>
 	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>cfg_alwaysraise</name>
-	      <border_width>2</border_width>
-	      <can_focus>True</can_focus>
-	      <label>Always raise the song-control window</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
 	  </widget>
 	</widget>
       </widget>
@@ -1511,136 +1674,6 @@
 	<xpad>0</xpad>
 	<ypad>0</ypad>
       </widget>
-
-      <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>GtkVBox</class>
-	  <name>vbox16</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <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>0</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>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>
-	    <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>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label23</name>
-	<label>Title</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>
 
     <widget>