diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/audio_out.c | 11 | ||||
| -rw-r--r-- | src/xine-engine/metronom.c | 11 | ||||
| -rw-r--r-- | src/xine-engine/metronom.h | 11 |
3 files changed, 9 insertions, 24 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 52d5c46f3..4326d598e 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.50 2002/03/31 14:36:42 mlampard Exp $ + * $Id: audio_out.c,v 1.51 2002/04/01 12:09:09 miguelfreitas 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,13 +344,8 @@ static void *ao_loop (void *this_gen) { cur_time > (last_sync_time + SYNC_TIME_INVERVAL) && bufs_since_sync >= SYNC_BUF_INTERVAL ) { - 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); - } + this->metronom->set_option(this->metronom, METRONOM_ADJ_VPTS_OFFSET, + -gap/SYNC_GAP_RATE ); last_sync_time = cur_time; bufs_since_sync = 0; } diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index 4f5b2b87d..e660815e6 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.c,v 1.77 2002/03/31 14:36:42 mlampard Exp $ + * $Id: metronom.c,v 1.78 2002/04/01 12:09:10 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -521,15 +521,11 @@ static void metronom_set_option (metronom_t *this, int option, int64_t value) { this->scr_adjustable = value; break; case METRONOM_ADJ_VPTS_OFFSET: - if (!this->deny_backward_adjust || value > 0) - this->vpts_offset += value; + this->vpts_offset += value; /*#ifdef LOG*/ printf ("metronom: adjusting vpts_offset by %lld\n", value ); /*#endif*/ break; - case METRONOM_DENY_BACKWARD_ADJUST: - this->deny_backward_adjust = value; - break; default: printf ("metronom: unknown option in set_option: %d\n", option); @@ -544,8 +540,6 @@ static int64_t metronom_get_option (metronom_t *this, int option) { return this->av_offset; case METRONOM_SCR_ADJUSTABLE: return this->scr_adjustable; - case METRONOM_DENY_BACKWARD_ADJUST: - return this->deny_backward_adjust; } printf ("metronom: unknown option in get_option: %d\n", option); @@ -698,7 +692,6 @@ metronom_t * metronom_init (int have_audio, void *xine) { this->in_discontinuity = 0; this->vpts_offset = 0; this->next_vpts_offset = 0; - this->deny_backward_adjust = 0; /* initialize video stuff */ diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index 924efd5c3..f470eb00e 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.h,v 1.27 2002/03/31 14:36:42 mlampard Exp $ + * $Id: metronom.h,v 1.28 2002/04/01 12:09:10 miguelfreitas Exp $ * * metronom: general pts => virtual calculation/assoc * @@ -226,8 +226,6 @@ struct metronom_s { scr_plugin_t** scr_list; pthread_t sync_thread; int scr_adjustable; - - int deny_backward_adjust; pthread_mutex_t lock; @@ -246,10 +244,9 @@ metronom_t *metronom_init (int have_audio, void *xine); * metronom options */ -#define METRONOM_SCR_ADJUSTABLE 1 -#define METRONOM_AV_OFFSET 2 -#define METRONOM_ADJ_VPTS_OFFSET 3 -#define METRONOM_DENY_BACKWARD_ADJUST 4 +#define METRONOM_SCR_ADJUSTABLE 1 +#define METRONOM_AV_OFFSET 2 +#define METRONOM_ADJ_VPTS_OFFSET 3 /* * SCR (system clock reference) plugins |