Commit 4f390dc1 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

addons: add missing intf and meta categories

(cherry picked from commit 0be3f55c492468b7545019c51b1ef412510279c1)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 8831d8b8
...@@ -36,6 +36,8 @@ typedef enum addon_type_t ...@@ -36,6 +36,8 @@ typedef enum addon_type_t
ADDON_SERVICE_DISCOVERY, ADDON_SERVICE_DISCOVERY,
ADDON_SKIN2, ADDON_SKIN2,
ADDON_PLUGIN, ADDON_PLUGIN,
ADDON_INTERFACE,
ADDON_META,
ADDON_OTHER ADDON_OTHER
} addon_type_t; } addon_type_t;
......
...@@ -58,6 +58,8 @@ static struct ...@@ -58,6 +58,8 @@ static struct
{ ADDON_EXTENSION, ADDONS_SCRIPTS_DIR DIR_SEP "extensions" }, { ADDON_EXTENSION, ADDONS_SCRIPTS_DIR DIR_SEP "extensions" },
{ ADDON_PLAYLIST_PARSER, ADDONS_SCRIPTS_DIR DIR_SEP "playlist" }, { ADDON_PLAYLIST_PARSER, ADDONS_SCRIPTS_DIR DIR_SEP "playlist" },
{ ADDON_SERVICE_DISCOVERY, ADDONS_SCRIPTS_DIR DIR_SEP "sd" }, { 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" }, { ADDON_SKIN2, ADDONS_DIR DIR_SEP "skins2" },
}; };
...@@ -319,7 +321,9 @@ static int List( addons_finder_t *p_finder ) ...@@ -319,7 +321,9 @@ static int List( addons_finder_t *p_finder )
addon_type_t types[] = { addon_type_t types[] = {
ADDON_EXTENSION, ADDON_EXTENSION,
ADDON_PLAYLIST_PARSER, ADDON_PLAYLIST_PARSER,
ADDON_SERVICE_DISCOVERY ADDON_SERVICE_DISCOVERY,
ADDON_INTERFACE,
ADDON_META,
}; };
unsigned int i_type = 0; unsigned int i_type = 0;
...@@ -439,6 +443,8 @@ static int InstallAllFiles( addons_storage_t *p_this, const addon_entry_t *p_ent ...@@ -439,6 +443,8 @@ static int InstallAllFiles( addons_storage_t *p_this, const addon_entry_t *p_ent
case ADDON_EXTENSION: case ADDON_EXTENSION:
case ADDON_PLAYLIST_PARSER: case ADDON_PLAYLIST_PARSER:
case ADDON_SERVICE_DISCOVERY: case ADDON_SERVICE_DISCOVERY:
case ADDON_INTERFACE:
case ADDON_META:
case ADDON_SKIN2: case ADDON_SKIN2:
{ {
if ( strstr( p_file->psz_filename, ".." ) ) if ( strstr( p_file->psz_filename, ".." ) )
...@@ -859,6 +865,8 @@ static int Remove( addons_storage_t *p_storage, addon_entry_t *p_entry ) ...@@ -859,6 +865,8 @@ static int Remove( addons_storage_t *p_storage, addon_entry_t *p_entry )
case ADDON_EXTENSION: case ADDON_EXTENSION:
case ADDON_PLAYLIST_PARSER: case ADDON_PLAYLIST_PARSER:
case ADDON_SERVICE_DISCOVERY: case ADDON_SERVICE_DISCOVERY:
case ADDON_INTERFACE:
case ADDON_META:
case ADDON_SKIN2: case ADDON_SKIN2:
{ {
char *psz_dest; char *psz_dest;
......
...@@ -55,6 +55,10 @@ static inline int ReadType( const char *value ) ...@@ -55,6 +55,10 @@ static inline int ReadType( const char *value )
return ADDON_SERVICE_DISCOVERY; return ADDON_SERVICE_DISCOVERY;
else if ( !strcmp( value, "extension" ) ) else if ( !strcmp( value, "extension" ) )
return ADDON_EXTENSION; return ADDON_EXTENSION;
else if ( !strcmp( value, "interface" ) )
return ADDON_INTERFACE;
else if ( !strcmp( value, "meta" ) )
return ADDON_META;
else else
return ADDON_UNKNOWN; return ADDON_UNKNOWN;
} }
...@@ -71,6 +75,10 @@ static inline const char * getTypePsz( int i_type ) ...@@ -71,6 +75,10 @@ static inline const char * getTypePsz( int i_type )
return "discovery"; return "discovery";
case ADDON_EXTENSION: case ADDON_EXTENSION:
return "extension"; return "extension";
case ADDON_INTERFACE:
return "interface";
case ADDON_META:
return "meta";
case ADDON_UNKNOWN: case ADDON_UNKNOWN:
default: default:
return "unknown"; return "unknown";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment