diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-05-30 17:57:32 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-05-30 17:57:32 +0000 |
commit | f46657ec5a23e9ff440b603fbf8ffd55e6aa4e84 (patch) | |
tree | d6bb995283343f4a8e9830827c475e16f3bdc646 /apps/gui | |
parent | dfb071d92ece27951dd2b3e17629ec61cd619460 (diff) | |
download | rockbox-f46657ec5a23e9ff440b603fbf8ffd55e6aa4e84.tar.gz rockbox-f46657ec5a23e9ff440b603fbf8ffd55e6aa4e84.zip |
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
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps-common.c | 10 | ||||
-rw-r--r-- | apps/gui/gwps-common.h | 1 | ||||
-rw-r--r-- | apps/gui/list.c | 8 |
3 files changed, 1 insertions, 18 deletions
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) | |||
126 | } | 126 | } |
127 | } | 127 | } |
128 | 128 | ||
129 | /* set volume */ | ||
130 | void setvol(void) | ||
131 | { | ||
132 | if (global_settings.volume < sound_min(SOUND_VOLUME)) | ||
133 | global_settings.volume = sound_min(SOUND_VOLUME); | ||
134 | if (global_settings.volume > sound_max(SOUND_VOLUME)) | ||
135 | global_settings.volume = sound_max(SOUND_VOLUME); | ||
136 | sound_set_volume(global_settings.volume); | ||
137 | settings_save(); | ||
138 | } | ||
139 | /* return true if screen restore is needed | 129 | /* return true if screen restore is needed |
140 | return false otherwise | 130 | return false otherwise |
141 | */ | 131 | */ |
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 @@ | |||
25 | 25 | ||
26 | void fade(bool fade_in); | 26 | void fade(bool fade_in); |
27 | bool gui_wps_display(void); | 27 | bool gui_wps_display(void); |
28 | void setvol(void); | ||
29 | bool update_onvol_change(struct gui_wps * gwps); | 28 | bool update_onvol_change(struct gui_wps * gwps); |
30 | bool update(struct gui_wps *gwps); | 29 | bool update(struct gui_wps *gwps); |
31 | bool ffwd_rew(int button); | 30 | 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, | |||
876 | /* up two because the falthrough brings it down one */ | 876 | /* up two because the falthrough brings it down one */ |
877 | case ACTION_LIST_VOLDOWN: | 877 | case ACTION_LIST_VOLDOWN: |
878 | global_settings.volume--; | 878 | global_settings.volume--; |
879 | 879 | setvol(); | |
880 | if (global_settings.volume < sound_min(SOUND_VOLUME)) | ||
881 | global_settings.volume = sound_min(SOUND_VOLUME); | ||
882 | if (global_settings.volume > sound_max(SOUND_VOLUME)) | ||
883 | global_settings.volume = sound_max(SOUND_VOLUME); | ||
884 | sound_set_volume(global_settings.volume); | ||
885 | settings_save(); | ||
886 | return button; | 880 | return button; |
887 | #endif | 881 | #endif |
888 | case ACTION_STD_PREV: | 882 | case ACTION_STD_PREV: |