From f46657ec5a23e9ff440b603fbf8ffd55e6aa4e84 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Wed, 30 May 2007 17:57:32 +0000 Subject: Move the setvol wrapper function to misc.c and use it in more places instead of doing the same checks everywhere git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13524 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/gwps-common.c | 10 ---------- apps/gui/gwps-common.h | 1 - apps/gui/list.c | 8 +------- 3 files changed, 1 insertion(+), 18 deletions(-) (limited to 'apps/gui') diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 2cdb92d964..2e8f7841c0 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c @@ -126,16 +126,6 @@ void fade(bool fade_in) } } -/* set volume */ -void setvol(void) -{ - if (global_settings.volume < sound_min(SOUND_VOLUME)) - global_settings.volume = sound_min(SOUND_VOLUME); - if (global_settings.volume > sound_max(SOUND_VOLUME)) - global_settings.volume = sound_max(SOUND_VOLUME); - sound_set_volume(global_settings.volume); - settings_save(); -} /* return true if screen restore is needed return false otherwise */ diff --git a/apps/gui/gwps-common.h b/apps/gui/gwps-common.h index 1203113be1..76555c1c06 100644 --- a/apps/gui/gwps-common.h +++ b/apps/gui/gwps-common.h @@ -25,7 +25,6 @@ void fade(bool fade_in); bool gui_wps_display(void); -void setvol(void); bool update_onvol_change(struct gui_wps * gwps); bool update(struct gui_wps *gwps); bool ffwd_rew(int button); diff --git a/apps/gui/list.c b/apps/gui/list.c index 4a72c3e505..f4cb607260 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -876,13 +876,7 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists, /* up two because the falthrough brings it down one */ case ACTION_LIST_VOLDOWN: global_settings.volume--; - - if (global_settings.volume < sound_min(SOUND_VOLUME)) - global_settings.volume = sound_min(SOUND_VOLUME); - if (global_settings.volume > sound_max(SOUND_VOLUME)) - global_settings.volume = sound_max(SOUND_VOLUME); - sound_set_volume(global_settings.volume); - settings_save(); + setvol(); return button; #endif case ACTION_STD_PREV: -- cgit v1.2.3