Commit 5c8fd676 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Move and split dummy text render

parent 5c385e6f
......@@ -327,6 +327,7 @@ $Id$
* swscale: Video scaling filter
* t140: T.140 text encoder
* taglib: Taglib tags parser and writer
* tdummy: dummy text renderer
* telepathy: Telepathy Presence information using MissionControl notification
* telx: teletext subtitles decoder
* theora: a theora video decoder/packetizer/encoder using the libtheora library
......
......@@ -4,8 +4,11 @@ SUBDIRS = $(BASE_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS)
SOURCES_freetype = text_renderer/freetype.c
SOURCES_tdummy = text_renderer/tdummy.c
SOURCES_win32text = text_renderer/win32text.c
SOURCES_quartztext = text_renderer/quartztext.c
libvlc_LTLIBRARIES += libtdummy_plugin.la
SOURCES_svg = text_renderer/svg.c
SOURCES_logger = logger.c
SOURCES_vod_rtsp = rtsp.c
......
......@@ -2,7 +2,6 @@ SOURCES_dummy = \
dummy.c \
dummy.h \
interface.c \
renderer.c \
$(NULL)
libvlc_LTLIBRARIES += libdummy_plugin.la
......@@ -58,10 +58,6 @@ vlc_module_begin ()
add_category_hint( N_("Interface"), NULL, false )
add_bool( "dummy-quiet", false, QUIET_TEXT, QUIET_LONGTEXT, false )
#endif
add_submodule ()
set_description( N_("Dummy font renderer function") )
set_capability( "text renderer", 1 )
set_callbacks( OpenRenderer, NULL )
add_submodule ()
set_description( N_("libc memcpy") )
set_capability( "memcpy", 50 )
......
......@@ -25,5 +25,3 @@
* External prototypes
*****************************************************************************/
int OpenIntf ( vlc_object_t * );
int OpenRenderer ( vlc_object_t * );
......@@ -26,10 +26,18 @@
#endif
#include <vlc_common.h>
#include <vlc_block.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include "dummy.h"
static int OpenRenderer( vlc_object_t * );
vlc_module_begin ()
set_shortname( N_("Dummy") )
set_description( N_("Dummy font renderer") )
set_capability( "text renderer", 1 )
set_callbacks( OpenRenderer, NULL )
vlc_module_end ()
static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
subpicture_region_t *p_region_in,
......@@ -40,11 +48,10 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
return VLC_EGENERIC;
}
int OpenRenderer( vlc_object_t *p_this )
static int OpenRenderer( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
p_filter->pf_render_text = RenderText;
p_filter->pf_render_html = NULL;
return VLC_SUCCESS;
}
......@@ -913,7 +913,6 @@ modules/misc/dhparams.h
modules/misc/dummy/dummy.c
modules/misc/dummy/dummy.h
modules/misc/dummy/interface.c
modules/misc/dummy/renderer.c
modules/misc/gnutls.c
modules/misc/inhibit.c
modules/misc/inhibit/osso.c
......@@ -945,6 +944,7 @@ modules/misc/stats/stats.h
modules/misc/text_renderer/freetype.c
modules/misc/text_renderer/quartztext.c
modules/misc/text_renderer/svg.c
modules/misc/text_renderer/tdummy.c
modules/misc/text_renderer/win32text.c
modules/misc/xml/libxml.c
modules/mmx/memcpy.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment