justdan96/tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #461 from jcdr428/jcdr428-FixMacFonts

Browse Source 
Fix Font updates for Mac
This commit is contained in:
jcdr428 2021-09-19 16:13:20 +00:00 committed by GitHub
commit be47e56772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tsMuxer/osdep/textSubtitlesRenderFT.cpp
View File

@ -21,7 +21,7 @@ const static char FONT_ROOT[] = "c:/WINDOWS/Fonts"; // for debug only
#elif __linux__ == 1
const static char FONT_ROOT[] = "/usr/share/fonts/";
#elif defined(__APPLE__) && defined(__MACH__)
const static char FONT_ROOT[] = "/Library/Fonts/";
const static char FONT_ROOT[] = "/System/Library/Fonts/";
#endif
#include <freetype/ftstroke.h>
@ -79,6 +79,14 @@ void TextSubtitlesRenderFT::loadFontMap()
vector<string> fileList;
// sort(fileList.begin(), fileList.end());
findFilesRecursive(FONT_ROOT, "*.ttf", &fileList);
#if defined(__APPLE__) && defined(__MACH__)
vector<string> fileList1;
findFilesRecursive("/Library/Fonts/", "*.ttf", &fileList1);
fileList.insert(fileList.end(), fileList1.begin(), fileList1.end());
findFilesRecursive("~/Library/Fonts/", "*.ttf", &fileList1);
fileList.insert(fileList.end(), fileList1.begin(), fileList1.end());
#endif
for (int i = 0; i < fileList.size(); ++i)
{
// LTRACE(LT_INFO, 2, "before loading font " << fileList[i].c_str());