[vlc-commits] addons: add missing intf and meta categories

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 23 11:34:09 2014 +0900| [4f390dc1009cf603b51861d75f0999ed74b01f64] | committer: Jean-Baptiste Kempf

addons: add missing intf and meta categories

(cherry picked from commit 0be3f55c492468b7545019c51b1ef412510279c1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 include/vlc_addons.h             |    2 ++
 modules/misc/addons/fsstorage.c  |   10 +++++++++-
 modules/misc/addons/xmlreading.h |    8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/include/vlc_addons.h b/include/vlc_addons.h
index 03aa97f..92d5bc6 100644
--- a/include/vlc_addons.h
+++ b/include/vlc_addons.h
@@ -36,6 +36,8 @@ typedef enum addon_type_t
     ADDON_SERVICE_DISCOVERY,
     ADDON_SKIN2,
     ADDON_PLUGIN,
+    ADDON_INTERFACE,
+    ADDON_META,
     ADDON_OTHER
 } addon_type_t;
 
diff --git a/modules/misc/addons/fsstorage.c b/modules/misc/addons/fsstorage.c
index 48f8c8c..717050c 100644
--- a/modules/misc/addons/fsstorage.c
+++ b/modules/misc/addons/fsstorage.c
@@ -58,6 +58,8 @@ static struct
     { ADDON_EXTENSION,           ADDONS_SCRIPTS_DIR DIR_SEP "extensions" },
     { ADDON_PLAYLIST_PARSER,     ADDONS_SCRIPTS_DIR DIR_SEP "playlist" },
     { ADDON_SERVICE_DISCOVERY,   ADDONS_SCRIPTS_DIR DIR_SEP "sd" },
+    { ADDON_INTERFACE,           ADDONS_SCRIPTS_DIR DIR_SEP "intf" },
+    { ADDON_META,                ADDONS_SCRIPTS_DIR DIR_SEP "meta" },
     { ADDON_SKIN2,               ADDONS_DIR DIR_SEP "skins2" },
 };
 
@@ -319,7 +321,9 @@ static int List( addons_finder_t *p_finder )
     addon_type_t types[] = {
         ADDON_EXTENSION,
         ADDON_PLAYLIST_PARSER,
-        ADDON_SERVICE_DISCOVERY
+        ADDON_SERVICE_DISCOVERY,
+        ADDON_INTERFACE,
+        ADDON_META,
     };
     unsigned int i_type = 0;
 
@@ -439,6 +443,8 @@ static int InstallAllFiles( addons_storage_t *p_this, const addon_entry_t *p_ent
         case ADDON_EXTENSION:
         case ADDON_PLAYLIST_PARSER:
         case ADDON_SERVICE_DISCOVERY:
+        case ADDON_INTERFACE:
+        case ADDON_META:
         case ADDON_SKIN2:
         {
             if ( strstr( p_file->psz_filename, ".." ) )
@@ -859,6 +865,8 @@ static int Remove( addons_storage_t *p_storage, addon_entry_t *p_entry )
         case ADDON_EXTENSION:
         case ADDON_PLAYLIST_PARSER:
         case ADDON_SERVICE_DISCOVERY:
+        case ADDON_INTERFACE:
+        case ADDON_META:
         case ADDON_SKIN2:
         {
             char *psz_dest;
diff --git a/modules/misc/addons/xmlreading.h b/modules/misc/addons/xmlreading.h
index 159d903..0f04729 100644
--- a/modules/misc/addons/xmlreading.h
+++ b/modules/misc/addons/xmlreading.h
@@ -55,6 +55,10 @@ static inline int ReadType( const char *value )
         return ADDON_SERVICE_DISCOVERY;
     else if ( !strcmp( value, "extension" ) )
         return ADDON_EXTENSION;
+    else if ( !strcmp( value, "interface" ) )
+        return ADDON_INTERFACE;
+    else if ( !strcmp( value, "meta" ) )
+        return ADDON_META;
     else
         return ADDON_UNKNOWN;
 }
@@ -71,6 +75,10 @@ static inline const char * getTypePsz( int i_type )
         return "discovery";
     case ADDON_EXTENSION:
         return "extension";
+    case ADDON_INTERFACE:
+        return "interface";
+    case ADDON_META:
+        return "meta";
     case ADDON_UNKNOWN:
     default:
         return "unknown";