Commit 9d85032d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Move and split dummy audio output

parent 91d41ce2
......@@ -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
......
......@@ -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
......
/*****************************************************************************
* 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;
}
SOURCES_dummy = \
dummy.c \
dummy.h \
aout.c \
vout.c \
interface.c \
input.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 )
......
......@@ -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 * );
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment