ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-05-15 17:03:28 +02:00
commit b3a2745227
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/ardour_ui_aaf.cc
View File

@ -465,15 +465,7 @@ ARDOUR_UI::new_session_from_aaf (string const& aaf, string const& target_dir, st
return -1; return -1;
} }
/* extract or set session name */ snapshot = legalize_for_universal_path (basename_nosuffix (aaf));
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) {
string compositionName = string (aafi->compositionName);
snapshot = laaf_util_clean_filename (&compositionName[0]);
} else {
snapshot = basename_nosuffix (aaf);
}
snapshot = legalize_for_universal_path (snapshot);
path = Glib::build_filename (target_dir, snapshot); path = Glib::build_filename (target_dir, snapshot);
if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {

8
libs/widgets/widgets/ui_config.h
View File

@ -21,6 +21,8 @@
#include <cassert> #include <cassert>
#include <pangomm/fontdescription.h>
#include "pbd/configuration.h" #include "pbd/configuration.h"
#include "gtkmm2ext/colors.h" #include "gtkmm2ext/colors.h"
@ -44,6 +46,12 @@ public:
virtual bool get_all_floating_windows_are_dialogs () const = 0; virtual bool get_all_floating_windows_are_dialogs () const = 0;
virtual bool get_widget_prelight () const = 0; virtual bool get_widget_prelight () const = 0;
virtual Gtkmm2ext::Color color (const std::string&, bool* failed = 0) 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;
}; };
} }