From 39d126e080ba36b4982b75e2ed9d9d302d8519da Mon Sep 17 00:00:00 2001
From: niels <niels@dyne.org>
Date: Sun, 15 Nov 2015 01:56:39 +0100
Subject: [PATCH] regression in fx anim #42

---
 .../share/reloaded_classic.glade              | 20 -------------------
 veejay-current/veejay-client/src/vj-api.c     |  2 --
 2 files changed, 22 deletions(-)

diff --git a/veejay-current/veejay-client/share/reloaded_classic.glade b/veejay-current/veejay-client/share/reloaded_classic.glade
index 69c056f4..c03d71a7 100644
--- a/veejay-current/veejay-client/share/reloaded_classic.glade
+++ b/veejay-current/veejay-client/share/reloaded_classic.glade
@@ -6814,26 +6814,6 @@ Quicktime-MJPEG</property>
 				      <property name="fill">True</property>
 				    </packing>
 				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="loglinear">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Toggle logarithmic scale</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Log</property>
-				      <property name="use_underline">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>
-				    </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/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c
index 4583ac8d..2a95f195 100644
--- a/veejay-current/veejay-client/src/vj-api.c
+++ b/veejay-current/veejay-client/src/vj-api.c
@@ -3034,8 +3034,6 @@ static void	update_current_slot(int *history, int pm, int last_pm)
 	{
 		int marker_go = 0;
 		
-		fx_anim = 1;
-
 		/* Update marker bounds */
 		if( (history[SAMPLE_MARKER_START] != info->status_tokens[SAMPLE_MARKER_START]) )
 		{