X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=281bedafe1b2173b8271808b1bea1459ed4bb194;hb=ccf58b8de23619db9983a45f696fd97e13a15cce;hp=124c63936791b9106cf0afa6d4e646c7f0986161;hpb=b0424889b32e136ca25186037b032b229824ac79;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 124c639367..281bedafe1 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,9 +27,9 @@ #include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/memento_command.h" #include #include @@ -37,16 +37,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/amp.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audioplaylist.h" +#include "ardour/event_type_map.h" +#include "ardour/location.h" +#include "ardour/panner.h" +#include "ardour/playlist.h" +#include "ardour/processor.h" +#include "ardour/profile.h" +#include "ardour/session.h" +#include "ardour/session_playlist.h" +#include "ardour/utils.h" #include "ardour_ui.h" #include "audio_time_axis.h" @@ -64,10 +66,11 @@ #include "audio_streamview.h" #include "utils.h" -#include +#include "ardour/audio_track.h" #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -81,17 +84,14 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh assert(!is_track() || is_audio_track()); subplugin_menu.set_name ("ArdourContextMenu"); - waveform_item = 0; _view = new AudioStreamView (*this); - create_automation_child (GainAutomation, false); - ignore_toggle = false; mute_button->set_active (false); solo_button->set_active (false); - + if (is_audio_track()) { controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); } else { // bus @@ -100,15 +100,24 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh ensure_xml_node (); - set_state (*xml_node); - - _route->panner().Changed.connect (bind (mem_fun(*this, &AudioTimeAxisView::update_pans), false)); + set_state (*xml_node, Stateful::loading_state_version); + + /* if set_state above didn't create a gain automation child, we need to make one */ + if (automation_track (GainAutomation) == 0) { + create_automation_child (GainAutomation, false); + } + + if (_route->panner()) { + _route->panner()->Changed.connect (bind ( + mem_fun(*this, &AudioTimeAxisView::ensure_pan_views), + false)); + } /* map current state of the route */ processors_changed (); reset_processor_automation_curves (); - update_pans (false); + ensure_pan_views (false); update_control_names (); if (is_audio_track()) { @@ -116,11 +125,11 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh /* ask for notifications of any new RegionViews */ _view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added)); - if (!editor.have_idled()) { + if (!_editor.have_idled()) { /* first idle will do what we need */ } else { first_idle (); - } + } } else { post_construct (); @@ -148,8 +157,8 @@ guint32 AudioTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { ensure_xml_node (); - xml_node->add_property ("shown_editor", "yes"); - + xml_node->add_property ("shown-editor", "yes"); + return TimeAxisView::show_at (y, nth, parent); } @@ -157,7 +166,7 @@ void AudioTimeAxisView::hide () { ensure_xml_node (); - xml_node->add_property ("shown_editor", "no"); + xml_node->add_property ("shown-editor", "no"); TimeAxisView::hide (); } @@ -175,62 +184,8 @@ AudioTimeAxisView::append_extra_display_menu_items () items.push_back (MenuElem (_("Hide all crossfades"), mem_fun(*this, &AudioTimeAxisView::hide_all_xfades))); items.push_back (MenuElem (_("Show all crossfades"), mem_fun(*this, &AudioTimeAxisView::show_all_xfades))); } - - // waveform menu - Menu *waveform_menu = manage(new Menu); - MenuList& waveform_items = waveform_menu->items(); - waveform_menu->set_name ("ArdourContextMenu"); - - waveform_items.push_back (CheckMenuElem (_("Show waveforms"), mem_fun(*this, &AudioTimeAxisView::toggle_waveforms))); - waveform_item = static_cast (&waveform_items.back()); - ignore_toggle = true; - waveform_item->set_active (editor.show_waveforms()); - ignore_toggle = false; - - waveform_items.push_back (SeparatorElem()); - - RadioMenuItem::Group group; - - waveform_items.push_back (RadioMenuElem (group, _("Traditional"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Traditional))); - traditional_item = static_cast (&waveform_items.back()); - - if (!Profile->get_sae()) { - waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Rectified))); - rectified_item = static_cast (&waveform_items.back()); - } else { - rectified_item = 0; - } - - waveform_items.push_back (SeparatorElem()); - - RadioMenuItem::Group group2; - - waveform_items.push_back (RadioMenuElem (group2, _("Linear"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_scale), LinearWaveform))); - linearscale_item = static_cast (&waveform_items.back()); - - waveform_items.push_back (RadioMenuElem (group2, _("Logarithmic"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_scale), LogWaveform))); - logscale_item = static_cast (&waveform_items.back()); - - // setting initial item state - AudioStreamView* asv = audio_view(); - if (asv) { - ignore_toggle = true; - if (asv->get_waveform_shape() == Rectified && rectified_item) { - rectified_item->set_active(true); - } else { - traditional_item->set_active(true); - } - - if (asv->get_waveform_scale() == LogWaveform) - logscale_item->set_active(true); - else linearscale_item->set_active(true); - ignore_toggle = false; - } - - items.push_back (MenuElem (_("Waveform"), *waveform_menu)); - } - + Gtk::Menu* AudioTimeAxisView::build_mode_menu() { @@ -241,9 +196,15 @@ AudioTimeAxisView::build_mode_menu() mode_menu->set_name ("ArdourContextMenu"); RadioMenuItem::Group mode_group; + items.push_back (RadioMenuElem (mode_group, _("Normal"), bind (mem_fun (*this, &AudioTimeAxisView::set_track_mode), ARDOUR::Normal))); normal_track_mode_item = dynamic_cast(&items.back()); + + items.push_back (RadioMenuElem (mode_group, _("Non Overlapping"), + bind (mem_fun (*this, &AudioTimeAxisView::set_track_mode), ARDOUR::NonLayered))); + non_layered_track_mode_item = dynamic_cast(&items.back()); + items.push_back (RadioMenuElem (mode_group, _("Tape"), bind (mem_fun (*this, &AudioTimeAxisView::set_track_mode), ARDOUR::Destructive))); destructive_track_mode_item = dynamic_cast(&items.back()); @@ -252,6 +213,9 @@ AudioTimeAxisView::build_mode_menu() case ARDOUR::Destructive: destructive_track_mode_item->set_active (); break; + case ARDOUR::NonLayered: + non_layered_track_mode_item->set_active (); + break; case ARDOUR::Normal: normal_track_mode_item->set_active (); break; @@ -260,30 +224,6 @@ AudioTimeAxisView::build_mode_menu() return mode_menu; } -void -AudioTimeAxisView::toggle_waveforms () -{ - AudioStreamView* asv = audio_view(); - assert(asv); - - if (asv && waveform_item && !ignore_toggle) { - asv->set_show_waveforms (waveform_item->get_active()); - } -} - -void -AudioTimeAxisView::set_show_waveforms (bool yn) -{ - AudioStreamView* asv = audio_view(); - assert(asv); - - if (waveform_item) { - waveform_item->set_active (yn); - } else { - asv->set_show_waveforms (yn); - } -} - void AudioTimeAxisView::set_show_waveforms_recording (bool yn) { @@ -295,31 +235,7 @@ AudioTimeAxisView::set_show_waveforms_recording (bool yn) } void -AudioTimeAxisView::set_waveform_shape (WaveformShape shape) -{ - AudioStreamView* asv = audio_view(); - - if (asv && !ignore_toggle) { - asv->set_waveform_shape (shape); - } - - map_frozen (); -} - -void -AudioTimeAxisView::set_waveform_scale (WaveformScale scale) -{ - AudioStreamView* asv = audio_view(); - - if (asv && !ignore_toggle) { - asv->set_waveform_scale (scale); - } - - map_frozen (); -} - -void -AudioTimeAxisView::create_automation_child (Parameter param, bool show) +AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { if (param.type() == GainAutomation) { @@ -329,52 +245,131 @@ AudioTimeAxisView::create_automation_child (Parameter param, bool show) return; } - boost::shared_ptr gain_track(new AutomationTimeAxisView (_session, - _route, _route, c, - editor, - *this, - false, - parent_canvas, - _route->describe_parameter(param))); + boost::shared_ptr + gain_track(new AutomationTimeAxisView (_session, + _route, _route->amp(), c, + _editor, + *this, + false, + parent_canvas, + _route->amp()->describe_parameter(param))); - add_automation_child(Parameter(GainAutomation), gain_track, show); + add_automation_child(Evoral::Parameter(GainAutomation), gain_track, show); } else if (param.type() == PanAutomation) { ensure_xml_node (); - update_pans (show); + ensure_pan_views (show); } else { - error << "AudioTimeAxisView: unknown automation child " << param.to_string() << endmsg; + error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg; } } +/** Ensure that we have the appropriate AutomationTimeAxisViews for the + * panners that we have. + * + * @param show true to show any new views that we create, otherwise false. + */ void -AudioTimeAxisView::update_pans (bool show) +AudioTimeAxisView::ensure_pan_views (bool show) { - Panner::iterator p; + if (!_route->panner()) { + return; + } + + const set& params = _route->panner()->what_can_be_automated(); + set::iterator p; + + for (p = params.begin(); p != params.end(); ++p) { + boost::shared_ptr pan_control + = boost::dynamic_pointer_cast( + _route->panner()->data().control(*p)); - uint32_t i = 0; - for (p = _route->panner().begin(); p != _route->panner().end(); ++p) { - boost::shared_ptr pan_control = (*p)->pan_control(); - if (pan_control->parameter().type() == NullAutomation) { error << "Pan control has NULL automation type!" << endmsg; continue; } - boost::shared_ptr pan_track(new AutomationTimeAxisView (_session, - _route, _route/*FIXME*/, pan_control, - editor, - *this, - false, - parent_canvas, - _route->describe_parameter(pan_control->parameter()))); - add_automation_child(Parameter(PanAutomation, i), pan_track, show); - ++i; + if (automation_child (pan_control->parameter ()).get () == 0) { + + /* we don't already have an AutomationTimeAxisView for this parameter */ + + std::string const name = _route->panner()->describe_parameter (pan_control->parameter ()); + + boost::shared_ptr pan_track ( + new AutomationTimeAxisView (_session, + _route, _route->panner(), pan_control, + _editor, + *this, + false, + parent_canvas, + name)); + + add_automation_child (*p, pan_track, show); + } + } +} +#if 0 +void +AudioTimeAxisView::toggle_gain_track () +{ + bool showit = gain_automation_item->get_active(); + + if (showit != gain_track->marked_for_display()) { + if (showit) { + gain_track->set_marked_for_display (true); + gain_track->canvas_display->show(); + gain_track->canvas_background->show(); + gain_track->get_state_node()->add_property ("shown", X_("yes")); + } else { + gain_track->set_marked_for_display (false); + gain_track->hide (); + gain_track->get_state_node()->add_property ("shown", X_("no")); + } + + /* now trigger a redisplay */ + + if (!no_redraw) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } + } +} + +void +AudioTimeAxisView::gain_hidden () +{ + gain_track->get_state_node()->add_property (X_("shown"), X_("no")); + + if (gain_automation_item && !_hidden) { + gain_automation_item->set_active (false); + } + + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ +} + +void +AudioTimeAxisView::toggle_pan_track () +{ + bool showit = pan_automation_item->get_active(); + + if (showit != pan_track->marked_for_display()) { + if (showit) { + pan_track->set_marked_for_display (true); + pan_track->canvas_display->show(); + pan_track->canvas_background->show(); + pan_track->get_state_node()->add_property ("shown", X_("yes")); + } else { + pan_track->set_marked_for_display (false); + pan_track->hide (); + pan_track->get_state_node()->add_property ("shown", X_("no")); + } + + /* now trigger a redisplay */ } } - +#endif + void AudioTimeAxisView::show_all_automation () { @@ -424,7 +419,7 @@ void AudioTimeAxisView::hide_all_xfades () { AudioStreamView* asv = audio_view(); - + if (asv) { asv->hide_all_xfades (); } @@ -493,4 +488,3 @@ AudioTimeAxisView::update_control_names () controls_ebox.set_name (controls_base_unselected_name); } } -