Chris's work on the region list

[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 38cd920e5e7833ceb49f450fc6d5284870b38679..57a9ba40c608f013395d683bf29a0b3506f31b80 100644 (file)
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_audio_region_edit_h__
@@ -53,11 +52,11 @@ class AudioRegionView;
 class AudioRegionEditor : public RegionEditor
 {
   public:
-       AudioRegionEditor (ARDOUR::Session&, ARDOUR::AudioRegion&, AudioRegionView& rv);
+       AudioRegionEditor (ARDOUR::Session&, boost::shared_ptr<ARDOUR::AudioRegion>, AudioRegionView& rv);
        ~AudioRegionEditor ();
 
   private:
-       ARDOUR::AudioRegion& _region;
+       boost::shared_ptr<ARDOUR::AudioRegion> _region;
        AudioRegionView& _region_view;
 
        void connect_editor_events ();
@@ -69,63 +68,28 @@ class AudioRegionEditor : public RegionEditor
        Gtk::HBox  top_row_hbox;
        Gtk::HBox  top_row_button_hbox;
 
-       Gtk::ToggleButton lock_button;
-       Gtk::ToggleButton mute_button;
-       Gtk::ToggleButton opaque_button;
-       Gtk::ToggleButton envelope_active_button;
-       Gtk::ToggleButton envelope_view_button;
-
-       Gtk::Button       raise_button;
-       Gtk::Arrow        raise_arrow;
-       Gtk::Button       lower_button;
-       Gtk::Arrow        lower_arrow;
-       Gtk::Frame        layer_frame;
-       Gtk::Label        layer_value_label;
-       Gtk::Label        layer_label;
-       Gtk::HBox         layer_hbox;
-
        Gtk::ToggleButton  audition_button;
 
        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::Label sync_label;
+       Gtk::Label start_label;
+       Gtk::Alignment position_alignment;
        Gtk::Alignment end_alignment;
        Gtk::Alignment length_alignment;
+       Gtk::Alignment sync_alignment;
+       Gtk::Alignment start_alignment;
 
-       AudioClock start_clock;
+       AudioClock position_clock;
        AudioClock end_clock;
        AudioClock length_clock;
        AudioClock sync_offset_clock;
-
-       Gtk::Table  envelope_loop_table;
-       Gtk::Button loop_button;
-       Gtk::Label  loop_label;
-       Gtk::Label  envelope_label;
-
-       Gtk::Table fade_in_table;
-       Gtk::Label fade_in_label;
-       Gtk::Alignment fade_in_label_align;
-       Gtk::Label fade_in_active_button_label;
-       Gtk::ToggleButton fade_in_active_button;
-       Gtk::Label fade_in_length_label;
-
-       Gtk::Adjustment fade_in_length_adjustment;
-       Gtk::SpinButton fade_in_length_spinner;
-
-       Gtk::Table fade_out_table;
-       Gtk::Label fade_out_label;
-       Gtk::Alignment fade_out_label_align;
-       Gtk::Label fade_out_active_button_label;
-       Gtk::ToggleButton fade_out_active_button;
-       Gtk::Label fade_out_length_label;
-
-       Gtk::Adjustment fade_out_length_adjustment;
-       Gtk::SpinButton fade_out_length_spinner;
+       AudioClock start_clock;
 
        Gtk::HSeparator sep3;
        Gtk::VSeparator sep1;
@@ -134,48 +98,17 @@ class AudioRegionEditor : public RegionEditor
        void region_changed (ARDOUR::Change);
        void bounds_changed (ARDOUR::Change);
        void name_changed ();
-       void opacity_changed ();
-       void mute_changed ();
-       void envelope_active_changed ();
-       void lock_changed ();
-       void layer_changed ();
-
-       void fade_in_length_adjustment_changed ();
-       void fade_out_length_adjustment_changed ();
-       void fade_in_changed ();
-       void fade_out_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 ();
 
-       gint envelope_active_button_press (GdkEventButton *);
-       gint envelope_active_button_release (GdkEventButton *);
-
        void audition_button_toggled ();
-       void envelope_view_button_toggled ();
-       void lock_button_clicked ();
-       void mute_button_clicked ();
-       void opaque_button_clicked ();
-       void raise_button_clicked ();
-       void lower_button_clicked ();
-
-       void fade_in_active_toggled ();
-       void fade_out_active_toggled ();
-       void fade_in_active_changed ();
-       void fade_out_active_changed ();
-
-       void fade_in_realized ();
-       void fade_out_realized ();
-
-       void start_editing_fade_in ();
-       void start_editing_fade_out ();
-       void stop_editing_fade_in ();
-       void stop_editing_fade_out ();
 
        gint bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)());
        gint breleased (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)());