summaryrefslogtreecommitdiff
path: root/src/xine-engine/audio_out.c
diff options
context:
space:
mode:
authorMike Lampard <mlampard@users.sourceforge.net>2002-03-31 14:36:42 +0000
committerMike Lampard <mlampard@users.sourceforge.net>2002-03-31 14:36:42 +0000
commitd243ac5499433b23d55687fafaf52e33a5eab5ab (patch)
treee0de86609778bb37f824125a21b2a932e14b14d3 /src/xine-engine/audio_out.c
parent2f7bba0bd01b3814c7239a9907c4c652d7718cb8 (diff)
downloadxine-lib-d243ac5499433b23d55687fafaf52e33a5eab5ab.tar.gz
xine-lib-d243ac5499433b23d55687fafaf52e33a5eab5ab.tar.bz2
patches by Michael Roitzsch for dxr3 compatibility: introduce a new metronom
option deny_backward_adjust, which, when set, only allows positive adjustments to vpts_offset. CVS patchset: 1649 CVS date: 2002/03/31 14:36:42
Diffstat (limited to 'src/xine-engine/audio_out.c')
-rw-r--r--src/xine-engine/audio_out.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 52e568339..52d5c46f3 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
* along with self program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_out.c,v 1.49 2002/03/26 01:47:17 miguelfreitas Exp $
+ * $Id: audio_out.c,v 1.50 2002/03/31 14:36:42 mlampard Exp $
*
* 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
* (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -344,8 +344,13 @@ static void *ao_loop (void *this_gen) {
cur_time > (last_sync_time + SYNC_TIME_INVERVAL) &&
bufs_since_sync >= SYNC_BUF_INTERVAL ) {
- this->metronom->set_option(this->metronom, METRONOM_ADJ_VPTS_OFFSET,
- -gap/SYNC_GAP_RATE );
+ if (!this->metronom->get_option(this->metronom, METRONOM_DENY_BACKWARD_ADJUST) ||
+ gap < 0) {
+ this->metronom->set_option(this->metronom, METRONOM_ADJ_VPTS_OFFSET,
+ -gap/SYNC_GAP_RATE );
+ } else {
+ ao_fill_gap(this, gap);
+ }
last_sync_time = cur_time;
bufs_since_sync = 0;
}