diff options
Diffstat (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h')
| -rw-r--r-- | xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h index ba0db1d..39a98fe 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h | |||
| @@ -104,16 +104,21 @@ namespace dialogs | |||
| 104 | /// fprintf(stderr, "Selected item is: %i\n", selected); | 104 | /// fprintf(stderr, "Selected item is: %i\n", selected); |
| 105 | /// ~~~~~~~~~~~~~ | 105 | /// ~~~~~~~~~~~~~ |
| 106 | /// | 106 | /// |
| 107 | inline int Show(const std::string& heading, const std::vector<std::string>& entries, int selected = -1, unsigned int autoclose = 0) | 107 | inline int ATTRIBUTE_HIDDEN Show(const std::string& heading, |
| 108 | const std::vector<std::string>& entries, | ||
| 109 | int selected = -1, | ||
| 110 | unsigned int autoclose = 0) | ||
| 108 | { | 111 | { |
| 109 | using namespace ::kodi::addon; | 112 | using namespace ::kodi::addon; |
| 110 | unsigned int size = entries.size(); | 113 | unsigned int size = static_cast<unsigned int>(entries.size()); |
| 111 | const char** cEntries = (const char**)malloc(size*sizeof(const char**)); | 114 | const char** cEntries = (const char**)malloc(size * sizeof(const char**)); |
| 112 | for (unsigned int i = 0; i < size; ++i) | 115 | for (unsigned int i = 0; i < size; ++i) |
| 113 | { | 116 | { |
| 114 | cEntries[i] = entries[i].c_str(); | 117 | cEntries[i] = entries[i].c_str(); |
| 115 | } | 118 | } |
| 116 | int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected, autoclose); | 119 | int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open( |
| 120 | CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected, | ||
| 121 | autoclose); | ||
| 117 | free(cEntries); | 122 | free(cEntries); |
| 118 | return ret; | 123 | return ret; |
| 119 | } | 124 | } |
| @@ -159,10 +164,13 @@ namespace dialogs | |||
| 159 | /// fprintf(stderr, "Selected item is: %i\n", selected); | 164 | /// fprintf(stderr, "Selected item is: %i\n", selected); |
| 160 | /// ~~~~~~~~~~~~~ | 165 | /// ~~~~~~~~~~~~~ |
| 161 | /// | 166 | /// |
| 162 | inline int Show(const std::string& heading, std::vector<SSelectionEntry>& entries, int selected = -1, unsigned int autoclose = 0) | 167 | inline int ATTRIBUTE_HIDDEN Show(const std::string& heading, |
| 168 | std::vector<SSelectionEntry>& entries, | ||
| 169 | int selected = -1, | ||
| 170 | unsigned int autoclose = 0) | ||
| 163 | { | 171 | { |
| 164 | using namespace ::kodi::addon; | 172 | using namespace ::kodi::addon; |
| 165 | unsigned int size = entries.size(); | 173 | unsigned int size = static_cast<unsigned int>(entries.size()); |
| 166 | const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char*))); | 174 | const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char*))); |
| 167 | for (unsigned int i = 0; i < size; ++i) | 175 | for (unsigned int i = 0; i < size; ++i) |
| 168 | { | 176 | { |
| @@ -224,10 +232,12 @@ namespace dialogs | |||
| 224 | /// } | 232 | /// } |
| 225 | /// ~~~~~~~~~~~~~ | 233 | /// ~~~~~~~~~~~~~ |
| 226 | /// | 234 | /// |
| 227 | inline bool ShowMultiSelect(const std::string& heading, std::vector<SSelectionEntry>& entries, int autoclose = 0) | 235 | inline bool ATTRIBUTE_HIDDEN ShowMultiSelect(const std::string& heading, |
| 236 | std::vector<SSelectionEntry>& entries, | ||
| 237 | int autoclose = 0) | ||
| 228 | { | 238 | { |
| 229 | using namespace ::kodi::addon; | 239 | using namespace ::kodi::addon; |
| 230 | unsigned int size = entries.size(); | 240 | unsigned int size = static_cast<unsigned int>(entries.size()); |
| 231 | const char** cEntryIDs = static_cast<const char**>(malloc(size*sizeof(const char*))); | 241 | const char** cEntryIDs = static_cast<const char**>(malloc(size*sizeof(const char*))); |
| 232 | const char** cEntryNames = static_cast<const char**>(malloc(size*sizeof(const char*))); | 242 | const char** cEntryNames = static_cast<const char**>(malloc(size*sizeof(const char*))); |
| 233 | bool* cEntriesSelected = static_cast<bool*>(malloc(size*sizeof(bool))); | 243 | bool* cEntriesSelected = static_cast<bool*>(malloc(size*sizeof(bool))); |
