X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=281bedafe1b2173b8271808b1bea1459ed4bb194;hb=ccf58b8de23619db9983a45f696fd97e13a15cce;hp=8f0c25bdb00464bd94349f2a45672258ec64cda8;hpb=e6eb059576eefd9a26c177627ae7dd3ba2feb727;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 8f0c25bdb0..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 @@ -84,7 +84,6 @@ 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); @@ -92,7 +91,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh mute_button->set_active (false); solo_button->set_active (false); - + if (is_audio_track()) { controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); } else { // bus @@ -101,13 +100,13 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh ensure_xml_node (); - set_state (*xml_node); + 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), @@ -130,7 +129,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh /* first idle will do what we need */ } else { first_idle (); - } + } } else { post_construct (); @@ -159,7 +158,7 @@ AudioTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { ensure_xml_node (); xml_node->add_property ("shown-editor", "yes"); - + return TimeAxisView::show_at (y, nth, parent); } @@ -185,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() { @@ -279,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) { @@ -313,30 +234,6 @@ 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 (const Evoral::Parameter& param, bool show) { @@ -348,7 +245,7 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool return; } - boost::shared_ptr + boost::shared_ptr gain_track(new AutomationTimeAxisView (_session, _route, _route->amp(), c, _editor, @@ -388,7 +285,7 @@ AudioTimeAxisView::ensure_pan_views (bool show) boost::shared_ptr pan_control = boost::dynamic_pointer_cast( _route->panner()->data().control(*p)); - + if (pan_control->parameter().type() == NullAutomation) { error << "Pan control has NULL automation type!" << endmsg; continue; @@ -402,13 +299,13 @@ AudioTimeAxisView::ensure_pan_views (bool show) boost::shared_ptr pan_track ( new AutomationTimeAxisView (_session, - _route, _route->panner(), pan_control, + _route, _route->panner(), pan_control, _editor, *this, false, parent_canvas, name)); - + add_automation_child (*p, pan_track, show); } } @@ -432,7 +329,7 @@ AudioTimeAxisView::toggle_gain_track () } /* now trigger a redisplay */ - + if (!no_redraw) { _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ } @@ -472,7 +369,7 @@ AudioTimeAxisView::toggle_pan_track () } } #endif - + void AudioTimeAxisView::show_all_automation () { @@ -522,7 +419,7 @@ void AudioTimeAxisView::hide_all_xfades () { AudioStreamView* asv = audio_view(); - + if (asv) { asv->hide_all_xfades (); } @@ -591,4 +488,3 @@ AudioTimeAxisView::update_control_names () controls_ebox.set_name (controls_base_unselected_name); } } -