[vlc-commits] audio_filter: move a52tospdif to tospdif

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jun 14 11:45:21 2016 +0200| [8b1c185a88a999d1e6cb978784401c6f52768dc7] | committer: Thomas Guillem

audio_filter: move a52tospdif to tospdif

Modified-By: Thomas Guillem <thomas at gllm.fr>
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8b1c185a88a999d1e6cb978784401c6f52768dc7
---

 NEWS                                                       |    1 +
 extras/package/rpm/vlc.altlinux.spec                       |    2 +-
 modules/MODULES_LIST                                       |    2 +-
 modules/audio_filter/Makefile.am                           |    4 ++--
 modules/audio_filter/converter/{a52tospdif.c => tospdif.c} |    2 +-
 po/POTFILES.in                                             |    2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 352f2b0..69bde4c 100644
--- a/NEWS
+++ b/NEWS
@@ -110,6 +110,7 @@ Audio output:
 
 Audio filters and output:
  * Add SoX Resampler library audio filter module (converter and resampler)
+ * a52tospdif and dtstospdif audio converters are merged into tospdif
 
 Video ouput:
  * Linux/BSD default video output is now OpenGL, instead of Xvideo
diff --git a/extras/package/rpm/vlc.altlinux.spec b/extras/package/rpm/vlc.altlinux.spec
index 9add728..33511ad 100644
--- a/extras/package/rpm/vlc.altlinux.spec
+++ b/extras/package/rpm/vlc.altlinux.spec
@@ -1011,6 +1011,7 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
 %_vlc_pluginsdir/audio_filter/libdolby_surround_decoder_plugin.so*
 %_vlc_pluginsdir/audio_filter/libheadphone_channel_mixer_plugin.so*
 %_vlc_pluginsdir/audio_filter/liblinear_resampler_plugin.so*
+%_vlc_pluginsdir/audio_filter/libtospdif_plugin.so*
 %_vlc_pluginsdir/audio_filter/libtrivial_channel_mixer_plugin.so*
 %_vlc_pluginsdir/audio_filter/libtrivial_resampler_plugin.so*
 %_vlc_pluginsdir/audio_filter/libugly_resampler_plugin.so*
@@ -1311,7 +1312,6 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
 
 %files plugin-a52
 %_vlc_pluginsdir/audio_filter/liba52tofloat32_plugin.so*
-%_vlc_pluginsdir/audio_filter/liba52tospdif_plugin.so*
 
 %files plugin-h264
 %_vlc_pluginsdir/codec/libx264_plugin.so*
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 0c94d60..24a5f7a 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -2,7 +2,6 @@ List of vlc plugins (475)
 $Id$
  * a52: A/52 basic parser/packetizer
  * a52tofloat32: A/52 audio converter & decoder plugin, using liba52
- * a52tospdif: Audio converter module to encapsulate A/52 into S/PDIF
  * aa: Ascii art video output
  * access_alsa: Alsa access module
  * access_archive: libarchive based access and stream filter
@@ -399,6 +398,7 @@ $Id$
  * theora: a theora video decoder/packetizer/encoder using the libtheora
  * timecode: clock/timecode as a subtitle input
  * tizen_audio: audio output for Tizen
+ * tospdif: Audio converter module to encapsulate A/52 and DTS into S/PDIF
  * transform: filter for horizontal and vertical image flips and 90° rotations
  * tremor: a vorbis audio decoder using the libvorbisidec (aka tremor) library
  * trivial_channel_mixer: Simple channel mixer plugin
diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am
index a436ed2..3b42bbf 100644
--- a/modules/audio_filter/Makefile.am
+++ b/modules/audio_filter/Makefile.am
@@ -98,10 +98,10 @@ libaudio_format_plugin_la_SOURCES = audio_filter/converter/format.c
 libaudio_format_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libaudio_format_plugin_la_LIBADD = $(LIBM)
 
-liba52tospdif_plugin_la_SOURCES = audio_filter/converter/a52tospdif.c
+libtospdif_plugin_la_SOURCES = audio_filter/converter/tospdif.c
 
 audio_filter_LTLIBRARIES += \
-	liba52tospdif_plugin.la \
+	libtospdif_plugin.la \
 	libaudio_format_plugin.la
 
 # Resamplers
diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/tospdif.c
similarity index 98%
rename from modules/audio_filter/converter/a52tospdif.c
rename to modules/audio_filter/converter/tospdif.c
index bd4175c..19a50ee 100644
--- a/modules/audio_filter/converter/a52tospdif.c
+++ b/modules/audio_filter/converter/tospdif.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * a52tospdif.c : encapsulates A/52 and DTS frames into S/PDIF packets
+ * tospdif.c : encapsulates A/52 and DTS frames into S/PDIF packets
  *****************************************************************************
  * Copyright (C) 2002, 2006-2016 VLC authors and VideoLAN
  * $Id$
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5d205f5..0831fac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -285,10 +285,10 @@ modules/audio_filter/channel_mixer/trivial.c
 modules/audio_filter/chorus_flanger.c
 modules/audio_filter/compressor.c
 modules/audio_filter/converter/a52tofloat32.c
-modules/audio_filter/converter/a52tospdif.c
 modules/audio_filter/converter/dtstofloat32.c
 modules/audio_filter/converter/format.c
 modules/audio_filter/converter/mpgatofixed32.c
+modules/audio_filter/converter/tospdif.c
 modules/audio_filter/equalizer.c
 modules/audio_filter/equalizer_presets.h
 modules/audio_filter/gain.c