Remove audioqueue plugin

zwh · Feb 27, 2017 · 4ceff8a · 4ceff8a
1 parent 3ac5f1f
commit 4ceff8a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 302 deletions.
diff --git a/NEWS b/NEWS
@@ -282,6 +282,7 @@ Removed modules
  * EyeTV access module
  * Rar access and stream filter: use libarchive
  * VDA decoder: use VT
+ * Audioqueue: use audiounit
 
 
 Changes between 2.2.0 and 2.2.1:

diff --git a/configure.ac b/configure.ac
@@ -3537,16 +3537,6 @@ AS_IF([test "$enable_wasapi" != "no"], [
 ])
 AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"])
 
-dnl
-dnl  AudioQueue plugin
-dnl
-AC_ARG_ENABLE(audioqueue,
-  [  --enable-audioqueue     AudioQueue audio module (default disabled)])
-if test "${enable_audioqueue}" = "yes"
-then
-  VLC_ADD_PLUGIN([audioqueue])
-fi
-
 dnl
 dnl  JACK modules
 dnl

diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
@@ -49,7 +49,6 @@ $Id$
  * audio_format: helper module for audio transcoding
  * audiobargraph_a: audiobargraph audio plugin
  * audiobargraph_v: audiobargraph video plugin
- * audioqueue: Audio Output based on AudioQueue API for iOS
  * audioscrobbler: AudioScrobbler/Last.fm submission plugin
  * audiounit_ios: AudioUnit output plugin for iOS
  * auhal: Audio output for Mac OS X based on the AUHAL API

diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
@@ -121,11 +121,6 @@ if HAVE_TVOS
 aout_LTLIBRARIES += libaudiounit_ios_plugin.la
 endif
 
-libaudioqueue_plugin_la_SOURCES = audio_output/audioqueue.c
-libaudioqueue_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices -rpath '$(aoutdir)'
-EXTRA_LTLIBRARIES += libaudioqueue_plugin.la
-aout_LTLIBRARIES += $(LTLIBaudioqueue)
-
 libtizen_audio_plugin_la_SOURCES = audio_output/tizen_audio.c
 libtizen_audio_plugin_la_CFLAGS = $(AM_CFLAGS)
 EXTRA_LTLIBRARIES += libtizen_audio_plugin.la

diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -305,7 +305,6 @@ modules/audio_mixer/integer.c
 modules/audio_output/adummy.c
 modules/audio_output/alsa.c
 modules/audio_output/amem.c
-modules/audio_output/audioqueue.c
 modules/audio_output/audiotrack.c
 modules/audio_output/audiounit_ios.m
 modules/audio_output/auhal.c