[vlc-commits] macosx: simple prefs: use config_GetIntChoices for int list

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Jan 20 18:16:54 2014 +0100| [ddb643bf03f2970e3cc9bf4575d2efc98d7756e6] | committer: David Fuhrmann

macosx: simple prefs: use config_GetIntChoices for int list

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ddb643bf03f2970e3cc9bf4575d2efc98d7756e6
---

 modules/gui/macosx/simple_prefs.m |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 1c7b54f..ab28a33 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -503,20 +503,23 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
     /* serious problem, if no item found */
     assert(p_item);
 
-    for (int i = 0; i < p_item->list_count; i++) {
-        NSMenuItem *mi;
-        if (p_item->list_text != NULL)
-            mi = [[NSMenuItem alloc] initWithTitle: _NS(p_item->list_text[i]) action:NULL keyEquivalent: @""];
-        else if (p_item->list.i[i])
-            mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: @"%d", p_item->list.i[i]] action:NULL keyEquivalent: @""];
-        else
-            msg_Err(p_intf, "item %d of pref %s failed to be created", i, name);
-        [mi setRepresentedObject:[NSNumber numberWithInt:p_item->list.i[i]]];
+    int64_t *values;
+    char **texts;
+    ssize_t count = config_GetIntChoices(VLC_OBJECT(VLCIntf), name, &values, &texts);
+    for (ssize_t i = 0; i < count; i++) {
+        NSMenuItem *mi = [[NSMenuItem alloc] initWithTitle: toNSStr(texts[i]) action: NULL keyEquivalent: @""];
+        [mi setRepresentedObject:[NSNumber numberWithInt:values[i]]];
         [[object menu] addItem: [mi autorelease]];
-        if (p_item->value.i == p_item->list.i[i])
+
+        if (p_item->value.i == values[i])
             [object selectItem:[object lastItem]];
+
+        free(texts[i]);
     }
-    [object setToolTip: _NS(p_item->psz_longtext)];
+    free(texts);
+
+    if (p_item->psz_longtext)
+        [object setToolTip: _NS(p_item->psz_longtext)];
 }
 
 - (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
@@ -869,8 +872,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
 static inline void save_int_list(intf_thread_t * p_intf, id object, const char * name)
 {
     NSNumber *p_valueobject;
-    module_config_t *p_item;
-    p_item = config_FindConfig(VLC_OBJECT(p_intf), name);
     p_valueobject = (NSNumber *)[[object selectedItem] representedObject];
     assert([p_valueobject isKindOfClass:[NSNumber class]]);
     if (p_valueobject) config_PutInt(p_intf, name, [p_valueobject intValue]);