diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/gwps-common.c | 10 | ||||
-rw-r--r-- | apps/gui/gwps.h | 1 | ||||
-rw-r--r-- | apps/gui/wps_debug.c | 7 | ||||
-rw-r--r-- | apps/gui/wps_parser.c | 2 |
4 files changed, 19 insertions, 1 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 2429d74b86..5524c1490e 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -943,6 +943,16 @@ static char *get_token_value(struct gui_wps *gwps, | |||
943 | snprintf(buf, buf_size, "%ld", id3->frequency); | 943 | snprintf(buf, buf_size, "%ld", id3->frequency); |
944 | return buf; | 944 | return buf; |
945 | 945 | ||
946 | case WPS_TOKEN_FILE_FREQUENCY_KHZ: | ||
947 | /* ignore remainders < 100, so 22050 Hz becomes just 22k */ | ||
948 | if ((id3->frequency % 1000) < 100) | ||
949 | snprintf(buf, buf_size, "%ld", id3->frequency / 1000); | ||
950 | else | ||
951 | snprintf(buf, buf_size, "%ld.%d", | ||
952 | id3->frequency / 1000, | ||
953 | (id3->frequency % 1000) / 100); | ||
954 | return buf; | ||
955 | |||
946 | case WPS_TOKEN_FILE_NAME: | 956 | case WPS_TOKEN_FILE_NAME: |
947 | if (get_dir(buf, buf_size, id3->path, 0)) { | 957 | if (get_dir(buf, buf_size, id3->path, 0)) { |
948 | /* Remove extension */ | 958 | /* Remove extension */ |
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 5fa2acfea9..26a800cbbd 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -172,6 +172,7 @@ enum wps_token_type { | |||
172 | WPS_TOKEN_FILE_BITRATE, | 172 | WPS_TOKEN_FILE_BITRATE, |
173 | WPS_TOKEN_FILE_CODEC, | 173 | WPS_TOKEN_FILE_CODEC, |
174 | WPS_TOKEN_FILE_FREQUENCY, | 174 | WPS_TOKEN_FILE_FREQUENCY, |
175 | WPS_TOKEN_FILE_FREQUENCY_KHZ, | ||
175 | WPS_TOKEN_FILE_NAME, | 176 | WPS_TOKEN_FILE_NAME, |
176 | WPS_TOKEN_FILE_NAME_WITH_EXTENSION, | 177 | WPS_TOKEN_FILE_NAME_WITH_EXTENSION, |
177 | WPS_TOKEN_FILE_PATH, | 178 | WPS_TOKEN_FILE_PATH, |
diff --git a/apps/gui/wps_debug.c b/apps/gui/wps_debug.c index 767f296cdd..8ba4b6f000 100644 --- a/apps/gui/wps_debug.c +++ b/apps/gui/wps_debug.c | |||
@@ -340,7 +340,12 @@ static void dump_wps_tokens(struct wps_data *data) | |||
340 | break; | 340 | break; |
341 | 341 | ||
342 | case WPS_TOKEN_FILE_FREQUENCY: | 342 | case WPS_TOKEN_FILE_FREQUENCY: |
343 | snprintf(buf, sizeof(buf), "%sfile audio frequency", | 343 | snprintf(buf, sizeof(buf), "%sfile audio frequency in Hz", |
344 | next_str(next)); | ||
345 | break; | ||
346 | |||
347 | case WPS_TOKEN_FILE_FREQUENCY_KHZ: | ||
348 | snprintf(buf, sizeof(buf), "%sfile audio frequency in KHz", | ||
344 | next_str(next)); | 349 | next_str(next)); |
345 | break; | 350 | break; |
346 | 351 | ||
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index b053cee109..5c72f7c90a 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -159,6 +159,7 @@ static const struct wps_tag all_tags[] = { | |||
159 | { WPS_TOKEN_FILE_BITRATE, "fb", WPS_REFRESH_STATIC, NULL }, | 159 | { WPS_TOKEN_FILE_BITRATE, "fb", WPS_REFRESH_STATIC, NULL }, |
160 | { WPS_TOKEN_FILE_CODEC, "fc", WPS_REFRESH_STATIC, NULL }, | 160 | { WPS_TOKEN_FILE_CODEC, "fc", WPS_REFRESH_STATIC, NULL }, |
161 | { WPS_TOKEN_FILE_FREQUENCY, "ff", WPS_REFRESH_STATIC, NULL }, | 161 | { WPS_TOKEN_FILE_FREQUENCY, "ff", WPS_REFRESH_STATIC, NULL }, |
162 | { WPS_TOKEN_FILE_FREQUENCY_KHZ, "fk", WPS_REFRESH_STATIC, NULL }, | ||
162 | { WPS_TOKEN_FILE_NAME_WITH_EXTENSION, "fm", WPS_REFRESH_STATIC, NULL }, | 163 | { WPS_TOKEN_FILE_NAME_WITH_EXTENSION, "fm", WPS_REFRESH_STATIC, NULL }, |
163 | { WPS_TOKEN_FILE_NAME, "fn", WPS_REFRESH_STATIC, NULL }, | 164 | { WPS_TOKEN_FILE_NAME, "fn", WPS_REFRESH_STATIC, NULL }, |
164 | { WPS_TOKEN_FILE_PATH, "fp", WPS_REFRESH_STATIC, NULL }, | 165 | { WPS_TOKEN_FILE_PATH, "fp", WPS_REFRESH_STATIC, NULL }, |
@@ -171,6 +172,7 @@ static const struct wps_tag all_tags[] = { | |||
171 | { WPS_TOKEN_FILE_BITRATE, "Fb", WPS_REFRESH_DYNAMIC, NULL }, | 172 | { WPS_TOKEN_FILE_BITRATE, "Fb", WPS_REFRESH_DYNAMIC, NULL }, |
172 | { WPS_TOKEN_FILE_CODEC, "Fc", WPS_REFRESH_DYNAMIC, NULL }, | 173 | { WPS_TOKEN_FILE_CODEC, "Fc", WPS_REFRESH_DYNAMIC, NULL }, |
173 | { WPS_TOKEN_FILE_FREQUENCY, "Ff", WPS_REFRESH_DYNAMIC, NULL }, | 174 | { WPS_TOKEN_FILE_FREQUENCY, "Ff", WPS_REFRESH_DYNAMIC, NULL }, |
175 | { WPS_TOKEN_FILE_FREQUENCY_KHZ, "Fk", WPS_REFRESH_STATIC, NULL }, | ||
174 | { WPS_TOKEN_FILE_NAME_WITH_EXTENSION, "Fm", WPS_REFRESH_DYNAMIC, NULL }, | 176 | { WPS_TOKEN_FILE_NAME_WITH_EXTENSION, "Fm", WPS_REFRESH_DYNAMIC, NULL }, |
175 | { WPS_TOKEN_FILE_NAME, "Fn", WPS_REFRESH_DYNAMIC, NULL }, | 177 | { WPS_TOKEN_FILE_NAME, "Fn", WPS_REFRESH_DYNAMIC, NULL }, |
176 | { WPS_TOKEN_FILE_PATH, "Fp", WPS_REFRESH_DYNAMIC, NULL }, | 178 | { WPS_TOKEN_FILE_PATH, "Fp", WPS_REFRESH_DYNAMIC, NULL }, |