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

use monotonic clock instead of system clock, allow calibration of any stream source and not just video4linux devices

Browse Source
This commit is contained in:
c0ntrol
2020-07-07 21:38:45 +02:00
parent 8965d18cd6
commit a16d153ad8
11 changed files with 178 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
veejay-current/veejay-server/libsample/sampleadm.c
View File

@@ -55,6 +55,7 @@
#include <libstream/vj-tag.h>
#include <libvjxml/vj-xml.h>
#include <veejay/vj-macro.h>
#include <libvje/internal.h>
//#define KAZLIB_OPAQUE_DEBUG 1
#ifdef HAVE_XML2
@@ -625,7 +626,7 @@ int sample_has_cali_fx(int sample_id)
return -1;
int i;
for( i =0;i < SAMPLE_MAX_EFFECTS; i ++ ) {
if(si->effect_chain[i]->effect_id == 190)
if(si->effect_chain[i]->effect_id == VJ_IMAGE_EFFECT_CALI)
return i;
}
return -1;
@@ -633,25 +634,15 @@ int sample_has_cali_fx(int sample_id)
void sample_cali_prepare( int sample_id, int slot, int chan )
{
sample_info *si = sample_get(sample_id);
if(si == NULL)
return;
vj_tag *tag = vj_tag_get( chan );
if( tag == NULL || tag->source_type != VJ_TAG_TYPE_CALI )
return;
//FIXME: prepare cali
/*
int fx_id = nvj_effect_real_to_sequence(
si->effect_chain[slot]->effect_id );
if( fx_id >= 0 ) {
vj_tag_cali_prepare_now( chan, fx_id );
veejay_msg(VEEJAY_MSG_DEBUG, "Prepared calibration data");
}*/
vj_tag_cali_prepare_now( tag );
veejay_msg(VEEJAY_MSG_DEBUG, "Prepared calibration data");
}
int sample_get_el_position( int sample_id, int *start, int *end )
{
sample_info *si = sample_get(sample_id);