[vlc-devel] commit: VLC_OBJECT_DIALOGS: remove ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jun 28 20:34:16 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jun 28 21:36:02 2008 +0300| [2adfbf0c7d073b0b031c8673f057de28c1a54ae9]

VLC_OBJECT_DIALOGS: remove

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

 include/vlc_objects.h              |    1 -
 modules/gui/skins2/src/dialogs.cpp |    2 +-
 modules/misc/lua/libs/objects.c    |    1 -
 src/misc/objects.c                 |    4 ----
 4 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a609133..331634a 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -42,7 +42,6 @@
 #define VLC_OBJECT_AOUT        (-10)
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
-#define VLC_OBJECT_DIALOGS     (-15)
 #define VLC_OBJECT_ANNOUNCE    (-17)
 #define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_FILTER      (-22)
diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index 732f754..576db25 100644
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -159,7 +159,7 @@ bool Dialogs::init()
 {
     // Allocate descriptor
     m_pProvider = (intf_thread_t *)vlc_object_create( getIntf(),
-                                                      VLC_OBJECT_DIALOGS );
+                                                    sizeof( intf_thread_t ) );
     if( m_pProvider == NULL )
     {
         msg_Err( getIntf(), "out of memory" );
diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index 2822f1f..2166657 100644
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -98,7 +98,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_DIALOGS, "dialogs" },
           { VLC_OBJECT_ANNOUNCE, "announce" },
           { VLC_OBJECT_OPENGL, "opengl" },
           { VLC_OBJECT_FILTER, "filter" },
diff --git a/src/misc/objects.c b/src/misc/objects.c
index ab63e8f..68dab87 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -230,10 +230,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(intf_thread_t);
             psz_type = "interface";
             break;
-        case VLC_OBJECT_DIALOGS:
-            i_size = sizeof(intf_thread_t);
-            psz_type = "dialogs";
-            break;
         case VLC_OBJECT_DECODER:
             i_size = sizeof(decoder_t);
             psz_type = "decoder";




More information about the vlc-devel mailing list