aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-12-06 20:49:12 +0100
committerPeter Wu <peter@lekensteyn.nl>2016-12-07 00:51:14 +0000
commitfc4bb7eb7413affa63049516c4dbc46ca272abea (patch)
tree6bffd44f7b8bd8be9e9a7178bdbc3688093e14f3
parent47829b9611b613425aa0a314224863b02b915ea2 (diff)
Change SpanDSP capitalization
Many capitalization can be found for this library (spandsp, Spandsp, SpanDSP), let's use the one found in the library README and in its spec file. Change-Id: Ia66b723e5d582a6218da1b6366b7d4859272f80c Reviewed-on: https://code.wireshark.org/review/19122 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--cmake/modules/FindSPANDSP.cmake16
-rw-r--r--cmakeconfig.h.in2
-rw-r--r--codecs/G722/G722decode.c2
-rw-r--r--codecs/G726/G726decode.c2
-rw-r--r--codecs/codecs.c6
-rw-r--r--configure.ac12
-rw-r--r--docbook/release-notes.asciidoc2
7 files changed, 21 insertions, 21 deletions
diff --git a/cmake/modules/FindSPANDSP.cmake b/cmake/modules/FindSPANDSP.cmake
index 6c64d8fdba..466982e85f 100644
--- a/cmake/modules/FindSPANDSP.cmake
+++ b/cmake/modules/FindSPANDSP.cmake
@@ -1,10 +1,10 @@
-# Find the system's Spandsp includes and library
+# Find the system's SpanDSP includes and library
#
# SPANDSP_INCLUDE_DIRS - where to find spandsp.h
-# SPANDSP_LIBRARIES - List of libraries when using spandsp
-# SPANDSP_FOUND - True if spandsp found
-# SPANDSP_DLL_DIR - (Windows) Path to the Spandsp DLL
-# SPANDSP_DLL - (Windows) Name of the Spandsp DLL
+# SPANDSP_LIBRARIES - List of libraries when using SpanDSP
+# SPANDSP_FOUND - True if SpanDSP found
+# SPANDSP_DLL_DIR - (Windows) Path to the SpanDSP DLL
+# SPANDSP_DLL - (Windows) Name of the SpanDSP DLL
include( FindWSWinLibs )
FindWSWinLibs( "spandsp-.*" "SPANDSP_HINTS" )
@@ -29,21 +29,21 @@ find_library( SPANDSP_LIBRARY
)
include( FindPackageHandleStandardArgs )
-find_package_handle_standard_args( Spandsp DEFAULT_MSG SPANDSP_INCLUDE_DIR SPANDSP_LIBRARY )
+find_package_handle_standard_args( SpanDSP DEFAULT_MSG SPANDSP_INCLUDE_DIR SPANDSP_LIBRARY )
if( SPANDSP_FOUND )
set( SPANDSP_INCLUDE_DIRS ${SPANDSP_INCLUDE_DIR} )
set( SPANDSP_LIBRARIES ${SPANDSP_LIBRARY} )
if (WIN32)
set ( SPANDSP_DLL_DIR "${SPANDSP_HINTS}/bin"
- CACHE PATH "Path to spandsp DLL"
+ CACHE PATH "Path to SpanDSP DLL"
)
file( GLOB _spandsp_dll RELATIVE "${SPANDSP_DLL_DIR}"
"${SPANDSP_DLL_DIR}/libspandsp-*.dll"
)
set ( SPANDSP_DLL ${_spandsp_dll}
# We're storing filenames only. Should we use STRING instead?
- CACHE FILEPATH "spandsp DLL file name"
+ CACHE FILEPATH "SpanDSP DLL file name"
)
mark_as_advanced( SPANDSP_DLL_DIR SPANDSP_DLL )
endif()
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index dbdfa8d340..a91414db7f 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -300,7 +300,7 @@
/* Define to 1 if you want to playing SBC by standalone BlueZ SBC library */
#cmakedefine HAVE_SBC 1
-/* Define to 1 if you have the spandsp library. */
+/* Define to 1 if you have the SpanDSP library. */
#cmakedefine HAVE_SPANDSP 1
/* Define to 1 if you have the `setresgid' function. */
diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c
index fae16c0626..e4951f8cd6 100644
--- a/codecs/G722/G722decode.c
+++ b/codecs/G722/G722decode.c
@@ -49,7 +49,7 @@ codec_g722_release(void *ctx)
return; /* out-of-memory; */
}
- /* Note: replaces g722_decode_release since spandsp 20090211 */
+ /* Note: replaces g722_decode_release since SpanDSP 20090211 */
g722_decode_free(state);
}
diff --git a/codecs/G726/G726decode.c b/codecs/G726/G726decode.c
index cb157d6c46..fb98182614 100644
--- a/codecs/G726/G726decode.c
+++ b/codecs/G726/G726decode.c
@@ -66,7 +66,7 @@ codec_g726_release(void *ctx)
return; /* out-of-memory; */
}
- /* Note: replaces g726_release since spandsp 20090211 */
+ /* Note: replaces g726_release since SpanDSP 20090211 */
g726_free(state->state);
g_free(state);
}
diff --git a/codecs/codecs.c b/codecs/codecs.c
index 447ee67793..4001a8d426 100644
--- a/codecs/codecs.c
+++ b/codecs/codecs.c
@@ -247,11 +247,11 @@ void codec_get_compiled_version_info(GString *str)
g_string_append(str, ", without SBC");
#endif
- /* Spandsp (G.722, G.726) */
+ /* SpanDSP (G.722, G.726) */
#ifdef HAVE_SPANDSP
- g_string_append(str, ", with Spandsp");
+ g_string_append(str, ", with SpanDSP");
#else
- g_string_append(str, ", without Spandsp");
+ g_string_append(str, ", without SpanDSP");
#endif
}
diff --git a/configure.ac b/configure.ac
index 6510b983fe..ab328d1a80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2539,20 +2539,20 @@ fi
AM_CONDITIONAL(HAVE_SBC, test "x$have_sbc" = "xyes")
#`
-# Check Spandsp library for RTP Player
+# Check SpanDSP library for RTP Player
# http://www.soft-switch.org/
AC_ARG_WITH([spandsp],
AC_HELP_STRING( [--with-spandsp=@<:@yes/no@:>@],
- [use Spandsp to play G.722/G.726 codecs @<:@default=yes, if available@:>@]),
+ [use SpanDSP to play G.722/G.726 codecs @<:@default=yes, if available@:>@]),
with_spandsp="$withval"; want_spandsp="yes", with_spandsp="yes")
PKG_CHECK_MODULES(SPANDSP, spandsp, [have_spandsp=yes], [have_spandsp=no])
if test "x$with_spandsp" != "xno"; then
if (test "${have_spandsp}" = "yes"); then
- AC_DEFINE(HAVE_SPANDSP, 1, [Define if you have the spandsp library])
+ AC_DEFINE(HAVE_SPANDSP, 1, [Define if you have the SpanDSP library])
elif test "x$want_spandsp" = "xyes"; then
- # Error out if the user explicitly requested the spandsp library
- AC_MSG_ERROR([Spandsp library was requested, but is not available])
+ # Error out if the user explicitly requested the SpanDSP library
+ AC_MSG_ERROR([SpanDSP library was requested, but is not available])
fi
else
have_spandsp=no
@@ -3172,7 +3172,7 @@ echo " Use libssh library : $libssh_message"
echo " Have ssh_userauth_agent : $ssh_userauth_agent_message"
echo " Use nl library : $libnl_message"
echo " Use SBC codec library : $have_sbc"
-echo " Use Spandsp library : $have_spandsp"
+echo " Use SpanDSP library : $have_spandsp"
echo " Use nghttp2 library : $nghttp2_message"
echo " Use LZ4 library : $have_lz4"
echo " Use Snappy library : $have_snappy"
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 1507cf2052..a162b0d547 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -38,7 +38,7 @@ since version 2.2.0:
* SS7 Point Codes can now be resolved into names with a hosts-like file.
* Wireshark can now go fullscreen to have more room for packets.
* TShark can now export objects like the other GUI interfaces.
-* Support for G.722 and G.726 codecs in the RTP Player (via the Spandsp library).
+* Support for G.722 and G.726 codecs in the RTP Player (via the SpanDSP library).
* You can now choose the output device when playing RTP streams.
//=== Removed Dissectors