fix fx anim issues

d-j-a-y · May 19, 2019 · 38f773a · 38f773a
1 parent 3de4b0f
commit 38f773a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/veejay-current/reloaded-gtk3/src/callback.c b/veejay-current/reloaded-gtk3/src/callback.c
@@ -2685,7 +2685,13 @@ void	on_curve_clear_parameter_clicked( GtkWidget *widget, gpointer user_data )
 	if( info->uc.selected_parameter_id == -1 )
 		return;
 	multi_vims( VIMS_SAMPLE_KF_CLEAR, "%d %d", info->uc.selected_chain_entry, info->uc.selected_parameter_id  );
-	reset_curve(  info->curve );
+    info->uc.reload_hint[HINT_KF] = 1;
+
+    if(!is_button_toggled("kf_none")) {
+        set_toggle_button("kf_none",1);
+    }
+    reset_curve(info->curve);
+
 }
 
 void	on_curve_buttonstore_clicked(GtkWidget *widget, gpointer user_data )
@@ -2771,9 +2777,15 @@ void	on_curve_buttonclear_clicked(GtkWidget *widget, gpointer user_data)
 	if( id < 0 )
 		id = 0;
 	int i = info->uc.selected_chain_entry;
-	vj_kf_refresh(); 
 
 	multi_vims( VIMS_SAMPLE_KF_RESET, "%d", i );
+
+    info->uc.reload_hint[HINT_KF] = 1;
+
+    if(!is_button_toggled("kf_none")) {
+        set_toggle_button("kf_none",1);
+    }
+    reset_curve(info->curve);
 }
 
 void	on_curve_typelinear_toggled(GtkWidget *widget, gpointer user_data)

diff --git a/veejay-current/reloaded-gtk3/src/vj-api.c b/veejay-current/reloaded-gtk3/src/vj-api.c
@@ -3403,12 +3403,6 @@ static void update_current_slot(int *history, int pm, int last_pm)
         set_pm_page_label( info->status_tokens[CURRENT_ID], pm );
 
     }
-    if( info->status_tokens[CURRENT_ENTRY] != history[CURRENT_ENTRY])
-    {
-        info->uc.selected_chain_entry = info->status_tokens[CURRENT_ENTRY];
-        info->uc.reload_hint[HINT_KF] = 1;
-        info->uc.reload_hint[HINT_ENTRY] = 1;
-    }
 
     /* Actions for stream */
     if( ( info->status_tokens[CURRENT_ID] != history[CURRENT_ID] || pm != last_pm ) && pm == MODE_STREAM )
@@ -4548,6 +4542,7 @@ void on_effectlist_row_activated(GtkTreeView *treeview,
 
             info->uc.reload_hint[HINT_CHAIN] = 1;
             info->uc.reload_hint[HINT_ENTRY] = 1;
+            info->uc.reload_hint[HINT_KF] = 1;
 
         }
         g_free(name);
@@ -6837,6 +6832,12 @@ static void update_globalinfo(int *history, int pm, int last_pm)
         }
     }
 
+    if( (pm == MODE_SAMPLE || pm == MODE_STREAM ) && info->status_tokens[CURRENT_ENTRY] != history[CURRENT_ENTRY] ) {
+        info->uc.selected_chain_entry = info->status_tokens[CURRENT_ENTRY];
+        info->uc.reload_hint[HINT_KF] = 1;
+        info->uc.reload_hint[HINT_ENTRY] = 1;
+    }
+
     if( info->status_tokens[CURRENT_ID] != history[CURRENT_ID] || last_pm != pm )
     {
         info->uc.reload_hint[HINT_ENTRY] = 1;
@@ -8270,7 +8271,7 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num)
     info->parameter_lock = 1;
     info->uc.expected_num_samples = -1;
     info->uc.expected_num_streams = -1;
-    info->uc.selected_chain_entry = -1;
+    info->uc.selected_chain_entry = 0;
 
     single_vims( VIMS_PROMOTION );