[vlc-devel] commit: Remove VLC_OBJECT_ENCODER ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Jan 19 21:15:10 2009 +0200| [c2f8a645c869b5f20e878e63a0b650e697ca2efd] | committer: Rémi Denis-Courmont 

Remove VLC_OBJECT_ENCODER

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c2f8a645c869b5f20e878e63a0b650e697ca2efd
---

 include/vlc_objects.h           |    1 -
 modules/misc/lua/libs/objects.c |    1 -
 share/lua/README.txt            |    2 +-
 src/libvlccore.sym              |    1 +
 src/misc/objects.c              |    4 ----
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index afc1dfe..8edb63e 100644
--- a/include/vlc_objects.h
+++ b/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)
diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index 6468f95..950f5fe 100644
--- a/modules/misc/lua/libs/objects.c
+++ b/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;
diff --git a/share/lua/README.txt b/share/lua/README.txt
index faf5925..3dd3fc8 100644
--- a/share/lua/README.txt
+++ b/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
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index c97ff57..f8275b9 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -331,6 +331,7 @@ sout_AccessOutSeek
 sout_AccessOutWrite
 sout_AnnounceRegisterSDP
 sout_AnnounceUnRegister
+sout_EncoderCreate
 sout_MethodRelease
 sout_MuxAddStream
 sout_MuxDelete
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 350f87a..fa1f691 100644
--- a/src/misc/objects.c
+++ b/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";