Commit 766e381d authored by David Fuhrmann's avatar David Fuhrmann

macosx: adapt module_list_get calls for latest changes in core

parent 568303d7
...@@ -1269,8 +1269,9 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -1269,8 +1269,9 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
size_t i_module_index; size_t i_module_index;
module_t *p_parser, **p_list; module_t *p_parser, **p_list;
p_list = module_list_get(NULL); size_t count;
for (i_module_index = 0; p_list[i_module_index]; i_module_index++) { p_list = module_list_get(&count);
for (i_module_index = 0; i_module_index < count; i_module_index++) {
p_parser = p_list[i_module_index]; p_parser = p_list[i_module_index];
if (p_item->i_type == CONFIG_ITEM_MODULE) { if (p_item->i_type == CONFIG_ITEM_MODULE) {
...@@ -1311,8 +1312,9 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -1311,8 +1312,9 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
/* build a list of available modules */ /* build a list of available modules */
module_t *p_parser, **p_list; module_t *p_parser, **p_list;
p_list = module_list_get(NULL); size_t count;
for (size_t i_index = 0; p_list[i_index]; i_index++) { p_list = module_list_get(&count);
for (size_t i_index = 0; i_index < count; i_index++) {
p_parser = p_list[i_index]; p_parser = p_list[i_index];
if (p_item->i_type == CONFIG_ITEM_MODULE) { if (p_item->i_type == CONFIG_ITEM_MODULE) {
...@@ -2010,8 +2012,9 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -2010,8 +2012,9 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
o_modulearray = [[NSMutableArray alloc] initWithCapacity:10]; o_modulearray = [[NSMutableArray alloc] initWithCapacity:10];
/* build a list of available modules */ /* build a list of available modules */
p_list = module_list_get(NULL); size_t count;
for (i_module_index = 0; p_list[i_module_index]; i_module_index++) { p_list = module_list_get(&count);
for (i_module_index = 0; i_module_index < count; i_module_index++) {
int i; int i;
p_parser = p_list[i_module_index]; p_parser = p_list[i_module_index];
......
...@@ -370,7 +370,8 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -370,7 +370,8 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
[object removeAllItems]; [object removeAllItems];
p_item = config_FindConfig(VLC_OBJECT(p_intf), name); p_item = config_FindConfig(VLC_OBJECT(p_intf), name);
p_list = module_list_get(NULL); size_t count;
p_list = module_list_get(&count);
if (!p_item ||!p_list) { if (!p_item ||!p_list) {
if (p_list) module_list_free(p_list); if (p_list) module_list_free(p_list);
msg_Err(p_intf, "serious problem, item or list not found"); msg_Err(p_intf, "serious problem, item or list not found");
...@@ -378,7 +379,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -378,7 +379,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
} }
[object addItemWithTitle: _NS("Default")]; [object addItemWithTitle: _NS("Default")];
for (size_t i_index = 0; p_list[i_index]; i_index++) { for (size_t i_index = 0; i_index < count; i_index++) {
p_parser = p_list[i_index]; p_parser = p_list[i_index];
if (module_provides(p_parser, p_item->psz_type)) { if (module_provides(p_parser, p_item->psz_type)) {
[object addItemWithTitle: [NSString stringWithUTF8String: _(module_GetLongName(p_parser)) ?: ""]]; [object addItemWithTitle: [NSString stringWithUTF8String: _(module_GetLongName(p_parser)) ?: ""]];
...@@ -738,8 +739,9 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha ...@@ -738,8 +739,9 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
p_item = config_FindConfig(VLC_OBJECT(p_intf), name); p_item = config_FindConfig(VLC_OBJECT(p_intf), name);
p_list = module_list_get(NULL); size_t count;
for (size_t i_module_index = 0; p_list[i_module_index]; i_module_index++) { p_list = module_list_get(&count);
for (size_t i_module_index = 0; i_module_index < count; i_module_index++) {
p_parser = p_list[i_module_index]; p_parser = p_list[i_module_index];
if (p_item->i_type == CONFIG_ITEM_MODULE && module_provides(p_parser, p_item->psz_type)) { if (p_item->i_type == CONFIG_ITEM_MODULE && module_provides(p_parser, p_item->psz_type)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment