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

sync

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1355 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2010-01-24 21:12:58 +00:00
parent 18f4239eb3
commit e6f03f0742
72 changed files with 2001 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@
#include <libel/elcache.h>
#include <veejay/vj-misc.h>
#include <veejay/vj-viewport-xml.h>
#include <libstream/vj-tag.h>
//#define KAZLIB_OPAQUE_DEBUG 1
#ifdef HAVE_XML2
@@ -524,6 +525,36 @@ int sample_get_startFrame(int sample_id)
return -1;
}
int sample_has_cali_fx(int sample_id)
{
sample_info *si = sample_get(sample_id);
if(si == NULL)
return -1;
int i;
for( i =0;i < SAMPLE_MAX_EFFECTS; i ++ ) {
if(si->effect_chain[i]->effect_id == 190)
return i;
}
return -1;
}
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;
int fx_id = vj_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.");
}
}
int sample_get_el_position( int sample_id, int *start, int *end )
{
@@ -2289,7 +2320,7 @@ int sample_apply_loop_dec(int s1, double fps) {
/* print sample status information into an allocated string str*/
//int sample_chain_sprint_status(int s1, int entry, int changed, int r_changed,char *str,
// int frame)
int sample_chain_sprint_status( int s1,int cache,int sa,int ca, int pfps, int frame, int mode,int total_slots, int seq_rec,int macro,char *str )
int sample_chain_sprint_status( int s1,int cache,int sa,int ca, int pfps, int frame, int mode,int total_slots, int seq_rec,int curfps, uint32_t lo, uint32_t hi,int macro,char *str )
{
sample_info *sample;
sample = sample_get(s1);
@@ -2317,7 +2348,7 @@ int sample_chain_sprint_status( int s1,int cache,int sa,int ca, int pfps, int fr
}
veejay_sprintf(str,1024,
"%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 %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
pfps,
frame,
mode,
@@ -2336,6 +2367,9 @@ int sample_chain_sprint_status( int s1,int cache,int sa,int ca, int pfps, int fr
sample->selected_entry,
total_slots,
cache,
curfps,
lo,
hi,
sa,
ca,
(int)( sample->fader_val ),