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
1402fd52
Commit
1402fd52
authored
Apr 27, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Libass: simplify and do not call ass_set_fonts_dir
This should continue to fix the fontconfig caching bugs
parent
c5bf6ea1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
31 deletions
+0
-31
modules/codec/libass.c
modules/codec/libass.c
+0
-31
No files found.
modules/codec/libass.c
View file @
1402fd52
...
...
@@ -698,42 +698,11 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
}
free
(
pp_attachments
);
char
*
psz_font_dir
=
NULL
;
#if defined(WIN32)
dialog_progress_bar_t
*
p_dialog
=
dialog_ProgressCreate
(
p_dec
,
_
(
"Building font cache"
),
_
(
"Please wait while your font cache is rebuilt.
\n
"
"This should take less than a minute."
),
NULL
);
/* This makes Windows build of VLC hang */
const
UINT
uPath
=
GetSystemWindowsDirectoryW
(
NULL
,
0
);
if
(
uPath
>
0
)
{
wchar_t
*
psw_path
=
calloc
(
uPath
+
1
,
sizeof
(
wchar_t
)
);
if
(
psw_path
)
{
if
(
GetSystemWindowsDirectoryW
(
psw_path
,
uPath
+
1
)
>
0
)
{
char
*
psz_tmp
=
FromWide
(
psw_path
);
if
(
psz_tmp
&&
asprintf
(
&
psz_font_dir
,
"%s
\\
Fonts"
,
psz_tmp
)
<
0
)
psz_font_dir
=
NULL
;
free
(
psz_tmp
);
}
free
(
psw_path
);
}
}
#endif
if
(
!
psz_font_dir
)
psz_font_dir
=
config_GetUserDir
(
VLC_CACHE_DIR
);
if
(
!
psz_font_dir
)
goto
error
;
msg_Dbg
(
p_dec
,
"Setting libass fontdir: %s"
,
psz_font_dir
);
ass_set_fonts_dir
(
p_library
,
psz_font_dir
);
free
(
psz_font_dir
);
#ifdef WIN32
if
(
p_dialog
)
dialog_ProgressSet
(
p_dialog
,
NULL
,
0
.
1
);
#endif
...
...
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