diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/option_select.c | 1 | ||||
-rw-r--r-- | apps/lang/english.lang | 25 | ||||
-rw-r--r-- | apps/recorder/peakmeter.c | 15 | ||||
-rw-r--r-- | apps/settings_list.c | 2 | ||||
-rw-r--r-- | apps/talk.c | 2 | ||||
-rw-r--r-- | apps/talk.h | 1 |
6 files changed, 35 insertions, 11 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index ddd0f7f9b7..7b6322ff91 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -42,6 +42,7 @@ static const char *unit_strings[] = | |||
42 | [UNIT_PER_SEC] = "per sec", | 42 | [UNIT_PER_SEC] = "per sec", |
43 | [UNIT_HERTZ] = "Hz", | 43 | [UNIT_HERTZ] = "Hz", |
44 | [UNIT_MB] = "MB", [UNIT_KBIT] = "kb/s", | 44 | [UNIT_MB] = "MB", [UNIT_KBIT] = "kb/s", |
45 | [UNIT_PM_TICK] = "units/10ms", | ||
45 | }; | 46 | }; |
46 | 47 | ||
47 | char *option_get_valuestring(struct settings_list *setting, | 48 | char *option_get_valuestring(struct settings_list *setting, |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 53c673a388..47acda9c62 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3566,19 +3566,16 @@ | |||
3566 | </phrase> | 3566 | </phrase> |
3567 | <phrase> | 3567 | <phrase> |
3568 | id: LANG_PM_UNITS_PER_READ | 3568 | id: LANG_PM_UNITS_PER_READ |
3569 | desc: in the peak meter menu | 3569 | desc: DEPRECATED |
3570 | user: | 3570 | user: |
3571 | <source> | 3571 | <source> |
3572 | *: "Units Per Read" | 3572 | *: "" |
3573 | masd: none | ||
3574 | </source> | 3573 | </source> |
3575 | <dest> | 3574 | <dest> |
3576 | *: "Units Per Read" | 3575 | *: "" |
3577 | masd: none | ||
3578 | </dest> | 3576 | </dest> |
3579 | <voice> | 3577 | <voice> |
3580 | *: "Units Per Read" | 3578 | *: "" |
3581 | masd: none | ||
3582 | </voice> | 3579 | </voice> |
3583 | </phrase> | 3580 | </phrase> |
3584 | <phrase> | 3581 | <phrase> |
@@ -11043,3 +11040,17 @@ | |||
11043 | *: "Only when viewing all types" | 11040 | *: "Only when viewing all types" |
11044 | </voice> | 11041 | </voice> |
11045 | </phrase> | 11042 | </phrase> |
11043 | <phrase> | ||
11044 | id: VOICE_PM_UNITS_PER_TICK | ||
11045 | desc: spoken only, peak meter release unit | ||
11046 | user: | ||
11047 | <source> | ||
11048 | *: "" | ||
11049 | </source> | ||
11050 | <dest> | ||
11051 | *: "" | ||
11052 | </dest> | ||
11053 | <voice> | ||
11054 | *: "units per tick" | ||
11055 | </voice> | ||
11056 | </phrase> | ||
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index f06b19ab2d..097c98f29d 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -880,6 +880,7 @@ void peak_meter_draw(struct screen *display, struct meter_scales *scales, | |||
880 | int left = 0, right = 0; | 880 | int left = 0, right = 0; |
881 | int meterwidth = width - 3; | 881 | int meterwidth = width - 3; |
882 | int i; | 882 | int i; |
883 | static long peak_release_tick = 0; | ||
883 | 884 | ||
884 | #ifdef PM_DEBUG | 885 | #ifdef PM_DEBUG |
885 | static long pm_tick = 0; | 886 | static long pm_tick = 0; |
@@ -934,9 +935,17 @@ void peak_meter_draw(struct screen *display, struct meter_scales *scales, | |||
934 | } | 935 | } |
935 | 936 | ||
936 | /* apply release */ | 937 | /* apply release */ |
937 | left = MAX(left , scales->last_left - pm_peak_release); | 938 | if(current_tick != peak_release_tick) |
938 | right = MAX(right, scales->last_right - pm_peak_release); | 939 | { |
939 | 940 | peak_release_tick = current_tick; | |
941 | left = MAX(left , scales->last_left - pm_peak_release); | ||
942 | right = MAX(right, scales->last_right - pm_peak_release); | ||
943 | } | ||
944 | else | ||
945 | { | ||
946 | left = MAX(left , scales->last_left); | ||
947 | right = MAX(right, scales->last_right); | ||
948 | } | ||
940 | /* reset max values after timeout */ | 949 | /* reset max values after timeout */ |
941 | if (TIME_AFTER(current_tick, scales->pm_peak_timeout_l)){ | 950 | if (TIME_AFTER(current_tick, scales->pm_peak_timeout_l)){ |
942 | scales->pm_peak_left = 0; | 951 | scales->pm_peak_left = 0; |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 5341c80e90..cfac08835c 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -708,7 +708,7 @@ const struct settings_list settings[] = { | |||
708 | TALK_ID(10, UNIT_SEC), TALK_ID(15, UNIT_SEC), TALK_ID(20, UNIT_SEC), | 708 | TALK_ID(10, UNIT_SEC), TALK_ID(15, UNIT_SEC), TALK_ID(20, UNIT_SEC), |
709 | TALK_ID(30, UNIT_SEC), TALK_ID(60, UNIT_SEC)), | 709 | TALK_ID(30, UNIT_SEC), TALK_ID(60, UNIT_SEC)), |
710 | INT_SETTING(0, peak_meter_release, LANG_PM_RELEASE, 8, "peak meter release", | 710 | INT_SETTING(0, peak_meter_release, LANG_PM_RELEASE, 8, "peak meter release", |
711 | UNIT_INT, 1, 0x7e, 1, NULL, NULL,NULL), | 711 | UNIT_PM_TICK, 1, 0x7e, 1, NULL, NULL,NULL), |
712 | OFFON_SETTING(0,peak_meter_dbfs,LANG_PM_DBFS,true,"peak meter dbfs",NULL), | 712 | OFFON_SETTING(0,peak_meter_dbfs,LANG_PM_DBFS,true,"peak meter dbfs",NULL), |
713 | {F_T_INT,&global_settings.peak_meter_min,LANG_PM_MIN,INT(60),"peak meter min",NULL,UNUSED}, | 713 | {F_T_INT,&global_settings.peak_meter_min,LANG_PM_MIN,INT(60),"peak meter min",NULL,UNUSED}, |
714 | {F_T_INT,&global_settings.peak_meter_max,LANG_PM_MAX,INT(0),"peak meter max",NULL,UNUSED}, | 714 | {F_T_INT,&global_settings.peak_meter_max,LANG_PM_MAX,INT(0),"peak meter max",NULL,UNUSED}, |
diff --git a/apps/talk.c b/apps/talk.c index ef8c22225c..9e73f71084 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -782,6 +782,8 @@ int talk_value(long n, int unit, bool enqueue) | |||
782 | = LANG_MEGABYTE, | 782 | = LANG_MEGABYTE, |
783 | [UNIT_KBIT] | 783 | [UNIT_KBIT] |
784 | = VOICE_KBIT_PER_SEC, | 784 | = VOICE_KBIT_PER_SEC, |
785 | [UNIT_PM_TICK] | ||
786 | = VOICE_PM_UNITS_PER_TICK, | ||
785 | }; | 787 | }; |
786 | 788 | ||
787 | #if CONFIG_CODEC != SWCODEC | 789 | #if CONFIG_CODEC != SWCODEC |
diff --git a/apps/talk.h b/apps/talk.h index 5374ae9b20..b016acba59 100644 --- a/apps/talk.h +++ b/apps/talk.h | |||
@@ -43,6 +43,7 @@ enum { | |||
43 | UNIT_HERTZ, /* hertz */ | 43 | UNIT_HERTZ, /* hertz */ |
44 | UNIT_MB, /* Megabytes */ | 44 | UNIT_MB, /* Megabytes */ |
45 | UNIT_KBIT, /* kilobits per sec */ | 45 | UNIT_KBIT, /* kilobits per sec */ |
46 | UNIT_PM_TICK, /* peak meter units per tick */ | ||
46 | UNIT_LAST /* END MARKER */ | 47 | UNIT_LAST /* END MARKER */ |
47 | }; | 48 | }; |
48 | 49 | ||