Commit 91f51e02 authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf
Browse files

libvlc: rename libvlc_media_slave_type audio to generic

parent 872d9655
......@@ -196,7 +196,8 @@ typedef enum libvlc_media_parsed_status_t
typedef enum libvlc_media_slave_type_t
{
libvlc_media_slave_type_subtitle,
libvlc_media_slave_type_audio,
libvlc_media_slave_type_generic,
libvlc_media_slave_type_audio = libvlc_media_slave_type_generic,
} libvlc_media_slave_type_t;
/**
......
......@@ -1218,7 +1218,7 @@ int libvlc_media_slaves_add( libvlc_media_t *p_md,
case libvlc_media_slave_type_subtitle:
i_input_slave_type = SLAVE_TYPE_SPU;
break;
case libvlc_media_slave_type_audio:
case libvlc_media_slave_type_generic:
i_input_slave_type = SLAVE_TYPE_GENERIC;
break;
default:
......@@ -1309,7 +1309,7 @@ unsigned int libvlc_media_slaves_get( libvlc_media_t *p_md,
p_slave->i_type = libvlc_media_slave_type_subtitle;
break;
case SLAVE_TYPE_GENERIC:
p_slave->i_type = libvlc_media_slave_type_audio;
p_slave->i_type = libvlc_media_slave_type_generic;
break;
default:
vlc_assert_unreachable();
......
......@@ -136,7 +136,7 @@ main (void)
};
libvlc_media_slave_t p_expected_slaves[] = {
{ NULL, libvlc_media_slave_type_audio, 3 /* all */ },
{ NULL, libvlc_media_slave_type_generic, 3 /* all */ },
{ NULL, libvlc_media_slave_type_subtitle, 2 /* right */ },
{ NULL, libvlc_media_slave_type_subtitle, 1 /* left */ },
{ NULL, libvlc_media_slave_type_subtitle, 0 /* none */ },
......
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