#include <vlc_xml.h>
#include <vlc_input.h>
+#include <TargetConditionals.h>
+
+#ifdef TARGET_OS_IPHONE
+#include <CoreText/CoreText.h>
+#include <CoreGraphics/CoreGraphics.h>
+
+#else
// Fix ourselves ColorSync headers that gets included in ApplicationServices.
#define DisposeCMProfileIterateUPP(a) DisposeCMProfileIterateUPP(CMProfileIterateUPP userUPP __attribute__((unused)))
#define DisposeCMMIterateUPP(a) DisposeCMMIterateUPP(CMProfileIterateUPP userUPP __attribute__((unused)))
#define __MACHINEEXCEPTIONS__
#include <ApplicationServices/ApplicationServices.h>
+#endif
#define DEFAULT_FONT "Arial Black"
#define DEFAULT_FONT_COLOR 0xffffff
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
- add_string( "quartztext-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
+ add_string( "quartztext-font", DEFAULT_FONT, FONT_TEXT, FONT_LONGTEXT,
false )
- add_integer( "quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, NULL, FONTSIZER_TEXT,
+ add_integer( "quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, FONTSIZER_TEXT,
FONTSIZER_LONGTEXT, false )
- change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
- add_integer( "quartztext-color", 0x00FFFFFF, NULL, COLOR_TEXT,
+ change_integer_list( pi_sizes, ppsz_sizes_text )
+ add_integer( "quartztext-color", 0x00FFFFFF, COLOR_TEXT,
COLOR_LONGTEXT, false )
- change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+ change_integer_list( pi_color_values, ppsz_color_descriptions )
set_capability( "text renderer", 150 )
add_shortcut( "text" )
set_callbacks( Create, Destroy )
int i_font_color;
int i_font_size;
+#ifndef TARGET_OS_IPHONE
ATSFontContainerRef *p_fonts;
int i_fonts;
+#endif
};
//////////////////////////////////////////////////////////////////////////////
p_filter->pf_render_text = RenderText;
p_filter->pf_render_html = RenderHtml;
+#ifndef TARGET_OS_IPHONE
p_sys->p_fonts = NULL;
p_sys->i_fonts = 0;
+#endif
LoadFontsFromAttachments( p_filter );
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
-
+#ifndef TARGET_OS_IPHONE
if( p_sys->p_fonts )
{
int k;
free( p_sys->p_fonts );
}
-
+#endif
free( p_sys->psz_font_name );
free( p_sys );
}
//////////////////////////////////////////////////////////////////////////////
static int LoadFontsFromAttachments( filter_t *p_filter )
{
+#ifdef TARGET_OS_IPHONE
+ VLC_UNUSED(p_filter);
+ return VLC_SUCCESS;
+#else
filter_sys_t *p_sys = p_filter->p_sys;
input_attachment_t **pp_attachments;
int i_attachments_cnt;
vlc_input_attachment_Delete( p_attach );
}
free( pp_attachments );
-
return VLC_SUCCESS;
+#endif
}
static char *EliminateCRLF( char *psz_string )
CFRangeMake( 0, len ), p_attrString);
RenderYUVA( p_filter, p_region_out, p_attrString );
+ CFRelease( p_attrString );
}
- CFRelease(p_attrString);
return VLC_SUCCESS;
}
{
CFStringRef p_cfString;
CTFontRef p_font;
-
+
// Handle font name and size
p_cfString = CFStringCreateWithCString( NULL,
psz_fontname,
p_bitmap->p_data = calloc( i_height, p_bitmap->i_bytesPerRow );
- *pp_colorSpace = CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB );
+ *pp_colorSpace = CGColorSpaceCreateDeviceRGB();
if( p_bitmap->p_data && *pp_colorSpace )
{