From 7b757482991b7443475104655f40a10ebdd86f4a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 15 May 2024 04:49:43 +0200 Subject: [PATCH 1/3] Revert "As we've yet to implement user options, let's prefer AAF filenames rather than extracting an internal Comp name" This reverts commit 2e55f4452fa50fab9549c04797a4e962c11e8273. --- gtk2_ardour/ardour_ui_aaf.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui_aaf.cc b/gtk2_ardour/ardour_ui_aaf.cc index 964b8d1aff..0adf492317 100644 --- a/gtk2_ardour/ardour_ui_aaf.cc +++ b/gtk2_ardour/ardour_ui_aaf.cc @@ -466,7 +466,7 @@ ARDOUR_UI::new_session_from_aaf (string const& aaf, string const& target_dir, st } /* extract or set session name */ - if (/* Temporary - in the absence of user-options, don't rely on extracted session names which can be meaningless... aafi->compositionName && aafi->compositionName[0] != */ 0x00) { + if (aafi->compositionName && aafi->compositionName[0] != 0x00) { string compositionName = string (aafi->compositionName); snapshot = laaf_util_clean_filename (&compositionName[0]); } else { From fc1377ae460a6c48fe8cddf5a69c5fcd56ead891 Mon Sep 17 00:00:00 2001 From: agfline Date: Fri, 10 May 2024 13:16:36 +0200 Subject: [PATCH 2/3] AAF: set session name from AAF filename instead of AAF composition name https://github.com/agfline/LibAAF/issues/5#issuecomment-1952193515 --- gtk2_ardour/ardour_ui_aaf.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gtk2_ardour/ardour_ui_aaf.cc b/gtk2_ardour/ardour_ui_aaf.cc index 0adf492317..7a69fba7f4 100644 --- a/gtk2_ardour/ardour_ui_aaf.cc +++ b/gtk2_ardour/ardour_ui_aaf.cc @@ -465,15 +465,7 @@ ARDOUR_UI::new_session_from_aaf (string const& aaf, string const& target_dir, st return -1; } - /* extract or set session name */ - if (aafi->compositionName && aafi->compositionName[0] != 0x00) { - string compositionName = string (aafi->compositionName); - snapshot = laaf_util_clean_filename (&compositionName[0]); - } else { - snapshot = basename_nosuffix (aaf); - } - - snapshot = legalize_for_universal_path (snapshot); + snapshot = legalize_for_universal_path (basename_nosuffix (aaf)); path = Glib::build_filename (target_dir, snapshot); if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { From b3df8ea6ef023089450e8a23bb337af842f23d99 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 15 May 2024 17:01:57 +0200 Subject: [PATCH 3/3] Expose UI config fonts to libwidgets Currently this is only for the benefit of derivative projects. --- libs/widgets/widgets/ui_config.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/widgets/widgets/ui_config.h b/libs/widgets/widgets/ui_config.h index a7b4585374..c04d8d4552 100644 --- a/libs/widgets/widgets/ui_config.h +++ b/libs/widgets/widgets/ui_config.h @@ -21,6 +21,8 @@ #include +#include + #include "pbd/configuration.h" #include "gtkmm2ext/colors.h" @@ -44,6 +46,12 @@ public: virtual bool get_all_floating_windows_are_dialogs () const = 0; virtual bool get_widget_prelight () const = 0; virtual Gtkmm2ext::Color color (const std::string&, bool* failed = 0) const = 0; + + virtual Pango::FontDescription get_NormalFont () const = 0; + virtual Pango::FontDescription get_SmallFont () const = 0; + virtual Pango::FontDescription get_NormalMonospaceFont () const = 0; + virtual Pango::FontDescription get_SmallMonospaceFont () const = 0; + virtual Pango::FontDescription get_ArdourSmallFont () const = 0; }; }