jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

default rdpsnd audin off, can enable with --enable-rdpsndaudin

Browse Source
This commit is contained in:
Jay Sorg 2019-10-22 22:48:15 -07:00
parent 04f885189a
commit d7b1f12d9b
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -150,6 +150,11 @@ AC_ARG_ENABLE(rfxcodec, AS_HELP_STRING([--disable-rfxcodec],
[], [enable_rfxcodec=yes]) [], [enable_rfxcodec=yes])
AM_CONDITIONAL(XRDP_RFXCODEC, [test x$enable_rfxcodec = xyes]) AM_CONDITIONAL(XRDP_RFXCODEC, [test x$enable_rfxcodec = xyes])
AC_ARG_ENABLE(rdpsndaudin, AS_HELP_STRING([--enable-rdpsndaudin],
[Use rdpsnd audio in (default: no)]),
[], [enable_rdpsndaudin=no])
AM_CONDITIONAL(XRDP_RDPSNDAUDIN, [test x$enable_rdpsndaudin = xyes])
# Don't fail without working nasm if rfxcodec is not enabled # Don't fail without working nasm if rfxcodec is not enabled
if test "x$enable_rfxcodec" != xyes; then if test "x$enable_rfxcodec" != xyes; then
with_simd=no with_simd=no
@ -390,6 +395,7 @@ echo " vsock $enable_vsock"
echo " pam $enable_pam" echo " pam $enable_pam"
echo " kerberos $enable_kerberos" echo " kerberos $enable_kerberos"
echo " debug $enable_xrdpdebug" echo " debug $enable_xrdpdebug"
echo " rdpsndaudin $enable_rdpsndaudin"
echo "" echo ""
echo " strict_locations $enable_strict_locations" echo " strict_locations $enable_strict_locations"
echo " prefix $prefix" echo " prefix $prefix"

4
sesman/chansrv/Makefile.am
View File

@ -37,6 +37,10 @@ AM_CPPFLAGS += -DXRDP_MP3LAME
CHANSRV_EXTRA_LIBS += -lmp3lame CHANSRV_EXTRA_LIBS += -lmp3lame
endif endif
if XRDP_RDPSNDAUDIN
AM_CPPFLAGS += -DXRDP_RDPSNDAUDIN
endif
AM_CFLAGS = $(X_CFLAGS) AM_CFLAGS = $(X_CFLAGS)
sbin_PROGRAMS = \ sbin_PROGRAMS = \

5
sesman/chansrv/sound.c
View File

@ -1438,6 +1438,7 @@ sound_check_wait_objs(void)
static int static int
sound_send_server_input_formats(void) sound_send_server_input_formats(void)
{ {
#if defined(XRDP_RDPSNDAUDIN)
struct stream *s; struct stream *s;
int bytes; int bytes;
int index; int index;
@ -1492,6 +1493,10 @@ sound_send_server_input_formats(void)
bytes = (int)(s->end - s->data); bytes = (int)(s->end - s->data);
send_channel_data(g_rdpsnd_chan_id, s->data, bytes); send_channel_data(g_rdpsnd_chan_id, s->data, bytes);
free_stream(s); free_stream(s);
#else
/* avoid warning */
(void)g_wave_inp_formats;
#endif
return 0; return 0;
} }