Skip to content

Commit

Permalink
addons: add missing intf and meta categories
Browse files Browse the repository at this point in the history
  • Loading branch information
fcartegnie committed Jul 23, 2014
1 parent 8840af0 commit 0be3f55
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
2 changes: 2 additions & 0 deletions include/vlc_addons.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
10 changes: 9 additions & 1 deletion modules/misc/addons/fsstorage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
};

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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, ".." ) )
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions modules/misc/addons/xmlreading.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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";
Expand Down

0 comments on commit 0be3f55

Please sign in to comment.