From f32a90a8396136cdded09390b68c9aac3d29ee7e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 22 Jul 2013 22:57:51 +0200
Subject: audio/out: remove options argument from init()

Same as with VOs in the previous commit.
---
 audio/out/ao.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'audio/out/ao.c')

diff --git a/audio/out/ao.c b/audio/out/ao.c
index c7fd60a8f8..04e6fcda12 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -146,9 +146,10 @@ static struct ao *ao_create(bool probing, struct MPOpts *opts,
     if (ao->driver->encode != !!ao->encode_lavc_ctx)
         goto error;
     struct m_config *config = m_config_from_obj_desc(ao, &desc);
-    if (m_config_initialize_obj(config, &desc, &ao->priv, &args) < 0)
+    if (m_config_set_obj_params(config, args) < 0)
         goto error;
-    if (ao->driver->init(ao, (char *)args) < 0)
+    ao->priv = config->optstruct;
+    if (ao->driver->init(ao) < 0)
         goto error;
     ao->bps = ao->channels.num * ao->samplerate * af_fmt2bits(ao->format) / 8;
     return ao;
-- 
cgit v1.2.3