Changeset b96154a2673604c3550a0ff0296a48d16420800a

Timestamp:

03/03/08 19:57:43 (6 months ago)

Author:

André Weber <WeberAndre@gmx.de>

git-committer:

André Weber <WeberAndre@gmx.de> 1204570663 +0100

git-parent:

[487b2b1e7439028935350ce5550afcac098bd5f3]

git-author:

André Weber <WeberAndre@gmx.de> 1204570663 +0100

Message:

Enable the last parameter of the macros change_integer_list, change_string_list to supply a method to initialize update dynamic selectionlists inside the settings GUI allready on showing the gui. (f.e. the audio device list)

Files:

• include/vlc_configuration.h (modified) (4 diffs)
• include/vlc_modules_macros.h (modified) (1 diff)
• modules/gui/qt4/components/preferences_widgets.cpp (modified) (3 diffs)
• modules/gui/wxwidgets/dialogs/preferences_widgets.cpp (modified) (2 diffs)
• src/modules/entry.c (modified) (1 diff)

include/vlc_configuration.h

@@ -170 +170 @@
-    char       **ppsz_list_text;          /* Friendly names for list values */
-    int          i_list;                               /* Options list size */
+    vlc_callback_t pf_update_list; /*callback to initialize dropdownlists */
-
-    /* Actions list */
@@ -436 +437 @@
-                    (size_t)(sizeof (list) / sizeof (char *)), \
-                    (const char *const *)(list), \
-
+
+
-
-#define change_integer_list( list, list_text, list_update_func ) \
@@ -442 +444 @@
-                    (size_t)(sizeof (list) / sizeof (int)), \
-                    (const int *)(list), \
-
+
+
-
-#define change_float_list( list, list_text, list_update_func ) \
@@ -448 +451 @@
-                    (size_t)(sizeof (list) / sizeof (float)), \
-                    (const float *)(list), \
-
+
+
-
-#define change_integer_range( minv, maxv ) \

include/vlc_modules_macros.h

@@ -36 +36 @@
- * Current plugin ABI version
- */
-g
-g
+h
+h
-
-/*****************************************************************************

modules/gui/qt4/components/preferences_widgets.cpp

@@ -374 +374 @@
-    combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    finish( p_module_config, bycat );
@@ -474 +488 @@
-    if( p_config )
-    {
+       if(p_config->pf_update_list) 
+        {
+            vlc_value_t val;
+            val.i_int = p_config->value.i;
+            p_config->pf_update_list(VLC_OBJECT(p_intf), configname, val, val, NULL);
+            // assume in any case that dirty was set to VLC_TRUE
+            // because lazy programmes will use the same callback for
+            // this, like the one behind the refresh push button?
+            p_config->b_dirty = VLC_FALSE;
+        }
+
-        for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
-        {
@@ -838 +863 @@
-    combo->setMinimumWidth( MINWIDTH_BOX );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    finish( p_module_config, bycat );

modules/gui/wxwidgets/dialogs/preferences_widgets.cpp

@@ -564 +564 @@
-                            wxDefaultPosition, wxDefaultSize,
-                            0, NULL, wxCB_READONLY );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    combo->SetToolTip( wxU(p_item->psz_longtext) );
@@ -794 +813 @@
-                            0, NULL, wxCB_READONLY );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    combo->SetToolTip( wxU(p_item->psz_longtext) );

src/modules/entry.c

@@ -369 +369 @@
-
-            item->i_list = len;
+            item->pf_update_list = va_arg (ap, vlc_callback_t);
-            ret = 0;
-            break;