fix from 2.X for automation line clear command using the wrong object in the memento...

[ardour.git] / gtk2_ardour / audio_region_editor.h

diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h
index 024f390d409f3702d60030ddb5b9101dea11e833..e3bb3b9a6b1d55349bee6460f6a31dc9b8841044 100644 (file)
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -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
@@ -30,13 +30,13 @@
 #include <gtkmm/arrow.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/table.h>
-#include <gtkmm/alignment.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/separator.h>
 #include <gtkmm/spinbutton.h>
 
 #include <libgnomecanvas/libgnomecanvas.h>
-#include <sigc++/signal.h>
+
+#include "pbd/signals.h"
 
 #include "audio_clock.h"
 #include "ardour_dialog.h"
@@ -52,7 +52,7 @@ class AudioRegionView;
 class AudioRegionEditor : public RegionEditor
 {
   public:
-       AudioRegionEditor (ARDOUR::Session&, boost::shared_ptr<ARDOUR::AudioRegion>, AudioRegionView& rv);
+       AudioRegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::AudioRegion>, AudioRegionView& rv);
        ~AudioRegionEditor ();
 
   private:
@@ -63,51 +63,55 @@ class AudioRegionEditor : public RegionEditor
 
        Gtk::Label name_label;
        Gtk::Entry name_entry;
-       Gtk::HBox  name_hbox;
-
-       Gtk::HBox  top_row_hbox;
-       Gtk::HBox  top_row_button_hbox;
+       Gtk::ToggleButton audition_button;
 
-       Gtk::ToggleButton  audition_button;
+       Gtk::Table _table;
 
-       Gtk::HBox  lower_hbox;
-       
-       Gtk::Table time_table;
-
-       Gtk::Label start_label;
+       Gtk::Label position_label;
        Gtk::Label end_label;
        Gtk::Label length_label;
-       Gtk::Alignment start_alignment;
-       Gtk::Alignment end_alignment;
-       Gtk::Alignment length_alignment;
+       Gtk::Label sync_relative_label;
+       Gtk::Label sync_absolute_label;
+       Gtk::Label start_label;
+       Gtk::Label gain_label;
 
-       AudioClock start_clock;
+       AudioClock position_clock;
        AudioClock end_clock;
        AudioClock length_clock;
-       AudioClock sync_offset_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;
 
-       Gtk::HSeparator sep3;
-       Gtk::VSeparator sep1;
-       Gtk::VSeparator sep2;
+       PBD::ScopedConnection state_connection;
+       PBD::ScopedConnection audition_connection;
 
-       void region_changed (ARDOUR::Change);
-       void bounds_changed (ARDOUR::Change);
+       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 start_clock_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;
 };