[vlc-devel] commit: remove dead code moved from libvlc.h ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Mar  8 21:30:22 2008 +0100| [c1bf65aa42472b1e0bb5187361fa451727f93cc3]

remove dead code moved from libvlc.h
update comment to really reflect the function
DBus's playlist-enqueue should really be saveable

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

 include/vlc_configuration.h |    2 +-
 src/libvlc-module.c         |    1 -
 src/libvlc.h                |   51 -------------------------------------------
 3 files changed, 1 insertions(+), 53 deletions(-)

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 4bcadf4..c0ee83a 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -190,7 +190,7 @@ struct module_config_t
 
     /* Option values loaded from config file */
     vlc_bool_t   b_autosave;      /* Config will be auto-saved at exit time */
-    vlc_bool_t   b_unsaveable;                    /* Config should be saved */
+    vlc_bool_t   b_unsaveable;                /* Config should not be saved */
 
     vlc_bool_t   b_safe;
 };
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 68f6cca..8d6690d 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1833,7 +1833,6 @@ vlc_module_begin();
               ONEINSTANCE_DBUS_LONGTEXT, VLC_TRUE );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
-        change_unsaveable();
 
     add_bool( "inhibit", 1, NULL, INHIBIT_TEXT,
               INHIBIT_LONGTEXT, VLC_TRUE );
diff --git a/src/libvlc.h b/src/libvlc.h
index 06385dd..4c1178b 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -148,57 +148,6 @@ static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj )
     return obj->p_internals;
 }
 
-/*
- * Configuration stuff
- */
-#if 0
-struct module_config_t
-{
-    int          i_type;                               /* Configuration type */
-    const char  *psz_type;                          /* Configuration subtype */
-    const char  *psz_name;                                    /* Option name */
-    char         i_short;                      /* Optional short option name */
-    const char  *psz_text;      /* Short comment on the configuration option */
-    const char  *psz_longtext;   /* Long comment on the configuration option */
-    module_value_t value;                                    /* Option value */
-    module_value_t orig;
-    module_value_t saved;
-    module_nvalue_t min;
-    module_nvalue_t max;
-
-    /* Function to call when commiting a change */
-    vlc_callback_t pf_callback;
-    void          *p_callback_data;
-
-    /* Values list */
-    const char **ppsz_list;       /* List of possible values for the option */
-    int         *pi_list;                              /* Idem for integers */
-    const char **ppsz_list_text;          /* Friendly names for list values */
-    int          i_list;                               /* Options list size */
-
-    /* Actions list */
-    vlc_callback_t *ppf_action;    /* List of possible actions for a config */
-    const char    **ppsz_action_text;         /* Friendly names for actions */
-    int            i_action;                           /* actions list size */
-
-    /* Misc */
-    vlc_mutex_t *p_lock;            /* Lock to use when modifying the config */
-    vlc_bool_t   b_dirty;          /* Dirty flag to indicate a config change */
-    vlc_bool_t   b_advanced;          /* Flag to indicate an advanced option */
-    vlc_bool_t   b_internal;   /* Flag to indicate option is not to be shown */
-    vlc_bool_t   b_restart;   /* Flag to indicate the option needs a restart */
-                              /* to take effect */
-
-    /* Deprecated */
-    const char    *psz_current;                         /* Good option name */
-    vlc_bool_t     b_strict;                     /* Transitionnal or strict */
-
-    /* Option values loaded from config file */
-    vlc_bool_t   b_autosave;      /* Config will be auto-saved at exit time */
-    vlc_bool_t   b_unsaveable;                    /* Config should be saved */
-};
-#endif
-
 extern module_config_t libvlc_config[];
 extern const size_t libvlc_config_count;