Make region properties dialogue work for MIDI regions too.
git-svn-id: svn://localhost/ardour2/branches/3.0@7136 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
parent
b1c3a22498
commit
22a2c82045
|
|
@ -42,90 +42,14 @@ using namespace PBD;
|
|||
using namespace std;
|
||||
using namespace Gtkmm2ext;
|
||||
|
||||
AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion> r, AudioRegionView& rv)
|
||||
: RegionEditor (s),
|
||||
_region (r),
|
||||
_region_view (rv),
|
||||
name_label (_("Name:")),
|
||||
audition_button (_("Play")),
|
||||
_table (8, 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)
|
||||
AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion> r)
|
||||
: RegionEditor (s, r)
|
||||
, _audio_region (r)
|
||||
, gain_adjustment(accurate_coefficient_to_dB(_audio_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)
|
||||
|
||||
{
|
||||
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);
|
||||
|
||||
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));
|
||||
|
||||
name_entry.set_name ("AudioRegionEditorEntry");
|
||||
name_label.set_name ("AudioRegionEditorLabel");
|
||||
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_relative_label.set_name ("AudioRegionEditorLabel");
|
||||
sync_relative_label.set_text (_("Sync point (relative to region):"));
|
||||
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:"));
|
||||
|
||||
_table.set_col_spacings (12);
|
||||
_table.set_row_spacings (6);
|
||||
_table.set_border_width (12);
|
||||
|
||||
name_label.set_alignment (1, 0.5);
|
||||
position_label.set_alignment (1, 0.5);
|
||||
end_label.set_alignment (1, 0.5);
|
||||
length_label.set_alignment (1, 0.5);
|
||||
sync_relative_label.set_alignment (1, 0.5);
|
||||
sync_absolute_label.set_alignment (1, 0.5);
|
||||
start_label.set_alignment (1, 0.5);
|
||||
gain_label.set_alignment (1, 0.5);
|
||||
|
||||
Gtk::HBox* nb = Gtk::manage (new Gtk::HBox);
|
||||
nb->set_spacing (6);
|
||||
nb->pack_start (name_entry);
|
||||
nb->pack_start (audition_button);
|
||||
|
||||
_table.attach (name_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (*nb, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
_table.attach (position_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (position_clock, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
_table.attach (end_label, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (end_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
_table.attach (length_label, 0, 1, 3, 4, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (length_clock, 1, 2, 3, 4, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
_table.attach (sync_relative_label, 0, 1, 4, 5, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (sync_offset_relative_clock, 1, 2, 4, 5, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
_table.attach (sync_absolute_label, 0, 1, 5, 6, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (sync_offset_absolute_clock, 1, 2, 5, 6, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
_table.attach (start_label, 0, 1, 6, 7, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (start_clock, 1, 2, 6, 7, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
Gtk::HBox* gb = Gtk::manage (new Gtk::HBox);
|
||||
gb->set_spacing (6);
|
||||
gb->pack_start (gain_entry);
|
||||
|
|
@ -136,176 +60,25 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
|
|||
gain_entry.configure (gain_adjustment, 0.0, 1);
|
||||
_table.attach (gain_label, 0, 1, 7, 8, Gtk::FILL, Gtk::FILL);
|
||||
_table.attach (*gb, 1, 2, 7, 8, Gtk::FILL, Gtk::FILL);
|
||||
|
||||
get_vbox()->pack_start (_table, true, true);
|
||||
|
||||
add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
|
||||
|
||||
set_name ("AudioRegionEditorWindow");
|
||||
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
|
||||
|
||||
signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
|
||||
signal_response().connect (sigc::mem_fun (*this, &AudioRegionEditor::handle_response));
|
||||
|
||||
set_title (string_compose (_("Region '%1'"), _region->name()));
|
||||
|
||||
show_all();
|
||||
|
||||
name_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, invalidator (*this), ui_bind (&AudioRegionEditor::region_changed, this, _1), gui_context());
|
||||
|
||||
spin_arrow_grab = false;
|
||||
|
||||
connect_editor_events ();
|
||||
}
|
||||
|
||||
AudioRegionEditor::~AudioRegionEditor ()
|
||||
{
|
||||
gain_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &AudioRegionEditor::gain_adjustment_changed));
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::region_changed (const PBD::PropertyChange& what_changed)
|
||||
{
|
||||
if (what_changed.contains (ARDOUR::Properties::name)) {
|
||||
name_changed ();
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
RegionEditor::region_changed (what_changed);
|
||||
|
||||
if (what_changed.contains (ARDOUR::Properties::scale_amplitude)) {
|
||||
gain_changed ();
|
||||
}
|
||||
}
|
||||
|
||||
gint
|
||||
AudioRegionEditor::bpressed (GdkEventButton* ev, Gtk::SpinButton* /*but*/, void (AudioRegionEditor::*/*pmf*/)())
|
||||
{
|
||||
switch (ev->button) {
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
if (ev->type == GDK_BUTTON_PRESS) { /* no double clicks here */
|
||||
if (!spin_arrow_grab) {
|
||||
// GTK2FIX probably nuke the region editor
|
||||
// if ((ev->window == but->gobj()->panel)) {
|
||||
// spin_arrow_grab = true;
|
||||
// (this->*pmf)();
|
||||
// }
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gint
|
||||
AudioRegionEditor::breleased (GdkEventButton* /*ev*/, Gtk::SpinButton* /*but*/, void (AudioRegionEditor::*pmf)())
|
||||
{
|
||||
if (spin_arrow_grab) {
|
||||
(this->*pmf)();
|
||||
spin_arrow_grab = false;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::connect_editor_events ()
|
||||
{
|
||||
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));
|
||||
|
||||
audition_button.signal_toggled().connect (sigc::mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
|
||||
|
||||
_session->AuditionActive.connect (audition_connection, invalidator (*this), ui_bind (&AudioRegionEditor::audition_state_changed, this, _1), gui_context());
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::position_clock_changed ()
|
||||
{
|
||||
_session->begin_reversible_command (_("change region start position"));
|
||||
|
||||
boost::shared_ptr<Playlist> pl = _region->playlist();
|
||||
|
||||
if (pl) {
|
||||
_region->clear_history ();
|
||||
_region->set_position (position_clock.current_time(), this);
|
||||
_session->add_command(new StatefulDiffCommand (_region));
|
||||
}
|
||||
|
||||
_session->commit_reversible_command ();
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::end_clock_changed ()
|
||||
{
|
||||
_session->begin_reversible_command (_("change region end position"));
|
||||
|
||||
boost::shared_ptr<Playlist> pl = _region->playlist();
|
||||
|
||||
if (pl) {
|
||||
_region->clear_history ();
|
||||
_region->trim_end (end_clock.current_time(), this);
|
||||
_session->add_command(new StatefulDiffCommand (_region));
|
||||
}
|
||||
|
||||
_session->commit_reversible_command ();
|
||||
|
||||
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"));
|
||||
|
||||
boost::shared_ptr<Playlist> pl = _region->playlist();
|
||||
|
||||
if (pl) {
|
||||
_region->clear_history ();
|
||||
_region->trim_end (_region->position() + frames - 1, this);
|
||||
_session->add_command(new StatefulDiffCommand (_region));
|
||||
}
|
||||
|
||||
_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());
|
||||
float const region_gain_dB = accurate_coefficient_to_dB (_audio_region->scale_amplitude());
|
||||
if (region_gain_dB != gain_adjustment.get_value()) {
|
||||
gain_adjustment.set_value(region_gain_dB);
|
||||
}
|
||||
|
|
@ -315,128 +88,7 @@ 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);
|
||||
if (_audio_region->scale_amplitude() != gain) {
|
||||
_audio_region->set_scale_amplitude (gain);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::audition_button_toggled ()
|
||||
{
|
||||
if (audition_button.get_active()) {
|
||||
_session->audition_region (_region);
|
||||
} else {
|
||||
_session->cancel_audition ();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::name_changed ()
|
||||
{
|
||||
if (name_entry.get_text() != _region->name()) {
|
||||
name_entry.set_text (_region->name());
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::bounds_changed (const PropertyChange& what_changed)
|
||||
{
|
||||
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 ()
|
||||
{
|
||||
if (name_entry.get_text() != _region->name()) {
|
||||
_region->set_name (name_entry.get_text());
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::audition_state_changed (bool 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);
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionEditor::handle_response (int)
|
||||
{
|
||||
hide ();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,67 +52,20 @@ class AudioRegionView;
|
|||
class AudioRegionEditor : public RegionEditor
|
||||
{
|
||||
public:
|
||||
AudioRegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::AudioRegion>, AudioRegionView& rv);
|
||||
~AudioRegionEditor ();
|
||||
AudioRegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::AudioRegion>);
|
||||
|
||||
private:
|
||||
boost::shared_ptr<ARDOUR::AudioRegion> _region;
|
||||
AudioRegionView& _region_view;
|
||||
|
||||
void connect_editor_events ();
|
||||
void region_changed (PBD::PropertyChange const &);
|
||||
|
||||
void gain_changed ();
|
||||
void gain_adjustment_changed ();
|
||||
|
||||
boost::shared_ptr<ARDOUR::AudioRegion> _audio_region;
|
||||
|
||||
Gtk::Label name_label;
|
||||
Gtk::Entry name_entry;
|
||||
Gtk::ToggleButton audition_button;
|
||||
|
||||
Gtk::Table _table;
|
||||
|
||||
Gtk::Label position_label;
|
||||
Gtk::Label end_label;
|
||||
Gtk::Label length_label;
|
||||
Gtk::Label sync_relative_label;
|
||||
Gtk::Label sync_absolute_label;
|
||||
Gtk::Label start_label;
|
||||
Gtk::Label gain_label;
|
||||
|
||||
AudioClock position_clock;
|
||||
AudioClock end_clock;
|
||||
AudioClock length_clock;
|
||||
AudioClock sync_offset_relative_clock; ///< sync offset relative to the start of the region
|
||||
AudioClock sync_offset_absolute_clock; ///< sync offset relative to the start of the timeline
|
||||
AudioClock start_clock;
|
||||
Gtk::Adjustment gain_adjustment;
|
||||
Gtk::SpinButton gain_entry;
|
||||
|
||||
PBD::ScopedConnection state_connection;
|
||||
PBD::ScopedConnection audition_connection;
|
||||
|
||||
void region_changed (const PBD::PropertyChange&);
|
||||
void bounds_changed (const PBD::PropertyChange&);
|
||||
void name_changed ();
|
||||
void gain_changed ();
|
||||
|
||||
void audition_state_changed (bool);
|
||||
|
||||
void activation ();
|
||||
|
||||
void name_entry_changed ();
|
||||
void position_clock_changed ();
|
||||
void end_clock_changed ();
|
||||
void length_clock_changed ();
|
||||
void sync_offset_absolute_clock_changed ();
|
||||
void sync_offset_relative_clock_changed ();
|
||||
void gain_adjustment_changed ();
|
||||
|
||||
void audition_button_toggled ();
|
||||
|
||||
gint bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)());
|
||||
gint breleased (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)());
|
||||
|
||||
bool on_delete_event (GdkEventAny *);
|
||||
void handle_response (int);
|
||||
|
||||
bool spin_arrow_grab;
|
||||
};
|
||||
|
||||
#endif /* __gtk_ardour_audio_region_edit_h__ */
|
||||
|
|
|
|||
|
|
@ -775,20 +775,6 @@ AudioRegionView::set_colors ()
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionView::show_region_editor ()
|
||||
{
|
||||
if (editor == 0) {
|
||||
editor = new AudioRegionEditor (trackview.session(), audio_region(), *this);
|
||||
// GTK2FIX : how to ensure float without realizing
|
||||
// editor->realize ();
|
||||
// trackview.editor.ensure_float (*editor);
|
||||
}
|
||||
|
||||
editor->present ();
|
||||
editor->show_all();
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionView::set_waveform_visible (bool yn)
|
||||
{
|
||||
|
|
@ -1387,3 +1373,14 @@ AudioRegionView::update_coverage_frames (LayerDisplay d)
|
|||
fade_in_handle->raise_to_top ();
|
||||
fade_out_handle->raise_to_top ();
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionView::show_region_editor ()
|
||||
{
|
||||
if (editor == 0) {
|
||||
editor = new AudioRegionEditor (trackview.session(), audio_region());
|
||||
}
|
||||
|
||||
editor->present ();
|
||||
editor->show_all();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ namespace ARDOUR {
|
|||
|
||||
class AudioTimeAxisView;
|
||||
class AudioRegionGainLine;
|
||||
class AudioRegionEditor;
|
||||
class GhostRegion;
|
||||
class AutomationTimeAxisView;
|
||||
class RouteTimeAxisView;
|
||||
|
|
@ -91,8 +90,6 @@ class AudioRegionView : public RegionView
|
|||
bool waveform_visible() const { return _flags & WaveformVisible; }
|
||||
bool envelope_visible() const { return _flags & EnvelopeVisible; }
|
||||
|
||||
void show_region_editor ();
|
||||
|
||||
void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
|
||||
void remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
|
||||
|
||||
|
|
@ -109,6 +106,8 @@ class AudioRegionView : public RegionView
|
|||
void set_fade_visibility (bool);
|
||||
void update_coverage_frames (LayerDisplay);
|
||||
|
||||
void show_region_editor ();
|
||||
|
||||
virtual void entered ();
|
||||
virtual void exited ();
|
||||
|
||||
|
|
|
|||
|
|
@ -20,22 +20,92 @@
|
|||
#ifndef __gtk_ardour_region_edit_h__
|
||||
#define __gtk_ardour_region_edit_h__
|
||||
|
||||
#include "ardour/session_handle.h"
|
||||
#include <map>
|
||||
|
||||
#include <gtkmm/label.h>
|
||||
#include <gtkmm/entry.h>
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/togglebutton.h>
|
||||
#include <gtkmm/button.h>
|
||||
#include <gtkmm/arrow.h>
|
||||
#include <gtkmm/frame.h>
|
||||
#include <gtkmm/table.h>
|
||||
#include <gtkmm/adjustment.h>
|
||||
#include <gtkmm/separator.h>
|
||||
#include <gtkmm/spinbutton.h>
|
||||
|
||||
#include <libgnomecanvas/libgnomecanvas.h>
|
||||
|
||||
#include "pbd/signals.h"
|
||||
|
||||
#include "audio_clock.h"
|
||||
#include "ardour_dialog.h"
|
||||
#include "region_editor.h"
|
||||
|
||||
namespace ARDOUR { class Session; }
|
||||
namespace ARDOUR {
|
||||
class Region;
|
||||
class Session;
|
||||
}
|
||||
|
||||
/** Just a useless stub for now... */
|
||||
class RegionEditor : public ArdourDialog
|
||||
{
|
||||
public:
|
||||
RegionEditor(ARDOUR::Session* s)
|
||||
: ArdourDialog ("region editor") {
|
||||
set_session (s);
|
||||
}
|
||||
RegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Region>);
|
||||
|
||||
virtual ~RegionEditor () {}
|
||||
protected:
|
||||
virtual void region_changed (const PBD::PropertyChange&);
|
||||
|
||||
Gtk::Table _table;
|
||||
|
||||
private:
|
||||
boost::shared_ptr<ARDOUR::Region> _region;
|
||||
|
||||
void connect_editor_events ();
|
||||
|
||||
Gtk::Label name_label;
|
||||
Gtk::Entry name_entry;
|
||||
Gtk::ToggleButton audition_button;
|
||||
|
||||
Gtk::Label position_label;
|
||||
Gtk::Label end_label;
|
||||
Gtk::Label length_label;
|
||||
Gtk::Label sync_relative_label;
|
||||
Gtk::Label sync_absolute_label;
|
||||
Gtk::Label start_label;
|
||||
|
||||
AudioClock position_clock;
|
||||
AudioClock end_clock;
|
||||
AudioClock length_clock;
|
||||
AudioClock sync_offset_relative_clock; ///< sync offset relative to the start of the region
|
||||
AudioClock sync_offset_absolute_clock; ///< sync offset relative to the start of the timeline
|
||||
AudioClock start_clock;
|
||||
|
||||
PBD::ScopedConnection state_connection;
|
||||
PBD::ScopedConnection audition_connection;
|
||||
|
||||
void bounds_changed (const PBD::PropertyChange&);
|
||||
void name_changed ();
|
||||
|
||||
void audition_state_changed (bool);
|
||||
|
||||
void activation ();
|
||||
|
||||
void name_entry_changed ();
|
||||
void position_clock_changed ();
|
||||
void end_clock_changed ();
|
||||
void length_clock_changed ();
|
||||
void sync_offset_absolute_clock_changed ();
|
||||
void sync_offset_relative_clock_changed ();
|
||||
|
||||
void audition_button_toggled ();
|
||||
|
||||
gint bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (RegionEditor::*pmf)());
|
||||
gint breleased (GdkEventButton* ev, Gtk::SpinButton* but, void (RegionEditor::*pmf)());
|
||||
|
||||
bool on_delete_event (GdkEventAny *);
|
||||
void handle_response (int);
|
||||
|
||||
bool spin_arrow_grab;
|
||||
};
|
||||
|
||||
#endif /* __gtk_ardour_region_edit_h__ */
|
||||
|
|
|
|||
|
|
@ -402,6 +402,17 @@ RegionView::fake_set_opaque (bool yn)
|
|||
set_frame_color ();
|
||||
}
|
||||
|
||||
void
|
||||
RegionView::show_region_editor ()
|
||||
{
|
||||
if (editor == 0) {
|
||||
editor = new RegionEditor (trackview.session(), region());
|
||||
}
|
||||
|
||||
editor->present ();
|
||||
editor->show_all();
|
||||
}
|
||||
|
||||
void
|
||||
RegionView::hide_region_editor()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@ class RegionView : public TimeAxisViewItem
|
|||
bool set_position(nframes64_t pos, void* src, double* delta = 0);
|
||||
void fake_set_opaque (bool yn);
|
||||
|
||||
virtual void show_region_editor () {}
|
||||
virtual void hide_region_editor();
|
||||
virtual void show_region_editor ();
|
||||
void hide_region_editor ();
|
||||
|
||||
virtual void region_changed (const PBD::PropertyChange&);
|
||||
|
||||
|
|
|
|||
|
|
@ -164,6 +164,7 @@ gtk2_ardour_sources = [
|
|||
'public_editor.cc',
|
||||
'quantize_dialog.cc',
|
||||
'rc_option_editor.cc',
|
||||
'region_editor.cc',
|
||||
'region_gain_line.cc',
|
||||
'region_selection.cc',
|
||||
'region_view.cc',
|
||||
|
|
|
|||
Loading…
Reference in New Issue