From 449484179f05ed6178663cab7b565eff7c884798 Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Thu, 11 Nov 2010 16:34:53 +0100 Subject: options: move [no]hr-mp3-seek to option struct --- libmpdemux/demux_audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmpdemux/demux_audio.c') diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 16118a4139..84ecc50130 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "options.h" #include "mp_msg.h" #include @@ -62,8 +63,6 @@ typedef struct mp3_hdr { struct mp3_hdr *next; } mp3_hdr_t; -int hr_mp3_seek = 0; - /** * \brief free a list of MP3 header descriptions * \param list pointer to the head-of-list pointer @@ -618,6 +617,7 @@ static void high_res_mp3_seek(demuxer_t *demuxer,float time) { } static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ + struct MPOpts *opts = demuxer->opts; sh_audio_t* sh_audio; stream_t* s; int64_t base,pos; @@ -629,7 +629,7 @@ static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_ s = demuxer->stream; priv = demuxer->priv; - if(priv->frmt == MP3 && hr_mp3_seek && !(flags & SEEK_FACTOR)) { + if(priv->frmt == MP3 && opts->hr_mp3_seek && !(flags & SEEK_FACTOR)) { len = (flags & SEEK_ABSOLUTE) ? rel_seek_secs - priv->next_pts : rel_seek_secs; if(len < 0) { stream_seek(s,demuxer->movi_start); -- cgit v1.2.3