ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove all trace of SAE from source code. 

This had become incoherent over time, and posed a development hazard and burden going forward
This commit is contained in:
Paul Davis 2015-10-26 15:17:42 -04:00
parent bc487bb4b0
commit 6991a07902
25 changed files with 290 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
gtk2_ardour/add_route_dialog.cc
View File

@ -135,16 +135,10 @@ AddRouteDialog::AddRouteDialog ()
table2->attach (channel_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
if (!ARDOUR::Profile->get_sae ()) {
/* Track mode */
mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
table2->attach (mode_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (mode_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
}
mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
table2->attach (mode_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table2->attach (mode_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
++n;
instrument_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
table2->attach (instrument_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
@ -325,11 +319,8 @@ AddRouteDialog::refill_track_modes ()
vector<string> s;
s.push_back (_("Normal"));
if (!ARDOUR::Profile->get_sae ()) {
s.push_back (_("Non Layered"));
s.push_back (_("Tape"));
}
s.push_back (_("Non Layered"));
s.push_back (_("Tape"));
set_popdown_strings (mode_combo, s);
mode_combo.set_active_text (s.front());
@ -338,10 +329,6 @@ AddRouteDialog::refill_track_modes ()
ARDOUR::TrackMode
AddRouteDialog::mode ()
{
if (ARDOUR::Profile->get_sae()) {
return ARDOUR::Normal;
}
std::string str = mode_combo.get_active_text();
if (str == _("Normal")) {
return ARDOUR::Normal;
@ -441,50 +428,48 @@ AddRouteDialog::refill_channel_setups ()
ARDOUR::find_route_templates (route_templates);
if (!ARDOUR::Profile->get_sae()) {
if (!route_templates.empty()) {
vector<string> v;
for (vector<TemplateInfo>::iterator x = route_templates.begin(); x != route_templates.end(); ++x) {
chn.name = x->name;
chn.channels = 0;
chn.template_path = x->path;
channel_setups.push_back (chn);
}
if (!route_templates.empty()) {
vector<string> v;
for (vector<TemplateInfo>::iterator x = route_templates.begin(); x != route_templates.end(); ++x) {
chn.name = x->name;
chn.channels = 0;
chn.template_path = x->path;
channel_setups.push_back (chn);
}
/* clear template path for the rest */
chn.template_path = "";
chn.name = _("3 Channel");
chn.channels = 3;
channel_setups.push_back (chn);
chn.name = _("4 Channel");
chn.channels = 4;
channel_setups.push_back (chn);
chn.name = _("5 Channel");
chn.channels = 5;
channel_setups.push_back (chn);
chn.name = _("6 Channel");
chn.channels = 6;
channel_setups.push_back (chn);
chn.name = _("8 Channel");
chn.channels = 8;
channel_setups.push_back (chn);
chn.name = _("12 Channel");
chn.channels = 12;
channel_setups.push_back (chn);
chn.name = _("Custom");
chn.channels = 0;
channel_setups.push_back (chn);
}
/* clear template path for the rest */
chn.template_path = "";
chn.name = _("3 Channel");
chn.channels = 3;
channel_setups.push_back (chn);
chn.name = _("4 Channel");
chn.channels = 4;
channel_setups.push_back (chn);
chn.name = _("5 Channel");
chn.channels = 5;
channel_setups.push_back (chn);
chn.name = _("6 Channel");
chn.channels = 6;
channel_setups.push_back (chn);
chn.name = _("8 Channel");
chn.channels = 8;
channel_setups.push_back (chn);
chn.name = _("12 Channel");
chn.channels = 12;
channel_setups.push_back (chn);
chn.name = _("Custom");
chn.channels = 0;
channel_setups.push_back (chn);
for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) {
channel_combo_strings.push_back ((*i).name);
}

16
gtk2_ardour/ardour_ui.cc
View File

@ -625,13 +625,8 @@ ARDOUR_UI::post_engine ()
/* set default clock modes */
if (Profile->get_sae()) {
primary_clock->set_mode (AudioClock::BBT);
secondary_clock->set_mode (AudioClock::MinSec);
} else {
primary_clock->set_mode (AudioClock::Timecode);
secondary_clock->set_mode (AudioClock::BBT);
}
primary_clock->set_mode (AudioClock::Timecode);
secondary_clock->set_mode (AudioClock::BBT);
/* start the time-of-day-clock */
@ -2845,7 +2840,7 @@ ARDOUR_UI::build_session_from_dialog (SessionDialog& sd, const std::string& sess
{
BusProfile bus_profile;
if (nsm || Profile->get_sae()) {
if (nsm) {
bus_profile.master_out_channels = 2;
bus_profile.input_ac = AutoConnectPhysical;
@ -4835,11 +4830,6 @@ ARDOUR_UI::setup_profile ()
Profile->set_small_screen ();
}
if (g_getenv ("ARDOUR_SAE")) {
Profile->set_sae ();
Profile->set_single_package ();
}
if (g_getenv ("TRX")) {
Profile->set_trx ();
}

5
gtk2_ardour/ardour_ui2.cc
View File

@ -445,11 +445,6 @@ ARDOUR_UI::setup_transport ()
transport_hbox.pack_start (editor_meter_peak_display, false, false);
}
if (Profile->get_sae()) {
Image* img = manage (new Image ((::get_icon (X_("sae")))));
transport_hbox.pack_end (*img, false, false);
}
/* desensitize */
set_transport_sensitivity (false);

4
gtk2_ardour/audio_clock.cc
View File

@ -2112,9 +2112,7 @@ AudioClock::build_ops_menu ()
MenuList& ops_items = ops_menu->items();
ops_menu->set_name ("ArdourContextMenu");
if (!Profile->get_sae()) {
ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Timecode)));
}
ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Timecode)));
ops_items.push_back (MenuElem (_("Bars:Beats"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), BBT)));
ops_items.push_back (MenuElem (_("Minutes:Seconds"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), MinSec)));
ops_items.push_back (MenuElem (_("Samples"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Frames)));

5
gtk2_ardour/audio_region_view.cc
View File

@ -231,10 +231,7 @@ AudioRegionView::init (bool wfd)
}
const string line_name = _region->name() + ":gain";
if (!Profile->get_sae()) {
gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope()));
}
gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope()));
update_envelope_visibility ();
gain_line->reset ();

6
gtk2_ardour/audio_streamview.cc
View File

@ -465,11 +465,7 @@ AudioStreamView::color_handler ()
//case cAudioBusBase:
if (!_trackview.is_track()) {
if (Profile->get_sae() && _trackview.route()->is_master()) {
canvas_rect->set_fill_color (UIConfiguration::instance().color ("audio master bus base"));
} else {
canvas_rect->set_fill_color (UIConfiguration::instance().color_mod ("audio bus base", "audio bus base"));
}
canvas_rect->set_fill_color (UIConfiguration::instance().color_mod ("audio bus base", "audio bus base"));
}
}

154
gtk2_ardour/crossfade_edit.cc
View File

@ -924,49 +924,46 @@ CrossfadeEditor::build_presets ()
fade_in_presets->push_back (p);
if (!Profile->get_sae()) {
p = new Preset ("Short cut", "fadein-short-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.389401, 0.0333333));
p->push_back (PresetPoint (0.629032, 0.0861111));
p->push_back (PresetPoint (0.829493, 0.233333));
p->push_back (PresetPoint (0.9447, 0.483333));
p->push_back (PresetPoint (0.976959, 0.697222));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
p = new Preset ("Short cut", "fadein-short-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.389401, 0.0333333));
p->push_back (PresetPoint (0.629032, 0.0861111));
p->push_back (PresetPoint (0.829493, 0.233333));
p->push_back (PresetPoint (0.9447, 0.483333));
p->push_back (PresetPoint (0.976959, 0.697222));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
p = new Preset ("Slow cut", "fadein-slow-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.304147, 0.0694444));
p->push_back (PresetPoint (0.529954, 0.152778));
p->push_back (PresetPoint (0.725806, 0.333333));
p->push_back (PresetPoint (0.847926, 0.558333));
p->push_back (PresetPoint (0.919355, 0.730556));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
p = new Preset ("Slow cut", "fadein-slow-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.304147, 0.0694444));
p->push_back (PresetPoint (0.529954, 0.152778));
p->push_back (PresetPoint (0.725806, 0.333333));
p->push_back (PresetPoint (0.847926, 0.558333));
p->push_back (PresetPoint (0.919355, 0.730556));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
p = new Preset ("Fast cut", "fadein-fast-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.0737327, 0.308333));
p->push_back (PresetPoint (0.246544, 0.658333));
p->push_back (PresetPoint (0.470046, 0.886111));
p->push_back (PresetPoint (0.652074, 0.972222));
p->push_back (PresetPoint (0.771889, 0.988889));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
p = new Preset ("Fast cut", "fadein-fast-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.0737327, 0.308333));
p->push_back (PresetPoint (0.246544, 0.658333));
p->push_back (PresetPoint (0.470046, 0.886111));
p->push_back (PresetPoint (0.652074, 0.972222));
p->push_back (PresetPoint (0.771889, 0.988889));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
p = new Preset ("Long cut", "fadein-long-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.0207373, 0.197222));
p->push_back (PresetPoint (0.0645161, 0.525));
p->push_back (PresetPoint (0.152074, 0.802778));
p->push_back (PresetPoint (0.276498, 0.919444));
p->push_back (PresetPoint (0.481567, 0.980556));
p->push_back (PresetPoint (0.767281, 1));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
}
p = new Preset ("Long cut", "fadein-long-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
p->push_back (PresetPoint (0.0207373, 0.197222));
p->push_back (PresetPoint (0.0645161, 0.525));
p->push_back (PresetPoint (0.152074, 0.802778));
p->push_back (PresetPoint (0.276498, 0.919444));
p->push_back (PresetPoint (0.481567, 0.980556));
p->push_back (PresetPoint (0.767281, 1));
p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
fade_in_presets->push_back (p);
/* FADE OUT */
@ -1010,49 +1007,46 @@ CrossfadeEditor::build_presets ()
p->push_back (PresetPoint (1.000000, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
if (!Profile->get_sae()) {
// p = new Preset ("hiout.xpm");
p = new Preset ("Short cut", "fadeout-short-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.305556, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.548611, 0.991736));
p->push_back (PresetPoint (0.759259, 0.931129));
p->push_back (PresetPoint (0.918981, 0.68595));
p->push_back (PresetPoint (0.976852, 0.22865));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
// p = new Preset ("hiout.xpm");
p = new Preset ("Short cut", "fadeout-short-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.305556, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.548611, 0.991736));
p->push_back (PresetPoint (0.759259, 0.931129));
p->push_back (PresetPoint (0.918981, 0.68595));
p->push_back (PresetPoint (0.976852, 0.22865));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
p = new Preset ("Slow cut", "fadeout-slow-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.228111, 0.988889));
p->push_back (PresetPoint (0.347926, 0.972222));
p->push_back (PresetPoint (0.529954, 0.886111));
p->push_back (PresetPoint (0.753456, 0.658333));
p->push_back (PresetPoint (0.9262673, 0.308333));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
p = new Preset ("Slow cut", "fadeout-slow-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.228111, 0.988889));
p->push_back (PresetPoint (0.347926, 0.972222));
p->push_back (PresetPoint (0.529954, 0.886111));
p->push_back (PresetPoint (0.753456, 0.658333));
p->push_back (PresetPoint (0.9262673, 0.308333));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
p = new Preset ("Fast cut", "fadeout-fast-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.080645, 0.730556));
p->push_back (PresetPoint (0.277778, 0.289256));
p->push_back (PresetPoint (0.470046, 0.152778));
p->push_back (PresetPoint (0.695853, 0.0694444));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
p = new Preset ("Fast cut", "fadeout-fast-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.080645, 0.730556));
p->push_back (PresetPoint (0.277778, 0.289256));
p->push_back (PresetPoint (0.470046, 0.152778));
p->push_back (PresetPoint (0.695853, 0.0694444));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
// p = new Preset ("loout.xpm");
p = new Preset ("Long cut", "fadeout-long-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.023041, 0.697222));
p->push_back (PresetPoint (0.0553, 0.483333));
p->push_back (PresetPoint (0.170507, 0.233333));
p->push_back (PresetPoint (0.370968, 0.0861111));
p->push_back (PresetPoint (0.610599, 0.0333333));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
}
// p = new Preset ("loout.xpm");
p = new Preset ("Long cut", "fadeout-long-cut");
p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
p->push_back (PresetPoint (0.023041, 0.697222));
p->push_back (PresetPoint (0.0553, 0.483333));
p->push_back (PresetPoint (0.170507, 0.233333));
p->push_back (PresetPoint (0.370968, 0.0861111));
p->push_back (PresetPoint (0.610599, 0.0333333));
p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
fade_out_presets->push_back (p);
}
void

7
gtk2_ardour/editor.cc
View File

@ -290,7 +290,6 @@ Editor::Editor ()
, _track_canvas_viewport (0)
, within_track_canvas (false)
, _verbose_cursor (0)
, logo_item (0)
, tempo_group (0)
, meter_group (0)
, marker_group (0)
@ -3486,11 +3485,7 @@ Editor::cycle_edit_mode ()
{
switch (Config->get_edit_mode()) {
case Slide:
if (Profile->get_sae()) {
Config->set_edit_mode (Lock);
} else {
Config->set_edit_mode (Ripple);
}
Config->set_edit_mode (Ripple);
break;
case Splice:
case Ripple:

3
gtk2_ardour/editor.h
View File

@ -349,7 +349,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void set_summary ();
void set_group_tabs ();
void toggle_measure_visibility ();
void toggle_logo_visibility ();
/* fades */
@ -807,8 +806,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
Gtk::EventBox time_bars_event_box;
Gtk::VBox time_bars_vbox;
ArdourCanvas::Pixbuf *logo_item;
ArdourCanvas::Container *tempo_group;
ArdourCanvas::Container *meter_group;
ArdourCanvas::Container *marker_group;

23
gtk2_ardour/editor_actions.cc
View File

@ -736,12 +736,6 @@ Editor::register_actions ()
myactions.register_toggle_action (editor_actions, X_("ToggleMeasureVisibility"), _("Show Measure Lines"), sigc::mem_fun (*this, &Editor::toggle_measure_visibility));
/* if there is a logo in the editor canvas, its always visible at startup */
act = myactions.register_toggle_action (editor_actions, X_("ToggleLogoVisibility"), _("Show Logo"), sigc::mem_fun (*this, &Editor::toggle_logo_visibility));
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
tact->set_active (true);
myactions.register_action (editor_actions, X_("toggle-midi-input-active"), _("Toggle MIDI Input Active for Editor-Selected Tracks/Busses"),
sigc::bind (sigc::mem_fun (*this, &Editor::toggle_midi_input_active), false));
}
@ -978,23 +972,6 @@ Editor::toggle_measure_visibility ()
}
}
void
Editor::toggle_logo_visibility ()
{
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleLogoVisibility"));
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
if (logo_item) {
if (tact->get_active()) {
logo_item->show ();
} else {
logo_item->hide ();
}
}
}
}
RefPtr<RadioAction>
Editor::snap_type_action (SnapType type)
{

20
gtk2_ardour/editor_canvas.cc
View File

@ -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<string>& 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<string>& 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);

2
gtk2_ardour/editor_canvas_events.cc
View File

@ -1219,7 +1219,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
* TODO: check if file is audio/midi, allow drops on same track-type only,
* currently: if audio is dropped on a midi-track, it is only added to the region-list
*/
if (Profile->get_sae() || UIConfiguration::instance().get_only_copy_imported_files()) {
if (UIConfiguration::instance().get_only_copy_imported_files()) {
context->drag_status(Gdk::ACTION_COPY, time);
} else {
if ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY) {

8
gtk2_ardour/editor_markers.cc
View File

@ -943,9 +943,7 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session)
items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
if (!Profile->get_sae()) {
items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
}
items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
@ -968,9 +966,7 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session)
items.push_back (MenuElem (_("Separate Regions in Range"), sigc::mem_fun(*this, &Editor::marker_menu_separate_regions_using_location)));
items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
if (!Profile->get_sae()) {
items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range)));
}
items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range)));
}
void

2
gtk2_ardour/editor_regions.cc
View File

@ -1249,7 +1249,7 @@ EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
framepos_t pos = 0;
bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY);
if (Profile->get_sae() || UIConfiguration::instance().get_only_copy_imported_files() || copy) {
if (UIConfiguration::instance().get_only_copy_imported_files() || copy) {
_editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos);
} else {
_editor->do_embed (paths, Editing::ImportDistinctFiles, ImportAsRegion, pos);

2
gtk2_ardour/editor_rulers.cc
View File

@ -540,7 +540,7 @@ Editor::update_ruler_visibility ()
tempo_label.hide();
}
if (!Profile->get_sae() && ruler_range_action->get_active()) {
if (ruler_range_action->get_active()) {
old_unit_pos = range_marker_group->position().y;
if (tbpos != old_unit_pos) {
range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));

12
gtk2_ardour/editor_selection.cc
View File

@ -1025,10 +1025,6 @@ Editor::track_selection_changed ()
void
Editor::time_selection_changed ()
{
if (Profile->get_sae()) {
return;
}
/* XXX this is superficially inefficient. Hide the selection in all
* tracks, then show it in all selected tracks.
*
@ -1614,9 +1610,7 @@ Editor::set_selection_from_region ()
selection->set (tvl);
if (!Profile->get_sae()) {
set_mouse_mode (Editing::MouseRange, false);
}
set_mouse_mode (Editing::MouseRange, false);
}
void
@ -1649,9 +1643,7 @@ Editor::set_selection_from_range (Location& loc)
selection->set (loc.start(), loc.end());
commit_reversible_selection_op ();
if (!Profile->get_sae()) {
set_mouse_mode (Editing::MouseRange, false);
}
set_mouse_mode (Editing::MouseRange, false);
}
void

9
gtk2_ardour/keyboard.cc
View File

@ -56,11 +56,7 @@ ArdourKeyboard::find_bindings_files (map<string,string>& files)
vector<std::string> found;
Searchpath spath = ardour_config_search_path();
if (getenv ("ARDOUR_SAE")) {
find_files_matching_pattern (found, spath, string_compose ("*SAE-*.%1", Keyboard::binding_filename_suffix));
} else {
find_files_matching_pattern (found, spath, string_compose ("*.%1", Keyboard::binding_filename_suffix));
}
find_files_matching_pattern (found, spath, string_compose ("*.%1", Keyboard::binding_filename_suffix));
if (found.empty()) {
return;
@ -99,8 +95,7 @@ ArdourKeyboard::setup_keybindings ()
binding_files.insert (newpair);
}
/* check to see if they gave a style name ("SAE", "ergonomic") or
an actual filename (*.bindings)
/* check to see if they gave a style name ("ergonomic") or an actual filename (*.bindings)
*/
if (!keybindings_path.empty() && keybindings_path.find (binding_filename_suffix) == string::npos) {

24
gtk2_ardour/keyeditor.cc
View File

@ -63,20 +63,16 @@ KeyEditor::KeyEditor ()
vpacker.pack_start (notebook, true, true);
if (!ARDOUR::Profile->get_sae()) {
Label* hint = manage (new Label (_("Select an action, then press the key(s) to (re)set its shortcut")));
hint->show ();
unbind_box.set_spacing (6);
unbind_box.pack_start (*hint, false, true);
unbind_box.pack_start (unbind_button, false, false);
unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
Label* hint = manage (new Label (_("Select an action, then press the key(s) to (re)set its shortcut")));
hint->show ();
unbind_box.set_spacing (6);
unbind_box.pack_start (*hint, false, true);
unbind_box.pack_start (unbind_button, false, false);
unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
vpacker.pack_start (unbind_box, false, false);
unbind_box.show ();
unbind_button.show ();
}
vpacker.pack_start (unbind_box, false, false);
unbind_box.show ();
unbind_button.show ();
reset_button.add (reset_label);
reset_label.set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("Reset Bindings to Defaults")));
@ -133,7 +129,7 @@ KeyEditor::on_key_press_event (GdkEventKey* ev)
bool
KeyEditor::on_key_release_event (GdkEventKey* ev)
{
if (ARDOUR::Profile->get_sae() || last_keyval == 0) {
if (last_keyval == 0) {
return false;
}

6
gtk2_ardour/mixer_strip.cc
View File

@ -1596,10 +1596,8 @@ MixerStrip::build_route_ops_menu ()
denormal_menu_item = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
denormal_menu_item->set_active (_route->denormal_protection());
if (!Profile->get_sae()) {
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
}
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
if (_route) {
/* note that this relies on selection being shared across editor and

8
gtk2_ardour/mixer_ui.h
View File

@ -347,7 +347,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
void monitor_section_going_away ();
<<<<<<< HEAD
void monitor_section_attached ();
void monitor_section_detached ();
@ -358,13 +357,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
void sync_treeview_favorite_ui_state (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&);
void save_favorite_ui_state (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path);
=======
void create_own_window ();
<<<<<<< HEAD
>>>>>>> the basics of tabbed
=======
>>>>>>> replicate the remove-all-trailing whitespace commit(s) in master
/// true if we are in fullscreen mode
bool _maximised;

5
gtk2_ardour/opts.cc
View File

@ -91,11 +91,6 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
const char *optstring = "abBc:C:dD:hHk:E:m:N:nOp:PST:U:vV";
const char *execname = strrchr (argv[0], '/');
if (getenv ("ARDOUR_SAE")) {
menus_file = "ardour-sae.menus";
keybindings_path = "SAE";
}
if (execname == 0) {
execname = argv[0];
} else {

6
gtk2_ardour/processor_box.cc
View File

@ -1877,9 +1877,6 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Processor>
case IOSelector::Accepted:
_route->add_processor_by_index (processor, _placement);
if (Profile->get_sae()) {
processor->activate ();
}
break;
}
@ -1905,9 +1902,6 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr<Processo
case IOSelector::Accepted:
_route->add_processor_by_index (processor, _placement);
if (Profile->get_sae()) {
processor->activate ();
}
break;
}

289
gtk2_ardour/route_time_axis.cc
View File

@ -588,11 +588,9 @@ RouteTimeAxisView::build_display_menu ()
items.push_back (SeparatorElem());
if (!Profile->get_sae()) {
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
items.push_back (SeparatorElem());
}
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
items.push_back (SeparatorElem());
// Hook for derived classes to add type specific stuff
append_extra_display_menu_items ();
@ -651,159 +649,154 @@ RouteTimeAxisView::build_display_menu ()
items.push_back (MenuElem (_("Layers"), *layers_menu));
if (!Profile->get_sae()) {
Menu* alignment_menu = manage (new Menu);
MenuList& alignment_items = alignment_menu->items();
alignment_menu->set_name ("ArdourContextMenu");
Menu* alignment_menu = manage (new Menu);
MenuList& alignment_items = alignment_menu->items();
alignment_menu->set_name ("ArdourContextMenu");
RadioMenuItem::Group align_group;
RadioMenuItem::Group align_group;
/* Same verbose hacks as for the layering options above */
/* Same verbose hacks as for the layering options above */
int existing = 0;
int capture = 0;
int automatic = 0;
int styles = 0;
boost::shared_ptr<Track> first_track;
int existing = 0;
int capture = 0;
int automatic = 0;
int styles = 0;
boost::shared_ptr<Track> first_track;
TrackSelection const & s = _editor.get_selection().tracks;
for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
if (!r || !r->is_track ()) {
continue;
}
if (!first_track) {
first_track = r->track();
}
switch (r->track()->alignment_choice()) {
case Automatic:
++automatic;
styles |= 0x1;
switch (r->track()->alignment_style()) {
case ExistingMaterial:
++existing;
break;
case CaptureTime:
++capture;
break;
}
break;
case UseExistingMaterial:
++existing;
styles |= 0x2;
break;
case UseCaptureTime:
++capture;
styles |= 0x4;
break;
}
for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
if (!r || !r->is_track ()) {
continue;
}
bool inconsistent;
switch (styles) {
case 1:
case 2:
case 4:
inconsistent = false;
break;
default:
inconsistent = true;
break;
}
RadioMenuItem* i;
if (!inconsistent && first_track) {
alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (automatic != 0 && existing == 0 && capture == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, Automatic, true));
switch (first_track->alignment_choice()) {
case Automatic:
switch (first_track->alignment_style()) {
case ExistingMaterial:
alignment_items.push_back (MenuElem (_("(Currently: Existing Material)")));
break;
case CaptureTime:
alignment_items.push_back (MenuElem (_("(Currently: Capture Time)")));
break;
}
break;
default:
break;
}
alignment_items.push_back (RadioMenuElem (align_group, _("Align with Existing Material")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (existing != 0 && capture == 0 && automatic == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
alignment_items.push_back (RadioMenuElem (align_group, _("Align with Capture Time")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (existing == 0 && capture != 0 && automatic == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseCaptureTime, true));
items.push_back (MenuElem (_("Alignment"), *alignment_menu));
} else {
/* show nothing */
}
Menu* mode_menu = manage (new Menu);
MenuList& mode_items = mode_menu->items ();
mode_menu->set_name ("ArdourContextMenu");
RadioMenuItem::Group mode_group;
int normal = 0;
int tape = 0;
int non_layered = 0;
for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
if (!r || !r->is_track ()) {
continue;
}
switch (r->track()->mode()) {
case Normal:
++normal;
break;
case Destructive:
++tape;
break;
case NonLayered:
++non_layered;
break;
}
if (!first_track) {
first_track = r->track();
}
mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode")));
i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal, true));
i->set_active (normal != 0 && tape == 0 && non_layered == 0);
i->set_inconsistent (normal != 0 && (tape != 0 || non_layered != 0));
mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode")));
i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive, true));
i->set_active (normal == 0 && tape != 0 && non_layered == 0);
i->set_inconsistent (tape != 0 && (normal != 0 || non_layered != 0));
mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode")));
i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered, true));
i->set_active (normal == 0 && tape == 0 && non_layered != 0);
i->set_inconsistent (non_layered != 0 && (normal != 0 || tape != 0));
items.push_back (MenuElem (_("Record Mode"), *mode_menu));
switch (r->track()->alignment_choice()) {
case Automatic:
++automatic;
styles |= 0x1;
switch (r->track()->alignment_style()) {
case ExistingMaterial:
++existing;
break;
case CaptureTime:
++capture;
break;
}
break;
case UseExistingMaterial:
++existing;
styles |= 0x2;
break;
case UseCaptureTime:
++capture;
styles |= 0x4;
break;
}
}
bool inconsistent;
switch (styles) {
case 1:
case 2:
case 4:
inconsistent = false;
break;
default:
inconsistent = true;
break;
}
RadioMenuItem* i;
if (!inconsistent && first_track) {
alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (automatic != 0 && existing == 0 && capture == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, Automatic, true));
switch (first_track->alignment_choice()) {
case Automatic:
switch (first_track->alignment_style()) {
case ExistingMaterial:
alignment_items.push_back (MenuElem (_("(Currently: Existing Material)")));
break;
case CaptureTime:
alignment_items.push_back (MenuElem (_("(Currently: Capture Time)")));
break;
}
break;
default:
break;
}
alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (existing != 0 && capture == 0 && automatic == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (existing == 0 && capture != 0 && automatic == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseCaptureTime, true));
items.push_back (MenuElem (_("Alignment"), *alignment_menu));
} else {
/* show nothing */
}
Menu* mode_menu = manage (new Menu);
MenuList& mode_items = mode_menu->items ();
mode_menu->set_name ("ArdourContextMenu");
RadioMenuItem::Group mode_group;
int normal = 0;
int tape = 0;
int non_layered = 0;
for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
if (!r || !r->is_track ()) {
continue;
}
switch (r->track()->mode()) {
case Normal:
++normal;
break;
case Destructive:
++tape;
break;
case NonLayered:
++non_layered;
break;
}
}
mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode")));
i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal, true));
i->set_active (normal != 0 && tape == 0 && non_layered == 0);
i->set_inconsistent (normal != 0 && (tape != 0 || non_layered != 0));
mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode")));
i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive, true));
i->set_active (normal == 0 && tape != 0 && non_layered == 0);
i->set_inconsistent (tape != 0 && (normal != 0 || non_layered != 0));
mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode")));
i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered, true));
i->set_active (normal == 0 && tape == 0 && non_layered != 0);
i->set_inconsistent (non_layered != 0 && (normal != 0 || tape != 0));
items.push_back (MenuElem (_("Record Mode"), *mode_menu));
items.push_back (SeparatorElem());

