diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-05-27 23:46:57 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-05-27 23:46:57 +0200 |
| commit | 4c0fb4b0db47dacb6eed33279558f88090eb06f9 (patch) | |
| tree | 0612e87a51ae725e040d95a5a26909bb619819f3 /src/pactl | |
| parent | ce6f922de24f004f9c108fc6d921ec141fb7818c (diff) | |
New upstream version 11.7
Diffstat (limited to 'src/pactl')
| -rw-r--r-- | src/pactl/m4/Makefile | 22 | ||||
| -rw-r--r-- | src/pactl/src/core-util.c | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/pactl/m4/Makefile b/src/pactl/m4/Makefile index 30b316a..fbf4be4 100644 --- a/src/pactl/m4/Makefile +++ b/src/pactl/m4/Makefile @@ -119,12 +119,12 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ ChangeLog DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/jos/src/own_stuff/eBook-speaker/src/pactl/missing aclocal-1.15 +ACLOCAL = ${SHELL} /home/jos/src/own_stuff/daisy-player/src/pactl/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 -AUTOCONF = ${SHELL} /home/jos/src/own_stuff/eBook-speaker/src/pactl/missing autoconf -AUTOHEADER = ${SHELL} /home/jos/src/own_stuff/eBook-speaker/src/pactl/missing autoheader -AUTOMAKE = ${SHELL} /home/jos/src/own_stuff/eBook-speaker/src/pactl/missing automake-1.15 +AUTOCONF = ${SHELL} /home/jos/src/own_stuff/daisy-player/src/pactl/missing autoconf +AUTOHEADER = ${SHELL} /home/jos/src/own_stuff/daisy-player/src/pactl/missing autoheader +AUTOMAKE = ${SHELL} /home/jos/src/own_stuff/daisy-player/src/pactl/missing automake-1.15 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -149,7 +149,7 @@ LDFLAGS = LIBOBJS = LIBS = -lsndfile -lpulse -lg -lc LTLIBOBJS = -MAKEINFO = ${SHELL} /home/jos/src/own_stuff/eBook-speaker/src/pactl/missing makeinfo +MAKEINFO = ${SHELL} /home/jos/src/own_stuff/daisy-player/src/pactl/missing makeinfo MKDIR_P = /bin/mkdir -p OBJEXT = o PACKAGE = pactl-set-volume @@ -162,13 +162,13 @@ PACKAGE_VERSION = 1.0 PATH_SEPARATOR = : POW_LIB = SET_MAKE = -SHELL = /bin/bash +SHELL = /bin/sh STRIP = VERSION = 1.0 -abs_builddir = /home/jos/src/own_stuff/eBook-speaker/src/pactl/m4 -abs_srcdir = /home/jos/src/own_stuff/eBook-speaker/src/pactl/m4 -abs_top_builddir = /home/jos/src/own_stuff/eBook-speaker/src/pactl -abs_top_srcdir = /home/jos/src/own_stuff/eBook-speaker/src/pactl +abs_builddir = /home/jos/src/own_stuff/daisy-player/src/pactl/m4 +abs_srcdir = /home/jos/src/own_stuff/daisy-player/src/pactl/m4 +abs_top_builddir = /home/jos/src/own_stuff/daisy-player/src/pactl +abs_top_srcdir = /home/jos/src/own_stuff/daisy-player/src/pactl ac_ct_CC = gcc am__include = include am__leading_dot = . @@ -195,7 +195,7 @@ host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/jos/src/own_stuff/eBook-speaker/src/pactl/install-sh +install_sh = ${SHELL} /home/jos/src/own_stuff/daisy-player/src/pactl/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/src/pactl/src/core-util.c b/src/pactl/src/core-util.c index 17648fa..a23de21 100644 --- a/src/pactl/src/core-util.c +++ b/src/pactl/src/core-util.c @@ -104,12 +104,12 @@ int pa_parse_volume (const char *v, pa_volume_t *volume) pa_assert(v); pa_assert(volume); - len = strlen(v); + len = (int) strlen(v); if (len >= 64) return -1; - memcpy(str, v, len + 1); + memcpy(str, v, (size_t) len + 1); if (str[len - 1] == '%') { str[len - 1] = '\0'; @@ -121,7 +121,7 @@ int pa_parse_volume (const char *v, pa_volume_t *volume) if (d < 0 || d > PA_VOLUME_MAX) return -1; - *volume = d; + *volume = (pa_volume_t) d; return 0; } |