From d3d05a9d55f8034fd856e32a5871e5977650c8c5 Mon Sep 17 00:00:00 2001
From: Niels Elburg <niels@dyne.org>
Date: Tue, 2 Feb 2010 20:54:15 +0000
Subject: [PATCH] Added button for follow chain fade

git-svn-id: svn://code.dyne.org/veejay/trunk@1371 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
---
 .../share/gveejay.reloaded.glade              |  30 ++++++++++++++++
 .../share/gveejay.reloaded.glade.bak          |  34 ++++++++++++++++--
 .../veejay-client/share/icon_follow.png       | Bin 0 -> 853 bytes
 veejay-current/veejay-client/src/callback.c   |   6 ++++
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 veejay-current/veejay-client/share/icon_follow.png

diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade
index 3d8d6092..ad60601d 100644
--- a/veejay-current/veejay-client/share/gveejay.reloaded.glade
+++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade
@@ -15139,6 +15139,36 @@ YUV (current)</property>
 						  <property name="fill">True</property>
 						</packing>
 					      </child>
+
+					      <child>
+						<widget class="GtkCheckButton" id="fx_followfade">
+						  <property name="visible">True</property>
+						  <property name="tooltip" translatable="yes">Switch to sample #B after completing fade.</property>
+						  <property name="can_focus">True</property>
+						  <property name="relief">GTK_RELIEF_HALF</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						  <signal name="toggled" handler="on_fx_followfade_toggled" last_modification_time="Tue, 02 Feb 2010 20:48:43 GMT"/>
+
+						  <child>
+						    <widget class="GtkImage" id="image3508">
+						      <property name="visible">True</property>
+						      <property name="pixbuf">icon_follow.png</property>
+						      <property name="xalign">0.5</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						    </widget>
+						  </child>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak
index b242b3db..ad60601d 100644
--- a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak
+++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak
@@ -3629,7 +3629,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_learn MIDI</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="activate" handler="on_midilearn_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:42 GMT"/>
 			    </widget>
 			  </child>
@@ -3639,7 +3639,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_MIDI enable</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">midilearn</property>
 			      <signal name="activate" handler="on_midievent_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:29 GMT"/>
 			    </widget>
@@ -15139,6 +15139,36 @@ YUV (current)</property>
 						  <property name="fill">True</property>
 						</packing>
 					      </child>
+
+					      <child>
+						<widget class="GtkCheckButton" id="fx_followfade">
+						  <property name="visible">True</property>
+						  <property name="tooltip" translatable="yes">Switch to sample #B after completing fade.</property>
+						  <property name="can_focus">True</property>
+						  <property name="relief">GTK_RELIEF_HALF</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						  <signal name="toggled" handler="on_fx_followfade_toggled" last_modification_time="Tue, 02 Feb 2010 20:48:43 GMT"/>
+
+						  <child>
+						    <widget class="GtkImage" id="image3508">
+						      <property name="visible">True</property>
+						      <property name="pixbuf">icon_follow.png</property>
+						      <property name="xalign">0.5</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						    </widget>
+						  </child>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
diff --git a/veejay-current/veejay-client/share/icon_follow.png b/veejay-current/veejay-client/share/icon_follow.png
new file mode 100644
index 0000000000000000000000000000000000000000..59fb755a6f54bc20b1b171db42a8f69a5b1d4bfa
GIT binary patch
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq001xm000;W1^@s6y#0RM00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igJx
z6gV>+*w{k=000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}00088Nkl<Z
zSi|j?F^?QY5QV?jJv-}N-|ihIKm<rgNJy3tAQFTV<HV$p5%{P09}w{yNJ&W$5|B6`
zBESJc*y0>mHny;DXUDrU)BQ+h#p+}oJC-qL>7FziO;1;My{fM6exk?ze2(qVe@YU&
zz_vH9MOB#{arN@$2oylrb*^LcCP}S&=S$lMwx^PU28@_<Mp6c9+mDN)SpD_r(TO%!
zE?p|lO(yS_F}|-5rhta|Zl{#)bX|9&=o>EpA4|F@X>6N;QE4Ro4*bwG%^`4NCY<wZ
zIv#(vKc9bIjz;?f36N8ARoA~9Ef)8S`D_+!A4vMh_9r>#^8-Rb2mzo5ZU8rdJO4%?
z=UkSf(VGXe*&EZzWISl;04XI>&Tmz9y<bR@?E-iOcwN%o#<>A?Py-hvl{@v9K#Czo
z#Ta>p0zgtB2%9A&AWDk1!>-OtBIitBh+*hb*dAv{*0)WItwu}oX21c_=l?|DCC3?o
z9WVtxcv%QI#(2CaYTygtE8y+tO`v$5gXNq<wOqamyaT+~Z_NQ{fNQ{~!1Z<8ey!6;
z0B{K5NlNKfANg}Vfs6ea^bPQ15kfwd83-Y8emZ?}v{)Phhg-kC?CaoXfEeRzKBXBT
zrF6V$415Tz{)-|mUcfH2K061_2%KURo6DPRZKR~_jndlbCb?y!vMgEF^~pB2{0|0S
z2zwj5*8%RIt}nRJP(fq60lE-Edde>JG}djG(x1z^ew?~)Hh8DYnWk;;*<Kbso0X(L
zfSa}_&k&83q}xEf3xOD8wO*~heem$%I>b0!Qs$hxuKTS^>2`6nSmfE>-UHw};8)wD
z0V2b_kZFOtz}=0eI0>Wic)e<x@7HbnlWZ|Wf7|r^8$%_4`D_+?F<;u&P(dRp+wN?y
f7FCsBWD)-j?r&?$zz*uD00000NkvXXu0mjfAA)(>

literal 0
HcmV?d00001

diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c
index 8971c398..a64e3d36 100644
--- a/veejay-current/veejay-client/src/callback.c
+++ b/veejay-current/veejay-client/src/callback.c
@@ -130,6 +130,12 @@ void	on_button_001_clicked(GtkWidget *widget, gpointer user_data)
 	vj_midi_learning_vims_simple( info->midi, NULL, VIMS_SET_PLAIN_MODE );
 }
 
+void	on_fx_followfade_toggled( GtkWidget *widget, gpointer data )
+{
+	int val = is_button_toggled( "fx_followfade" ) ? 1:0;
+	multi_vims( VIMS_CHAIN_FOLLOW_FADE,"%d", val );
+}
+
 void	on_button_252_clicked( GtkWidget *widget, gpointer user_data)
 {
 	single_vims( VIMS_DEBUG_LEVEL );