diff --git a/veejay-current/veejay-server/libvje/effects/bgpush.c b/veejay-current/veejay-server/libvje/effects/bgpush.c index f97b0f23..7f286012 100644 --- a/veejay-current/veejay-server/libvje/effects/bgpush.c +++ b/veejay-current/veejay-server/libvje/effects/bgpush.c @@ -81,9 +81,6 @@ int bgpush_prepare(void *ptr, VJFrame *frame ) veejay_memcpy( b->frame_ptr[1], frame->data[1], uv_len ); veejay_memcpy( b->frame_ptr[2], frame->data[2], uv_len ); - if( frame->stride[3] > 0 ) - veejay_memcpy( b->frame_ptr[3], frame->data[3], frame->len ); - if( frame->ssm == 0 ) { chroma_supersample( SSM_422_444, frame, b->frame_ptr ); } diff --git a/veejay-current/veejay-server/libvje/libvje.c b/veejay-current/veejay-server/libvje/libvje.c index 9b9b3f4b..7772906a 100644 --- a/veejay-current/veejay-server/libvje/libvje.c +++ b/veejay-current/veejay-server/libvje/libvje.c @@ -280,6 +280,7 @@ void vje_set_bg(VJFrame *bg) else { if(vj_fx_bg->data[0]) { free(vj_fx_bg->data[0]); + vj_fx_bg->data[0] = NULL; } } diff --git a/veejay-current/veejay-server/libvje/vjert.c b/veejay-current/veejay-server/libvje/vjert.c index 9520e763..6a596cbc 100644 --- a/veejay-current/veejay-server/libvje/vjert.c +++ b/veejay-current/veejay-server/libvje/vjert.c @@ -140,6 +140,9 @@ void vjert_update( void *ptr, VJFrame *frame ) { sample_eff_chain **chain = (sample_eff_chain**) ptr; int i; + + vje_set_bg(frame); + for( i = 0; i < SAMPLE_MAX_EFFECTS; i ++ ) { sample_eff_chain *entry = chain[i]; if(entry->fx_instance) { diff --git a/veejay-current/veejay-server/veejay/vj-perform.c b/veejay-current/veejay-server/veejay/vj-perform.c index fc1557ec..ae14063e 100644 --- a/veejay-current/veejay-server/veejay/vj-perform.c +++ b/veejay-current/veejay-server/veejay/vj-perform.c @@ -3704,15 +3704,6 @@ int vj_perform_transition_sample( veejay_t *info, VJFrame *srcA, VJFrame *srcB ) return 1; } -/* - * - * if(info->uc->take_bg==1 ) //FIXME implement functionailty to snapshot a frame as bg - { - info->uc->take_bg = vj_perform_take_bg(info,&frame); - } - - */ - static void vj_perform_queue_fx_entry( veejay_t *info, int sample_id, int entry_id, sample_eff_chain *entry, performer_t *p, VJFrame *a, VJFrame *b,const int is_sample, int *alpha_clear ) { if( entry->clear && b->stride[3] > 0 ) {