X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_editor.cc;h=adbb1e04ea65038837232d65e9333a092466f5c0;hb=c2c224727eee4c16bd64ca4a5b5bb2d276f5afe3;hp=ff84a44488d1e1a11fae065e1c00968e30c6da1a;hpb=c69ef10067cbdde5fc87ff676097aa4ffe406f2c;p=ardour.git diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index ff84a44488..adbb1e04ea 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 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 @@ -17,14 +17,16 @@ */ -#include +#include "pbd/memento_command.h" +#include "pbd/stateful_diff_command.h" -#include -#include -#include +#include "ardour/session.h" +#include "ardour/audioregion.h" +#include "ardour/playlist.h" +#include "ardour/utils.h" +#include "ardour/dB.h" #include #include -#include #include #include "audio_region_editor.h" @@ -37,26 +39,32 @@ 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) +AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr r, AudioRegionView& rv) : RegionEditor (s), _region (r), _region_view (rv), - name_label (_("NAME:")), - audition_button (_("play")), - time_table (3, 2), - start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), true), - end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true), - length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, true), - sync_offset_clock (X_("regionsyncoffset"), true, X_("AudioRegionEditorClock"), true, true) + name_label (_("Name:")), + audition_button (_("Play")), + time_table (6, 2), + position_clock (X_("regionposition"), true, X_("AudioRegionEditorClock"), true, false), + end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true, false), + length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, false, true), + sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("AudioRegionEditorClock"), true, false), + sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("AudioRegionEditorClock"), true, false), + /* XXX cannot file start yet */ + start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false, false), + gain_adjustment(accurate_coefficient_to_dB(_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0) { - start_clock.set_session (&_session); - end_clock.set_session (&_session); - length_clock.set_session (&_session); + position_clock.set_session (_session); + end_clock.set_session (_session); + length_clock.set_session (_session); + sync_offset_relative_clock.set_session (_session); + sync_offset_absolute_clock.set_session (_session); + start_clock.set_session (_session); name_entry.set_name ("AudioRegionEditorEntry"); name_label.set_name ("AudioRegionEditorLabel"); @@ -65,48 +73,68 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr name_hbox.pack_start (name_label, false, false); name_hbox.pack_start (name_entry, false, false); - ARDOUR_UI::instance()->tooltips().set_tip (audition_button, _("audition this region")); + ARDOUR_UI::instance()->set_tip (audition_button, _("audition this region")); audition_button.unset_flags (Gtk::CAN_FOCUS); - + 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_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:")); + end_label.set_text (_("End")); length_label.set_name ("AudioRegionEditorLabel"); - length_label.set_text (_("LENGTH:")); - + length_label.set_text (_("Length")); + sync_relative_label.set_name ("AudioRegionEditorLabel"); + sync_relative_label.set_text (_("Sync point (relative to region position)")); + sync_absolute_label.set_name ("AudioRegionEditorLabel"); + sync_absolute_label.set_text (_("Sync point (absolute)")); + 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); - end_alignment.set (1.0, 0.5); - length_alignment.set (1.0, 0.5); - - start_alignment.add (start_label); - end_alignment.add (end_label); - length_alignment.add (length_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); + position_label.set_alignment (1, 0.5); + time_table.attach (position_label, 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); + end_label.set_alignment (1, 0.5); + time_table.attach (end_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL); time_table.attach (end_clock, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL); - - time_table.attach (length_alignment, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL); + + length_label.set_alignment (1, 0.5); + time_table.attach (length_label, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL); time_table.attach (length_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL); - + + sync_relative_label.set_alignment (1, 0.5); + time_table.attach (sync_relative_label, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL); + time_table.attach (sync_offset_relative_clock, 1, 2, 3, 4, Gtk::FILL, Gtk::FILL); + + sync_absolute_label.set_alignment (1, 0.5); + time_table.attach (sync_absolute_label, 0, 1, 4, 5, Gtk::FILL, Gtk::FILL); + time_table.attach (sync_offset_absolute_clock, 1, 2, 4, 5, Gtk::FILL, Gtk::FILL); + + start_label.set_alignment (1, 0.5); + time_table.attach (start_label, 0, 1, 5, 6, Gtk::FILL, Gtk::FILL); + time_table.attach (start_clock, 1, 2, 5, 6, Gtk::FILL, Gtk::FILL); + + gain_label.set_name ("AudioRegionEditorLabel"); + gain_label.set_text (_("Scale amplitude:")); + gain_label.set_alignment (1, 0.5); + gain_entry.configure (gain_adjustment, 0.0, 1); + time_table.attach (gain_label, 0, 1, 6, 7, Gtk::FILL, Gtk::FILL); + time_table.attach (gain_entry, 1, 2, 6, 7, Gtk::FILL, Gtk::FILL); + lower_hbox.pack_start (time_table, true, true); lower_hbox.pack_start (sep1, false, false); lower_hbox.pack_start (sep2, false, false); @@ -118,22 +146,29 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr set_name ("AudioRegionEditorWindow"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); - signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast (this))); + signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast (this))); - WindowTitle title(string_compose (_("Region %1"), _region->name())); - title += Glib::get_application_name(); - - set_title (title.get_string()); + set_title (string_compose (_("Region %1"), _region->name())); show_all(); name_changed (); - bounds_changed (Change (StartChanged|LengthChanged|PositionChanged)); - _region->StateChanged.connect (mem_fun(*this, &AudioRegionEditor::region_changed)); - + PropertyChange change; + + change.add (ARDOUR::Properties::start); + change.add (ARDOUR::Properties::length); + change.add (ARDOUR::Properties::position); + change.add (ARDOUR::Properties::sync_position); + + bounds_changed (change); + + gain_changed (); + + _region->PropertyChanged.connect (state_connection, ui_bind (&AudioRegionEditor::region_changed, this, _1), gui_context()); + spin_arrow_grab = false; - + connect_editor_events (); } @@ -142,18 +177,30 @@ AudioRegionEditor::~AudioRegionEditor () } void -AudioRegionEditor::region_changed (Change what_changed) +AudioRegionEditor::region_changed (const PBD::PropertyChange& what_changed) { - if (what_changed & NameChanged) { + if (what_changed.contains (ARDOUR::Properties::name)) { name_changed (); } - if (what_changed & BoundsChanged) { + + PropertyChange interesting_stuff; + + interesting_stuff.add (ARDOUR::Properties::position); + interesting_stuff.add (ARDOUR::Properties::length); + interesting_stuff.add (ARDOUR::Properties::start); + interesting_stuff.add (ARDOUR::Properties::sync_position); + + if (what_changed.contains (interesting_stuff)) { bounds_changed (what_changed); } + + if (what_changed.contains (ARDOUR::Properties::scale_amplitude)) { + gain_changed (); + } } -gint -AudioRegionEditor::bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)()) +gint +AudioRegionEditor::bpressed (GdkEventButton* ev, Gtk::SpinButton* /*but*/, void (AudioRegionEditor::*/*pmf*/)()) { switch (ev->button) { case 1: @@ -165,9 +212,9 @@ AudioRegionEditor::bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (Aud // if ((ev->window == but->gobj()->panel)) { // spin_arrow_grab = true; // (this->*pmf)(); - // } - } - } + // } + } + } break; default: break; @@ -175,8 +222,8 @@ AudioRegionEditor::bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (Aud return FALSE; } -gint -AudioRegionEditor::breleased (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)()) +gint +AudioRegionEditor::breleased (GdkEventButton* /*ev*/, Gtk::SpinButton* /*but*/, void (AudioRegionEditor::*pmf)()) { if (spin_arrow_grab) { (this->*pmf)(); @@ -188,80 +235,99 @@ AudioRegionEditor::breleased (GdkEventButton* ev, Gtk::SpinButton* but, void (Au void AudioRegionEditor::connect_editor_events () { - name_entry.signal_changed().connect (mem_fun(*this, &AudioRegionEditor::name_entry_changed)); + name_entry.signal_changed().connect (sigc::mem_fun(*this, &AudioRegionEditor::name_entry_changed)); + + position_clock.ValueChanged.connect (sigc::mem_fun(*this, &AudioRegionEditor::position_clock_changed)); + end_clock.ValueChanged.connect (sigc::mem_fun(*this, &AudioRegionEditor::end_clock_changed)); + length_clock.ValueChanged.connect (sigc::mem_fun(*this, &AudioRegionEditor::length_clock_changed)); + sync_offset_absolute_clock.ValueChanged.connect (sigc::mem_fun (*this, &AudioRegionEditor::sync_offset_absolute_clock_changed)); + sync_offset_relative_clock.ValueChanged.connect (sigc::mem_fun (*this, &AudioRegionEditor::sync_offset_relative_clock_changed)); + gain_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &AudioRegionEditor::gain_adjustment_changed)); - start_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::start_clock_changed)); - end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed)); - length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed)); + audition_button.signal_toggled().connect (sigc::mem_fun(*this, &AudioRegionEditor::audition_button_toggled)); - audition_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled)); - _session.AuditionActive.connect (mem_fun(*this, &AudioRegionEditor::audition_state_changed)); + _session->AuditionActive.connect (audition_connection, ui_bind (&AudioRegionEditor::audition_state_changed, this, _1), gui_context()); } void -AudioRegionEditor::start_clock_changed () +AudioRegionEditor::position_clock_changed () { - _session.begin_reversible_command (_("change region start position")); + _session->begin_reversible_command (_("change region start position")); boost::shared_ptr pl = _region->playlist(); if (pl) { - XMLNode &before = pl->get_state(); - _region->set_position (start_clock.current_time(), this); - XMLNode &after = pl->get_state(); - _session.add_command(new MementoCommand(*pl, &before, &after)); + _region->clear_history (); + _region->set_position (position_clock.current_time(), this); + _session->add_command(new StatefulDiffCommand (_region)); } - _session.commit_reversible_command (); + _session->commit_reversible_command (); } void AudioRegionEditor::end_clock_changed () { - _session.begin_reversible_command (_("change region end position")); + _session->begin_reversible_command (_("change region end position")); boost::shared_ptr pl = _region->playlist(); - + if (pl) { - XMLNode &before = pl->get_state(); + _region->clear_history (); _region->trim_end (end_clock.current_time(), this); - XMLNode &after = pl->get_state(); - _session.add_command(new MementoCommand(*pl, &before, &after)); + _session->add_command(new StatefulDiffCommand (_region)); } - _session.commit_reversible_command (); + _session->commit_reversible_command (); - end_clock.set (_region->position() + _region->length(), true); + end_clock.set (_region->position() + _region->length() - 1, true); } void AudioRegionEditor::length_clock_changed () { nframes_t frames = length_clock.current_time(); - - _session.begin_reversible_command (_("change region length")); - + + _session->begin_reversible_command (_("change region length")); + boost::shared_ptr pl = _region->playlist(); 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)); + _region->clear_history (); + _region->trim_end (_region->position() + frames - 1, this); + _session->add_command(new StatefulDiffCommand (_region)); } - _session.commit_reversible_command (); + _session->commit_reversible_command (); length_clock.set (_region->length()); } +void +AudioRegionEditor::gain_changed () +{ + float const region_gain_dB = accurate_coefficient_to_dB (_region->scale_amplitude()); + if (region_gain_dB != gain_adjustment.get_value()) { + gain_adjustment.set_value(region_gain_dB); + } +} + +void +AudioRegionEditor::gain_adjustment_changed () +{ + float const gain = dB_to_coefficient (gain_adjustment.get_value()); + if (_region->scale_amplitude() != gain) { + _region->set_scale_amplitude (gain); + } +} + void AudioRegionEditor::audition_button_toggled () { if (audition_button.get_active()) { - _session.audition_region (_region); + _session->audition_region (_region); } else { - _session.cancel_audition (); + _session->cancel_audition (); } } @@ -274,20 +340,44 @@ AudioRegionEditor::name_changed () } void -AudioRegionEditor::bounds_changed (Change what_changed) +AudioRegionEditor::bounds_changed (const PropertyChange& what_changed) { - if (what_changed & Change ((PositionChanged|LengthChanged))) { - start_clock.set (_region->position(), true); - end_clock.set (_region->position() + _region->length(), true); + if (what_changed.contains (ARDOUR::Properties::position) && what_changed.contains (ARDOUR::Properties::length)) { + position_clock.set (_region->position(), true); + end_clock.set (_region->position() + _region->length() - 1, true); length_clock.set (_region->length(), true); + } else if (what_changed.contains (ARDOUR::Properties::position)) { + position_clock.set (_region->position(), true); + end_clock.set (_region->position() + _region->length() - 1, true); + } else if (what_changed.contains (ARDOUR::Properties::length)) { + end_clock.set (_region->position() + _region->length() - 1, true); + length_clock.set (_region->length(), true); + } + + if (what_changed.contains (ARDOUR::Properties::sync_position) || what_changed.contains (ARDOUR::Properties::position)) { + int dir; + nframes_t off = _region->sync_offset (dir); + if (dir == -1) { + off = -off; + } + + if (what_changed.contains (ARDOUR::Properties::sync_position)) { + sync_offset_relative_clock.set (off, true); + } + + sync_offset_absolute_clock.set (off + _region->position (), true); + } + + if (what_changed.contains (ARDOUR::Properties::start)) { + start_clock.set (_region->start(), true); } } void AudioRegionEditor::activation () { - -} + +} void AudioRegionEditor::name_entry_changed () @@ -300,10 +390,48 @@ AudioRegionEditor::name_entry_changed () void AudioRegionEditor::audition_state_changed (bool yn) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionEditor::audition_state_changed), yn)); + ENSURE_GUI_THREAD (*this, &AudioRegionEditor::audition_state_changed, yn) if (!yn) { audition_button.set_active (false); } } +void +AudioRegionEditor::sync_offset_absolute_clock_changed () +{ + _session->begin_reversible_command (_("change region sync point")); + + _region->clear_history (); + _region->set_sync_position (sync_offset_absolute_clock.current_time()); + _session->add_command (new StatefulDiffCommand (_region)); + + _session->commit_reversible_command (); +} + +void +AudioRegionEditor::sync_offset_relative_clock_changed () +{ + _session->begin_reversible_command (_("change region sync point")); + + _region->clear_history (); + _region->set_sync_position (sync_offset_relative_clock.current_time() + _region->position ()); + _session->add_command (new StatefulDiffCommand (_region)); + + _session->commit_reversible_command (); +} + +bool +AudioRegionEditor::on_delete_event (GdkEventAny* ev) +{ + PropertyChange change; + + change.add (ARDOUR::Properties::start); + change.add (ARDOUR::Properties::length); + change.add (ARDOUR::Properties::position); + change.add (ARDOUR::Properties::sync_position); + + bounds_changed (change); + + return RegionEditor::on_delete_event (ev); +}