Commit 6fc5c512 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove old NODOMAIN stuff (ABI broken anyway)

parent deb763e0
......@@ -41,9 +41,6 @@ enum vlc_module_properties
* Append new items at the end ONLY. */
VLC_MODULE_CPU_REQUIREMENT,
VLC_MODULE_SHORTCUT,
VLC_MODULE_SHORTNAME_NODOMAIN,
VLC_MODULE_DESCRIPTION_NODOMAIN,
VLC_MODULE_HELP_NODOMAIN,
VLC_MODULE_CAPABILITY,
VLC_MODULE_SCORE,
VLC_MODULE_CB_OPEN,
......@@ -63,9 +60,6 @@ enum vlc_config_properties
VLC_CONFIG_NAME,
/* command line name (args=const char *, vlc_callback_t) */
VLC_CONFIG_DESC_NODOMAIN,
/* description (args=const char *, const char *) */
VLC_CONFIG_VALUE,
/* actual value (args=int/double/const char *) */
......@@ -96,13 +90,6 @@ enum vlc_config_properties
VLC_CONFIG_SHORTCUT,
/* one-character (short) command line option name (args=char) */
VLC_CONFIG_LIST_NODOMAIN,
/* possible values list
* (args=size_t, const <type> *, const char *const *) */
VLC_CONFIG_ADD_ACTION_NODOMAIN,
/* add value change callback (args=vlc_callback_t, const char *) */
VLC_CONFIG_OLDNAME,
/* former option name (args=const char *) */
......
......@@ -151,27 +151,6 @@ int vlc_module_set (module_t *module, int propid, ...)
break;
}
case VLC_MODULE_SHORTNAME_NODOMAIN:
{
const char *name = va_arg (ap, char *);
ret = vlc_module_set (module, VLC_MODULE_SHORTNAME, NULL, name);
break;
}
case VLC_MODULE_DESCRIPTION_NODOMAIN:
{
const char *desc = va_arg (ap, char *);
ret = vlc_module_set (module, VLC_MODULE_DESCRIPTION, NULL, desc);
break;
}
case VLC_MODULE_HELP_NODOMAIN:
{
const char *help = va_arg (ap, char *);
ret = vlc_module_set (module, VLC_MODULE_HELP, NULL, help);
break;
}
case VLC_MODULE_CAPABILITY:
module->psz_capability = va_arg (ap, char *);
break;
......@@ -291,14 +270,6 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
break;
}
case VLC_CONFIG_DESC_NODOMAIN:
{
const char *text = va_arg (ap, const char *);
const char *longtext = va_arg (ap, const char *);
ret = vlc_config_set (item, VLC_CONFIG_DESC, NULL, text, longtext);
break;
}
case VLC_CONFIG_VALUE:
{
if (IsConfigIntegerType (item->i_type))
......@@ -387,35 +358,6 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
ret = 0;
break;
case VLC_CONFIG_LIST_NODOMAIN:
{
size_t len = va_arg (ap, size_t);
if (IsConfigIntegerType (item->i_type))
{
const int *src = va_arg (ap, const int *);
const char *const *text = va_arg (ap, const char *const *);
ret = vlc_config_set (item, VLC_CONFIG_LIST, NULL, len, src,
text);
}
else
if (IsConfigStringType (item->i_type))
{
const char *const *src = va_arg (ap, const char *const *);
const char *const *text = va_arg (ap, const char *const *);
ret = vlc_config_set (item, VLC_CONFIG_LIST, NULL, len, src,
text);
}
break;
}
case VLC_CONFIG_ADD_ACTION_NODOMAIN:
{
vlc_callback_t cb = va_arg (ap, vlc_callback_t);
const char *name = va_arg (ap, const char *);
ret = vlc_config_set (item, VLC_CONFIG_ADD_ACTION, NULL, cb, name);
break;
}
case VLC_CONFIG_OLDNAME:
{
const char *oldname = va_arg (ap, const char *);
......
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