diff options
| author | Robin Gareus <robin@gareus.org> | 2013-01-31 07:41:37 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-01-31 07:41:37 +0000 |
| commit | 38374e7aa546cd40fd671096ac9f802c78aa9bf6 (patch) | |
| tree | 6ea1f8542934bf47596b22766ca89568c98531fd | |
| parent | 56fd9e9b85df51add4ee0cdff730fa959ae9342b (diff) | |
OSX CoreText font loading, updated ArdourMono font-family name
git-svn-id: svn://localhost/ardour2/branches/3.0@14042 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ArdourMono.ttf | bin | 116824 -> 116760 bytes | |||
| -rw-r--r-- | gtk2_ardour/main.cc | 28 |
2 files changed, 26 insertions, 2 deletions
diff --git a/gtk2_ardour/ArdourMono.ttf b/gtk2_ardour/ArdourMono.ttf Binary files differindex e6f91cda83..d4c93d1f91 100644 --- a/gtk2_ardour/ArdourMono.ttf +++ b/gtk2_ardour/ArdourMono.ttf diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 381f97d82f..8b7a8772b2 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -217,6 +217,30 @@ fixup_bundle_environment (int, char* []) setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1); } +#include <Carbon/Carbon.h> + +static void load_custom_fonts() { +#if 0 // untested OSX code + std::string ardour_mono_file; + + if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) { + cerr << _("Cannot find ArdourMono TrueType font") << endl; + } + + CFStringRef ttf; + CFURLRef fontURL; + CFErrorRef error; + ttf = CFStringCreateWithBytes( + kCFAllocatorDefault, ardour_mono_filec_str(), + ardour_mono_file.length(), + kCFStringEncodingUTF8, FALSE); + fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE); + if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) { + cerr << _("Cannot load ArdourMono TrueType font.") << endl; + } +#endif +} + #else void @@ -319,8 +343,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) } -#endif - static void load_custom_fonts() { std::string ardour_mono_file; if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) { @@ -338,6 +360,8 @@ static void load_custom_fonts() { } } +#endif + static gboolean tell_about_jack_death (void* /* ignored */) { |