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

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Jan 19 20:47:34 2009 +0200| [6cf6df7c3f51c67217e591df83f254b914cea36f] | committer: Rémi Denis-Courmont 

Remove VLC_OBJECT_OSDMENU

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

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

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 07cf4a0..cb43516 100644
--- 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 0048409..cbf5c37 100644
--- 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 045d603..faf5925 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", "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 c2a64a5..7e74a97 100644
--- 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;