summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2010-06-18 13:33:22 +0000
committerTeruaki Kawashima <teru@rockbox.org>2010-06-18 13:33:22 +0000
commitbe7e835d92b6b872767c2ce1678524b06c57fd65 (patch)
tree3d92922fe346d539117a0c3410a95c619f1e6700
parentf9b0f81d63cc7bf2ab17ca401c15fe64f57f157c (diff)
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.c9
-rw-r--r--apps/plugins/superdom.c3
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 {
bool wrap;
bool wipe;
bool active_one_line;
- enum {
- ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT,
- } align;
+ int align; /* 0: left, 1: center, 2: right */
bool statusbar_on;
bool display_title;
#endif
@@ -2225,7 +2223,7 @@ static void load_or_save_settings(bool save)
{ TYPE_BOOL, 0, 1, { .bool_p = &prefs.wipe }, "wipe", NULL },
{ TYPE_BOOL, 0, 1, { .bool_p = &prefs.active_one_line },
"active one line", NULL },
- { TYPE_INT, 0, 2, { .int_p = (int *) &prefs.align }, "align", NULL },
+ { TYPE_INT, 0, 2, { .int_p = &prefs.align }, "align", NULL },
{ TYPE_BOOL, 0, 1, { .bool_p = &prefs.statusbar_on },
"statusbar on", NULL },
{ TYPE_BOOL, 0, 1, { .bool_p = &prefs.display_title },
@@ -2256,7 +2254,7 @@ static void load_or_save_settings(bool save)
prefs.wrap = true;
prefs.wipe = true;
prefs.active_one_line = false;
- prefs.align = ALIGN_CENTER;
+ prefs.align = 1; /* center */
prefs.statusbar_on = false;
prefs.display_title = true;
#endif
@@ -2848,6 +2846,7 @@ static int lrc_main(void)
{
/* current.loaded_lrc is false after changing encode setting */
update_display_state = true;
+ display_state();
load_lrc_file();
}
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 {
struct resources humanres;
struct resources compres;
-enum { GS_PROD, GS_MOVE, GS_WAR } gamestate;
+enum { GS_PROD, GS_MOVE, GS_WAR };
+int gamestate;
struct cursor{
int x;