Browse Source

Remove VLC_OBJECT_ENCODER

pull/2/head
Rémi Denis-Courmont 17 years ago
parent
commit
c2f8a645c8
  1. 1
      include/vlc_objects.h
  2. 1
      modules/misc/lua/libs/objects.c
  3. 2
      share/lua/README.txt
  4. 1
      src/libvlccore.sym
  5. 4
      src/misc/objects.c

1
include/vlc_objects.h

@ -36,7 +36,6 @@
#define VLC_OBJECT_DECODER (-8)
#define VLC_OBJECT_VOUT (-9)
#define VLC_OBJECT_AOUT (-10)
#define VLC_OBJECT_ENCODER (-14)
/* Please add new object types below -34 */
/* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666)

1
modules/misc/lua/libs/objects.c

@ -93,7 +93,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{ VLC_OBJECT_DECODER, "decoder" },
{ VLC_OBJECT_VOUT, "vout" },
{ VLC_OBJECT_AOUT, "aout" },
{ VLC_OBJECT_ENCODER, "encoder" },
{ VLC_OBJECT_GENERIC, "generic" },
{ 0, "" } };
int i;

2
share/lua/README.txt

@ -156,7 +156,7 @@ object.find( object, type, mode ): Find an object of given type. mode can
"object"'s children. If set to "anywhere", it will look in all the
objects. If object is unset, the current module's object will be used.
Type can be: "libvlc", "playlist", "input", "decoder",
"vout", "aout", "packetizer", "encoder", "generic".
"vout", "aout", "packetizer", "generic".
This function is deprecated and slow and should be avoided.
object.find_name( object, name, mode ): Same as above except that it matches
on the object's name and not type. This function is also slow and should

1
src/libvlccore.sym

@ -331,6 +331,7 @@ sout_AccessOutSeek
sout_AccessOutWrite
sout_AnnounceRegisterSDP
sout_AnnounceUnRegister
sout_EncoderCreate
sout_MethodRelease
sout_MuxAddStream
sout_MuxDelete

4
src/misc/objects.c

@ -231,10 +231,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof(decoder_t);
psz_type = "packetizer";
break;
case VLC_OBJECT_ENCODER:
i_size = sizeof(encoder_t);
psz_type = "encoder";
break;
case VLC_OBJECT_AOUT:
i_size = sizeof(aout_instance_t);
psz_type = "audio output";

Loading…
Cancel
Save