diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/settings_dumper.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/apps/plugins/settings_dumper.c b/apps/plugins/settings_dumper.c index cdf973498b..4b3d03c5e6 100644 --- a/apps/plugins/settings_dumper.c +++ b/apps/plugins/settings_dumper.c | |||
@@ -33,7 +33,10 @@ static void write_setting(const struct settings_list *setting, int fd, unsigned | |||
33 | return; | 33 | return; |
34 | if (group && (setting->flags&group) == 0) /* not in the group we are dumping */ | 34 | if (group && (setting->flags&group) == 0) /* not in the group we are dumping */ |
35 | return; | 35 | return; |
36 | else if (!group && (setting->flags&(F_THEMESETTING|F_RECSETTING|F_EQSETTING|F_SOUNDSETTING))) | 36 | else if (!group && (setting->flags&(F_THEMESETTING| |
37 | F_RECSETTING| | ||
38 | F_EQSETTING| | ||
39 | F_SOUNDSETTING))) | ||
37 | return; | 40 | return; |
38 | setting_count++; | 41 | setting_count++; |
39 | if (setting_count%10 == 0) | 42 | if (setting_count%10 == 0) |
@@ -56,7 +59,8 @@ static void write_setting(const struct settings_list *setting, int fd, unsigned | |||
56 | setting->flags&F_ALLOW_ARBITRARY_VALS? " (And any value between)":""); | 59 | setting->flags&F_ALLOW_ARBITRARY_VALS? " (And any value between)":""); |
57 | for(i=0;i<setting->table_setting->count;i++) | 60 | for(i=0;i<setting->table_setting->count;i++) |
58 | { | 61 | { |
59 | rb->snprintf(temp, 8, "%d, ", setting->table_setting->values[i]); | 62 | rb->snprintf(temp, 8, "%d, ", |
63 | setting->table_setting->values[i]); | ||
60 | rb->strcat(text, temp); | 64 | rb->strcat(text, temp); |
61 | } | 65 | } |
62 | } | 66 | } |
@@ -68,14 +72,16 @@ static void write_setting(const struct settings_list *setting, int fd, unsigned | |||
68 | rb->snprintf(text, sizeof(text), "Min: %d, Max: %d, Step size: %d", | 72 | rb->snprintf(text, sizeof(text), "Min: %d, Max: %d, Step size: %d", |
69 | min, max, step); | 73 | min, max, step); |
70 | } | 74 | } |
71 | else if (setting->flags&F_CHOICE_SETTING && (setting->cfg_vals == NULL)) | 75 | else if (setting->flags&F_CHOICE_SETTING && |
76 | (setting->cfg_vals == NULL)) | ||
72 | { | 77 | { |
73 | char temp[64]; | 78 | char temp[64]; |
74 | int i; | 79 | int i; |
75 | temp[0] = '\0'; | 80 | temp[0] = '\0'; |
76 | for(i=0;i<setting->choice_setting->count;i++) | 81 | for(i=0;i<setting->choice_setting->count;i++) |
77 | { | 82 | { |
78 | rb->snprintf(temp, 64, "%s, ", setting->choice_setting->desc[i]); | 83 | rb->snprintf(temp, 64, "%s, ", |
84 | setting->choice_setting->desc[i]); | ||
79 | rb->strcat(text, temp); | 85 | rb->strcat(text, temp); |
80 | } | 86 | } |
81 | } | 87 | } |
@@ -89,17 +95,16 @@ static void write_setting(const struct settings_list *setting, int fd, unsigned | |||
89 | break; | 95 | break; |
90 | case F_T_CHARPTR: | 96 | case F_T_CHARPTR: |
91 | case F_T_UCHARPTR: | 97 | case F_T_UCHARPTR: |
92 | if (setting->flags&F_FILENAME) | 98 | rb->snprintf(text, sizeof(text), "Text.. Up to %d characters. ", |
99 | setting->filename_setting->max_len-1); | ||
100 | if (setting->filename_setting->prefix && | ||
101 | setting->filename_setting->suffix) | ||
93 | { | 102 | { |
94 | rb->snprintf(text, sizeof(text), "Up to %d characters.", setting->filename_setting->max_len-1); | 103 | rb->strcat(text, "Should start with:\""); |
95 | if (setting->filename_setting->prefix && setting->filename_setting->suffix) | 104 | rb->strcat(text, setting->filename_setting->prefix); |
96 | { | 105 | rb->strcat(text, "\" and end with:\""); |
97 | rb->strcat(text, "Should start with:\""); | 106 | rb->strcat(text, setting->filename_setting->suffix); |
98 | rb->strcat(text, setting->filename_setting->prefix); | 107 | rb->strcat(text, "\""); |
99 | rb->strcat(text, "\" And end with:\""); | ||
100 | rb->strcat(text, setting->filename_setting->suffix); | ||
101 | rb->strcat(text, "\""); | ||
102 | } | ||
103 | } | 108 | } |
104 | break; | 109 | break; |
105 | } | 110 | } |
@@ -109,7 +114,8 @@ static void write_setting(const struct settings_list *setting, int fd, unsigned | |||
109 | 114 | ||
110 | 115 | ||
111 | /* this is the plugin entry point */ | 116 | /* this is the plugin entry point */ |
112 | enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) | 117 | enum plugin_status plugin_start(const struct plugin_api* api, |
118 | const void* parameter) | ||
113 | { | 119 | { |
114 | const struct settings_list *list; | 120 | const struct settings_list *list; |
115 | int setting_count, i; | 121 | int setting_count, i; |