From 9d85032d9c10694ba062b81003bc9964b35925ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Thu, 4 Aug 2011 13:28:03 +0300
Subject: [PATCH] Move and split dummy audio output
---
modules/LIST | 1 +
modules/audio_output/Modules.am | 6 ++++++
.../{misc/dummy/aout.c => audio_output/adummy.c} | 16 ++++++++++++----
modules/misc/dummy/Modules.am | 1 -
modules/misc/dummy/dummy.c | 4 ----
modules/misc/dummy/dummy.h | 2 --
po/POTFILES.in | 2 +-
7 files changed, 20 insertions(+), 12 deletions(-)
rename modules/{misc/dummy/aout.c => audio_output/adummy.c} (88%)
diff --git a/modules/LIST b/modules/LIST
index a632a30f8a80..11eb8c23eb1d 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -37,6 +37,7 @@ $Id$
* access_vdr: VDR access module
* adjust: Contrast/Hue/saturation/Brightness adjust module
* adpcm: ADPCM audio decoder
+ * adummy: dummy audio output
* aes3: aes3 decoder/packetizer
* aiff: AIFF demuxer
* alphamask: Alpha layer mask video filter
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index a258456c7d4b..5faa6826cc1b 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -7,12 +7,18 @@ SOURCES_jack = jack.c
SOURCES_audioqueue = audioqueue.c
SOURCES_opensles_android = opensles_android.c
+libadummy_plugin_la_SOURCES = adummy.c
+libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
+libadummy_plugin_la_LIBADD = $(AM_LIBADD)
+libadummy_plugin_la_DEPENDENCIES =
+
libamem_plugin_la_SOURCES = amem.c
libamem_plugin_la_CFLAGS = $(AM_CFLAGS)
libamem_plugin_la_LIBADD = $(AM_LIBADD)
libamem_plugin_la_DEPENDENCIES =
libvlc_LTLIBRARIES += \
+ libadummy_plugin.la \
libamem_plugin.la \
libaout_file_plugin.la
diff --git a/modules/misc/dummy/aout.c b/modules/audio_output/adummy.c
similarity index 88%
rename from modules/misc/dummy/aout.c
rename to modules/audio_output/adummy.c
index b12fef78c6d6..2b67a4a4146f 100644
--- a/modules/misc/dummy/aout.c
+++ b/modules/audio_output/adummy.c
@@ -1,5 +1,5 @@
/*****************************************************************************
- * aout.c : dummy audio output plugin
+ * adummy.c : dummy audio output plugin
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* $Id$
@@ -30,10 +30,19 @@
#endif
#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_cpu.h>
-#include "dummy.h"
+static int Open( vlc_object_t * p_this );
+
+vlc_module_begin ()
+ set_shortname( N_("Dummy") )
+ set_description( N_("Dummy audio output") )
+ set_capability( "audio output", 1 )
+ set_callbacks( Open, NULL )
+ add_shortcut( "dummy" )
+vlc_module_end ()
#define FRAME_SIZE 2048
#define A52_FRAME_NB 1536
@@ -46,7 +55,7 @@ static void Play( audio_output_t *, block_t * );
/*****************************************************************************
* OpenAudio: open a dummy audio device
*****************************************************************************/
-int OpenAudio ( vlc_object_t * p_this )
+static int Open( vlc_object_t * p_this )
{
audio_output_t * p_aout = (audio_output_t *)p_this;
@@ -80,4 +89,3 @@ static void Play( audio_output_t *aout, block_t *block )
block_Release( block );
(void) aout;
}
-
diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am
index 300177d126ab..e0fb8fb452a3 100644
--- a/modules/misc/dummy/Modules.am
+++ b/modules/misc/dummy/Modules.am
@@ -1,7 +1,6 @@
SOURCES_dummy = \
dummy.c \
dummy.h \
- aout.c \
vout.c \
interface.c \
input.c \
diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 00fb584661b4..a38660513f8c 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -92,10 +92,6 @@ vlc_module_begin ()
set_description( N_("Dummy encoder function") )
set_capability( "encoder", 0 )
set_callbacks( OpenEncoder, CloseEncoder )
- add_submodule ()
- set_description( N_("Dummy audio output function") )
- set_capability( "audio output", 1 )
- set_callbacks( OpenAudio, NULL )
add_submodule ()
set_description( N_("Dummy video output function") )
set_section( N_( "Dummy Video output" ), NULL )
diff --git a/modules/misc/dummy/dummy.h b/modules/misc/dummy/dummy.h
index 97837e962779..e4b00ebce125 100644
--- a/modules/misc/dummy/dummy.h
+++ b/modules/misc/dummy/dummy.h
@@ -36,8 +36,6 @@ void CloseDecoder ( vlc_object_t * );
int OpenEncoder ( vlc_object_t * );
void CloseEncoder ( vlc_object_t * );
-int OpenAudio ( vlc_object_t * );
-
int OpenVideo ( vlc_object_t * );
int OpenVideoStat( vlc_object_t * );
void CloseVideo ( vlc_object_t * );
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a29cf92f8b2d..07c60e71e27e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -314,6 +314,7 @@ modules/audio_filter/spatializer/tuning.h
modules/audio_mixer/fixed32.c
modules/audio_mixer/float32.c
modules/audio_mixer/trivial.c
+modules/audio_output/adummy.c
modules/audio_output/alsa.c
modules/audio_output/amem.c
modules/audio_output/audioqueue.c
@@ -906,7 +907,6 @@ modules/meta_engine/folder.c
modules/meta_engine/taglib.cpp
modules/misc/audioscrobbler.c
modules/misc/dhparams.h
-modules/misc/dummy/aout.c
modules/misc/dummy/decoder.c
modules/misc/dummy/dummy.c
modules/misc/dummy/dummy.h
--
GitLab