diff --git a/modules/LIST b/modules/LIST index ee959c007cefec0ba63a52b6ea3640922d50d1e7..69932ac4a5ebe1f25a6a83d3e7a72d09c31e4b97 100644 --- a/modules/LIST +++ b/modules/LIST @@ -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 diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index d69ee718518e7296b7fb1cec8228c45ccd06d5fa..c852cc54d2d2a133d99a2d2efea0851826abf737 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -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 diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am index 5d34b8182f6097c0907daefde2f07ef6dd5a76a7..961ecb155a66b81f32bcbb2cba697a8f2a7e3606 100644 --- a/modules/misc/dummy/Modules.am +++ b/modules/misc/dummy/Modules.am @@ -2,7 +2,6 @@ SOURCES_dummy = \ dummy.c \ dummy.h \ interface.c \ - renderer.c \ $(NULL) libvlc_LTLIBRARIES += libdummy_plugin.la diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c index d891687972198411ce63c3876d8b6db41218e277..8e081f109ebf5a8739e3f4e310eb1eb2a6bf7eb0 100644 --- a/modules/misc/dummy/dummy.c +++ b/modules/misc/dummy/dummy.c @@ -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 ) diff --git a/modules/misc/dummy/dummy.h b/modules/misc/dummy/dummy.h index 427b3a176ce86737ccd051b953f6e1b800edacd6..ba058af8fcb53542b5f426dbd44f82a99c6abf51 100644 --- a/modules/misc/dummy/dummy.h +++ b/modules/misc/dummy/dummy.h @@ -25,5 +25,3 @@ * External prototypes *****************************************************************************/ int OpenIntf ( vlc_object_t * ); - -int OpenRenderer ( vlc_object_t * ); diff --git a/modules/misc/dummy/renderer.c b/modules/misc/text_renderer/tdummy.c similarity index 84% rename from modules/misc/dummy/renderer.c rename to modules/misc/text_renderer/tdummy.c index 219cef746e046952420c01aeed5a145ad8b679ad..38343e8c54e81d99faf5697608a17da41fd91f42 100644 --- a/modules/misc/dummy/renderer.c +++ b/modules/misc/text_renderer/tdummy.c @@ -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; } - diff --git a/po/POTFILES.in b/po/POTFILES.in index cdff9fc8725bed7184480a115729d9aae2c71aeb..2c2134638c42dccd4c929bac66de4765edb6c5db 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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