From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 17 Mar 2024 11:38:21 +0000 (+0100)
Subject: Merge topic branch t/play into pu
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=f192fc3c0f824b951c4cb275d7b54b2651de7e8e;hp=-c;p=paraslash.git

Merge topic branch t/play into pu

This small series contains a few minor tweaks for para_play. The most
obvious change is that para_play is no longer built on systems which
lack libreadline.

<!--
- para_play is no longer built if libreadline is not installed.
-->

* refs/heads/t/play:
  play: Shut down alsa on input EOF.
  play: Simplify and improve get_key_map_seq().
  play: Remove pointless goto in play_post_monitor().
  Return from filter_setup() so callers can reset the terminal.
  Let para_play depend on libreadline.

# Conflicts:
#	configure.ac
---

f192fc3c0f824b951c4cb275d7b54b2651de7e8e
diff --combined Makefile.real
index 21d5fc03,bd2bd9d9..fec328a6
--- a/Makefile.real
+++ b/Makefile.real
@@@ -14,6 -14,7 +14,6 @@@ SEVERITIES := \"debug\",\"info\",\"noti
  vardir := /var/paraslash
  mandir := $(datarootdir)/man/man1
  MKDIR_P := mkdir -p
 -prefixed_executables := $(addprefix para_, $(executables))
  
  build_date := $(shell date)
  uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@@ -34,263 -35,15 +34,263 @@@ m4depdir := $(build_dir)/m4dep
  lls_suite_dir := $(build_dir)/lls
  lls_m4_dir := m4/lls
  test_dir := t
 -yy_src_dir = yy
 -yy_build_dir = $(build_dir)/yy
 +yy_src_dir := yy
 +yy_build_dir := $(build_dir)/yy
 +
- executables := recv filter audioc write afh play
++executables := recv filter audioc write afh
 +ifneq ($(CRYPTOLIB),)
 +	ifeq ($(HAVE_OSL),yes)
 +	executables += server upgrade_db
 +		server_objs := $(addsuffix .o, \
 +			server afh_common mp3_afh vss command net string \
 +			signal time daemon http_send close_on_fork \
 +			crypt_common base64 ipc dccp_send fd user_list \
 +			chunk_queue afs aft mood mp score attribute blob \
 +			playlist sched acl send_common udp_send color fec \
 +			wma_afh wma_common sideband version lsu \
 +		)
 +		ifeq ($(CRYPTOLIB),openssl)
 +			server_objs += openssl.o
 +		else
 +			server_objs += gcrypt.o
 +		endif
 +		ifeq ($(NEED_OGG_OBJECTS),yes)
 +			server_objs += ogg_afh_common.o
 +		endif
 +		ifeq ($(NEED_VORBIS_OBJECTS),yes)
 +			server_objs += ogg_afh.o
 +		endif
 +		ifeq ($(NEED_SPEEX_OBJECTS),yes)
 +			server_objs += spx_afh.o spx_common.o
 +		endif
 +		ifeq ($(NEED_OPUS_OBJECTS),yes)
 +			server_objs += opus_afh.o opus_common.o
 +		endif
 +		ifeq ($(NEED_FLAC_OBJECTS),yes)
 +			server_objs += flac_afh.o
 +		endif
 +		ifeq ($(HAVE_FAAD),yes)
 +			server_objs += aac_afh.o mp4.o
 +		endif
 +		upgrade_db_objs := $(addsuffix .o, crypt_common exec fd string \
 +			upgrade_db version base64)
 +	endif
 +endif
 +ifneq ($(CRYPTOLIB),)
 +	executables += client audiod
 +	client_objs := $(addsuffix .o, \
 +		client net string fd lsu sched stdin stdout time sideband client_common \
 +		buffer_tree crypt_common base64 version $(CRYPTOLIB) \
 +	)
 +	ifeq ($(HAVE_READLINE),yes)
 +		client_objs += interactive.o
 +	endif
 +	audiod_objs := $(addsuffix .o, \
 +		audiod signal string daemon stat net crypt_common base64 sideband \
 +		time grab_client filter_common wav_filter compress_filter amp_filter \
 +		http_recv dccp_recv recv_common fd sched write_common file_write \
 +		audiod_command fecdec_filter client_common udp_recv color fec \
 +		prebuffer_filter version bitstream imdct wma_common wmadec_filter \
 +		buffer_tree sync_filter lsu $(CRYPTOLIB) \
 +	)
 +	audiod_audio_formats := "wma"
 +	ifeq ($(NEED_VORBIS_OBJECTS),yes)
 +		audiod_objs += oggdec_filter.o
 +		audiod_audio_formats += ,"ogg"
 +	endif
 +	ifeq ($(NEED_SPEEX_OBJECTS),yes)
 +		audiod_objs += spxdec_filter.o spx_common.o
 +		audiod_audio_formats += ,"spx"
 +	endif
 +	ifeq ($(NEED_OPUS_OBJECTS),yes)
 +		audiod_objs += opusdec_filter.o opus_common.o
 +		audiod_audio_formats += ,"opus"
 +	endif
 +	ifeq ($(NEED_FLAC_OBJECTS),yes)
 +		audiod_objs += flacdec_filter.o
 +		audiod_audio_formats += ,"flac"
 +	endif
 +	ifeq ($(HAVE_FAAD),yes)
 +		audiod_objs += aacdec_filter.o
 +		audiod_audio_formats += ,"aac"
 +	endif
 +	ifeq ($(HAVE_MAD),yes)
 +		audiod_objs += mp3dec_filter.o
 +		audiod_audio_formats += ,"mp3"
 +	endif
 +	ifeq ($(HAVE_OSS),yes)
 +		audiod_objs += oss_write.o
 +	endif
 +	ifeq ($(HAVE_ALSA),yes)
 +		audiod_objs += alsa_write.o
 +	endif
 +	ifeq ($(NEED_AO_OBJECTS),yes)
 +		audiod_objs += ao_write.o
 +	endif
 +	ifeq ($(HAVE_SAMPLERATE),yes)
 +		audiod_objs += resample_filter.o check_wav.o
 +	endif
 +endif
 +ifneq ($(HAVE_OSS)-$(HAVE_ALSA),no-no)
 +	executables += mixer
 +	mixer_objs := $(addsuffix .o, mixer exec string fd time lsu version)
 +	ifeq ($(HAVE_OSS),yes)
 +		mixer_objs += oss_mix.o
 +	endif
 +	ifeq ($(HAVE_ALSA),yes)
 +		mixer_objs += alsa_mix.o
 +	endif
 +endif
 +ifeq ($(HAVE_CURSES),yes)
 +	executables += gui
 +	gui_objs := $(addsuffix .o, exec signal string stat ringbuffer fd \
 +		gui gui_theme lsu time sched version)
 +endif
 +filter_objs := $(addsuffix .o, \
 +	filter_common wav_filter compress_filter filter string stdin stdout \
 +	sched fd amp_filter fecdec_filter fec lsu version prebuffer_filter \
 +	time bitstream imdct wma_common wmadec_filter buffer_tree net \
 +	sync_filter \
 +)
 +ifeq ($(NEED_VORBIS_OBJECTS),yes)
 +	filter_objs += oggdec_filter.o
 +endif
 +ifeq ($(NEED_SPEEX_OBJECTS),yes)
 +	filter_objs += spxdec_filter.o spx_common.o
 +endif
 +ifeq ($(NEED_OPUS_OBJECTS),yes)
 +	filter_objs += opusdec_filter.o opus_common.o
 +endif
 +ifeq ($(NEED_FLAC_OBJECTS),yes)
 +	filter_objs += flacdec_filter.o
 +endif
 +ifeq ($(HAVE_FAAD),yes)
 +	filter_objs += aacdec_filter.o
 +endif
 +ifeq ($(HAVE_MAD),yes)
 +	filter_objs += mp3dec_filter.o
 +endif
 +ifeq ($(HAVE_SAMPLERATE),yes)
 +	filter_objs += resample_filter.o check_wav.o
 +endif
 +
 +recv_objs := $(addsuffix .o, \
 +	http_recv recv_common recv time string net dccp_recv fd sched stdout \
 +	udp_recv buffer_tree afh_recv afh_common wma_afh wma_common mp3_afh \
 +	version \
 +)
 +ifeq ($(NEED_OGG_OBJECTS),yes)
 +	recv_objs += ogg_afh_common.o
 +endif
 +ifeq ($(NEED_VORBIS_OBJECTS),yes)
 +	recv_objs += ogg_afh.o
 +endif
 +ifeq ($(NEED_SPEEX_OBJECTS),yes)
 +	recv_objs += spx_afh.o spx_common.o
 +endif
 +ifeq ($(NEED_OPUS_OBJECTS),yes)
 +	recv_objs += opus_afh.o opus_common.o
 +endif
 +ifeq ($(NEED_FLAC_OBJECTS),yes)
 +	recv_objs += flac_afh.o
 +endif
 +ifeq ($(HAVE_FAAD),yes)
 +	recv_objs += aac_afh.o mp4.o
 +endif
 +
 +audio_format_handlers := mp3 wma
 +afh_objs := $(addsuffix .o, afh string fd mp3_afh afh_common time wma_afh \
 +	wma_common version)
 +ifeq ($(NEED_OGG_OBJECTS),yes)
 +	afh_objs += ogg_afh_common.o
 +endif
 +ifeq ($(NEED_VORBIS_OBJECTS),yes)
 +	afh_objs += ogg_afh.o
 +	audio_format_handlers += ogg
 +endif
 +ifeq ($(NEED_SPEEX_OBJECTS),yes)
 +	afh_objs += spx_common.o
 +	audio_format_handlers += spx
 +endif
 +ifeq ($(NEED_OPUS_OBJECTS),yes)
 +	afh_objs += opus_afh.o opus_common.o
 +	audio_format_handlers += opus
 +endif
 +ifeq ($(NEED_FLAC_OBJECTS),yes)
 +	afh_objs += flac_afh.o
 +	audio_format_handlers += flac
 +endif
 +ifeq ($(HAVE_FAAD),yes)
 +	afh_objs += aac_afh.o mp4.o
 +	audio_format_handlers += aac
 +endif
 +
