Merge branch 'ardour'
This commit is contained in:
commit
b3a2745227
@ -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 (/* 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);
|
||||
snapshot = legalize_for_universal_path (basename_nosuffix (aaf));
|
||||
path = Glib::build_filename (target_dir, snapshot);
|
||||
|
||||
if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
|
||||
|
@ -21,6 +21,8 @@
|
||||
|
||||
#include <cassert>
|
||||
|
||||
#include <pangomm/fontdescription.h>
|
||||
|
||||
#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;
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user