From d58d4ec93c6a89cea3488689f12f6e7abd0617c9 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 23 Oct 2013 19:07:27 +0200
Subject: audio/out: remove useless info struct and redundant fields

---
 audio/out/ao.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/audio/out/ao.c b/audio/out/ao.c
index 416bec43f0..c21e58ccf6 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -102,8 +102,8 @@ static bool get_desc(struct m_obj_desc *dst, int index)
         return false;
     const struct ao_driver *ao = audio_out_drivers[index];
     *dst = (struct m_obj_desc) {
-        .name = ao->info->short_name,
-        .description = ao->info->name,
+        .name = ao->name,
+        .description = ao->description,
         .priv_size = ao->priv_size,
         .priv_defaults = ao->priv_defaults,
         .options = ao->options,
@@ -189,7 +189,7 @@ autoprobe:
     for (int i = 0; audio_out_drivers[i]; i++) {
         struct ao *ao = ao_create(true, global, input_ctx, encode_lavc_ctx,
                                   samplerate, format, channels,
-                          (char *)audio_out_drivers[i]->info->short_name, NULL);
+                                  (char *)audio_out_drivers[i]->name, NULL);
         if (ao)
             return ao;
     }
-- 
cgit v1.2.3