diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2010-06-18 13:33:22 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2010-06-18 13:33:22 +0000 |
commit | be7e835d92b6b872767c2ce1678524b06c57fd65 (patch) | |
tree | 3d92922fe346d539117a0c3410a95c619f1e6700 | |
parent | f9b0f81d63cc7bf2ab17ca401c15fe64f57f157c (diff) | |
download | rockbox-be7e835d92b6b872767c2ce1678524b06c57fd65.tar.gz rockbox-be7e835d92b6b872767c2ce1678524b06c57fd65.zip |
use int instead of enum.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26916 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/lrcplayer.c | 9 | ||||
-rw-r--r-- | apps/plugins/superdom.c | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c index dce5f4ff02..fdd54b6366 100644 --- a/apps/plugins/lrcplayer.c +++ b/apps/plugins/lrcplayer.c | |||
@@ -75,9 +75,7 @@ struct preferences { | |||
75 | bool wrap; | 75 | bool wrap; |
76 | bool wipe; | 76 | bool wipe; |
77 | bool active_one_line; | 77 | bool active_one_line; |
78 | enum { | 78 | int align; /* 0: left, 1: center, 2: right */ |
79 | ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, | ||
80 | } align; | ||
81 | bool statusbar_on; | 79 | bool statusbar_on; |
82 | bool display_title; | 80 | bool display_title; |
83 | #endif | 81 | #endif |
@@ -2225,7 +2223,7 @@ static void load_or_save_settings(bool save) | |||
2225 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.wipe }, "wipe", NULL }, | 2223 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.wipe }, "wipe", NULL }, |
2226 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.active_one_line }, | 2224 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.active_one_line }, |
2227 | "active one line", NULL }, | 2225 | "active one line", NULL }, |
2228 | { TYPE_INT, 0, 2, { .int_p = (int *) &prefs.align }, "align", NULL }, | 2226 | { TYPE_INT, 0, 2, { .int_p = &prefs.align }, "align", NULL }, |
2229 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.statusbar_on }, | 2227 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.statusbar_on }, |
2230 | "statusbar on", NULL }, | 2228 | "statusbar on", NULL }, |
2231 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.display_title }, | 2229 | { TYPE_BOOL, 0, 1, { .bool_p = &prefs.display_title }, |
@@ -2256,7 +2254,7 @@ static void load_or_save_settings(bool save) | |||
2256 | prefs.wrap = true; | 2254 | prefs.wrap = true; |
2257 | prefs.wipe = true; | 2255 | prefs.wipe = true; |
2258 | prefs.active_one_line = false; | 2256 | prefs.active_one_line = false; |
2259 | prefs.align = ALIGN_CENTER; | 2257 | prefs.align = 1; /* center */ |
2260 | prefs.statusbar_on = false; | 2258 | prefs.statusbar_on = false; |
2261 | prefs.display_title = true; | 2259 | prefs.display_title = true; |
2262 | #endif | 2260 | #endif |
@@ -2848,6 +2846,7 @@ static int lrc_main(void) | |||
2848 | { | 2846 | { |
2849 | /* current.loaded_lrc is false after changing encode setting */ | 2847 | /* current.loaded_lrc is false after changing encode setting */ |
2850 | update_display_state = true; | 2848 | update_display_state = true; |
2849 | display_state(); | ||
2851 | load_lrc_file(); | 2850 | load_lrc_file(); |
2852 | } | 2851 | } |
2853 | if (update_display_state) | 2852 | if (update_display_state) |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index d5d08fb162..c2a7d8f896 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -238,7 +238,8 @@ struct settings { | |||
238 | 238 | ||
239 | struct resources humanres; | 239 | struct resources humanres; |
240 | struct resources compres; | 240 | struct resources compres; |
241 | enum { GS_PROD, GS_MOVE, GS_WAR } gamestate; | 241 | enum { GS_PROD, GS_MOVE, GS_WAR }; |
242 | int gamestate; | ||
242 | 243 | ||
243 | struct cursor{ | 244 | struct cursor{ |
244 | int x; | 245 | int x; |