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

fixed stack smash in unicast, added new vims 331, do not cache if sample does not fit in memory, rewrote preview handler in gveejayreloaded (it rocks), rearranged quality preview buttons, bugfixes

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@728 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2006-12-21 16:38:07 +00:00
parent 5352aa67c4
commit 812d639f58
25 changed files with 2960 additions and 2754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
veejay-current/libsample/sampleadm.c
View File

@@ -1204,11 +1204,11 @@ int sample_set_chain_channel(int s1, int position, int input)
//sample->effect_chain[position]->channel = input;
int src_type = sample->effect_chain[position]->source_type;
// now, reset cache and setup
if( src_type == 0 )
if( src_type == 0)
{
sample_info *new = sample_get( input );
if( sample->effect_chain[position]->channel != input )
if( sample->effect_chain[position]->channel != input && sample->effect_chain[position]->effect_id > 0)
{
sample_info *old = sample_get( sample->effect_chain[position]->channel );
if(old)
@@ -1249,18 +1249,21 @@ int sample_cache_used( int s1 )
return cache_avail_mb();
}
int sample_start_playing(int s1)
int sample_start_playing(int s1, int no_cache)
{
sample_info *sample = sample_get(s1);
if (!sample)
return -1;
int i;
vj_el_setup_cache( sample->edit_list );
int i;
if(!no_cache)
vj_el_setup_cache( sample->edit_list );
for( i = 0; i < SAMPLE_MAX_EFFECTS; i ++ )
{
int src_type = sample->effect_chain[i]->source_type;
int id = sample->effect_chain[i]->channel;
if( src_type == 0 && id > 0 )
if( src_type == 0 && id > 0 && sample->effect_chain[i]->effect_id > 0 )
{
sample_info *second = sample_get( id );
if(second)
@@ -1291,7 +1294,8 @@ int sample_set_chain_source(int s1, int position, int input)
return -1;
if( sample->effect_chain[position]->source_type == 0 &&
sample->effect_chain[position]->channel > 0 )
sample->effect_chain[position]->channel > 0 &&
sample->effect_chain[position]->effect_id > 0)
{
sample_info *second = sample_get( sample->effect_chain[position]->channel );
if(second)