From 6991a07902cc844b87c895aa56de613c96b88b4f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 26 Oct 2015 15:17:42 -0400 Subject: remove all trace of SAE from source code. This had become incoherent over time, and posed a development hazard and burden going forward --- gtk2_ardour/editor_canvas.cc | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'gtk2_ardour/editor_canvas.cc') diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 2266904178..152a8046c4 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -98,18 +98,6 @@ Editor::initialize_canvas () _verbose_cursor = new VerboseCursor (this); - /* on the bottom, an image */ - - if (Profile->get_sae()) { - Image img (::get_icon (X_("saelogo"))); - // logo_item = new ArdourCanvas::Pixbuf (_track_canvas->root(), 0.0, 0.0, img.get_pixbuf()); - // logo_item->property_height_in_pixels() = true; - // logo_item->property_width_in_pixels() = true; - // logo_item->property_height_set() = true; - // logo_item->property_width_set() = true; - // logo_item->show (); - } - /*a group to hold global rects like punch/loop indicators */ global_rect_group = new ArdourCanvas::Container (hv_scroll_group); CANVAS_DEBUG_NAME (global_rect_group, "global rect group"); @@ -227,10 +215,6 @@ Editor::initialize_canvas () playhead_cursor = new EditorCursor (*this, &Editor::canvas_playhead_cursor_event); - if (logo_item) { - logo_item->lower_to_bottom (); - } - _canvas_drop_zone = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, 0.0)); /* this thing is transparent */ _canvas_drop_zone->set_fill (false); @@ -428,7 +412,7 @@ Editor::drop_paths_part_two (const vector& paths, framepos_t frame, doub InstrumentSelector is; // instantiation builds instrument-list and sets default. do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, frame, is.selected_instrument()); - if (Profile->get_sae() || UIConfiguration::instance().get_only_copy_imported_files() || copy) { + if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame); } else { do_embed (audio_paths, Editing::ImportDistinctFiles, ImportAsTrack, frame); @@ -444,7 +428,7 @@ Editor::drop_paths_part_two (const vector& paths, framepos_t frame, doub do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, SrcBest, frame); - if (Profile->get_sae() || UIConfiguration::instance().get_only_copy_imported_files() || copy) { + if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame); } else { do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, frame); -- cgit v1.2.3