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

set previous playback speed when switching sample ( pause all samples -> resume one by one, resume at sample speed), move initialization to playback cycle

Browse Source
This commit is contained in:
niels
2015-10-18 16:43:17 +02:00
parent 4ad65649a9
commit 05d6c07cbb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
veejay-current/veejay-server/veejay/liblavplayvj.c
View File

@@ -649,6 +649,9 @@ static int veejay_start_playing_sample( veejay_t *info, int sample_id )
veejay_sample_resume_at( info, sample_id );
if( speed != 0 )
settings->previous_playback_speed = speed;
veejay_set_speed(info, speed);
veejay_msg(VEEJAY_MSG_INFO, "Playing sample %d (FX=%x, Sl=%d, Speed=%d, Start=%d, Loop=%d)",
@@ -809,8 +812,8 @@ void veejay_set_sample(veejay_t * info, int sampleid)
if ( info->uc->playback_mode == VJ_PLAYBACK_MODE_TAG)
{
veejay_start_playing_stream(info,sampleid );
}
else if( info->uc->playback_mode == VJ_PLAYBACK_MODE_SAMPLE)
}
else if( info->uc->playback_mode == VJ_PLAYBACK_MODE_SAMPLE)
{
if( info->uc->sample_id == sampleid )
{
@@ -1869,8 +1872,6 @@ int veejay_init(veejay_t * info, int x, int y,char *arg, int def_tags, int gen_t
settings->action_scheduler.state = 0;
}
settings->previous_playback_speed = 1;
int instances = 0;
char *title = NULL;
@@ -2210,6 +2211,8 @@ static void veejay_playback_cycle(veejay_t * info)
veejay_set_speed(info,1);
settings->previous_playback_speed = 1;
switch(info->uc->playback_mode)
{
case VJ_PLAYBACK_MODE_PLAIN: