Browse Source

[0.99.75] do not repeat frame on transport start

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@903 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
joq 20 years ago
parent
commit
0074dc3a79
2 changed files with 3 additions and 6 deletions
  1. +1
    -1
      configure.ac
  2. +2
    -5
      jackd/transengine.c

+ 1
- 1
configure.ac View File

@@ -15,7 +15,7 @@ dnl changes are made
dnl --- dnl ---
JACK_MAJOR_VERSION=0 JACK_MAJOR_VERSION=0
JACK_MINOR_VERSION=99 JACK_MINOR_VERSION=99
JACK_MICRO_VERSION=74
JACK_MICRO_VERSION=75


dnl --- dnl ---
dnl HOWTO: updating the jack protocol version dnl HOWTO: updating the jack protocol version


+ 2
- 5
jackd/transengine.c View File

@@ -395,7 +395,6 @@ jack_transport_cycle_end (jack_engine_t *engine)
{ {
jack_control_t *ectl = engine->control; jack_control_t *ectl = engine->control;
transport_command_t cmd; /* latest transport command */ transport_command_t cmd; /* latest transport command */
jack_transport_state_t old_state;


/* Promote pending_time to current_time. Maintain the usecs, /* Promote pending_time to current_time. Maintain the usecs,
* frame_rate and frame values, clients may not set them. */ * frame_rate and frame values, clients may not set them. */
@@ -405,8 +404,6 @@ jack_transport_cycle_end (jack_engine_t *engine)
ectl->current_time = ectl->pending_time; ectl->current_time = ectl->pending_time;
ectl->new_pos = ectl->pending_pos; ectl->new_pos = ectl->pending_pos;


old_state = ectl->transport_state;

/* check sync results from previous cycle */ /* check sync results from previous cycle */
if (ectl->transport_state == JackTransportStarting) { if (ectl->transport_state == JackTransportStarting) {
if ((ectl->sync_remain == 0) || if ((ectl->sync_remain == 0) ||
@@ -479,8 +476,8 @@ jack_transport_cycle_end (jack_engine_t *engine)
ectl->transport_state); ectl->transport_state);
} }


/* update timebase, if needed */
if (old_state == JackTransportRolling) {
/* Update timebase, if needed. */
if (ectl->transport_state == JackTransportRolling) {
ectl->pending_time.frame = ectl->pending_time.frame =
ectl->current_time.frame + ectl->buffer_size; ectl->current_time.frame + ectl->buffer_size;
} }


Loading…
Cancel
Save