X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_editor.cc;h=c36ddbc041ce69fb8fafd04ebe4cf24d355baf27;hb=9c89a93e4f96826bec6ed519f8f435e4fc73bfa5;hp=b6bb4589a9a950e8a4f5416de2de7fef3db4f3a7;hpb=93c7aeba048f19df5abee5e4325ef8b0ef62c279;p=ardour.git diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index b6bb4589a9..c36ddbc041 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -15,13 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ +#include + #include +#include #include #include #include +#include #include #include "audio_region_editor.h" @@ -36,39 +39,28 @@ using namespace ARDOUR; using namespace PBD; using namespace sigc; using namespace std; +using namespace Gtkmm2ext; AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr r, AudioRegionView& rv) : RegionEditor (s), _region (r), _region_view (rv), name_label (_("NAME:")), - lock_button (_("lock")), - mute_button (_("mute")), - opaque_button (_("opaque")), - envelope_active_button(_("active")), - envelope_view_button(_("visible")), - raise_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT), - lower_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT), - layer_label (_("Layer")), audition_button (_("play")), - time_table (3, 2), - start_clock ("AudioRegionEditorClock", true), - end_clock ("AudioRegionEditorClock", true), - length_clock ("AudioRegionEditorClock", true, true), - sync_offset_clock ("AudioRegionEditorClock", true, true), - envelope_loop_table (1, 3), - envelope_label (_("ENVELOPE")), - fade_in_table (4, 3), - fade_in_length_adjustment (5.0, 0.0, 10000, 0.05, 1), - fade_in_length_spinner (fade_in_length_adjustment, 10), - fade_out_table (4, 3), - fade_out_length_adjustment (5.0, 0.0, 10000, 0.05, 1), - fade_out_length_spinner (fade_out_length_adjustment, 10) + time_table (5, 2), + position_clock (X_("regionposition"), true, X_("AudioRegionEditorClock"), true), + end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true), + length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, true), + /* XXX cannot edit sync point or start yet */ + sync_offset_clock (X_("regionsyncoffset"), true, X_("AudioRegionEditorClock"), false), + start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false) { - start_clock.set_session (&_session); + position_clock.set_session (&_session); end_clock.set_session (&_session); length_clock.set_session (&_session); + sync_offset_clock.set_session (&_session); + start_clock.set_session (&_session); name_entry.set_name ("AudioRegionEditorEntry"); name_label.set_name ("AudioRegionEditorLabel"); @@ -77,92 +69,49 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr name_hbox.pack_start (name_label, false, false); name_hbox.pack_start (name_entry, false, false); - raise_button.add (raise_arrow); - lower_button.add (lower_arrow); - layer_frame.set_name ("BaseFrame"); - layer_frame.set_shadow_type (Gtk::SHADOW_IN); - layer_frame.add (layer_value_label); - layer_label.set_name ("AudioRegionEditorLabel"); - layer_value_label.set_name ("AudioRegionEditorLabel"); - Gtkmm2ext::set_size_request_to_display_given_text (layer_value_label, "99", 5, 2); - - layer_hbox.set_spacing (5); - layer_hbox.pack_start (layer_label, false, false); - layer_hbox.pack_start (layer_frame, false, false); -#if 0 - layer_hbox.pack_start (raise_button, false, false); - layer_hbox.pack_start (lower_button, false, false); -#endif - - mute_button.set_name ("AudioRegionEditorToggleButton"); - opaque_button.set_name ("AudioRegionEditorToggleButton"); - lock_button.set_name ("AudioRegionEditorToggleButton"); - envelope_active_button.set_name ("AudioRegionEditorToggleButton"); - envelope_view_button.set_name ("AudioRegionEditorToggleButton"); - fade_in_active_button.set_name ("AudioRegionEditorToggleButton"); - fade_out_active_button.set_name ("AudioRegionEditorToggleButton"); - audition_button.set_name ("AudioRegionEditorToggleButton"); - - ARDOUR_UI::instance()->tooltips().set_tip (mute_button, _("mute this region")); - ARDOUR_UI::instance()->tooltips().set_tip (opaque_button, _("regions underneath this one cannot be heard")); - ARDOUR_UI::instance()->tooltips().set_tip (lock_button, _("prevent any changes to this region")); - ARDOUR_UI::instance()->tooltips().set_tip (envelope_active_button, _("use the gain envelope during playback")); - ARDOUR_UI::instance()->tooltips().set_tip (envelope_view_button, _("show the gain envelope")); - ARDOUR_UI::instance()->tooltips().set_tip (fade_in_active_button, _("use fade in curve during playback")); - ARDOUR_UI::instance()->tooltips().set_tip (fade_out_active_button, _("use fade out curve during playback")); ARDOUR_UI::instance()->tooltips().set_tip (audition_button, _("audition this region")); - mute_button.unset_flags (Gtk::CAN_FOCUS); - opaque_button.unset_flags (Gtk::CAN_FOCUS); - lock_button.unset_flags (Gtk::CAN_FOCUS); - envelope_active_button.unset_flags (Gtk::CAN_FOCUS); - envelope_view_button.unset_flags (Gtk::CAN_FOCUS); - fade_in_active_button.unset_flags (Gtk::CAN_FOCUS); - fade_out_active_button.unset_flags (Gtk::CAN_FOCUS); audition_button.unset_flags (Gtk::CAN_FOCUS); - mute_button.set_events (mute_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - opaque_button.set_events (opaque_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - lock_button.set_events (lock_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - envelope_active_button.set_events (envelope_active_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - envelope_view_button.set_events (envelope_view_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - fade_in_active_button.set_events (fade_in_active_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - fade_out_active_button.set_events (fade_out_active_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); audition_button.set_events (audition_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); top_row_button_hbox.set_border_width (5); top_row_button_hbox.set_spacing (5); top_row_button_hbox.set_homogeneous (false); - top_row_button_hbox.pack_start (mute_button, false, false); - top_row_button_hbox.pack_start (opaque_button, false, false); - top_row_button_hbox.pack_start (lock_button, false, false); - top_row_button_hbox.pack_start (layer_hbox, false, false, 5); top_row_button_hbox.pack_end (audition_button, false, false); top_row_hbox.pack_start (name_hbox, true, true); top_row_hbox.pack_end (top_row_button_hbox, true, true); - start_label.set_name ("AudioRegionEditorLabel"); - start_label.set_text (_("START:")); + position_label.set_name ("AudioRegionEditorLabel"); + position_label.set_text (_("POSITION:")); end_label.set_name ("AudioRegionEditorLabel"); end_label.set_text (_("END:")); length_label.set_name ("AudioRegionEditorLabel"); length_label.set_text (_("LENGTH:")); + sync_label.set_name ("AudioRegionEditorLabel"); + sync_label.set_text (_("SYNC POINT:")); + start_label.set_name ("AudioRegionEditorLabel"); + start_label.set_text (_("FILE START:")); time_table.set_col_spacings (2); time_table.set_row_spacings (5); time_table.set_border_width (5); - start_alignment.set (1.0, 0.5); + position_alignment.set (1.0, 0.5); end_alignment.set (1.0, 0.5); length_alignment.set (1.0, 0.5); + sync_alignment.set (1.0, 0.5); + start_alignment.set (1.0, 0.5); - start_alignment.add (start_label); + position_alignment.add (position_label); end_alignment.add (end_label); length_alignment.add (length_label); + sync_alignment.add (sync_label); + start_alignment.add (start_label); - time_table.attach (start_alignment, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL); - time_table.attach (start_clock, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL); + time_table.attach (position_alignment, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL); + time_table.attach (position_clock, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL); time_table.attach (end_alignment, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL); time_table.attach (end_clock, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL); @@ -170,87 +119,15 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr time_table.attach (length_alignment, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL); time_table.attach (length_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL); - envelope_label.set_name ("AudioRegionEditorLabel"); - - envelope_loop_table.set_border_width (5); - envelope_loop_table.set_row_spacings (2); - envelope_loop_table.attach (envelope_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL); - envelope_loop_table.attach (envelope_active_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); - envelope_loop_table.attach (envelope_view_button, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); - - /* fade in */ - - fade_in_table.set_border_width (5); - fade_in_table.set_homogeneous (false); - - fade_in_label.set_name ("AudioRegionEditorLabel"); - fade_in_active_button_label.set_name ("AudioRegionEditorSmallLabel"); - fade_in_length_label.set_name ("AudioRegionEditorSmallLabel"); - - fade_in_label.set_text (_("FADE IN")); - fade_in_active_button_label.set_text (_("active")); - fade_in_length_label.set_text (_("msecs")); - - fade_in_active_button.add (fade_in_active_button_label); - - fade_in_length_spinner.set_name("GenericSpinner"); - - fade_in_length_spinner.set_digits (3); - - // fade_in_length_spinner.signal_activate().connect (mem_fun(*this, &AudioRegionEditor::activation)); - - Gtkmm2ext::set_size_request_to_display_given_text (fade_in_length_spinner, "500g", 20, -1); - - fade_in_label_align.add (fade_in_label); - fade_in_label_align.set (0.5); - - - fade_in_table.attach (fade_in_label_align, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); - - fade_in_table.attach (fade_in_length_label, 0, 1, 1, 2, Gtk::EXPAND, Gtk::FILL); - fade_in_table.attach (fade_in_length_spinner, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); - - fade_in_table.attach (fade_in_active_button, 0, 2, 3, 5, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); - - /* fade out */ - - fade_out_table.set_border_width (5); - fade_out_table.set_homogeneous (false); + time_table.attach (sync_alignment, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL); + time_table.attach (sync_offset_clock, 1, 2, 3, 4, Gtk::FILL, Gtk::FILL); - fade_out_label.set_name ("AudioRegionEditorLabel"); - fade_out_active_button_label.set_name ("AudioRegionEditorSmallLabel"); - fade_out_length_label.set_name ("AudioRegionEditorSmallLabel"); - - fade_out_label.set_text (_("FADE OUT")); - fade_out_active_button_label.set_text (_("active")); - fade_out_length_label.set_text (_("msecs")); - - fade_out_active_button.add (fade_out_active_button_label); - - fade_out_length_spinner.set_name("GenericSpinner"); - - fade_out_length_spinner.set_digits (3); - - fade_out_length_spinner.signal_activate().connect (mem_fun(*this, &AudioRegionEditor::activation)); - - Gtkmm2ext::set_size_request_to_display_given_text (fade_out_length_spinner, "500g", 20, -1); - - fade_out_label_align.add (fade_out_label); - fade_out_label_align.set (0.5); - - fade_out_table.attach (fade_out_label_align, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); - - fade_out_table.attach (fade_out_length_label, 0, 1, 1, 2, Gtk::EXPAND, Gtk::FILL); - fade_out_table.attach (fade_out_length_spinner, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); - - fade_out_table.attach (fade_out_active_button, 0, 2, 3, 5, Gtk::FILL|Gtk::EXPAND, Gtk::FILL); + time_table.attach (start_alignment, 0, 1, 4, 5, Gtk::FILL, Gtk::FILL); + time_table.attach (start_clock, 1, 2, 4, 5, Gtk::FILL, Gtk::FILL); lower_hbox.pack_start (time_table, true, true); lower_hbox.pack_start (sep1, false, false); - lower_hbox.pack_start (envelope_loop_table, true, true); lower_hbox.pack_start (sep2, false, false); - lower_hbox.pack_start (fade_in_table, true, true); - lower_hbox.pack_start (fade_out_table, true, true); get_vbox()->pack_start (top_row_hbox, true, true); get_vbox()->pack_start (sep3, false, false); @@ -261,37 +138,15 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast (this))); - string title = _("ardour: region "); - title += _region->name(); - set_title (title); + WindowTitle title(string_compose (_("Region %1"), _region->name())); + title += Glib::get_application_name(); + + set_title (title.get_string()); show_all(); name_changed (); - bounds_changed (Change (StartChanged|LengthChanged|PositionChanged)); - envelope_active_changed (); - mute_changed (); - opacity_changed (); - lock_changed (); - layer_changed (); - fade_in_changed (); - fade_out_changed (); - - XMLNode *node = _region->extra_xml ("GUI"); - XMLProperty *prop = 0; - bool showing_envelope = false; - - if (node && (prop = node->property ("envelope-visible")) != 0) { - if (prop->value() == "yes") { - showing_envelope = true; - } - } - - if (showing_envelope) { - envelope_view_button.set_active (true); - } else { - envelope_view_button.set_active (false); - } + bounds_changed (Change (StartChanged|LengthChanged|PositionChanged|StartChanged|Region::SyncOffsetChanged)); _region->StateChanged.connect (mem_fun(*this, &AudioRegionEditor::region_changed)); @@ -310,52 +165,12 @@ AudioRegionEditor::region_changed (Change what_changed) if (what_changed & NameChanged) { name_changed (); } - if (what_changed & BoundsChanged) { - bounds_changed (what_changed); - } - if (what_changed & Region::OpacityChanged) { - opacity_changed (); - } - if (what_changed & Region::MuteChanged) { - mute_changed (); - } - if (what_changed & Region::LockChanged) { - lock_changed (); - } - if (what_changed & Region::LayerChanged) { - layer_changed (); - } - - if (what_changed & AudioRegion::EnvelopeActiveChanged) { - envelope_active_changed (); - } - if (what_changed & AudioRegion::FadeInChanged) { - fade_in_changed (); - } - if (what_changed & AudioRegion::FadeOutChanged) { - fade_out_changed (); - } - if (what_changed & AudioRegion::FadeInActiveChanged) { - fade_in_active_changed (); - } - if (what_changed & AudioRegion::FadeOutActiveChanged) { - fade_out_active_changed (); + if (what_changed & Change (BoundsChanged|StartChanged|Region::SyncOffsetChanged)) { + bounds_changed (what_changed); } } -void -AudioRegionEditor::fade_in_realized () -{ - fade_in_changed (); -} - -void -AudioRegionEditor::fade_out_realized () -{ - fade_out_changed (); -} - gint AudioRegionEditor::bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)()) { @@ -389,77 +204,51 @@ AudioRegionEditor::breleased (GdkEventButton* ev, Gtk::SpinButton* but, void (Au return FALSE; } -void -AudioRegionEditor::start_editing_fade_in () -{ - _region->freeze (); -} - -void -AudioRegionEditor::stop_editing_fade_in () -{ - _region->thaw (_("fade in edit")); -} - -void -AudioRegionEditor::start_editing_fade_out () -{ - _region->freeze (); -} - -void -AudioRegionEditor::stop_editing_fade_out () -{ - _region->thaw (_("fade out edit")); -} - void AudioRegionEditor::connect_editor_events () { - name_entry.signal_changed().connect (mem_fun(*this, &AudioRegionEditor::name_entry_changed)); + name_entry.signal_changed().connect (mem_fun(*this, &AudioRegionEditor::name_entry_changed)); - start_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::start_clock_changed)); + position_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::position_clock_changed)); end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed)); length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed)); - fade_in_length_spinner.signal_button_press_event().connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_in_length_spinner, - &AudioRegionEditor::start_editing_fade_in)); - fade_in_length_spinner.signal_button_release_event().connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_in_length_spinner, - &AudioRegionEditor::stop_editing_fade_in)); - - fade_out_length_spinner.signal_button_press_event().connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_out_length_spinner, - &AudioRegionEditor::start_editing_fade_out)); - fade_out_length_spinner.signal_button_release_event().connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_out_length_spinner, - &AudioRegionEditor::stop_editing_fade_out)); - - fade_in_length_adjustment.signal_value_changed().connect (mem_fun(*this, &AudioRegionEditor::fade_in_length_adjustment_changed)); - fade_out_length_adjustment.signal_value_changed().connect (mem_fun(*this, &AudioRegionEditor::fade_out_length_adjustment_changed)); - - fade_in_active_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::fade_in_active_toggled)); - fade_out_active_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::fade_out_active_toggled)); - - envelope_active_button.signal_button_press_event().connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_press)); - envelope_active_button.signal_button_release_event().connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_release)); audition_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled)); - envelope_view_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::envelope_view_button_toggled)); - lock_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lock_button_clicked)); - mute_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::mute_button_clicked)); - opaque_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::opaque_button_clicked)); - raise_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::raise_button_clicked)); - lower_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lower_button_clicked)); _session.AuditionActive.connect (mem_fun(*this, &AudioRegionEditor::audition_state_changed)); } void -AudioRegionEditor::start_clock_changed () +AudioRegionEditor::position_clock_changed () { - _region->set_position (start_clock.current_time(), this); + _session.begin_reversible_command (_("change region start position")); + + boost::shared_ptr pl = _region->playlist(); + + if (pl) { + XMLNode &before = pl->get_state(); + _region->set_position (position_clock.current_time(), this); + XMLNode &after = pl->get_state(); + _session.add_command(new MementoCommand(*pl, &before, &after)); + } + + _session.commit_reversible_command (); } void AudioRegionEditor::end_clock_changed () { - _region->trim_end (end_clock.current_time(), this); + _session.begin_reversible_command (_("change region end position")); + + boost::shared_ptr pl = _region->playlist(); + + if (pl) { + XMLNode &before = pl->get_state(); + _region->trim_end (end_clock.current_time(), this); + XMLNode &after = pl->get_state(); + _session.add_command(new MementoCommand(*pl, &before, &after)); + } + + _session.commit_reversible_command (); end_clock.set (_region->position() + _region->length(), true); } @@ -468,30 +257,21 @@ void AudioRegionEditor::length_clock_changed () { nframes_t frames = length_clock.current_time(); - _region->trim_end (_region->position() + frames, this); - - length_clock.set (_region->length()); -} - -gint -AudioRegionEditor::envelope_active_button_press(GdkEventButton *ev) -{ - return stop_signal (envelope_active_button, "button_press_event"); -} + + _session.begin_reversible_command (_("change region length")); + + boost::shared_ptr pl = _region->playlist(); -gint -AudioRegionEditor::envelope_active_button_release (GdkEventButton *ev) -{ - _region->set_envelope_active (!_region->envelope_active()); - return stop_signal (envelope_active_button, "button_release_event"); -} + if (pl) { + XMLNode &before = pl->get_state(); + _region->trim_end (_region->position() + frames, this); + XMLNode &after = pl->get_state(); + _session.add_command(new MementoCommand(*pl, &before, &after)); + } -void -AudioRegionEditor::envelope_view_button_toggled () -{ - bool visible = envelope_view_button.get_active (); + _session.commit_reversible_command (); - _region_view.set_envelope_visible (visible); + length_clock.set (_region->length()); } void @@ -504,56 +284,6 @@ AudioRegionEditor::audition_button_toggled () } } -void -AudioRegionEditor::raise_button_clicked () -{ - _region->raise (); -} - -void -AudioRegionEditor::lower_button_clicked () -{ - _region->lower (); -} - -void -AudioRegionEditor::opaque_button_clicked () -{ - bool ractive = _region->opaque(); - - if (opaque_button.get_active() != ractive) { - _region->set_opaque (!ractive); - } -} - -void -AudioRegionEditor::mute_button_clicked () -{ - bool ractive = _region->muted(); - - if (mute_button.get_active() != ractive) { - _region->set_muted (!ractive); - } -} - -void -AudioRegionEditor::lock_button_clicked () -{ - bool ractive = _region->locked(); - - if (lock_button.get_active() != ractive) { - _region->set_locked (!ractive); - } -} - -void -AudioRegionEditor::layer_changed () -{ - char buf[8]; - snprintf (buf, sizeof(buf), "%d", (int) _region->layer() + 1); - layer_value_label.set_text (buf); -} - void AudioRegionEditor::name_changed () { @@ -563,54 +293,26 @@ AudioRegionEditor::name_changed () } void -AudioRegionEditor::lock_changed () -{ - bool yn; - - if ((yn = _region->locked()) != lock_button.get_active()) { - lock_button.set_active (yn); - } - - start_clock.set_sensitive (!yn); - end_clock.set_sensitive (!yn); - length_clock.set_sensitive (!yn); -} - -void -AudioRegionEditor::envelope_active_changed () -{ - bool yn; - - if ((yn = _region->envelope_active()) != envelope_active_button.get_active()) { - envelope_active_button.set_active (yn); - } -} - -void -AudioRegionEditor::opacity_changed () +AudioRegionEditor::bounds_changed (Change what_changed) { - bool yn; - if ((yn = _region->opaque()) != opaque_button.get_active()) { - opaque_button.set_active (yn); + if ((what_changed & Change (PositionChanged|LengthChanged)) == Change (PositionChanged|LengthChanged)) { + position_clock.set (_region->position(), true); + end_clock.set (_region->position() + _region->length(), true); + length_clock.set (_region->length(), true); + } else if (what_changed & Change (PositionChanged)) { + position_clock.set (_region->position(), true); + end_clock.set (_region->position() + _region->length(), true); + } else if (what_changed & Change (LengthChanged)) { + end_clock.set (_region->position() + _region->length(), true); + length_clock.set (_region->length(), true); } -} -void -AudioRegionEditor::mute_changed () -{ - bool yn; - if ((yn = _region->muted()) != mute_button.get_active()) { - mute_button.set_active (yn); + if (what_changed & Region::SyncOffsetChanged) { + sync_offset_clock.set (_region->sync_position(), true); } -} -void -AudioRegionEditor::bounds_changed (Change what_changed) -{ - if (what_changed & Change ((PositionChanged|LengthChanged))) { - start_clock.set (_region->position(), true); - end_clock.set (_region->position() + _region->length(), true); - length_clock.set (_region->length(), true); + if (what_changed & StartChanged) { + start_clock.set (_region->start(), true); } } @@ -628,97 +330,6 @@ AudioRegionEditor::name_entry_changed () } } -void -AudioRegionEditor::fade_in_changed () -{ - float msecs = fade_in_length_adjustment.get_value(); - nframes_t sr = _session.frame_rate(); - nframes_t adj_frames = (nframes_t) floor (msecs * (sr/1000.0f)); - nframes_t frames; - bool x; - - if (adj_frames != (frames = (nframes_t) _region->fade_in().back()->when)) { - fade_in_length_adjustment.set_value ((frames * 1000.0f) / sr); - } - - if ((x = _region->fade_in_active()) != fade_in_active_button.get_active()) { - fade_in_active_button.set_active (x); - } -} - -void -AudioRegionEditor::fade_out_changed () -{ - float msecs = fade_out_length_adjustment.get_value(); - nframes_t sr = _session.frame_rate(); - nframes_t adj_frames = (nframes_t) floor (msecs * (sr/1000.0f)); - nframes_t frames; - bool x; - if (adj_frames != (frames = (nframes_t) _region->fade_out().back()->when)) { - fade_out_length_adjustment.set_value ((frames * 1000.0f) / sr); - } - - if ((x = _region->fade_out_active()) != fade_out_active_button.get_active()) { - fade_out_active_button.set_active (x); - } -} - -void -AudioRegionEditor::fade_in_length_adjustment_changed () -{ - nframes_t fade_length = (nframes_t) floor (fade_in_length_adjustment.get_value() * _session.frame_rate() * 0.001); - fade_length = max (fade_length, (nframes_t) 64); - fade_length = min (fade_length, _region->length()); - - _region->set_fade_in_length (fade_length); - /* region is frozen, no worries */ - fade_in_changed(); -} - -void -AudioRegionEditor::fade_out_length_adjustment_changed () -{ - nframes_t fade_length = (nframes_t) floor (fade_out_length_adjustment.get_value() * _session.frame_rate() * 0.001); - fade_length = max (fade_length, (nframes_t) 64); - fade_length = min (fade_length, _region->length()); - - _region->set_fade_out_length (fade_length); - /* region is frozen, no worries */ - fade_out_changed(); -} - -void -AudioRegionEditor::fade_in_active_toggled () -{ - _region->set_fade_in_active (fade_in_active_button.get_active()); -} - -void -AudioRegionEditor::fade_out_active_toggled () -{ - _region->set_fade_out_active (fade_out_active_button.get_active()); -} - -void -AudioRegionEditor::fade_out_active_changed () -{ - bool x; - - if ((x = _region->fade_out_active()) != fade_out_active_button.get_active()) { - fade_out_active_button.set_active (x); - } -} - -void -AudioRegionEditor::fade_in_active_changed () -{ - bool x; - - if ((x = _region->fade_in_active()) != fade_in_active_button.get_active()) { - fade_in_active_button.set_active (x); - } -} - void AudioRegionEditor::audition_state_changed (bool yn) {