- play_objs := $(addsuffix .o, \
- 	play fd sched buffer_tree time string net afh_recv afh_common \
- 	wma_afh wma_common mp3_afh recv_common udp_recv http_recv dccp_recv \
- 	filter_common fec bitstream imdct wav_filter compress_filter \
- 	amp_filter prebuffer_filter fecdec_filter wmadec_filter write_common \
- 	file_write version sync_filter lsu \
- )
- ifeq ($(NEED_OGG_OBJECTS),yes)
- 	play_objs += ogg_afh_common.o
- endif
- ifeq ($(NEED_VORBIS_OBJECTS),yes)
- 	play_objs += oggdec_filter.o ogg_afh.o
- endif
- ifeq ($(NEED_SPEEX_OBJECTS),yes)
- 	play_objs += spxdec_filter.o spx_afh.o spx_common.o
- endif
- ifeq ($(NEED_OPUS_OBJECTS),yes)
- 	play_objs += opusdec_filter.o opus_afh.o opus_common.o
- endif
- ifeq ($(NEED_FLAC_OBJECTS),yes)
- 	play_objs += flacdec_filter.o flac_afh.o
- endif
- ifeq ($(HAVE_FAAD),yes)
- 	play_objs += aac_afh.o aacdec_filter.o mp4.o
- endif
- ifeq ($(HAVE_MAD),yes)
- 	play_objs += mp3dec_filter.o
- endif
- ifeq ($(HAVE_OSS),yes)
- 	play_objs += oss_write.o
- endif
- ifeq ($(HAVE_ALSA),yes)
- 	play_objs += alsa_write.o
- endif
- ifeq ($(NEED_AO_OBJECTS),yes)
- 	play_objs += ao_write.o
- endif
 +ifeq ($(HAVE_READLINE),yes)
- 	play_objs += interactive.o
- endif
- ifeq ($(HAVE_SAMPLERATE),yes)
- 	play_objs += resample_filter.o check_wav.o
++	executables += play
++	play_objs := $(addsuffix .o, \
++		play fd sched buffer_tree time string net afh_recv afh_common \
++		wma_afh wma_common mp3_afh recv_common udp_recv http_recv dccp_recv \
++		filter_common fec bitstream imdct wav_filter compress_filter \
++		amp_filter prebuffer_filter fecdec_filter wmadec_filter write_common \
++		file_write version sync_filter lsu interactive \
++	)
++	ifeq ($(NEED_OGG_OBJECTS),yes)
++		play_objs += ogg_afh_common.o
++	endif
++	ifeq ($(NEED_VORBIS_OBJECTS),yes)
++		play_objs += oggdec_filter.o ogg_afh.o
++	endif
++	ifeq ($(NEED_SPEEX_OBJECTS),yes)
++		play_objs += spxdec_filter.o spx_afh.o spx_common.o
++	endif
++	ifeq ($(NEED_OPUS_OBJECTS),yes)
++		play_objs += opusdec_filter.o opus_afh.o opus_common.o
++	endif
++	ifeq ($(NEED_FLAC_OBJECTS),yes)
++		play_objs += flacdec_filter.o flac_afh.o
++	endif
++	ifeq ($(HAVE_FAAD),yes)
++		play_objs += aac_afh.o aacdec_filter.o mp4.o
++	endif
++	ifeq ($(HAVE_MAD),yes)
++		play_objs += mp3dec_filter.o
++	endif
++	ifeq ($(HAVE_OSS),yes)
++		play_objs += oss_write.o
++	endif
++	ifeq ($(HAVE_ALSA),yes)
++		play_objs += alsa_write.o
++	endif
++	ifeq ($(NEED_AO_OBJECTS),yes)
++		play_objs += ao_write.o
++	endif
++	ifeq ($(HAVE_SAMPLERATE),yes)
++		play_objs += resample_filter.o check_wav.o
++	endif
 +endif
 +
 +write_objs := $(addsuffix .o, write write_common file_write time fd \
 +	string sched stdin buffer_tree check_wav version)
 +ifeq ($(NEED_AO_OBJECTS),yes)
 +	write_objs += ao_write.o
 +endif
 +ifeq ($(HAVE_OSS),yes)
 +	write_objs += oss_write.o
 +endif
 +ifeq ($(HAVE_ALSA),yes)
 +	write_objs += alsa_write.o
 +endif
 +
 +audioc_objs := $(addsuffix .o, audioc string lsu net fd time version)
 +ifeq ($(HAVE_READLINE),yes)
 +	audioc_objs += buffer_tree.o interactive.o sched.o
 +endif
  
  # sort removes duplicate words, which is all we need here
 -all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 +dep_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
  	$(audiod_objs) $(audioc_objs) $(mixer_objs) $(server_objs) \
 -	$(write_objs) $(afh_objs) $(play_objs))
 -deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
 -deps += $(addprefix $(dep_dir)/, mp.bison.d mp.flex.d)
 +	$(write_objs) $(afh_objs) $(play_objs) mp.bison mp.flex)
 +deps := $(addprefix $(dep_dir)/, $(dep_objs:.o=.d))
  
  afh_objs += afh.lsg.o
  audioc_objs += audioc.lsg.o
