Changeset 62829b3b5eac81d4db269c6b1be7631e6a1f9beb

Timestamp:

05/06/08 10:57:47 (2 months ago)

Author:

Jean-Paul Saman <jean-paul.saman@m2x.nl>

git-committer:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1210064267 +0200

git-parent:

[09b646affc8be98f194ce09d59484423423b696c]

git-author:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1210061663 +0200

Message:

Remove dead code.

Files:

• modules/gui/fbosd.c (modified) (14 diffs)

modules/gui/fbosd.c

@@ -51 +51 @@
-#include <vlc_strings.h>
-
-
+
+
-
-/*****************************************************************************
@@ -73 +74 @@
-static int  OpenTextRenderer ( intf_thread_t * );
-static void CloseTextRenderer( intf_thread_t * );
-
-#if 0
-static int  OpenScaling      ( intf_thread_t * );
-static int  CloseScaling     ( intf_thread_t * );
-#endif
-
-/* Manipulate the overlay buffer */
@@ -280 +276 @@
-#endif
-    filter_t *p_text;                                /* text renderer module */
-#if 0
-    filter_t *p_scale;                                     /* scaling module */
-#endif
-
-    /* Render */
@@ -292 +285 @@
-    /* Position */
-    bool      b_absolute;
-      
-      
-      
-
-      
+
+
+
+
+
-
-    /* commands control */
@@ -314 +307 @@
-    char          *psz_tmp;
-    int i;
-
-
-    /* Allocate instance and initialize some members */
@@ -471 +463 @@
-        return VLC_EGENERIC;
-    }
-
-
-
-
-
-
-
-
-
+
-    p_sys->b_render = true;
-    p_sys->b_need_update = true;
@@ -544 +528 @@
-#endif
-    if( p_sys->p_text )  CloseTextRenderer( p_intf );
-
-
-
+
-    if( p_sys->p_image )
-        image_HandlerDelete( p_sys->p_image );
@@ -649 +631 @@
-    }
-}
-#if 0
-static int OpenScaling( intf_thread_t *p_intf )
-{
-    if( p_intf->p_sys->p_scale ) return VLC_EGENERIC;
-
-    p_intf->p_sys->p_scale =
-            vlc_object_create( p_intf, VLC_OBJECT_FILTER );
-    vlc_object_attach( p_intf->p_sys->p_scale, p_intf );
-    p_intf->p_sys->p_scale->fmt_out.video.i_chroma =
-        p_intf->p_sys->p_scale->fmt_in.video.i_chroma =
-            p_intf->p_sys->fmt_out.i_chroma;
-
-    /* XXX: We'll also be using it for YUVA and RGBA blending ... */
-    p_intf->p_sys->p_scale->fmt_in.video.i_width =
-        p_intf->p_sys->p_scale->fmt_in.video.i_height = 32;
-    p_intf->p_sys->p_scale->fmt_out.video.i_width =
-        p_intf->p_sys->p_scale->fmt_out.video.i_height = 16;
-
-    p_intf->p_sys->p_scale->p_module =
-        module_Need( p_intf->p_sys->p_scale, "video filter2", 0, 0 );
-
-    if( !p_intf->p_sys->p_scale->p_module )
-        return VLC_EGENERIC;
-
-    return VLC_SUCCESS;
-}
-
-static int CloseScaling( intf_thread_t *p_intf )
-{
-    if( p_intf->p_sys->p_scale )
-    {
-        if( p_intf->p_sys->p_scale->p_module )
-            module_Unneed( p_intf->p_sys->p_scale,
-                           p_intf->p_sys->p_scale->p_module );
-
-        vlc_object_detach( p_intf->p_sys->p_scale );
-        vlc_object_release( p_intf->p_sys->p_scale );
-    }
-}
-#endif
-
-/*****************************************************************************
@@ -786 +728 @@
-
-        memcpy( &p_sys->p_blend->fmt_in.video, p_fmt_src, sizeof( video_format_t ) );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        /* Update the output picture size */
-        p_sys->p_blend->fmt_out.video.i_width =
@@ -821 +748 @@
-    return VLC_EGENERIC;
-}
-#endif
-
-static int InvertAlpha( intf_thread_t *p_intf, picture_t **p_pic, video_format_t fmt )
@@ -867 +793 @@
-    return VLC_SUCCESS;
-}
+#endif
-
-/*****************************************************************************
@@ -903 +830 @@
-            i_y_clip = ( i_y_offset + p_src->p[i].i_visible_lines ) - p_dest->p[i].i_visible_lines;
-            i_y_clip = ( i_y_clip > 0 ) ? i_y_clip : 0;
-0
+defined(FBOSD_DEBUG)
-            msg_Dbg( p_intf, "i_pitch (%d,%d), (%d,%d)/(%d,%d)",
-                     p_dest->p[i].i_visible_pitch, p_src->p[i].i_visible_pitch,
@@ -1202 +1129 @@
-        if( !p_sys->p_palette )
-        {
-            msg_Err( p_intf, "out of memory" );
-            close( p_sys->i_fd );
-            return VLC_ENOMEM;
@@ -1366 +1292 @@
-                Render( p_intf, &p_sys->render[i] );
-                RenderClear( p_intf, &p_sys->render[i] );
- 
- 
+
+
-
-        if( p_sys->b_clear )