eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-20 06:40:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

issue #42

Browse Source
This commit is contained in:
c0ntrol
2016-04-04 20:33:46 +02:00
parent 0bca5f142c
commit 403988a33d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
veejay-current/veejay-client/src/vj-api.c
View File

@@ -4671,8 +4671,10 @@ static void load_samplelist_info(gboolean with_reset_slotselection)
if( fxtext ) free(fxtext); if( fxtext ) free(fxtext);
fxlen = 0; fxlen = 0;
load_from = (info->status_tokens[PLAY_MODE] == MODE_STREAM ? // load_from = (info->status_tokens[PLAY_MODE] == MODE_STREAM ?
info->status_tokens[ SAMPLE_COUNT ] : info->status_tokens[ SAMPLE_INV_COUNT ] ); // 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 ) if( load_from < 0 )
{ {
load_from = 0; load_from = 0;

2
veejay-current/veejay-server/veejay/vj-misc.c
View File

@@ -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_BGSUBTRACT ||
fx_id == VJ_IMAGE_EFFECT_BGSUBTRACTGAUSS || fx_id == VJ_IMAGE_EFFECT_BGSUBTRACTGAUSS ||
fx_id == VJ_VIDEO_EFFECT_DIFF || fx_id == VJ_VIDEO_EFFECT_DIFF ||
fx_id == VJ_IMAGE_EFFECT_BGPUSH ||
fx_id == VJ_IMAGE_EFFECT_CONTOUR ) fx_id == VJ_IMAGE_EFFECT_CONTOUR )
{ {
vj_effect_prepare( frame, fx_id ); 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_BGSUBTRACT ||
fx_id == VJ_IMAGE_EFFECT_BGSUBTRACTGAUSS || fx_id == VJ_IMAGE_EFFECT_BGSUBTRACTGAUSS ||
fx_id == VJ_VIDEO_EFFECT_DIFF || fx_id == VJ_VIDEO_EFFECT_DIFF ||
fx_id == VJ_IMAGE_EFFECT_BGPUSH ||
fx_id == VJ_IMAGE_EFFECT_CONTOUR ) fx_id == VJ_IMAGE_EFFECT_CONTOUR )
{ {
vj_effect_prepare( frame, fx_id ); vj_effect_prepare( frame, fx_id );