From 403988a33da044eb1b2482b5092fc51990f1c6c1 Mon Sep 17 00:00:00 2001 From: c0ntrol Date: Mon, 4 Apr 2016 20:33:46 +0200 Subject: [PATCH] issue #42 --- veejay-current/veejay-client/src/vj-api.c | 6 ++++-- veejay-current/veejay-server/veejay/vj-misc.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index 1719b37d..21bc3c61 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -4671,8 +4671,10 @@ static void load_samplelist_info(gboolean with_reset_slotselection) if( fxtext ) free(fxtext); fxlen = 0; - load_from = (info->status_tokens[PLAY_MODE] == MODE_STREAM ? - info->status_tokens[ SAMPLE_COUNT ] : info->status_tokens[ SAMPLE_INV_COUNT ] ); +// load_from = (info->status_tokens[PLAY_MODE] == MODE_STREAM ? +// info->status_tokens[ SAMPLE_COUNT ] : info->status_tokens[ SAMPLE_INV_COUNT ] ); + + load_from = 0; /* usually there are not that many streams but FIXME: offset wrong by one */ if( load_from < 0 ) { load_from = 0; diff --git a/veejay-current/veejay-server/veejay/vj-misc.c b/veejay-current/veejay-server/veejay/vj-misc.c index 0a18b417..05dd2b90 100644 --- a/veejay-current/veejay-server/veejay/vj-misc.c +++ b/veejay-current/veejay-server/veejay/vj-misc.c @@ -241,6 +241,7 @@ int vj_perform_take_bg(veejay_t *info, VJFrame *frame) fx_id == VJ_IMAGE_EFFECT_BGSUBTRACT || fx_id == VJ_IMAGE_EFFECT_BGSUBTRACTGAUSS || fx_id == VJ_VIDEO_EFFECT_DIFF || + fx_id == VJ_IMAGE_EFFECT_BGPUSH || fx_id == VJ_IMAGE_EFFECT_CONTOUR ) { vj_effect_prepare( frame, fx_id ); @@ -263,6 +264,7 @@ int vj_perform_take_bg(veejay_t *info, VJFrame *frame) fx_id == VJ_IMAGE_EFFECT_BGSUBTRACT || fx_id == VJ_IMAGE_EFFECT_BGSUBTRACTGAUSS || fx_id == VJ_VIDEO_EFFECT_DIFF || + fx_id == VJ_IMAGE_EFFECT_BGPUSH || fx_id == VJ_IMAGE_EFFECT_CONTOUR ) { vj_effect_prepare( frame, fx_id );