[openMSX-commits] [SCM] openMSX (main) branch master updated. RELEASE_0_9_1-663-ge230dab

[Alex W. <aw...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "openMSX (main)".

The branch, master has been updated
       via  e230dab4695e56934ecef01c4bd6595d623bb82d (commit)
       via  ed4b8c36ff02a13a3fc15ee0ade216deb9d3b841 (commit)
      from  40a7814731efcbc97839083b82f186ba6e5ae572 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e230dab4695e56934ecef01c4bd6595d623bb82d
Author: Alex Wulms <aw...@no...evoid>
Date:   Sun Nov 17 20:33:51 2013 +0100

    Refine texts for resampler setting

commit ed4b8c36ff02a13a3fc15ee0ade216deb9d3b841
Author: Alex Wulms <aw...@no...evoid>
Date:   Sun Nov 17 20:00:36 2013 +0100

    Simplify resampler settings code for OSD menu

-----------------------------------------------------------------------

Summary of changes:
 share/scripts/_osd_menu.tcl |   43 +++----------------------------------------
 1 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/share/scripts/_osd_menu.tcl b/share/scripts/_osd_menu.tcl
index 0fd8625..ea7f1b6 100644
--- a/share/scripts/_osd_menu.tcl
+++ b/share/scripts/_osd_menu.tcl
@@ -601,7 +601,7 @@ set misc_setting_menu {
 	         actions { LEFT  { osd_menu::menu_setting [incr maxframeskip -1] }
 	                   RIGHT { osd_menu::menu_setting [incr maxframeskip  1] }}}}}
 
-set resampler_desc [dict create fast "Fast, but low quality" blip "A bit slower but much better quality" hq "Highest quality but very slow on ARM"]
+set resampler_desc [dict create fast "Fast (but low quality)" blip "blip (good speed/quality)" hq "hq (best but slow on Android)"]
 
 set sound_setting_menu {
 	font-size 8
@@ -620,8 +620,8 @@ set sound_setting_menu {
 	         actions { LEFT  { osd_menu::menu_setting [cycle_back mute] }
 	                   RIGHT { osd_menu::menu_setting [cycle      mute] }}}
 	       { text "Resampler: [osd_menu::get_resampler_presentation $resampler]"
-	         actions { A  { osd_menu::menu_create [osd_menu::menu_create_resampler_list]; osd_menu::select_menu_item $resampler }}
-	         post-spacing 3 }}}
+	         actions { LEFT  { osd_menu::menu_setting [cycle_back resampler] }
+	                   RIGHT { osd_menu::menu_setting [cycle      resampler] }}}}}
 
 set horizontal_stretch_desc [dict create 320.0 "none (large borders)" 288.0 "a bit more than all border pixels" 284.0 "all border pixels" 280.0 "a bit less than all border pixels" 272.0 "realistic" 256.0 "no borders at all"]
 
@@ -793,43 +793,6 @@ proc get_horizontal_stretch_presentation { value } {
 	}
 }
 
-proc menu_create_resampler_list {} {
-
-	set menu_def [list \
-	         execute menu_resampler_exec \
-	         font-size 8 \
-	         border-size 2 \
-	         width 170 \
-	         xpos 110 \
-	         ypos 130 \
-	         header { text "Select Resampler:"
-	                  font-size 10
-	                  post-spacing 6 }]
-
-	set items [list]
-	set presentation [list]
-
-	set values [dict keys $osd_menu::resampler_desc]
-	if {$::resampler ni $values} {
-		lappend values $::resampler
-	}
-	foreach value $values {
-		lappend items $value
-		lappend presentation [osd_menu::get_resampler_presentation $value]
-	}
-	lappend menu_def presentation $presentation
-
-	return [prepare_menu_list $items 3 $menu_def]
-}
-
-proc menu_resampler_exec {value} {
-	set ::resampler $value
-	menu_close_top
-	# refresh the sound settings menu
-	menu_close_top
-	menu_create $osd_menu::sound_setting_menu
-}
-
 proc menu_create_stretch_list {} {
 
 	set menu_def [list \


hooks/post-receive
-- 
openMSX (main)