diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-07-02 10:50:42 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-07-02 10:50:42 +0000 |
commit | 8102f3da270ce5a442523a1738318493906bb86a (patch) | |
tree | 84ead8106d88ff86ec8f1887c5e88d9d7be41a5d /apps/settings_menu.c | |
parent | a077b9ef12c480ddd7845af5e7da6ffd22e8464d (diff) | |
download | rockbox-8102f3da270ce5a442523a1738318493906bb86a.tar.gz rockbox-8102f3da270ce5a442523a1738318493906bb86a.zip |
New option to enable/disable the runtime database. Moved the runtimedb init to a more appropriate place and added proper USB handling.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6984 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r-- | apps/settings_menu.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index d7bf96aaff..3de8fa4b70 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "timefuncs.h" | 46 | #include "timefuncs.h" |
47 | #include "misc.h" | 47 | #include "misc.h" |
48 | #include "power.h" | 48 | #include "power.h" |
49 | #include "database.h" | ||
49 | 50 | ||
50 | #ifdef HAVE_LCD_BITMAP | 51 | #ifdef HAVE_LCD_BITMAP |
51 | #include "peakmeter.h" | 52 | #include "peakmeter.h" |
@@ -1124,6 +1125,24 @@ static bool next_folder(void) | |||
1124 | return set_bool( str(LANG_NEXT_FOLDER), &global_settings.next_folder ); | 1125 | return set_bool( str(LANG_NEXT_FOLDER), &global_settings.next_folder ); |
1125 | } | 1126 | } |
1126 | 1127 | ||
1128 | static bool runtimedb(void) | ||
1129 | { | ||
1130 | bool rc; | ||
1131 | bool old = global_settings.runtimedb; | ||
1132 | |||
1133 | rc = set_bool_options( str(LANG_RUNTIMEDB_ACTIVE), | ||
1134 | &global_settings.runtimedb, | ||
1135 | STR(LANG_SET_BOOL_YES), | ||
1136 | STR(LANG_SET_BOOL_NO), | ||
1137 | NULL); | ||
1138 | if (old && !global_settings.runtimedb) | ||
1139 | rundb_shutdown(); | ||
1140 | if (!old && global_settings.runtimedb) | ||
1141 | rundb_init(); | ||
1142 | |||
1143 | return rc; | ||
1144 | } | ||
1145 | |||
1127 | static bool playback_settings_menu(void) | 1146 | static bool playback_settings_menu(void) |
1128 | { | 1147 | { |
1129 | int m; | 1148 | int m; |
@@ -1145,6 +1164,7 @@ static bool playback_settings_menu(void) | |||
1145 | #endif | 1164 | #endif |
1146 | { ID2P(LANG_ID3_ORDER), id3_order }, | 1165 | { ID2P(LANG_ID3_ORDER), id3_order }, |
1147 | { ID2P(LANG_NEXT_FOLDER), next_folder }, | 1166 | { ID2P(LANG_NEXT_FOLDER), next_folder }, |
1167 | { ID2P(LANG_RUNTIMEDB_ACTIVE), runtimedb }, | ||
1148 | }; | 1168 | }; |
1149 | 1169 | ||
1150 | bool old_shuffle = global_settings.playlist_shuffle; | 1170 | bool old_shuffle = global_settings.playlist_shuffle; |