r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600

 Trunk merge conflicts resolved


git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 154 deletions

diff --git a/gtk2_ardour/region_editor.h b/gtk2_ardour/region_editor.h
index 65b0bbaa94..70590b0db5 100644
--- a/gtk2_ardour/region_editor.h
+++ b/gtk2_ardour/region_editor.h
@@ -15,172 +15,29 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
+    $Id: /local/undo/gtk2_ardour/region_editor.h 5 2006-05-31T02:48:48.738745Z paul  $
 */
 
 #ifndef __gtk_ardour_region_edit_h__
 #define __gtk_ardour_region_edit_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/alignment.h>
-#include <gtkmm/adjustment.h>
-#include <gtkmm/separator.h>
-#include <gtkmm/spinbutton.h>
-
-#include <libgnomecanvas/libgnomecanvas.h>
-#include <sigc++/signal.h>
-
-#include "audio_clock.h"
 #include "ardour_dialog.h"
 
-namespace ARDOUR {
-	class AudioRegion;
-	class Session;
-}
-
-class AudioRegionView;
+namespace ARDOUR { class Session; }
 
-class AudioRegionEditor : public ArdourDialog
+/** Just a useless stub for now... */
+class RegionEditor : public ArdourDialog
 {
   public:
-	AudioRegionEditor (ARDOUR::Session&, ARDOUR::AudioRegion&, AudioRegionView& rv);
-	~AudioRegionEditor ();
-
-  private:
-	ARDOUR::Session& _session;
-	ARDOUR::AudioRegion& _region;
-	AudioRegionView& _region_view;
-
-	void connect_editor_events ();
-
-	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 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 end_label;
-	Gtk::Label length_label;
-	Gtk::Alignment start_alignment;
-	Gtk::Alignment end_alignment;
-	Gtk::Alignment length_alignment;
-
-	AudioClock start_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;
-
-	Gtk::HSeparator sep3;
-	Gtk::VSeparator sep1;
-	Gtk::VSeparator sep2;
-
-	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 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 ();
+	RegionEditor(ARDOUR::Session& s)
+	: ArdourDialog ("region editor")
+	, _session(s)
+	{}
 
-	gint bpressed (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)());
-	gint breleased (GdkEventButton* ev, Gtk::SpinButton* but, void (AudioRegionEditor::*pmf)());
+	virtual ~RegionEditor () {}
 
-	bool spin_arrow_grab;
+  protected:
+	ARDOUR::Session&     _session;
 };
 
 #endif /* __gtk_ardour_region_edit_h__ */