Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
9e3a8395
Commit
9e3a8395
authored
Jun 13, 2009
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fallback on freetype if quartztext isn't present
This only happen in 64bit mode.
parent
d66f3c87
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+11
-7
No files found.
modules/gui/macosx/simple_prefs.m
View file @
9e3a8395
...
...
@@ -570,18 +570,15 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
if
(
module_exists
(
"quartztext"
)
)
{
[
self
setupField
:
o_osd_font_fld
forOption
:
"quartztext-font"
];
[
self
setupButton
:
o_osd_font_color_pop
forIntList
:
"quartztext-color"
];
[
self
setupButton
:
o_osd_font_size_pop
forIntList
:
"quartztext-rel-fontsize"
];
}
else
{
[
o_osd_font_fld
setEnabled
:
NO
];
[
o_osd_font_color_pop
setEnabled
:
NO
];
[
o_osd_font_size_pop
setEnabled
:
NO
];
[
o_osd_font_color_pop
removeAllItems
];
[
o_osd_font_size_pop
removeAllItems
];
[
o_osd_font_btn
setEnabled
:
NO
];
/* fallback on freetype */
[
self
setupField
:
o_osd_font_fld
forOption
:
"freetype-font"
];
[
self
setupButton
:
o_osd_font_color_pop
forIntList
:
"freetype-color"
];
[
self
setupButton
:
o_osd_font_size_pop
forIntList
:
"freetype-rel-fontsize"
];
}
...
...
@@ -942,6 +939,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
SaveIntList
(
o_osd_font_color_pop
,
"quartztext-color"
);
SaveIntList
(
o_osd_font_size_pop
,
"quartztext-rel-fontsize"
);
}
else
{
/* fallback on freetype */
config_PutPsz
(
p_intf
,
"freetype-font"
,
[[
o_osd_font_fld
stringValue
]
UTF8String
]
);
SaveIntList
(
o_osd_font_color_pop
,
"freetype-color"
);
SaveIntList
(
o_osd_font_size_pop
,
"freetype-rel-fontsize"
);
}
i
=
config_SaveConfigFile
(
p_intf
,
NULL
);
...
...
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