Changeset d2adc9f3c197dfb3b148db04d24f838d7f0befcd

Timestamp:

12/14/04 19:44:04 (4 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1103049844 +0000

git-parent:

[dc7674b5895d6a59b6df6ca6f5f1a4f8a9167d3a]

git-author:

Clément Stenac <zorglub@videolan.org> 1103049844 +0000

Message:

Implement add_module_cat to add a module by category + use this for intf

Files:

• include/configuration.h (modified) (2 diffs)
• modules/control/http.c (modified) (1 diff)
• modules/control/rc.c (modified) (3 diffs)
• modules/control/rtci.c (modified) (3 diffs)
• modules/control/telnet.c (modified) (1 diff)
• modules/gui/wxwindows/preferences_widgets.cpp (modified) (3 diffs)
• modules/gui/wxwindows/preferences_widgets.h (modified) (2 diffs)
• modules/visualization/xosd.c (modified) (1 diff)
• src/libvlc.h (modified) (1 diff)
• src/misc/configuration.c (modified) (1 diff)

include/configuration.h

@@ -52 +52 @@
-#define CONFIG_ITEM_DIRECTORY               0x0070  /* Directory option */
-#define CONFIG_ITEM_KEY                     0x0080  /* Hot key option */
-
-
+
+
+
-
-#define CONFIG_ITEM                         0x00F0
@@ -277 +278 @@
-    { static module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, '\0', text, longtext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-
+#define add_module_cat( name, i_subcategory, psz_value, p_callback, text, longtext, advc ) \
+    i_config++; \
+    if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
+        (i_config+11) * sizeof(module_config_t)); \
+    { static module_config_t tmp = { CONFIG_ITEM_MODULE_CAT, NULL, name, '\0', text, longtext, psz_value, 0, 0.0, i_subcategory }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-
-#define add_module_list( name, psz_caps, psz_value, p_callback, text, longtext, advc ) \

modules/control/http.c

@@ -93 +93 @@
-    set_description( _("HTTP remote control interface") );
-    set_category( CAT_INTERFACE );
-CONTRO
+GENERA
-        add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
-        add_string ( "http-src",  NULL, NULL, SRC_TEXT,  SRC_LONGTEXT,  VLC_TRUE );

modules/control/rc.c

@@ -97 +97 @@
-    char *psz_unix_path;
-    vlc_bool_t b_extend;
-
+
-#ifdef WIN32
-    HANDLE hConsoleIn;
@@ -139 +139 @@
-#define EXTEND_TEXT N_("Extended help")
-#define EXTEND_LONGTEXT N_("List additional commands.")
-            
-
-#ifdef WIN32
@@ -152 +151 @@
-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-CONTRO
+GENERA
-    set_description( _("Remote control interface") );
-    add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );

modules/control/rtci.c

@@ -103 +103 @@
-    char *psz_unix_path;
-    vlc_bool_t b_extend;
-
+
-#ifdef WIN32
-    HANDLE hConsoleIn;
@@ -142 +142 @@
-#define EXTEND_TEXT N_("Extended help")
-#define EXTEND_LONGTEXT N_("List additional commands.")
-            
-
-#ifdef WIN32
@@ -154 +153 @@
-    set_description( _("Real time control interface") );
-    set_category( CAT_INTERFACE );
-CONTRO
+GENERA
-    add_bool( "rtci-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
-#ifdef HAVE_ISATTY

modules/control/telnet.c

@@ -83 +83 @@
-
-vlc_module_begin();
+    set_category( CAT_INTERFACE );
+    set_subcategory( SUBCAT_INTERFACE_GENERAL );
-    add_integer( "telnet-port", 4212, NULL, TELNETPORT_TEXT,
-                 TELNETPORT_LONGTEXT, VLC_TRUE );

modules/gui/wxwindows/preferences_widgets.cpp

@@ -54 +54 @@
-        p_control = new ModuleConfigControl( p_this, p_item, parent );
-        break;
+    case CONFIG_ITEM_MODULE_CAT:
+        p_control = new ModuleCatConfigControl( p_this, p_item, parent );
+        break;
-    case CONFIG_ITEM_MODULE_LIST_CAT:
-        p_control = new ModuleListCatConfigControl( p_this, p_item, parent );
@@ -291 +294 @@
-}
-
+ModuleCatConfigControl::~ModuleCatConfigControl()
+{
+    ;
+}
+
+wxString ModuleCatConfigControl::GetPszValue()
+{
+    return wxU( (char *)combo->GetClientData( combo->GetSelection() ));
+}
+
+/*****************************************************************************
+ * ModuleCatConfigControl implementation
+ *****************************************************************************/
+ModuleCatConfigControl::ModuleCatConfigControl( vlc_object_t *p_this,
+                                                module_config_t *p_item,
+                                                wxWindow *parent )
+  : ConfigControl( p_this, p_item, parent )
+{
+    vlc_list_t *p_list;
+    module_t *p_parser;
+
+    label = new wxStaticText(this, -1, wxU(p_item->psz_text));
+    combo = new wxComboBox( this, -1, wxL2U(p_item->psz_value),
+                            wxDefaultPosition, wxDefaultSize,
+                            0, NULL, wxCB_READONLY | wxCB_SORT );
+
+    combo->Append( wxU(_("Default")), (void *)NULL );
+    combo->SetSelection( 0 );
+
+    /* build a list of available modules */
+    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+    for(  int i_index = 0; i_index < p_list->i_count; i_index++ )
+    {
+        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
+        if( !strcmp( p_parser->psz_object_name, "main" ) )
+              continue;
+
+        module_config_t *p_config = p_parser->p_config;
+        if( p_config ) do
+        {
+            /* Hack: required subcategory is stored in i_min */
+            if( p_config->i_type == CONFIG_SUBCATEGORY &&
+                p_config->i_value == p_item->i_min )
+            {
+                combo->Append( wxU(p_parser->psz_longname),
+                                   p_parser->psz_object_name );
+                if( p_item->psz_value && !strcmp(p_item->psz_value,
+                                        p_parser->psz_object_name) )
+                combo->SetValue( wxU(p_parser->psz_longname) );
+            }
+        } while( p_config->i_type != CONFIG_HINT_END && p_config++ );
+    }
+    vlc_list_release( p_list );
+
+    combo->SetToolTip( wxU(p_item->psz_longtext) );
+    sizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+    sizer->Add( combo, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+    sizer->Layout();
+    this->SetSizerAndFit( sizer );
+}
+
-ModuleConfigControl::~ModuleConfigControl()
-{
@@ -300 +365 @@
-    return wxU( (char *)combo->GetClientData( combo->GetSelection() ));
-}
+
-
-/*****************************************************************************

modules/gui/wxwindows/preferences_widgets.h

@@ -90 +90 @@
-};
-
+class ModuleCatConfigControl: public ConfigControl
+{
+public:
+    ModuleCatConfigControl( vlc_object_t *, module_config_t *, wxWindow * );
+    ~ModuleCatConfigControl();
+    virtual wxString GetPszValue();
+private:
+    wxComboBox *combo;
+};
+
+
-class ModuleListCatConfigControl: public ConfigControl
-{
@@ -100 +111 @@
-
-    void OnUpdate( wxCommandEvent& );
-
+
-    wxTextCtrl *text;
-    DECLARE_EVENT_TABLE()

modules/visualization/xosd.c

@@ -78 +78 @@
-
-vlc_module_begin();
+    set_category( CAT_INTERFACE );
+    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_description( _("XOSD interface") );
-    add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, VLC_TRUE );

src/libvlc.h

@@ -1127 +1127 @@
-
-    set_section ( N_("Interface module" ), NULL );
-( "intf", "interface"
+_cat( "intf", SUBCAT_INTERFACE_GENERAL
-                INTF_LONGTEXT, VLC_FALSE );
-        change_short('I');

src/misc/configuration.c

@@ -206 +206 @@
-        (p_config->i_type!=CONFIG_ITEM_MODULE_LIST) &&
-        (p_config->i_type!=CONFIG_ITEM_MODULE_LIST_CAT) &&
+        (p_config->i_type!=CONFIG_ITEM_MODULE_CAT) &&
-        (p_config->i_type!=CONFIG_ITEM_MODULE) )
-    {