From: Shinichiro Nakamura <shinta.main.jp@gmail.com>
Date: Thu, 19 Jul 2012 21:26:01 +0000 (+0900)
Subject: ...
X-Git-Url: http://git.osdn.net/view?p=kozos-expbrd%2Fkozos_expbrd.git;a=commitdiff_plain;h=67e1ea7c41a1368356d252ae5ccdcd12aa95d949

...
---

diff --git a/firm/sample/simple_mp3_player/os/task_fileio.c b/firm/sample/simple_mp3_player/os/task_fileio.c
index 340b023..2673b1e 100644
--- a/firm/sample/simple_mp3_player/os/task_fileio.c
+++ b/firm/sample/simple_mp3_player/os/task_fileio.c
@@ -28,21 +28,10 @@ static int play(const char *filename)
     while (audio_play(readfunc)) {
         switch ((divcnt++) % 8) {
             case 0:
-                menu_file_info(
-                        filinfo.fname, fatfs.fptr * 100 / fatfs.fsize);
-                break;
-            case 1:
-                menu_audio_info(&vol_curr);
-                if (vol_curr != vol_prev) {
-                    audio_volume(vol_curr, vol_curr);
-                }
-                vol_prev = vol_curr;
-                break;
-            case 2:
                 /*
                  * 早送りや巻き戻し
                  */
-                menu_audio_control(&control);
+                menu_get_audio_control(&control);
                 if (control != 0) {
                     switch (control) {
                         case AUDIO_CONTROL_FWD:
@@ -60,6 +49,23 @@ static int play(const char *filename)
                     }
                 }
                 break;
+            case 1:
+                /*
+                 * ファイル情報の通知
+                 */
+                menu_file_info(
+                        filinfo.fname, fatfs.fptr * 100 / fatfs.fsize);
+                break;
+            case 2:
+                /*
+                 * オーディオ情報の取得
+                 */
+                menu_get_audio_info(&vol_curr);
+                if (vol_curr != vol_prev) {
+                    audio_volume(vol_curr, vol_curr);
+                }
+                vol_prev = vol_curr;
+                break;
         }
     }
     return 0;
diff --git a/firm/sample/simple_mp3_player/os/task_menu.c b/firm/sample/simple_mp3_player/os/task_menu.c
index cc8c804..34f476f 100644
--- a/firm/sample/simple_mp3_player/os/task_menu.c
+++ b/firm/sample/simple_mp3_player/os/task_menu.c
@@ -9,17 +9,39 @@
 #define MENU_CMD_SWITCH     's'
 #define MENU_CMD_REMOTE     'i'
 
+#define LED_LEFT() \
+    do { \
+      display_led_write(1, 0); \
+      display_led_toggle(0); \
+    } while (0)
+
+#define LED_RIGHT() \
+    do { \
+      display_led_write(0, 0); \
+      display_led_toggle(1); \
+    } while (0)
+
+#define LED_GREEN() \
+    do { \
+      display_led_toggle(2); \
+    } while (0)
+
+#define LED_RED() \
+    do { \
+      display_led_toggle(3); \
+    } while (0)
+
 static int _volume = 220;
 static int _control = 0;
 
-int menu_audio_control(int *control)
+int menu_get_audio_control(int *control)
 {
     *control = _control;
     _control = 0;
     return 0;
 }
 
-int menu_audio_info(int *volume)
+int menu_get_audio_info(int *volume)
 {
     *volume = _volume;
     return 0;
@@ -74,28 +96,6 @@ int menu_remote_from_isr(char *signal, int siz)
   return 0;
 }
 
-#define LED_LEFT() \
-    do { \
-      display_led_write(1, 0); \
-      display_led_toggle(0); \
-    } while (0)
-
-#define LED_RIGHT() \
-    do { \
-      display_led_write(0, 0); \
-      display_led_toggle(1); \
-    } while (0)
-
-#define LED_GREEN() \
-    do { \
-      display_led_toggle(2); \
-    } while (0)
-
-#define LED_RED() \
-    do { \
-      display_led_toggle(3); \
-    } while (0)
-
 static int menu_cmdproc(char *p)
 {
   int cmd = p[0];
diff --git a/firm/sample/simple_mp3_player/os/task_menu.h b/firm/sample/simple_mp3_player/os/task_menu.h
index a83ca15..51aeab0 100644
--- a/firm/sample/simple_mp3_player/os/task_menu.h
+++ b/firm/sample/simple_mp3_player/os/task_menu.h
@@ -6,8 +6,8 @@
 #define AUDIO_CONTROL_REW   0x01
 #define AUDIO_CONTROL_FWD   0x02
 
-int menu_audio_control(int *control);
-int menu_audio_info(int *volume);
+int menu_get_audio_control(int *control);
+int menu_get_audio_info(int *volume);
 int menu_file_info(const char *filename, int location);
 int menu_rotary_from_isr(int left, int right);
 int menu_switch_from_isr(int sw1, int sw2, int swr);