# HG changeset patch # User Matti Hamalainen # Date 1065150845 0 # Node ID 77371e84bf33195ef0804ccca82c040616dda7d3 # Parent f1899e4d255d819304754857305ef0f4040ced4d Changed interface to include new settings diff -r f1899e4d255d -r 77371e84bf33 xmms-sid.glade --- 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 @@ GtkAlignment alignment4 - 4 + 2 0.04 0 0.12 @@ -238,7 +238,7 @@ False 44100 4000 - 48000 + 128000 100 1000 0 @@ -373,6 +373,48 @@ + + + GtkHSeparator + hseparator1 + + 4 + True + True + + + + + GtkRadioButton + cfg_overfilter_average + 2 + True + Averaging filter + False + True + overfilter + + 0 + False + False + + + + + GtkRadioButton + cfg_overfilter_sinc + 2 + True + Sinc lowpass filter (CPU-intensive) + False + True + overfilter + + 0 + False + False + + @@ -405,8 +447,8 @@ GTK_SHADOW_ETCHED_IN 0 - True - True + False + False @@ -422,6 +464,11 @@ 2 Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though. True + + toggled + xs_cfg_emu_sidplay1_toggled + Mon, 15 Sep 2003 12:12:50 GMT + SIDPlay 1 (frame-based) False True @@ -439,6 +486,11 @@ 2 Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation. True + + toggled + xs_cfg_emu_sidplay2_toggled + Mon, 15 Sep 2003 12:13:00 GMT + SIDPlay 2 (cycle-based) False True @@ -451,13 +503,20 @@ - GtkCheckButton - cfg_emu_sidplay2_opt + GtkRadioButton + cfg_emu_nanosid 2 + Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation. True - SIDPlay 2 optimization mode (faster, inaccurate) + + toggled + xs_cfg_emu_nanosid_toggled + Mon, 15 Sep 2003 12:13:09 GMT + + NanoSID False True + emulator 0 False @@ -468,6 +527,108 @@ + GtkFrame + frame1 + 4 + Memory Mode: + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkVBox + vbox5 + 2 + False + 0 + + + GtkRadioButton + cfg_emu_mem_real + True + Real C64 (SIDPlay 2 only) + False + True + memorymode + + 0 + False + False + + + + + GtkRadioButton + cfg_emu_mem_banksw + True + Bank switching + False + True + memorymode + + 0 + False + False + + + + + GtkRadioButton + cfg_emu_mem_transrom + True + Transparent ROM + False + True + memorymode + + 0 + False + False + + + + + GtkRadioButton + cfg_emu_mem_playsid + True + PlaySID environment + False + True + memorymode + + 0 + False + False + + + + + + + + GtkLabel + Notebook:tab + label2 + Emu#1 + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkVBox + vbox29 + False + 0 + + GtkHBox hbox1 False @@ -601,32 +762,31 @@ GtkFrame - frame1 + cfg_sidplay2_grp 4 - Memory Mode: + SIDPlay 2 options: 0 GTK_SHADOW_ETCHED_IN 0 - True + False True GtkVBox - vbox5 - 2 + vbox30 False 0 - GtkRadioButton - cfg_emu_mem_real + GtkCheckButton + cfg_emu_sidplay2_opt + 2 True - Real C64 (SIDPlay 2 only) + Optimization mode (faster, inaccurate) False True - memorymode 0 False @@ -636,12 +796,13 @@ GtkRadioButton - cfg_emu_mem_banksw + cfg_emu_sidplay2_resid + 2 True - Bank switching + reSID-emulation False True - memorymode + emutype 0 False @@ -651,27 +812,13 @@ GtkRadioButton - cfg_emu_mem_transrom + cfg_emu_sidplay2_hardsid + 2 True - Transparent ROM + HardSID False True - memorymode - - 0 - False - False - - - - - GtkRadioButton - cfg_emu_mem_playsid - True - PlaySID environment - False - True - memorymode + emutype 0 False @@ -685,8 +832,8 @@ GtkLabel Notebook:tab - label2 - Emulation + label48 + Emu#2 GTK_JUSTIFY_CENTER False 0.5 @@ -714,6 +861,11 @@ cfg_emu_filters 2 True + + toggled + xs_cfg_emu_filters_toggled + Mon, 15 Sep 2003 12:30:11 GMT + Emulate filters False True @@ -738,7 +890,7 @@ GtkFrame - cfg_frm1 + cfg_frm_fs 2 56 152 @@ -770,7 +922,7 @@ GtkFrame - cfg_frm2 + cfg_frm_fm 2 48 152 @@ -802,7 +954,7 @@ GtkFrame - frame12 + cfg_frm_ft 2 48 152 @@ -1130,35 +1282,95 @@ + + + + GtkLabel + Notebook:tab + label26 + Songlength + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkFrame + frame16 + 4 + Song name/title format: + 0 + GTK_SHADOW_ETCHED_IN - GtkFrame - frame27 - 4 - Silence detection: - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - True - + GtkVBox + vbox16 + 2 + False + 0 - GtkVBox - vbox28 - 2 - False + GtkCheckButton + cfg_ftitle_override + True + + toggled + xs_cfg_ftitle_override_toggled + Sat, 20 Sep 2003 01:09:48 GMT + + Override generic XMMS titles + False + True + + 0 + False + False + + + + + GtkEntry + cfg_ftitle_format + True + True + True + 0 + %1 : %2 (C) %3 [%5 %6 by %8] -- %9 + + 2 + False + False + + + + + GtkHBox + hbox9 + True 0 + + 2 + False + False + - GtkCheckButton - cfg_silence_enable - 2 - True - Check for silence before stopping - False - True + GtkLabel + cfg_ftitle_desc1 + %1 - Composer +%2 - Song name (title) +%3 - Copyright +%4 - SID File Type +%5 - Subtune number + GTK_JUSTIFY_LEFT + False + 0.04 + 0.5 + 0 + 0 0 False @@ -1167,144 +1379,42 @@ - GtkHBox - hbox17 - 2 - False - 0 - - 2 - False - True - - - - GtkLabel - label44 - Minimum silent time: - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkSpinButton - cfg_silence_min - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 60 - 10 - 1000 - 1 - 10 - 10 - - 0 - True - True - - - - - GtkLabel - label45 - ms - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - True - True - - - - - - GtkHBox - hbox18 - 2 - False - 0 + GtkLabel + cfg_ftitle_desc2 + %6 - STIL Title +%7 - STIL Name +%8 - STIL Artist +%9 - STIL Comment + GTK_JUSTIFY_LEFT + False + 0.04 + 0.5 + 0 + 0 0 False False - - - GtkLabel - label46 - Max check length: - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - + + - - GtkSpinButton - cfg_silence_max - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1000 - 1000 - 10000 - 1 - 10 - 10 - - 0 - True - True - - - - - GtkLabel - label47 - ms - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - True - True - - - + + GtkLabel + cfg_ftitle_desc3 + (STIL-entries are only available if +database support is turned on) + GTK_JUSTIFY_FILL + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + @@ -1312,8 +1422,8 @@ GtkLabel Notebook:tab - label26 - Songlength + label23 + Title GTK_JUSTIFY_CENTER False 0.5 @@ -1344,7 +1454,7 @@ GtkVBox vbox8 - 4 + 2 True 0 @@ -1449,6 +1559,73 @@ GtkFrame + frame28 + 4 + Sub-song control: + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + True + + + + GtkVBox + vbox31 + 2 + False + 0 + + + GtkRadioButton + cfg_subsong_none + True + Disabled + False + True + subsong + + 0 + False + False + + + + + GtkRadioButton + cfg_subsong_popup + True + Pop-up via seekbar + False + True + subsong + + 0 + False + False + + + + + GtkRadioButton + cfg_subsong_patch + True + Song-position patch + False + True + subsong + + 0 + False + False + + + + + + + GtkFrame frame22 4 Miscellaneous options: @@ -1456,13 +1633,14 @@ GTK_SHADOW_ETCHED_IN 0 - True + False True GtkVBox vbox22 + 2 False 0 @@ -1480,21 +1658,6 @@ False - - - GtkCheckButton - cfg_alwaysraise - 2 - True - Always raise the song-control window - False - True - - 0 - False - False - - @@ -1511,136 +1674,6 @@ 0 0 - - - GtkFrame - frame16 - 4 - Song name/title format: - 0 - GTK_SHADOW_ETCHED_IN - - - GtkVBox - vbox16 - 4 - False - 0 - - - GtkCheckButton - cfg_ftitle_override - True - Override generic XMMS titles - False - True - - 0 - False - False - - - - - GtkEntry - cfg_ftitle_format - True - True - True - 0 - %1 : %2 (C) %3 [%5 %6 by %8] -- %9 - - 2 - False - False - - - - - GtkHBox - hbox9 - True - 0 - - 2 - False - False - - - - GtkLabel - label7 - %1 - Composer -%2 - Song name (title) -%3 - Copyright -%4 - SID File Type -%5 - Subtune number - GTK_JUSTIFY_LEFT - False - 0.04 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label25 - %6 - STIL Title -%7 - STIL Name -%8 - STIL Artist -%9 - STIL Comment - GTK_JUSTIFY_LEFT - False - 0.04 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - label34 - (STIL-entries are only available if -database support is turned on) - GTK_JUSTIFY_FILL - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - label23 - Title - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 -