Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
66d883a9
Commit
66d883a9
authored
Jul 20, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetics (moved BuildDone under HAVE_FONTCONFIG)
parent
fb0a0605
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
25 deletions
+24
-25
modules/misc/freetype.c
modules/misc/freetype.c
+24
-25
No files found.
modules/misc/freetype.c
View file @
66d883a9
...
@@ -178,8 +178,6 @@ static int RenderHtml( filter_t *, subpicture_region_t *,
...
@@ -178,8 +178,6 @@ static int RenderHtml( filter_t *, subpicture_region_t *,
subpicture_region_t
*
);
subpicture_region_t
*
);
static
char
*
FontConfig_Select
(
FcConfig
*
,
const
char
*
,
static
char
*
FontConfig_Select
(
FcConfig
*
,
const
char
*
,
bool
,
bool
,
int
*
);
bool
,
bool
,
int
*
);
static
int
BuildDone
(
vlc_object_t
*
,
const
char
*
,
vlc_value_t
,
vlc_value_t
,
void
*
);
#endif
#endif
...
@@ -249,6 +247,8 @@ static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_loc
...
@@ -249,6 +247,8 @@ static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_loc
static
void
FontBuilderDetach
(
filter_t
*
p_filter
,
vlc_object_t
*
p_fontbuilder
);
static
void
FontBuilderDetach
(
filter_t
*
p_filter
,
vlc_object_t
*
p_fontbuilder
);
static
void
FontBuilderThread
(
vlc_object_t
*
p_this
);
static
void
FontBuilderThread
(
vlc_object_t
*
p_this
);
static
void
FontBuilderDestructor
(
vlc_object_t
*
p_this
);
static
void
FontBuilderDestructor
(
vlc_object_t
*
p_this
);
static
int
FontBuilderDone
(
vlc_object_t
*
,
const
char
*
,
vlc_value_t
,
vlc_value_t
,
void
*
);
#endif
#endif
/*****************************************************************************
/*****************************************************************************
...
@@ -482,7 +482,7 @@ static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_loc
...
@@ -482,7 +482,7 @@ static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_loc
}
}
if
(
p_fontbuilder
)
if
(
p_fontbuilder
)
{
{
var_AddCallback
(
p_fontbuilder
,
"build-done"
,
Build
Done
,
p_filter
);
var_AddCallback
(
p_fontbuilder
,
"build-done"
,
FontBuilder
Done
,
p_filter
);
var_TriggerCallback
(
p_fontbuilder
,
"build-done"
);
var_TriggerCallback
(
p_fontbuilder
,
"build-done"
);
}
}
vlc_mutex_unlock
(
p_lock
);
vlc_mutex_unlock
(
p_lock
);
...
@@ -494,7 +494,7 @@ static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder )
...
@@ -494,7 +494,7 @@ static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder )
vlc_mutex_t
*
lock
=
var_AcquireMutex
(
"fontbuilder"
);
vlc_mutex_t
*
lock
=
var_AcquireMutex
(
"fontbuilder"
);
if
(
p_fontbuilder
)
if
(
p_fontbuilder
)
{
{
var_DelCallback
(
p_fontbuilder
,
"build-done"
,
Build
Done
,
p_filter
);
var_DelCallback
(
p_fontbuilder
,
"build-done"
,
FontBuilder
Done
,
p_filter
);
/* We wait for the thread on the first FontBuilderDetach */
/* We wait for the thread on the first FontBuilderDetach */
if
(
vlc_object_alive
(
p_fontbuilder
)
)
if
(
vlc_object_alive
(
p_fontbuilder
)
)
...
@@ -547,6 +547,26 @@ static void FontBuilderDestructor( vlc_object_t *p_this )
...
@@ -547,6 +547,26 @@ static void FontBuilderDestructor( vlc_object_t *p_this )
if
(
p_fontconfig
)
if
(
p_fontconfig
)
FcConfigDestroy
(
p_fontconfig
);
FcConfigDestroy
(
p_fontconfig
);
}
}
static
int
FontBuilderDone
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
{
filter_t
*
p_filter
=
param
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
if
(
newval
.
b_bool
)
{
vlc_mutex_t
*
p_lock
=
var_AcquireMutex
(
"fontbuilder"
);
p_sys
->
b_fontconfig_ok
=
true
;
p_sys
->
p_fontconfig
=
p_this
->
p_private
;
vlc_mutex_unlock
(
p_lock
);
}
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
return
VLC_SUCCESS
;
}
#endif
#endif
/*****************************************************************************
/*****************************************************************************
...
@@ -2196,27 +2216,6 @@ static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style
...
@@ -2196,27 +2216,6 @@ static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
static
int
BuildDone
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
{
filter_t
*
p_filter
=
param
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
if
(
newval
.
b_bool
)
{
vlc_mutex_t
*
p_lock
=
var_AcquireMutex
(
"fontbuilder"
);
p_sys
->
b_fontconfig_ok
=
true
;
p_sys
->
p_fontconfig
=
p_this
->
p_private
;
vlc_mutex_unlock
(
p_lock
);
}
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
return
VLC_SUCCESS
;
}
static
int
ProcessLines
(
filter_t
*
p_filter
,
static
int
ProcessLines
(
filter_t
*
p_filter
,
uint32_t
*
psz_text
,
uint32_t
*
psz_text
,
int
i_len
,
int
i_len
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment