Remove VLC_OBJECT_OSDMENU

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 07cf4a0382b3cd63c2733278097e263789b80dfd..cb435161dc0082b8d9874a5172f691bb7e13c66c 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -39,7 +39,6 @@
 #define VLC_OBJECT_AOUT        (-10)
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
-#define VLC_OBJECT_OSDMENU     (-28)
 /* 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 004840921202530c7d29737f621a611d2b0bf3f1..cbf5c374067ab8eadf6c9103e50ff7584f29b4e1 100644 (file)
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -95,7 +95,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_AOUT, "aout" },
           { VLC_OBJECT_PACKETIZER, "packetizer" },
           { VLC_OBJECT_ENCODER, "encoder" },
-          { VLC_OBJECT_OSDMENU, "osdmenu" },
           { VLC_OBJECT_GENERIC, "generic" },
           { 0, "" } };
     int i;

diff --git a/share/lua/README.txt b/share/lua/README.txt
index 045d603b7626cfc0dbd636f8479c438b6ba87f4b..faf59257ec7db204a2e1ca5178f8174c9853f97d 100644 (file)
--- 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", "osdmenu", "generic".
+  "vout", "aout", "packetizer", "encoder", "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/osd/osd.c b/src/osd/osd.c
index c2a64a51c78f865444672e1b7ba3521ee01f528f..7e74a971cf2e3fd7242e1de72e57f4ac707d73d1 100644 (file)
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -153,8 +153,8 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
     {
         static const char osdmenu_name[] = "osd menu";
 
-        p_osd = vlc_custom_create( p_this, sizeof( *p_osd ), VLC_OBJECT_OSDMENU,
-                                    osdmenu_name );
+        p_osd = vlc_custom_create( p_this, sizeof( *p_osd ),
+                                   VLC_OBJECT_GENERIC, osdmenu_name );
         if( !p_osd )
             return NULL;