From cc5431dc65e272454ddacd9f57865af77e22f6bb Mon Sep 17 00:00:00 2001 From: niels Date: Sun, 15 Nov 2015 17:31:00 +0100 Subject: [PATCH] issue #47 --- veejay-current/veejay-client/src/callback.c | 3 ++- veejay-current/veejay-client/src/utils.c | 2 +- veejay-current/veejay-client/src/vj-api.c | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c index 70fd96ee..a2fe6560 100644 --- a/veejay-current/veejay-client/src/callback.c +++ b/veejay-current/veejay-client/src/callback.c @@ -127,7 +127,8 @@ void on_videobar_value_changed(GtkWidget *widget, gpointer user_data) void on_subrender_toggled(GtkWidget *widget, gpointer user_data) { - multi_vims( VIMS_SUB_RENDER,"%d",0); + if(!info->status_lock) + multi_vims( VIMS_SUB_RENDER,"%d",0); } void on_button_001_clicked(GtkWidget *widget, gpointer user_data) diff --git a/veejay-current/veejay-client/src/utils.c b/veejay-current/veejay-client/src/utils.c index a719581a..0a431f44 100644 --- a/veejay-current/veejay-client/src/utils.c +++ b/veejay-current/veejay-client/src/utils.c @@ -28,7 +28,7 @@ int status_to_arr( char *status, int *array ) { - int n = sscanf(status, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", + int n = sscanf(status, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", array + 0, array + 1, array + 2, diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index 2a95f195..324d2015 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -3140,6 +3140,10 @@ static void update_current_slot(int *history, int pm, int last_pm) update = 1; } + if( (history[SUBRENDER] != info->status_tokens[SUBRENDER] || is_button_toggled( "toggle_subrender") != info->status_tokens[SUBRENDER]) ) + { + set_toggle_button( "toggle_subrender", 1 ); + } if(update) {