Move UIConfiguration Singleton into UIConfiguration header

This removes the direct dependence on ardour_ui.h from 39 files
This commit is contained in:
Tim Mayberry 2015-01-02 21:44:54 +07:00 committed by Paul Davis
parent 45d487f16e
commit 6b019a4953
84 changed files with 726 additions and 712 deletions

View file

@ -68,6 +68,7 @@
#include "main_clock.h"
#include "public_editor.h"
#include "timers.h"
#include "ui_config.h"
#include "sfdb_freesound_mootcher.h"
@ -1315,7 +1316,7 @@ SoundFileOmega::reset_options ()
to do embedding (or if we are importing a MIDI file).
*/
if (ARDOUR_UI::config()->get_only_copy_imported_files()) {
if (UIConfiguration::instance().get_only_copy_imported_files()) {
copy_files_btn.set_sensitive (false);
} else {
copy_files_btn.set_sensitive (false);
@ -1489,7 +1490,7 @@ SoundFileOmega::reset_options ()
* or any file if we are under nsm control */
bool const must_copy = _session->get_nsm_state() || have_a_midi_file || notebook.get_current_page() == 2;
if (ARDOUR_UI::config()->get_only_copy_imported_files()) {
if (UIConfiguration::instance().get_only_copy_imported_files()) {
if (selection_can_be_embedded_with_links && !must_copy) {
copy_files_btn.set_sensitive (true);