Changeset c2c6729b7abd3a0d1096c79251a6d05a2e9a3403

Timestamp:

28/06/08 20:46:26 (4 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214678786 +0300

git-parent:

[2adfbf0c7d073b0b031c8673f057de28c1a54ae9]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214678786 +0300

Message:

VLC_OBJECT_FILTER: remove

Files:

• include/vlc_objects.h (modified) (1 diff)
• modules/gui/fbosd.c (modified) (2 diffs)
• modules/misc/lua/libs/objects.c (modified) (1 diff)
• modules/video_filter/blendbench.c (modified) (1 diff)
• modules/video_filter/chain.c (modified) (1 diff)
• src/misc/filter_chain.c (modified) (1 diff)
• src/misc/image.c (modified) (1 diff)
• src/misc/objects.c (modified) (1 diff)
• src/video_output/video_output.c (modified) (1 diff)
• src/video_output/vout_subpictures.c (modified) (3 diffs)

include/vlc_objects.h

@@ -45 +45 @@
-#define VLC_OBJECT_ANNOUNCE    (-17)
-#define VLC_OBJECT_OPENGL      (-21)
-#define VLC_OBJECT_FILTER      (-22)
-#define VLC_OBJECT_OSDMENU     (-28)
-/* Please add new object types below -34 */

modules/gui/fbosd.c

@@ -534 +534 @@
-
-    p_intf->p_sys->p_blend =
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-    vlc_object_attach( p_intf->p_sys->p_blend, p_intf );
-    p_intf->p_sys->p_blend->fmt_out.video.i_x_offset =
@@ -579 +579 @@
-
-    p_intf->p_sys->p_text =
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-    vlc_object_attach( p_intf->p_sys->p_text, p_intf );
-

modules/misc/lua/libs/objects.c

@@ -101 +101 @@
-          { VLC_OBJECT_ANNOUNCE, "announce" },
-          { VLC_OBJECT_OPENGL, "opengl" },
-          { VLC_OBJECT_FILTER, "filter" },
-          { VLC_OBJECT_OSDMENU, "osdmenu" },
-          { VLC_OBJECT_GENERIC, "generic" },

modules/video_filter/blendbench.c

@@ -216 +216 @@
-        return p_pic;
-
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-    if( !p_blend )
-    {

modules/video_filter/chain.c

@@ -88 +88 @@
-                               video_format_t *fmt_out )
-{
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-    vlc_object_attach( p_filter, p_this );
-

src/misc/filter_chain.c

@@ -134 +134 @@
-{
-    filter_t *p_filter =
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-    if( !p_filter ) return NULL;
-    vlc_object_attach( p_filter, p_chain->p_this );

src/misc/image.c

@@ -752 +752 @@
-    filter_t *p_filter;
-
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-    vlc_object_attach( p_filter, p_this );
-

src/misc/objects.c

@@ -242 +242 @@
-            i_size = sizeof(encoder_t);
-            psz_type = "encoder";
-            break;
-        case VLC_OBJECT_FILTER:
-            i_size = sizeof(filter_t);
-            psz_type = "filter";
-            break;
-        case VLC_OBJECT_AOUT:

src/video_output/video_output.c

@@ -656 +656 @@
-
-        /* Choose the best module */
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-        filter_t *p_chroma = p_vout->p_chroma;
-        vlc_object_attach( p_chroma, p_vout );

src/video_output/vout_subpictures.c

@@ -528 +528 @@
-        if( !p_spu->p_blend && p_region )
-        {
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-            vlc_object_attach( p_spu->p_blend, p_spu );
-            p_spu->p_blend->fmt_out.video.i_x_offset =
@@ -549 +549 @@
-            char *psz_modulename = NULL;
-
-VLC_OBJECT_FILTER
+sizeof(filter_t)
-            vlc_object_attach( p_spu->p_text, p_spu );
-
@@ -691 +691 @@
-             ((pi_scale_width[ SCALE_DEFAULT ] != 1000) || (pi_scale_height[ SCALE_DEFAULT ] != 1000)))) )
-        {
-VLC_OBJECT_FILTER 
+sizeof(filter_t)
-            vlc_object_attach( p_spu->p_scale, p_spu );
-            p_spu->p_scale->fmt_out.video.i_chroma =