From 2a7c5a1365ad194a42e3f667f85828a152544857 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 9 Apr 2011 03:03:22 +0300 Subject: audio: change external AO interface to "ao_[method](ao, ...)" Make the outside interface of audio output handling similar to the video output one. An AO object is first created, and then methods called with ao_[methodname](ao, args...). However internally libao2/ still holds all data in globals, and trying to create multiple simultaneous AO instances won't work. --- mp_core.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mp_core.h') diff --git a/mp_core.h b/mp_core.h index bbb93bce48..733962fe0c 100644 --- a/mp_core.h +++ b/mp_core.h @@ -99,7 +99,6 @@ typedef struct MPContext { unsigned int osd_visible; int osd_function; - const ao_functions_t *audio_out; struct play_tree *playtree; struct play_tree_iter *playtree_iter; char *filename; // currently playing file @@ -124,6 +123,7 @@ typedef struct MPContext { struct demux_stream *d_video; struct demux_stream *d_sub; mixer_t mixer; + struct ao *ao; struct vo *video_out; /* We're starting playback from scratch or after a seek. Show first @@ -228,7 +228,6 @@ extern int file_filter; // These appear in options list extern int forced_subs_only; -struct ao_data; void uninit_player(struct MPContext *mpctx, unsigned int mask); void reinit_audio_chain(struct MPContext *mpctx); void init_vo_spudec(struct MPContext *mpctx); -- cgit v1.2.3