From 4ae64c91058a25423a9e1f533edfcda559736b1b Mon Sep 17 00:00:00 2001 From: Karsten Wiese Date: Tue, 3 Jan 2006 14:16:27 +0000 Subject: make AudioRegionEditor work git-svn-id: svn://localhost/trunk/ardour2@231 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/region_editor.cc | 33 +++++++++++++++++++++------------ gtk2_ardour/region_editor.h | 5 +---- 2 files changed, 22 insertions(+), 16 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc index 3e889d01fc..73aa3465d9 100644 --- a/gtk2_ardour/region_editor.cc +++ b/gtk2_ardour/region_editor.cc @@ -28,6 +28,7 @@ #include "regionview.h" #include "ardour_ui.h" #include "utils.h" +#include "gui_thread.h" #include "i18n.h" @@ -44,10 +45,12 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView lock_button (_("lock")), mute_button (_("mute")), opaque_button (_("opaque")), + envelope_active_button(_("active")), + envelope_view_button(_("visible")), raise_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT), lower_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT), layer_label (_("Layer")), - audition_label (_("play")), + audition_button (_("play")), time_table (3, 2), start_clock ("AudioRegionEditorClock", true), end_clock ("AudioRegionEditorClock", true), @@ -91,8 +94,6 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView layer_hbox.pack_start (lower_button, false, false); #endif - audition_button.add (audition_label); - mute_button.set_name ("AudioRegionEditorToggleButton"); opaque_button.set_name ("AudioRegionEditorToggleButton"); lock_button.set_name ("AudioRegionEditorToggleButton"); @@ -171,11 +172,6 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView envelope_label.set_name ("AudioRegionEditorLabel"); - envelope_active_button_label.set_text (_("active")); - envelope_active_button.add (envelope_active_button_label); - envelope_view_button_label.set_text (_("visible")); - envelope_view_button.add (envelope_view_button_label); - envelope_loop_table.set_border_width (5); envelope_loop_table.set_row_spacings (2); envelope_loop_table.attach (envelope_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL); @@ -256,11 +252,10 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView lower_hbox.pack_start (fade_in_table, true, true); lower_hbox.pack_start (fade_out_table, true, true); - upper_vbox.pack_start (top_row_hbox, true, true); - upper_vbox.pack_start (sep3, false, false); - upper_vbox.pack_start (lower_hbox, true, true); + get_vbox()->pack_start (top_row_hbox, true, true); + get_vbox()->pack_start (sep3, false, false); + get_vbox()->pack_start (lower_hbox, true, true); - add (upper_vbox); set_name ("AudioRegionEditorWindow"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); @@ -270,6 +265,8 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView title += _region.name(); set_title (title); + show_all(); + name_changed (); bounds_changed (Change (StartChanged|LengthChanged|PositionChanged)); envelope_active_changed (); @@ -450,6 +447,7 @@ AudioRegionEditor::connect_editor_events () opaque_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::opaque_button_clicked)); raise_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::raise_button_clicked)); lower_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lower_button_clicked)); + _session.AuditionActive.connect (mem_fun(*this, &AudioRegionEditor::audition_state_changed)); } void @@ -720,3 +718,14 @@ AudioRegionEditor::fade_in_active_changed () fade_in_active_button.set_active (x); } } + +void +AudioRegionEditor::audition_state_changed (bool yn) +{ + ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionEditor::audition_state_changed), yn)); + + if (!yn) { + audition_button.set_active (false); + } +} + diff --git a/gtk2_ardour/region_editor.h b/gtk2_ardour/region_editor.h index 08ab05f334..65b0bbaa94 100644 --- a/gtk2_ardour/region_editor.h +++ b/gtk2_ardour/region_editor.h @@ -74,8 +74,6 @@ class AudioRegionEditor : public ArdourDialog Gtk::ToggleButton opaque_button; Gtk::ToggleButton envelope_active_button; Gtk::ToggleButton envelope_view_button; - Gtk::Label envelope_active_button_label; - Gtk::Label envelope_view_button_label; Gtk::Button raise_button; Gtk::Arrow raise_arrow; @@ -87,9 +85,7 @@ class AudioRegionEditor : public ArdourDialog Gtk::HBox layer_hbox; Gtk::ToggleButton audition_button; - Gtk::Label audition_label; - Gtk::VBox upper_vbox; Gtk::HBox lower_hbox; Gtk::Table time_table; @@ -148,6 +144,7 @@ class AudioRegionEditor : public ArdourDialog void fade_out_length_adjustment_changed (); void fade_in_changed (); void fade_out_changed (); + void audition_state_changed (bool); void activation (); -- cgit v1.2.3