4
libs/ardour/ardour/profile.h
View File

@ -31,7 +31,6 @@ class LIBARDOUR_API RuntimeProfile {
public:
enum Element {
SmallScreen,
SAE,
SinglePackage,
Trx,
Mixbus,
@ -44,9 +43,6 @@ public:
void set_small_screen() { bits[SmallScreen] = true; }
bool get_small_screen() const { return bits[SmallScreen]; }
void set_sae () { bits[SAE] = true; }
bool get_sae () const { return bits[SAE]; }
bool get_trx() const { return bits[Trx]; }
void set_trx() { bits[Trx] = true; }

22
libs/ardour/region.cc
View File

@ -301,17 +301,6 @@ Region::Region (boost::shared_ptr<const Region> other)
_sync_position = _start;
}
if (Profile->get_sae()) {
/* reset sync point to start if its ended up
outside region bounds.
*/
if (_sync_position < _start || _sync_position >= _start + _length) {
_sync_marked = false;
_sync_position = _start;
}
}
assert (_type == other->data_type());
}
@ -360,17 +349,6 @@ Region::Region (boost::shared_ptr<const Region> other, frameoffset_t offset)
_sync_position = _start;
}
if (Profile->get_sae()) {
/* reset sync point to start if its ended up
outside region bounds.
*/
if (_sync_position < _start || _sync_position >= _start + _length) {
_sync_marked = false;
_sync_position = _start;
}
}
assert (_type == other->data_type());
}