@@@ -331,7 -84,6 +331,7 @@@ write_objs := $(addprefix $(object_dir)
  afh_objs := $(addprefix $(object_dir)/, $(afh_objs))
  play_objs := $(addprefix $(object_dir)/, $(play_objs))
  
 +prefixed_executables := $(addprefix para_, $(executables))
  man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
  
  autocrap := config.h.in configure
@@@ -448,10 -200,6 +448,10 @@@ $(object_dir)/%.o: %.c | $(object_dir
  OD = $(addsuffix .d, $(addprefix $(dep_dir)/, $(1))) \
  	$(addsuffix .o, $(addprefix $(object_dir)/, $(1)))
  
 +$(call OD, audiod): \
 +	CPPFLAGS += -DAUDIOD_AUDIO_FORMAT_ARRAY='$(audiod_audio_formats)'
 +$(call OD, afh command): \
 +	CPPFLAGS += -DAUDIO_FORMAT_HANDLERS='"$(audio_format_handlers)"'
  $(call OD, opus%): CPPFLAGS += $(opus_cppflags)
  $(call OD, gui gui%): CPPFLAGS += $(curses_cppflags)
  $(call OD, spx%): CPPFLAGS += $(speex_cppflags)
@@@ -475,6 -223,7 +475,6 @@@ $(call OD, afs aft attribute blob mood 
  	CPPFLAGS += $(osl_cppflags)
  
  $(call OD, compress_filter): CFLAGS += -O3
 -$(call OD, openssl): CFLAGS += -Wno-deprecated-declarations
  
  $(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h)
  define CC_CMD
diff --combined audiod.c
index 0fae454c,bb5dd703..3e86af53
--- a/audiod.c
+++ b/audiod.c
@@@ -46,9 -46,8 +46,9 @@@ static struct lls_parse_result *lpr
  #define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name)))
  
  __printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
 -/** define the array containing all supported audio formats */
 -const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
 +/* Audio formats supported by audiod */
 +static const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY};
 +#define NUM_AUDIO_FORMATS ARRAY_SIZE(audio_formats)
  
  /** Defines how audiod handles one supported audio format. */
  struct audio_format_info {
@@@ -829,11 -828,14 +829,14 @@@ static int parse_stream_command(const c
  static int add_filter(int format, const char *cmdline)
  {
  	struct audio_format_info *a = &afi[format];
- 	int filter_num, nf = a->num_filters;
+ 	int ret, filter_num, nf = a->num_filters;
  	void *cfg;
  	struct lls_parse_result *flpr;
  
- 	filter_num = filter_setup(cmdline, &cfg, &flpr);
+ 	ret = filter_setup(cmdline, &cfg, &flpr);
+ 	if (ret < 0)
+ 		return ret;
+ 	filter_num = ret;
  	a->filter_lpr = arr_realloc(a->filter_lpr, nf + 1, sizeof(flpr));
  	a->filter_conf = arr_realloc(a->filter_conf, nf + 1, sizeof(void *));
  	a->filter_nums = arr_realloc(a->filter_nums, nf + 1, sizeof(unsigned));