diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/icons/record_normal_red.png | bin | 0 -> 489 bytes | |||
| -rw-r--r-- | gtk2_ardour/icons/record_tape_red.png | bin | 0 -> 613 bytes | |||
| -rw-r--r-- | gtk2_ardour/region_gain_line.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 26 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 1 |
5 files changed, 28 insertions, 3 deletions
diff --git a/gtk2_ardour/icons/record_normal_red.png b/gtk2_ardour/icons/record_normal_red.png Binary files differnew file mode 100644 index 0000000000..c4bbaff0b0 --- /dev/null +++ b/gtk2_ardour/icons/record_normal_red.png diff --git a/gtk2_ardour/icons/record_tape_red.png b/gtk2_ardour/icons/record_tape_red.png Binary files differnew file mode 100644 index 0000000000..f9e231381a --- /dev/null +++ b/gtk2_ardour/icons/record_tape_red.png diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc index 6354763c09..efc50f91f8 100644 --- a/gtk2_ardour/region_gain_line.cc +++ b/gtk2_ardour/region_gain_line.cc @@ -62,7 +62,7 @@ AudioRegionGainLine::remove_point (ControlPoint& cp) model_representation (cp, mr); trackview.editor.current_session()->begin_reversible_command (_("remove control point")); - XMLNode &before = get_state(); + XMLNode &before = alist.get_state(); if (!rv.audio_region()->envelope_active()) { XMLNode ®ion_before = rv.audio_region()->get_state(); @@ -73,7 +73,7 @@ AudioRegionGainLine::remove_point (ControlPoint& cp) alist.erase (mr.start, mr.end); - trackview.editor.current_session()->add_command (new MementoCommand<AudioRegionGainLine>(*this, &before, &get_state())); + trackview.editor.current_session()->add_command (new MementoCommand<AutomationList>(alist, &before, &alist.get_state())); trackview.editor.current_session()->commit_reversible_command (); trackview.editor.current_session()->set_dirty (); } diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 7ae1f860fc..da0c22b015 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -129,6 +129,20 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false); if (is_track()) { + + /* use icon */ + + rec_enable_button->remove (); + switch (track()->mode()) { + case ARDOUR::Normal: + rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red")))))); + break; + case ARDOUR::Destructive: + rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red")))))); + break; + } + rec_enable_button->show_all (); + rec_enable_button->set_name ("TrackRecordEnableButton"); rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press)); controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); @@ -518,6 +532,18 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* } track->set_mode (mode); + + rec_enable_button->remove (); + switch (mode) { + case ARDOUR::Normal: + rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red")))))); + break; + case ARDOUR::Destructive: + rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red")))))); + break; + } + rec_enable_button->show_all (); + } void diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index c228a52d8b..665f0f9288 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -91,7 +91,6 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co _session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed)); rec_enable_button = manage (new BindableToggleButton (t->rec_enable_control(), r_name )); - rec_enable_button->unset_flags (Gtk::CAN_FOCUS); update_rec_display (); |
