eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-04 14:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed playback of mixing samples

Browse Source
This commit is contained in:
niels
2010-11-15 20:12:15 +01:00
parent bebb17275a
commit 6de63ebfb5
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
veejay-current/veejay-server/veejay/vj-perform.c
View File

@@ -1342,8 +1342,9 @@ static int vj_perform_get_subframe(veejay_t * info, int sub_sample,
cur_sfd = 0;
}
sample_set_framedups( b , cur_sfd);
if( cur_sfd != 0 )
if( cur_sfd != 0 ) {
return 1;
}
}
/* offset + start >= end */
@@ -1361,7 +1362,7 @@ static int vj_perform_get_subframe(veejay_t * info, int sub_sample,
{
/* then set speed in reverse and set offset to sample end */
//offset = sample_b[1] - sample_b[0];
offset = 0;
offset = len_b;
sample_set_speed( b, (-1 * sample_b[3]) );
sample_set_offset(a,chain_entry,offset);
return sample_b[1];
@@ -1388,7 +1389,9 @@ static int vj_perform_get_subframe(veejay_t * info, int sub_sample,
if( sample_b[2] == 3 )
offset = sample_b[0] + ( (int) ( (double) len_b * rand()/RAND_MAX));
if ( offset < -(len_b) )
if ( (sample_b[0] + offset ) <=0 ) // < -(len_b) )
{
/* reached start position */
if(sample_b[2] == 2)
@@ -1402,20 +1405,24 @@ static int vj_perform_get_subframe(veejay_t * info, int sub_sample,
if(sample_b[2] == 1)
{
//offset = sample_b[1] - sample_b[0];
offset = 0;
offset = sample_b[1]; // play from end to start
}
if(sample_b[2]== 0)
{
sample_set_speed(b , 0);
offset = 0;
offset = 0; // stop playing
}
if(sample_b[2] == 3 )
offset = 0;
}
#ifdef STRICT_CHECKING
assert( offset >= 0 );
#endif
sample_set_offset(a, chain_entry, offset);
return (sample_b[1] + offset);
return (sample_b[0] + offset); //1
}
return 0;
}

7
veejay-current/veejay-utils/src/sayVIMS.c
View File

@@ -183,6 +183,9 @@ int main(int argc, char *argv[])
}
sayvims = sayvims_connect();
vj_flush(1);
if(!sayvims)
return -1;
@@ -209,8 +212,7 @@ int main(int argc, char *argv[])
}
else
{
int n = vj_client_send( sayvims,V_CMD, msg[i] );
vj_flush(1);
vj_client_send( sayvims,V_CMD, msg[i] );
}
i++;
}
@@ -244,7 +246,6 @@ int main(int argc, char *argv[])
else
{
vj_client_send( sayvims, V_CMD, buf );
vj_flush(1);
}
}
}