diff options
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/keyboard.c | 3 | ||||
-rw-r--r-- | apps/recorder/peakmeter.c | 9 | ||||
-rw-r--r-- | apps/recorder/recording.c | 7 |
3 files changed, 7 insertions, 12 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 5f2a32c367..c4cfe48ad9 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -142,7 +142,7 @@ static const unsigned char morse_codes[] = { | |||
142 | call with NULL to reset keyboard */ | 142 | call with NULL to reset keyboard */ |
143 | int load_kbd(unsigned char* filename) | 143 | int load_kbd(unsigned char* filename) |
144 | { | 144 | { |
145 | int fd, l; | 145 | int fd; |
146 | int i, line_len, max_line_len; | 146 | int i, line_len, max_line_len; |
147 | unsigned char buf[4]; | 147 | unsigned char buf[4]; |
148 | unsigned short *pbuf; | 148 | unsigned short *pbuf; |
@@ -331,7 +331,6 @@ int kbd_input(char* text, int buflen) | |||
331 | bool done = false; | 331 | bool done = false; |
332 | struct keyboard_parameters * const param = kbd_param; | 332 | struct keyboard_parameters * const param = kbd_param; |
333 | struct edit_state state; | 333 | struct edit_state state; |
334 | int l; /* screen loop variable */ | ||
335 | unsigned short ch; | 334 | unsigned short ch; |
336 | int ret = 0; /* assume success */ | 335 | int ret = 0; /* assume success */ |
337 | FOR_NB_SCREENS(l) | 336 | FOR_NB_SCREENS(l) |
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index c7f2b17d05..9f0db3330a 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -403,7 +403,7 @@ static void peak_meter_set_min(int newmin) | |||
403 | 403 | ||
404 | pm_db_min = calc_db(peak_meter_range_min); | 404 | pm_db_min = calc_db(peak_meter_range_min); |
405 | pm_db_range = pm_db_max - pm_db_min; | 405 | pm_db_range = pm_db_max - pm_db_min; |
406 | int i; | 406 | |
407 | FOR_NB_SCREENS(i) | 407 | FOR_NB_SCREENS(i) |
408 | scales[i].db_scale_valid = false; | 408 | scales[i].db_scale_valid = false; |
409 | } | 409 | } |
@@ -452,7 +452,7 @@ static void peak_meter_set_max(int newmax) | |||
452 | 452 | ||
453 | pm_db_max = calc_db(peak_meter_range_max); | 453 | pm_db_max = calc_db(peak_meter_range_max); |
454 | pm_db_range = pm_db_max - pm_db_min; | 454 | pm_db_range = pm_db_max - pm_db_min; |
455 | int i; | 455 | |
456 | FOR_NB_SCREENS(i) | 456 | FOR_NB_SCREENS(i) |
457 | scales[i].db_scale_valid = false; | 457 | scales[i].db_scale_valid = false; |
458 | } | 458 | } |
@@ -493,7 +493,6 @@ bool peak_meter_get_use_dbfs(void) | |||
493 | */ | 493 | */ |
494 | void peak_meter_set_use_dbfs(bool use) | 494 | void peak_meter_set_use_dbfs(bool use) |
495 | { | 495 | { |
496 | int i; | ||
497 | pm_use_dbfs = use; | 496 | pm_use_dbfs = use; |
498 | FOR_NB_SCREENS(i) | 497 | FOR_NB_SCREENS(i) |
499 | scales[i].db_scale_valid = false; | 498 | scales[i].db_scale_valid = false; |
@@ -571,7 +570,6 @@ void pm_reset_clipcount(void) | |||
571 | */ | 570 | */ |
572 | void peak_meter_playback(bool playback) | 571 | void peak_meter_playback(bool playback) |
573 | { | 572 | { |
574 | int i; | ||
575 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) | 573 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) |
576 | (void)playback; | 574 | (void)playback; |
577 | #elif CONFIG_CODEC == SWCODEC | 575 | #elif CONFIG_CODEC == SWCODEC |
@@ -1313,7 +1311,6 @@ void peak_meter_draw_trig(int xpos[], int ypos[], | |||
1313 | int barend[NB_SCREENS]; | 1311 | int barend[NB_SCREENS]; |
1314 | int icon; | 1312 | int icon; |
1315 | int ixpos[NB_SCREENS]; | 1313 | int ixpos[NB_SCREENS]; |
1316 | int i; | ||
1317 | int trigbar_width[NB_SCREENS]; | 1314 | int trigbar_width[NB_SCREENS]; |
1318 | 1315 | ||
1319 | FOR_NB_SCREENS(i) | 1316 | FOR_NB_SCREENS(i) |
@@ -1374,7 +1371,7 @@ void peak_meter_draw_trig(int xpos[], int ypos[], | |||
1374 | return; | 1371 | return; |
1375 | } | 1372 | } |
1376 | 1373 | ||
1377 | for(i = 0; i < nb_screens; i++) | 1374 | for(int i = 0; i < nb_screens; i++) |
1378 | { | 1375 | { |
1379 | gui_scrollbar_draw(&screens[i], xpos[i] + ICON_PLAY_STATE_WIDTH + 1, | 1376 | gui_scrollbar_draw(&screens[i], xpos[i] + ICON_PLAY_STATE_WIDTH + 1, |
1380 | ypos[i] + 1, trigbar_width[i], TRIG_HEIGHT - 2, | 1377 | ypos[i] + 1, trigbar_width[i], TRIG_HEIGHT - 2, |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index d706899b1c..15b628508f 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -184,7 +184,7 @@ static bool remote_display_on = true; | |||
184 | #endif | 184 | #endif |
185 | 185 | ||
186 | /* as we have the ability to disable the remote, we need an alternative loop */ | 186 | /* as we have the ability to disable the remote, we need an alternative loop */ |
187 | #define FOR_NB_ACTIVE_SCREENS(i) for(i = 0; i < screen_update; i++) | 187 | #define FOR_NB_ACTIVE_SCREENS(i) for(int i = 0; i < screen_update; i++) |
188 | 188 | ||
189 | static bool update_list = false; /* (GIU) list needs updating */ | 189 | static bool update_list = false; /* (GIU) list needs updating */ |
190 | 190 | ||
@@ -1042,7 +1042,6 @@ bool recording_screen(bool no_source) | |||
1042 | int peak_l, peak_r; | 1042 | int peak_l, peak_r; |
1043 | int balance = 0; | 1043 | int balance = 0; |
1044 | #endif | 1044 | #endif |
1045 | int i; | ||
1046 | int pm_x[NB_SCREENS]; /* peakmeter (and trigger bar) x pos */ | 1045 | int pm_x[NB_SCREENS]; /* peakmeter (and trigger bar) x pos */ |
1047 | int pm_y[NB_SCREENS]; /* peakmeter y pos */ | 1046 | int pm_y[NB_SCREENS]; /* peakmeter y pos */ |
1048 | int pm_h[NB_SCREENS]; /* peakmeter height */ | 1047 | int pm_h[NB_SCREENS]; /* peakmeter height */ |
@@ -2009,7 +2008,7 @@ static bool f2_rec_screen(void) | |||
2009 | 2008 | ||
2010 | bool exit = false; | 2009 | bool exit = false; |
2011 | bool used = false; | 2010 | bool used = false; |
2012 | int w, h, i; | 2011 | int w, h; |
2013 | char buf[32]; | 2012 | char buf[32]; |
2014 | int button; | 2013 | int button; |
2015 | struct audio_recording_options rec_options; | 2014 | struct audio_recording_options rec_options; |
@@ -2140,7 +2139,7 @@ static bool f3_rec_screen(void) | |||
2140 | { | 2139 | { |
2141 | bool exit = false; | 2140 | bool exit = false; |
2142 | bool used = false; | 2141 | bool used = false; |
2143 | int w, h, i; | 2142 | int w, h; |
2144 | int button; | 2143 | int button; |
2145 | const char *src_str[] = | 2144 | const char *src_str[] = |
2146 | { | 2145 | { |