From 600f625dfee407a2139b719272617ae286fde0e5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 11 Nov 2006 15:41:33 +0000
Subject: [PATCH] use thorsten's new record button icons; fix history rebuild
 error caused by using an unregistered object type

git-svn-id: svn://localhost/ardour2/trunk@1106 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/icons/record_normal_red.png | Bin 0 -> 489 bytes
 gtk2_ardour/icons/record_tape_red.png   | Bin 0 -> 613 bytes
 gtk2_ardour/region_gain_line.cc         |   4 ++--
 gtk2_ardour/route_time_axis.cc          |  26 ++++++++++++++++++++++++
 gtk2_ardour/route_ui.cc                 |   1 -
 5 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 gtk2_ardour/icons/record_normal_red.png
 create mode 100644 gtk2_ardour/icons/record_tape_red.png

diff --git a/gtk2_ardour/icons/record_normal_red.png b/gtk2_ardour/icons/record_normal_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4bbaff0b0f90f3e20f08c865e2802166fd177a6
GIT binary patch
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00004XF*Lt006O%
z3;baP00006VoOIv0RI600RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru
z)(Z;`3lqh*R-FI<0cJ@=K~yNug_6Ba!cZ87-*b9ui}44DkfH<3I@p0h7mUV42XDc6
z38I5;B)S*}|L(wxFa}&u24x_oCOT?lvXO+MF|?(pd@jZqqwvhnGrcb(A^-qmi~%s?
zk;qCX3}a!pD|8`V9M3BQs1cC_07gV$j73H?Z95Z<#&_rDHPbLKsH&*c>o~05_z#U&
z`_1={h{$CC#HglitxcN~Crir$zaRklQc<4XS&et!-{AnVQ;DQ;{D%wx48Y0KvdBcE
zaR8<g)AiN8g~hSSL;}4S9~u@HPmc!oq)g?~Y4pQ140OUU#ud(GI|%v)gQ|+K+ZB93
zQ5?&*`v#SI9l8)Nyy?1Ug{!jPOC|sZ)ob7JyfO!1J-1rT^-@vNKS91!4DK5Z8$j)Q
zxKT~pm`Ws#&6!y(mrkP{1h8xyh0C({)N-7UPG_HpT=wG{0zfvV>+_zJDTQ;XDvIN{
f?m2*4`Vv0@v+SDqQ;yNl00000NkvXXu0mjfD$>c;

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/record_tape_red.png b/gtk2_ardour/icons/record_tape_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9e231381a180eeada8dedde8c05e4196a5c32f0
GIT binary patch
literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00004XF*Lt006O%
z3;baP00006VoOIv0RI600RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru
z)(Z;`3jsC{C)EG|0pdwSK~yNuU6M^mlVJeIf6x0q?tM2cx4GA*9kzpoOGbk}y(rV5
zqE1nlBDzIHL3J>?1a*-vMGz64I!1>sLiB+dUF;ySK*<m#W8ie;JI(p-<JtRkuuS^h
z{vWshUudlX5JCtb6AcDW)*6jS!}p~v<$_zOi~$o`YXu;*)(9bj+b!#6G8~TH?ax|2
zR#ym^Cb3|M`=7?EQ^lpiO11hxYwZa@wp!NEg}s@b504&`0GX#x0LWduga)p?d99v(
z$rV?t)jK9|a9>Af?~BuC0)h>e%4Je9hyFwo0UYn@GM-OO1{TZZf*G;x^TPv2VtX8i
zzx?z(+MAn6#r}DnE!*VVx!Jg^DAm!INNff#r@wOR{phAX)tv$$6OU7CG$Mv+7;3#<
zNBKVE`8-<@2*&eyl<yO2YNFx$QU*-Z{Ww40JT&@_#kDo2FJEDJU=V;F$D#Z2BX+d3
zFq|F4mU6-Ll=?MWa?>Yv?Uq*$93q=cl8QN`Vh(Mg5M9wW!nV!G%(v>y^74oQ<i3|m
z%YZtYPV+zKHoW>|u~+~mHiv7qtm{2ad;G@XUaK#WV7*=^S154%!&qgm<hpCM+C8nc
zC$?Ne0{bJjovkR<VH$>NGELX@yjQ?y{ipaFf6~EQQE}&j00000NkvXXu0mjfNGA~=

literal 0
HcmV?d00001

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 &region_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 ();