diff options
author | William Wilgus <wilgus.william@gmail.com> | 2020-08-17 21:59:43 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2020-08-18 02:07:23 +0000 |
commit | 96e1bb655651ad7e0d5bd7841ce5b4642e9458dc (patch) | |
tree | ab3139096fe2b16b02f371d574ede7c30076eee5 /apps | |
parent | f029078f0d1173f44d5163eed58cb9fb2a48859d (diff) | |
download | rockbox-96e1bb655651ad7e0d5bd7841ce5b4642e9458dc.tar.gz rockbox-96e1bb655651ad7e0d5bd7841ce5b4642e9458dc.zip |
Open Plugin cleanup
cleanup a few unneded functions
Change-Id: I7207fd1380f92bb26ab8365a4bbef6104975acbe
Diffstat (limited to 'apps')
-rw-r--r-- | apps/open_plugin.c | 27 | ||||
-rw-r--r-- | apps/open_plugin.h | 1 |
2 files changed, 1 insertions, 27 deletions
diff --git a/apps/open_plugin.c b/apps/open_plugin.c index 0fb20403bc..5bca829708 100644 --- a/apps/open_plugin.c +++ b/apps/open_plugin.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | #include "open_plugin.h" | 25 | #include "open_plugin.h" |
26 | #include "pathfuncs.h" | 26 | #include "pathfuncs.h" |
27 | #include "keyboard.h" | ||
28 | #include "splash.h" | 27 | #include "splash.h" |
29 | #include "lang.h" | 28 | #include "lang.h" |
30 | 29 | ||
@@ -32,14 +31,6 @@ struct open_plugin_entry_t open_plugin_entry; | |||
32 | 31 | ||
33 | static const int op_entry_sz = sizeof(struct open_plugin_entry_t); | 32 | static const int op_entry_sz = sizeof(struct open_plugin_entry_t); |
34 | 33 | ||
35 | static void get_param(void) | ||
36 | { | ||
37 | char tmp_buf[OPEN_PLUGIN_BUFSZ+1]; | ||
38 | strlcpy(tmp_buf, open_plugin_entry.param, OPEN_PLUGIN_BUFSZ); | ||
39 | if (kbd_input(tmp_buf, OPEN_PLUGIN_BUFSZ, NULL)) | ||
40 | strlcpy(open_plugin_entry.param, tmp_buf, OPEN_PLUGIN_BUFSZ); | ||
41 | } | ||
42 | |||
43 | uint32_t open_plugin_add_path(const char *key, const char *plugin, const char *parameter) | 34 | uint32_t open_plugin_add_path(const char *key, const char *plugin, const char *parameter) |
44 | { | 35 | { |
45 | int len; | 36 | int len; |
@@ -72,15 +63,7 @@ uint32_t open_plugin_add_path(const char *key, const char *plugin, const char *p | |||
72 | strlcpy(open_plugin_entry.path, plugin, OPEN_PLUGIN_BUFSZ); | 63 | strlcpy(open_plugin_entry.path, plugin, OPEN_PLUGIN_BUFSZ); |
73 | 64 | ||
74 | if(parameter) | 65 | if(parameter) |
75 | { | 66 | strlcpy(open_plugin_entry.param, parameter, OPEN_PLUGIN_BUFSZ); |
76 | if (parameter[0] == '\0' && | ||
77 | yesno_pop(ID2P(LANG_PARAMETER))) | ||
78 | { | ||
79 | get_param(); | ||
80 | } | ||
81 | else | ||
82 | strlcpy(open_plugin_entry.param, parameter, OPEN_PLUGIN_BUFSZ); | ||
83 | } | ||
84 | 67 | ||
85 | write(fd, &open_plugin_entry, op_entry_sz); | 68 | write(fd, &open_plugin_entry, op_entry_sz); |
86 | } | 69 | } |
@@ -131,15 +114,7 @@ void open_plugin_browse(const char *key) | |||
131 | browse.bufsize = OPEN_PLUGIN_BUFSZ; | 114 | browse.bufsize = OPEN_PLUGIN_BUFSZ; |
132 | 115 | ||
133 | if (rockbox_browse(&browse) == GO_TO_PREVIOUS) | 116 | if (rockbox_browse(&browse) == GO_TO_PREVIOUS) |
134 | { | ||
135 | open_plugin_add_path(key, tmp_buf, NULL); | 117 | open_plugin_add_path(key, tmp_buf, NULL); |
136 | } | ||
137 | } | ||
138 | |||
139 | void open_plugin_remove(const char *key) | ||
140 | { | ||
141 | (void)key; | ||
142 | open_plugin_add_path(key, NULL, NULL); | ||
143 | } | 118 | } |
144 | 119 | ||
145 | static int open_plugin_hash_get_entry(uint32_t hash, struct open_plugin_entry_t *entry) | 120 | static int open_plugin_hash_get_entry(uint32_t hash, struct open_plugin_entry_t *entry) |
diff --git a/apps/open_plugin.h b/apps/open_plugin.h index 2d8a527073..9f20d7ffda 100644 --- a/apps/open_plugin.h +++ b/apps/open_plugin.h | |||
@@ -58,7 +58,6 @@ extern struct open_plugin_entry_t open_plugin_entry; | |||
58 | uint32_t open_plugin_add_path(const char *key, const char *plugin, const char *parameter); | 58 | uint32_t open_plugin_add_path(const char *key, const char *plugin, const char *parameter); |
59 | int open_plugin_get_entry(const char *key, struct open_plugin_entry_t *entry); | 59 | int open_plugin_get_entry(const char *key, struct open_plugin_entry_t *entry); |
60 | void open_plugin_browse(const char *key); | 60 | void open_plugin_browse(const char *key); |
61 | void open_plugin_remove(const char *key); | ||
62 | int open_plugin_run(const char *key); | 61 | int open_plugin_run(const char *key); |
63 | #endif | 62 | #endif |
64 | 63 | ||