Request 2921 (accepted)

siren.changes Changed

@@ -1,4 +1,89 @@
 -------------------------------------------------------------------
+Sat Oct  8 14:14:53 UTC 2016 - aloisio@gmx.com
+
+- Update to version 0.7
+  * Add the ffmpeg input plug-in.
+  * Add the pwd and reopen-output-plugin commands.
+  * Add the library-format-alt, player-track-format-alt, 
+    playlist-format-alt and
+    queue*format-alt options.
+  * Add the filename format variable.
+  * Add OpenBSD pledge(2) support.
+  * Bind "i" to select-active-entry by default.
+  * Support the (less standard) totaldiscs and totaltracks 
+    Vorbis comments.
+  * Handle the "n/m" format in the discnumber and 
+    tracknumber Vorbis comments
+    where "n" is the disc/track number and "m" is total 
+    number of discs/tracks.
+  * Remove support for ao file output drivers. These are not 
+    very useful.
+  * Fix various minor bugs.
+  Siren 0.6 (2015*09-01):
+  * Support bit depths other than 16.
+  * Add the aac input plug-in.
+  * Add the portaudio output plug-in.
+  * Add the albumartist, comment, discnumber, disctotal and 
+    tracktotal metadata
+    fields.
+  * Update the metadata cache on start-up if the metadata 
+    cache file uses an
+    older format.
+  * Allow relative paths in playlists.
+  * Handle CRLF newlines in playlists.
+  * Remove the confirm command. It is not very useful. 
+    Instead let the delete-entry and quit commands ask for
+    confirmation directly.
+  * Remove the -p option of the command-prompt and 
+    search-prompt commands. It is
+    not very useful.
+  * Fix various minor bugs.
+  Siren 0.5 (2015*03-04):
+  * Add 256-colour support.
+  * Add the mpg123 input plug-in.
+  * Add the opus input plug-in.
+  * Add the source command.
+  * Build on OS X.
+  * Fix various minor bugs.
+  Siren 0.4 (2014*07-16):
+  * Add the playlist view.
+  * Add the load-playlist command.
+  * Allow continued playback of all audio files in the 
+    browser view.
+  * Add the -d flag to the update-metadata command to delete 
+    the metadata of non-existent tracks.
+  * Remove the clear-history command and the 
+    max-history-entries and
+    show*dirs-before-files options as they were not very 
+    useful.
+  * Significantly reduce the time needed to load the library 
+    on start-up.
+  * Do not silently remove unsupported and non-existent 
+    tracks from the library.
+  * Let changes to output plug-in options take effect 
+    immediately.
+  * Change the default key bindings that display views.
+  * Fix various minor bugs.
+  Siren 0.3.1 (2013*07-08):
+  * Accommodate the build to flac 1.3.0.
+  Siren 0.3 (2013*06-04):
+  * Add the ALSA output plug-in.
+  * Add the update-metadata command.
+  * Rename the save-cache command to save-metadata for 
+    consistency.
+  * Remove the clear-cache command. It is no longer possible 
+    to clear the metadata cache while Siren is running.
+    To clear the metadata cache, remove the ~/.siren/metadata
+    file.
+  * Fix a buffer overflow in the format-string parser.
+  * Fix a mutex deadlock.
+  * Fix various minor bugs.
+
+- Spec cleanup
+
+- Refreshed siren-ncurses.patch
+
+-------------------------------------------------------------------
 Wed Nov  7 23:07:13 UTC 2012 - pascal.bleser@opensuse.org
 
 - fix ncurses patch for the feature detection to work properly,

siren.spec Changed

@@ -1,5 +1,6 @@
-# vim: set sw=4 ts=4 et nu:
-
+# spec file for package siren
+#
+# Copyright (c) 2016 Packman Team <packman@links2linux.de>
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -11,28 +12,33 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
+#
 
-Name:               siren
-Version:            0.2
-Release:            0
-Summary:            Text-Based Audio Player
-Source:             http://www.kariliq.nl/siren/dist/siren-%{version}.tar.gz
-Patch1:             siren-ncurses.patch
-URL:                http://www.kariliq.nl/siren/
-Group:              Productivity/Multimedia/Sound/Players
-License:            ISC
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
-BuildRequires:      ncurses-devel
-BuildRequires:      flac-devel
-BuildRequires:      libao-devel
-BuildRequires:      libid3tag-devel
-BuildRequires:      libmad-devel
-BuildRequires:      libsndfile-devel
-BuildRequires:      libvorbis-devel
-BuildRequires:      pulseaudio-devel
-BuildRequires:      wavpack-devel
-BuildRequires:      gcc make glibc-devel pkgconfig
+
+Name:           siren
+Version:        0.7
+Release:        0
+Summary:        Text-Based Audio Player
+License:        ISC
+Group:          Productivity/Multimedia/Sound/Players
+Patch1:         siren-ncurses.patch
+Url:            http://www.kariliq.nl/siren/
+Source:         http://www.kariliq.nl/siren/dist/siren-%{version}.tar.gz
+BuildRequires:  flac-devel
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  libao-devel
+BuildRequires:  libid3tag-devel
+BuildRequires:  libmad-devel
+BuildRequires:  libsndfile-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  make
+BuildRequires:  ncurses-devel
+BuildRequires:  pkgconfig
+BuildRequires:  pulseaudio-devel
+BuildRequires:  wavpack-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Siren is a text-based audio player for UNIX-like operating systems. Various
@@ -45,7 +51,7 @@
 
 %prep
 %setup -q
-%patch1
+%patch1 -p1
 
 %build
 CFLAGS="%{optflags}" \
@@ -66,19 +72,16 @@
     sndio=no \
     sun=no
 
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
 %files
 %defattr(-,root,root)
 %doc CHANGES
 %{_bindir}/siren
-%doc %{_mandir}/man1/siren.1*
+%{_mandir}/man1/siren.1*
 %dir %{_prefix}/lib/siren
 %dir %{_prefix}/lib/siren/ip
 %dir %{_prefix}/lib/siren/op

siren-ncurses.patch Changed

@@ -1,15 +1,39 @@
---- configure.orig	2012-11-08 00:03:37.036175156 +0100
-+++ configure	2012-11-08 00:03:50.134164196 +0100
-@@ -332,7 +332,7 @@
+Index: siren-0.7/configure
+===================================================================
+--- siren-0.7.orig/configure
++++ siren-0.7/configure
+@@ -336,10 +336,10 @@ makefile_assign CPPFLAGS "$CPPFLAGS"
+ makefile_assign LDFLAGS "$LDFLAGS"
+ 
+ if  "$(uname)" = Darwin ; then
+-	makefile_assign LDFLAGS_PROG -lcurses
++	makefile_assign LDFLAGS_PROG -lncurses
+ 	makefile_assign LDFLAGS_LIB "-bundle -bundle_loader siren"
+ else
+-	makefile_assign LDFLAGS_PROG "-Wl,--export-dynamic -pthread -lcurses"
++	makefile_assign LDFLAGS_PROG "-Wl,--export-dynamic -pthread -lncurses"
+ 	makefile_assign CFLAGS_LIB -fPIC
+ 	makefile_assign LDFLAGS_LIB "-fPIC -shared"
+ fi
+@@ -387,7 +387,7 @@ else
  	makefile_append SRCS compat/fgetln.c
  fi
  
+-if ! check_function initscr "initscr()" curses.h "" -lcurses; then
++if ! check_function initscr "initscr()" curses.h "" -lncurses; then
+ 	error "cannot determine how to use initscr()"
+ fi
+ 
+@@ -401,7 +401,7 @@ else
+ 	makefile_append SRCS compat/reallocarray.c
+ fi
+ 
 -if check_function resizeterm "resizeterm(0, 0)" curses.h "" -lcurses; then
 +if check_function resizeterm "resizeterm(0, 0)" curses.h "" -lncurses; then
  	header_define HAVE_RESIZETERM
  fi
  
-@@ -376,7 +376,7 @@
+@@ -446,7 +446,7 @@ elif check_function "bswap16() in <sys/e
  fi
  
  if check_function use_default_colors "use_default_colors()" curses.h "" \
@@ -18,25 +42,3 @@
  	header_define HAVE_USE_DEFAULT_COLORS
  fi
  
---- GNUmakefile.orig	2012-10-24 18:02:53.000000000 +0200
-+++ GNUmakefile	2012-11-08 00:03:33.108178446 +0100
-@@ -51,7 +51,7 @@
- 		-Wformat=2 -Wpointer-arith -Wshadow -Wundef -Wwrite-strings
- CFLAGS+=	${CDIAGFLAGS}
- CPPFLAGS+=	-DVERSION=\"${VERSION}\"
--LDFLAGS+=	-lcurses -pthread -Wl,--export-dynamic
-+LDFLAGS+=	-lncurses -pthread -Wl,--export-dynamic
- LINTFLAGS?=	-hx
- MKDEPFLAGS?=	-a
- 
---- Makefile.orig	2012-10-24 18:02:53.000000000 +0200
-+++ Makefile	2012-11-08 00:03:33.108178446 +0100
-@@ -51,7 +51,7 @@
- 		-Wformat=2 -Wpointer-arith -Wshadow -Wundef -Wwrite-strings
- CFLAGS+=	${CDIAGFLAGS}
- CPPFLAGS+=	-DVERSION=\"${VERSION}\"
--LDFLAGS+=	-lcurses -pthread -Wl,--export-dynamic
-+LDFLAGS+=	-lncurses -pthread -Wl,--export-dynamic
- LINTFLAGS?=	-hx
- MKDEPFLAGS?=	-a
-

siren-0.2.tar.gz/xpathconf.c Deleted

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <errno.h>
-#include <unistd.h>
-
-#include "siren.h"
-
-long int
-xfpathconf(int fd, int name, const char *namestr)
-{
-	long int value;
-
-	errno = 0;
-	if ((value = fpathconf(fd, name)) == -1) {
-		if (errno)
-			LOG_ERR("fpathconf: %s", namestr);
-		else
-			LOG_ERRX("fpathconf: %s: indeterminate value",
-			    namestr);
-	}
-
-	return value;
-}
-
-long int
-xpathconf(const char *path, int name, const char *namestr)
-{
-	long int value;
-
-	errno = 0;
-	if ((value = pathconf(path, name)) == -1) {
-		if (errno)
-			LOG_ERR("pathconf: %s: %s", path, namestr);
-		else
-			LOG_ERRX("pathconf: %s: %s: indeterminate value", path,
-			    namestr);
-	}
-
-	return value;
-}
-
-long int
-xsysconf(int name, const char *namestr)
-{
-	long int value;
-
-	errno = 0;
-	if ((value = sysconf(name)) == -1) {
-		if (errno)
-			LOG_ERR("sysconf: %s", namestr);
-		else
-			LOG_ERRX("sysconf: %s: indeterminate value", namestr);
-	}
-
-	return value;
-}

siren-0.2.tar.gz/CHANGES -> siren-0.7.tar.gz/CHANGES Changed

@@ -1,7 +1,79 @@
 This is a list of the most important changes only. See the repository history
 for a list of all changes.
 
-Siren 0.2 (2012-10-01):
+Siren 0.7 (2016-10-06):
+
+- Add the ffmpeg input plug-in.
+- Add the pwd and reopen-output-plugin commands.
+- Add the library-format-alt, player-track-format-alt, playlist-format-alt and
+  queue-format-alt options.
+- Add the filename format variable.
+- Add OpenBSD pledge(2) support.
+- Bind "i" to select-active-entry by default.
+- Support the (less standard) totaldiscs and totaltracks Vorbis comments.
+- Handle the "n/m" format in the discnumber and tracknumber Vorbis comments
+  where "n" is the disc/track number and "m" is total number of discs/tracks.
+- Remove support for ao file output drivers. These are not very useful.
+- Fix various minor bugs.
+
+Siren 0.6 (2015-09-01):
+
+- Support bit depths other than 16.
+- Add the aac input plug-in.
+- Add the portaudio output plug-in.
+- Add the albumartist, comment, discnumber, disctotal and tracktotal metadata
+  fields.
+- Update the metadata cache on start-up if the metadata cache file uses an
+  older format.
+- Allow relative paths in playlists.
+- Handle CRLF newlines in playlists.
+- Remove the confirm command. It is not very useful. Instead let the
+  delete-entry and quit commands ask for confirmation directly.
+- Remove the -p option of the command-prompt and search-prompt commands. It is
+  not very useful.
+- Fix various minor bugs.
+
+Siren 0.5 (2015-03-04):
+
+- Add 256-colour support.
+- Add the mpg123 input plug-in.
+- Add the opus input plug-in.
+- Add the source command.
+- Build on OS X.
+- Fix various minor bugs.
+
+Siren 0.4 (2014-07-16):
+
+- Add the playlist view.
+- Add the load-playlist command.
+- Allow continued playback of all audio files in the browser view.
+- Add the -d flag to the update-metadata command to delete the metadata of
+  non-existent tracks.
+- Remove the clear-history command and the max-history-entries and
+  show-dirs-before-files options as they were not very useful.
+- Significantly reduce the time needed to load the library on start-up.
+- Do not silently remove unsupported and non-existent tracks from the library.
+- Let changes to output plug-in options take effect immediately.
+- Change the default key bindings that display views.
+- Fix various minor bugs.
+
+Siren 0.3.1 (2013-07-08):
+
+- Accommodate the build to flac 1.3.0.
+
+Siren 0.3 (2013-06-04):
+
+- Add the ALSA output plug-in.
+- Add the update-metadata command.
+- Rename the save-cache command to save-metadata for consistency.
+- Remove the clear-cache command. It is no longer possible to clear the
+  metadata cache while Siren is running. To clear the metadata cache, remove
+  the ~/.siren/metadata file.
+- Fix a buffer overflow in the format-string parser.
+- Fix a mutex deadlock.
+- Fix various minor bugs.
+
+Siren 0.2 (2012-10-24):
 
 - Add the WavPack input plug-in.
 - Add the OSS output plug-in.

siren-0.2.tar.gz/GNUmakefile -> siren-0.7.tar.gz/GNUmakefile Changed

@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+# Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -22,24 +22,20 @@
 
 SRCS+=		argv.c bind.c browser.c cache.c command.c conf.c dir.c \
 		format.c history.c input.c library.c log.c menu.c msg.c \
-		option.c path.c player.c plugin.c prompt.c queue.c screen.c \
-		siren.c track.c view.c xmalloc.c xpathconf.c
+		option.c path.c player.c playlist.c plugin.c prompt.c queue.c \
+		screen.c siren.c track.c view.c xmalloc.c
 OBJS=		${SRCS:.c=.o}
-LOBJS=		${SRCS:.c=.ln}
 
 IP_SRCS=	$(addprefix ip/, $(addsuffix .c, ${IP}))
 IP_LIBS=	${IP_SRCS:.c=.so}
 IP_OBJS=	${IP_SRCS:.c=.o}
-IP_LOBJS=	${IP_SRCS:.c=.ln}
 
 OP_SRCS=	$(addprefix op/, $(addsuffix .c, ${OP}))
 OP_LIBS=	${OP_SRCS:.c=.so}
 OP_OBJS=	${OP_SRCS:.c=.o}
-OP_LOBJS=	${OP_SRCS:.c=.ln}
 
 CC?=		cc
 CTAGS?=		ctags
-LINT?=		lint
 MKDEP?=		mkdep
 
 INSTALL_DIR=	install -dm 755
@@ -47,35 +43,25 @@
 INSTALL_LIB=	install -m 444
 INSTALL_MAN=	install -m 444
 
-CDIAGFLAGS+=	-Wall -W -Wbad-function-cast -Wcast-align -Wcast-qual \
+CFLAGS+=	-Wall -W -Wbad-function-cast -Wcast-align -Wcast-qual \
 		-Wformat=2 -Wpointer-arith -Wshadow -Wundef -Wwrite-strings
-CFLAGS+=	${CDIAGFLAGS}
-CPPFLAGS+=	-DVERSION=\"${VERSION}\"
-LDFLAGS+=	-lcurses -pthread -Wl,--export-dynamic
-LINTFLAGS?=	-hx
+CPPCHECKFLAGS?=	-I /usr/include -I /usr/local/include --enable=all --force \
+		--quiet
 MKDEPFLAGS?=	-a
 
-# lint does not understand "-pthread", so use "-lpthread".
-ifeq (${MAKECMDGOALS}, lint)
-LDFLAGS+=	-lpthread
-endif
-
-.PHONY: all clean cleandir cleanlog cppcheck depend dist install lint
+.PHONY: all clean cleandir cleanlog cppcheck depend dist install
 
 ip/%.o: ip/%.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${CPPFLAGS_$(*F)} -fPIC -c -o $@ $<
+	${CC} ${CFLAGS} ${CFLAGS_LIB} ${CPPFLAGS} ${CPPFLAGS_$(*F)} -c -o $@ $<
 
 ip/%.so: ip/%.o
-	${CC} -fPIC -shared -o $@ $< ${LDFLAGS_$(*F)}
+	${CC} -o $@ $< ${LDFLAGS} ${LDFLAGS_LIB} ${LDFLAGS_$(*F)}
 
 op/%.o: op/%.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${CPPFLAGS_$(*F)} -fPIC -c -o $@ $<
+	${CC} ${CFLAGS} ${CFLAGS_LIB} ${CPPFLAGS} ${CPPFLAGS_$(*F)} -c -o $@ $<
 
 op/%.so: op/%.o
-	${CC} -fPIC -shared -o $@ $< ${LDFLAGS_$(*F)}
-
-%.ln: %.c
-	${LINT} ${LINTFLAGS} ${CPPFLAGS} ${CPPFLAGS_$(*F)} -i -o $@ $<
+	${CC} -o $@ $< ${LDFLAGS} ${LDFLAGS_LIB} ${LDFLAGS_$(*F)}
 
 %.o: %.c
 	${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<
@@ -83,7 +69,7 @@
 all: ${PROG} ${IP_LIBS} ${OP_LIBS}
 
 ${PROG}: ${OBJS}
-	${CC} -o $@ ${OBJS} ${LDFLAGS}
+	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LDFLAGS_PROG}
 
 .depend: ${SRCS} ${IP_SRCS} ${OP_SRCS} ${PROG}.h
 	${MKDEP} ${MKDEPFLAGS} ${CPPFLAGS} ${SRCS}
@@ -91,9 +77,9 @@
 	${MKDEP} ${MKDEPFLAGS} $(foreach p, ${OP}, ${CPPFLAGS_$p}) ${OP_SRCS}
 
 clean:
-	rm -f core *.core ${PROG} ${OBJS} ${LOBJS}
-	rm -f ${IP_LIBS} ${IP_OBJS} ${IP_LOBJS}
-	rm -f ${OP_LIBS} ${OP_OBJS} ${OP_LOBJS}
+	rm -f core *.core ${PROG} ${OBJS}
+	rm -f ${IP_LIBS} ${IP_OBJS}
+	rm -f ${OP_LIBS} ${OP_OBJS}
 
 cleandir: clean cleanlog
 	rm -f .depend tags config.h config.mk
@@ -102,7 +88,7 @@
 	rm -f *.log
 
 cppcheck:
-	cppcheck --enable=all --quiet ${SRCS} ${IP_SRCS} ${OP_SRCS}
+	cppcheck ${CPPCHECKFLAGS} *.c */*.c
 
 depend: .depend
 
@@ -112,7 +98,7 @@
 	GZIP=-9 tar -czf ${DIST}.tar.gz ${DIST}
 	rm -fr ${DIST}
 	sha256 ${DIST}.tar.gz > ${DIST}.tar.gz.sha256
-	gpg -bu 4cdfe96f ${DIST}.tar.gz
+	gpg -b ${DIST}.tar.gz
 
 install:
 	${INSTALL_DIR} ${DESTDIR}${BINDIR}
@@ -122,12 +108,12 @@
 	${INSTALL_DIR} ${DESTDIR}${PLUGINDIR}/op
 	${INSTALL_BIN} ${PROG} ${DESTDIR}${BINDIR}
 	${INSTALL_MAN} ${PROG}.1 ${DESTDIR}${MANDIR}/man1
+ifneq (${IP_LIBS},)
 	${INSTALL_LIB} ${IP_LIBS} ${DESTDIR}${PLUGINDIR}/ip
+endif
+ifneq (${OP_LIBS},)
 	${INSTALL_LIB} ${OP_LIBS} ${DESTDIR}${PLUGINDIR}/op
-
-lint: ${LOBJS} ${IP_LOBJS} ${OP_LOBJS}
-	${LINT} ${LINTFLAGS} $(filter -l%, ${LDFLAGS}) ${LOBJS} ${IP_LOBJS} \
-	    ${OP_LOBJS}
+endif
 
 tags: ${SRCS} ${IP_SRCS} ${OP_SRCS} ${PROG}.h
 	${CTAGS} -dtw ${SRCS} ${IP_SRCS} ${OP_SRCS}

siren-0.2.tar.gz/INSTALL -> siren-0.7.tar.gz/INSTALL Changed

@@ -7,58 +7,126 @@
 	make
 	make install
 
-The configure script supports the following options.
+The configure script supports the following options. Default values are in
+parentheses.
 
-prefix=path
-	Install Siren in <path>. The default is "/usr/local".
+prefix=path (/usr/local)
+	Install Siren in <path>.
 
-bindir=path
-	Install the binary in <path>. The default is "<prefix>/bin".
+bindir=path (<prefix>/bin)
+	Install the binary in <path>.
 
-mandir=path
-	Install the manual page in <path>. The default is "<prefix>/man".
+mandir=path (<prefix>/man)
+	Install the manual page in <path>.
 
-plugindir=path
+plugindir=path (<prefix>/lib/siren)
 	Install the plug-ins in <path>. Input plug-ins will be installed in
-	"<path>/ip" and output plug-ins in "<path>/op". The default is
-	"<prefix>/lib/siren".
-
-debug=yes|no
-	Whether to build a debug version of Siren. The debug version is built
-	with debug symbols and, if Siren is run with the -l option, provides
-	additional debug messages in the log file. The default is "no".
-
-flac=yes|no
-	Whether to build the FLAC input plug-in. The default is "yes".
-
-mad=yes|no
-	Whether to build the mad input plug-in. The default is "yes".
-
-sndfile=yes|no
-	Whether to build the sndfile input plug-in. The default is "yes".
-
-vorbis=yes|no
-	Whether to build the Ogg Vorbis input plug-in. The default is "yes".
-
-wavpack=yes|no
-	Whether to build the WavPack input plug-in. The default is "yes".
-
-ao=yes|no
-	Whether to build the ao output plug-in. The default is "yes".
-
-oss=yes|no
-	Whether to build the OSS output plug-in. Both OSS 3 and OSS 4 are
-	supported, but volume support is available only for OSS 4. The default
-	is "yes".
-
-pulse=yes|no
-	Whether to build the PulseAudio output plug-in. The default is "yes".
+	"<path>/ip" and output plug-ins in "<path>/op".
+
+debug=yes|no (no)
+	Whether to build a debug version of Siren.
+
+aac=yes|no (yes)
+	Whether to build the aac input plug-in. This plug-in provides support
+	for the MPEG-2/4 AAC audio format. It requires the libfaad and libmp4v2
+	libraries. For more information, see <http://www.audiocoding.com/> and
+	<https://code.google.com/p/mp4v2/>.
+
+ffmpeg=yes|no (yes)
+	Wether to build the ffmpeg input plug-in. This plug-in provides support
+	for a variety of audio formats. It requires the libavformat library.
+	For more information, see <https://www.ffmpeg.org/>.
+
+flac=yes|no (yes)
+	Whether to build the flac input plug-in. This plug-in provides support
+	for the FLAC audio format. It requires the libFLAC library. For more
+	information, see <https://www.xiph.org/flac/>.
+
+mad=yes|no (yes)
+	Whether to build the mad input plug-in. This plug-in provides support
+	for the MPEG-1/2/2.5 audio layer I/II/III formats such as MP3. It
+	requires the libmad and libid3tag libraries. For more information, see
+	<http://www.underbit.com/products/mad/>.
+
+mpg123=yes|no (yes)
+	Whether to build the mpg123 input plug-in. This plug-in is an
+	alternative to the mad input plug-in. It requires the libmpg123
+	library. For more information, see <http://www.mpg123.org/>.
+
+opus=yes|no (yes)
+	Whether to build the opus input plug-in. This plug-in provides support
+	for the Opus audio format. It requires the libopusfile library. For
+	more information, see <https://www.opus-codec.org/>.
+
+sndfile=yes|no (yes)
+	Whether to build the sndfile input plug-in. This plug-in provides
+	support for a variety of audio formats including WAVE and AIFF. It
+	requires the libsndfile library. For more information, see
+	<http://www.mega-nerd.com/libsndfile/>.
+
+vorbis=yes|no (yes)
+	Whether to build the vorbis input plug-in. This plug-in provides
+	support for the Ogg Vorbis audio format. It requires the libvorbisfile
+	library. For more information, see <https://www.xiph.org/vorbis/>.
+
+wavpack=yes|no (yes)
+	Whether to build the wavpack input plug-in. This plug-in provides
+	support for the WavPack audio format. It requires the libwavpack
+	library. For more information, see <http://www.wavpack.com/>.
+
+alsa=yes|no (yes)
+	Whether to build the alsa output plug-in. This plug-in provides support
+	for ALSA. It requires the libasound library. For more information, see
+	<http://www.alsa-project.org/>.
+
+ao=yes|no (yes)
+	Whether to build the ao output plug-in. This plug-in provides support
+	for libao which in turn supports a variety of audio systems. It
+	requires the libao library. For more information, see
+	<https://www.xiph.org/ao/>.
+
+oss=yes|no (yes)
+	Whether to build the oss output plug-in. This plug-in provides support
+	for OSS. Both OSS 3 and OSS 4 are supported, but volume support is
+	available only for OSS 4. For more information, see
+	<http://www.opensound.com/>.
+
+portaudio=yes|no (yes)
+	Whether to build the portaudio output plug-in. This plug-in provides
+	support for PortAudio which in turn supports a variety of audio
+	systems. It requires the libportaudio library. For more information,
+	see <http://www.portaudio.com/>.
+
+pulse=yes|no (yes)
+	Whether to build the pulse output plug-in. This plug-in provides
+	support for PulseAudio. It requires the libpulse-simple library. For
+	more information, see <http://www.pulseaudio.org/>.
+
+sndio=yes|no (yes)
+	Whether to build the sndio output plug-in. This plug-in provides
+	support for sndio. For more information, see the OpenBSD sndio(7)
+	manual page and <http://www.sndio.org/>.
+
+sun=yes|no (yes)
+	Whether to build the sun output plug-in. This plug-in provides support
+	for the SunOS audio system.
+
+Running Siren from the source directory
+---------------------------------------
+
+To run Siren from the source directory (i.e. without installing it first), run
+the following commands.
+
+	./configure plugindir="$PWD"
+	make
+	./siren
 
-sndio=yes|no
-	Whether to build the sndio output plug-in. The default is "yes".
+Should you later wish to install Siren after all, then ensure you reconfigure
+and rebuild it first so that the plugindir variable is set to a proper value.
+It is perhaps safest to start from a clean source directory. Therefore, run the
+following command before reconfiguring.
 
-sun=yes|no
-	Whether to build the Sun output plug-in. The default is "yes".
+	make cleandir
 
 Uninstalling Siren
 ------------------

siren-0.7.tar.gz/LICENCE Added

@@ -0,0 +1,102 @@
+Except for the files specified below, all files in the Siren distribution are
+distributed under the ISC licence, as follows.
+
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The file compat/reallocarray.c is distributed under the ISC licence as well,
+but with the following copyright.
+
+ * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
+
+The files compat/strlcat.c and compat/strlcpy.c are distributed under the ISC
+licence as well, but with the following copyright.
+
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+
+The file compat/strtonum.c is distributed under the ISC licence as well, but
+with the following copyright.
+
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+
+The file compat/tree.h is distributed under the 2-clause BSD licence, as
+follows.
+
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The file compat/queue.h is distributed under the 3-clause BSD licence, as
+follows.
+
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+The file compat/strcasestr.c is distributed under the 3-clause BSD licence as
+well, but with the following copyright and notice.
+
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+
+The file compat/strsep.c is distributed under the 3-clause BSD licence as well,
+but with the following copyright.
+
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.

siren-0.2.tar.gz/Makefile -> siren-0.7.tar.gz/Makefile Changed

@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+# Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -22,24 +22,20 @@
 
 SRCS+=		argv.c bind.c browser.c cache.c command.c conf.c dir.c \
 		format.c history.c input.c library.c log.c menu.c msg.c \
-		option.c path.c player.c plugin.c prompt.c queue.c screen.c \
-		siren.c track.c view.c xmalloc.c xpathconf.c
+		option.c path.c player.c playlist.c plugin.c prompt.c queue.c \
+		screen.c siren.c track.c view.c xmalloc.c
 OBJS=		${SRCS:S,c$,o,}
-LOBJS=		${SRCS:S,c$,ln,}
 
 IP_SRCS=	${IP:S,^,ip/,:S,$,.c,}
 IP_LIBS=	${IP_SRCS:S,.c$,.so,}
 IP_OBJS=	${IP_SRCS:S,.c$,.lo,}
-IP_LOBJS=	${IP_SRCS:S,.c$,.ln,}
 
 OP_SRCS=	${OP:S,^,op/,:S,$,.c,}
 OP_LIBS=	${OP_SRCS:S,.c$,.so,}
 OP_OBJS=	${OP_SRCS:S,.c$,.lo,}
-OP_LOBJS=	${OP_SRCS:S,.c$,.ln,}
 
 CC?=		cc
 CTAGS?=		ctags
-LINT?=		lint
 MKDEP?=		mkdep
 
 INSTALL_DIR=	install -dm 755
@@ -47,39 +43,30 @@
 INSTALL_LIB=	install -m 444
 INSTALL_MAN=	install -m 444
 
-CDIAGFLAGS+=	-Wall -W -Wbad-function-cast -Wcast-align -Wcast-qual \
+CFLAGS+=	-Wall -W -Wbad-function-cast -Wcast-align -Wcast-qual \
 		-Wformat=2 -Wpointer-arith -Wshadow -Wundef -Wwrite-strings
-CFLAGS+=	${CDIAGFLAGS}
-CPPFLAGS+=	-DVERSION=\"${VERSION}\"
-LDFLAGS+=	-lcurses -pthread -Wl,--export-dynamic
-LINTFLAGS?=	-hx
+CPPCHECKFLAGS?=	-I /usr/include -I /usr/local/include --enable=all --force \
+		--quiet
 MKDEPFLAGS?=	-a
 
-# lint does not understand "-pthread", so use "-lpthread".
-.if make(lint)
-LDFLAGS+=	-lpthread
-.endif
-
-.PHONY: all clean cleandir cleanlog cppcheck depend dist install lint
-
-.SUFFIXES: .c .ln .lo .o .so
+.PHONY: all clean cleandir cleanlog cppcheck depend dist install
 
-.c.ln:
-	${LINT} ${LINTFLAGS} ${CPPFLAGS} ${CPPFLAGS_${@:T:R}} -i -o $@ $<
+.SUFFIXES: .c .lo .o .so
 
 .c.lo:
-	${CC} ${CFLAGS} ${CPPFLAGS} ${CPPFLAGS_${@:T:R}} -fPIC -c -o $@ $<
+	${CC} ${CFLAGS} ${CFLAGS_LIB} ${CPPFLAGS} ${CPPFLAGS_${@:T:R}} -c -o \
+	    $@ $<
 
 .c.o:
 	${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<
 
 .lo.so:
-	${CC} -fPIC -shared -o $@ $< ${LDFLAGS_${@:T:R}}
+	${CC} -o $@ $< ${LDFLAGS} ${LDFLAGS_LIB} ${LDFLAGS_${@:T:R}}
 
 all: ${PROG} ${IP_LIBS} ${OP_LIBS}
 
 ${PROG}: ${OBJS}
-	${CC} -o $@ ${OBJS} ${LDFLAGS}
+	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LDFLAGS_PROG}
 
 .depend: ${SRCS} ${IP_SRCS} ${OP_SRCS} ${PROG}.h
 	${MKDEP} ${MKDEPFLAGS} ${CPPFLAGS} ${SRCS}
@@ -88,9 +75,9 @@
 .endfor
 
 clean:
-	rm -f core *.core ${PROG} ${OBJS} ${LOBJS}
-	rm -f ${IP_LIBS} ${IP_OBJS} ${IP_LOBJS}
-	rm -f ${OP_LIBS} ${OP_OBJS} ${OP_LOBJS}
+	rm -f core *.core ${PROG} ${OBJS}
+	rm -f ${IP_LIBS} ${IP_OBJS}
+	rm -f ${OP_LIBS} ${OP_OBJS}
 
 cleandir: clean cleanlog
 	rm -f .depend tags config.h config.mk
@@ -99,7 +86,7 @@
 	rm -f *.log
 
 cppcheck:
-	cppcheck --enable=all --quiet ${SRCS} ${IP_SRCS} ${OP_SRCS}
+	cppcheck ${CPPCHECKFLAGS} *.c */*.c
 
 depend: .depend
 
@@ -109,7 +96,7 @@
 	GZIP=-9 tar -czf ${DIST}.tar.gz ${DIST}
 	rm -fr ${DIST}
 	sha256 ${DIST}.tar.gz > ${DIST}.tar.gz.sha256
-	gpg -bu 4cdfe96f ${DIST}.tar.gz
+	gpg -b ${DIST}.tar.gz
 
 install:
 	${INSTALL_DIR} ${DESTDIR}${BINDIR}
@@ -119,11 +106,12 @@
 	${INSTALL_DIR} ${DESTDIR}${PLUGINDIR}/op
 	${INSTALL_BIN} ${PROG} ${DESTDIR}${BINDIR}
 	${INSTALL_MAN} ${PROG}.1 ${DESTDIR}${MANDIR}/man1
+.if !empty(IP_LIBS)
 	${INSTALL_LIB} ${IP_LIBS} ${DESTDIR}${PLUGINDIR}/ip
+.endif
+.if !empty(OP_LIBS)
 	${INSTALL_LIB} ${OP_LIBS} ${DESTDIR}${PLUGINDIR}/op
-
-lint: ${LOBJS} ${IP_LOBJS} ${OP_LOBJS}
-	${LINT} ${LINTFLAGS} ${LDFLAGS:M-l*} ${LOBJS} ${IP_LOBJS} ${OP_LOBJS}
+.endif
 
 tags: ${SRCS} ${IP_SRCS} ${OP_SRCS} ${PROG}.h
 	${CTAGS} -dtw ${SRCS} ${IP_SRCS} ${OP_SRCS}

siren-0.7.tar.gz/README Added

siren-0.2.tar.gz/argv.c -> siren-0.7.tar.gz/argv.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2012 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,14 +29,14 @@
 #define ARGV_QUOTED_SINGLE	1
 #define ARGV_QUOTED_DOUBLE	2
 
-static void argv_unescape(char **);
+static void argv_unescape(char *);
 
 static void
 argv_add_args(char ***argv, int *argc, char **args, size_t nargs)
 {
 	size_t i;
 
-	*argv = xrecalloc(*argv, (size_t)*argc + nargs, sizeof **argv);
+	*argv = xreallocarray(*argv, *argc + nargs, sizeof **argv);
 
 	for (i = 0; i < nargs; i++)
 		(*argv)(*argc)++ = xstrdup(argsi);
@@ -72,7 +72,7 @@
 	}
 
 	if (home != NULL) {
-		(void)xasprintf(&narg, "%s%s", home, *arg + userlen + 1);
+		xasprintf(&narg, "%s%s", home, *arg + userlen + 1);
 		free(home);
 		free(*arg);
 		*arg = narg;
@@ -304,7 +304,7 @@
 			argv_expand_tilde(&arg);
 
 		if (glob(arg, 0, NULL, &gl)) {
-			argv_unescape(&arg);
+			argv_unescape(arg);
 			argv_add_args(argv, argc, &arg, 1);
 		} else {
 			argv_add_args(argv, argc, gl.gl_pathv, gl.gl_pathc);
@@ -321,14 +321,14 @@
 }
 
 static void
-argv_unescape(char **arg)
+argv_unescape(char *arg)
 {
 	size_t i, len;
 
-	len = strlen(*arg);
+	len = strlen(arg);
 	for (i = 0; i < len; i++)
-		if ((*arg)i == '\\') {
-			(void)memmove(*arg + i, *arg + i + 1, len - i);
+		if (argi == '\\') {
+			memmove(arg + i, arg + i + 1, len - i);
 			len--;
 		}
 }

siren-0.2.tar.gz/attribute.h -> siren-0.7.tar.gz/attribute.h Changed

siren-0.2.tar.gz/bind.c -> siren-0.7.tar.gz/bind.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef __OpenBSD__
+#include <sys/tree.h>
+#else
+#include "compat/tree.h"
+#endif
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,16 +27,10 @@
 
 #include "siren.h"
 
-#ifdef HAVE_TREE_H
-#include <sys/tree.h>
-#else
-#include "compat/tree.h"
-#endif
-
 /*
  * The length of the longest key-name (including "\0"). Most key names are
- * defined in the bind_key_names array below. The other key names have a length
- * of 1 (e.g. "a") or 2 (e.g. "^A").
+ * defined in the bind_keys array below. The other key names have a length of 1
+ * (e.g. "a") or 2 (e.g. "^A").
  */
 #define BIND_KEY_MAXLEN 10
 
@@ -40,10 +40,10 @@
 	struct command		*command;
 	void			*command_data;
 	char			*command_string;
-	SPLAY_ENTRY(bind_entry)  entries;
+	RB_ENTRY(bind_entry)	 entries;
 };
 
-SPLAY_HEAD(bind_tree, bind_entry);
+RB_HEAD(bind_tree, bind_entry);
 
 static int			 bind_cmp_entry(struct bind_entry *,
 				    struct bind_entry *);
@@ -52,14 +52,14 @@
 static void			 bind_remove(struct bind_entry *);
 static const char		*bind_scope_to_string(enum bind_scope);
 
-SPLAY_PROTOTYPE(bind_tree, bind_entry, entries, bind_cmp_entry)
+RB_PROTOTYPE(bind_tree, bind_entry, entries, bind_cmp_entry)
 
-static struct bind_tree bind_tree = SPLAY_INITIALIZER(bind_tree);
+static struct bind_tree bind_tree = RB_INITIALIZER(bind_tree);
 
 static const struct {
 	const enum bind_scope	 scope;
 	const char		*name;
-} bind_scope_names = {
+} bind_scopes = {
 	{ BIND_SCOPE_BROWSER,	"browser" },
 	{ BIND_SCOPE_COMMON,	"common" },
 	{ BIND_SCOPE_LIBRARY,	"library" },
@@ -69,7 +69,7 @@
 static const struct {
 	const int		 key;
 	const char		*name;
-} bind_key_names = {
+} bind_keys = {
 	{ ' ',			"space" },
 	{ K_BACKSPACE,		"backspace" },
 	{ K_BACKTAB,		"backtab" },
@@ -108,7 +108,7 @@
 	{ K_F20,		"f20" }
 };
 
-SPLAY_GENERATE(bind_tree, bind_entry, entries, bind_cmp_entry)
+RB_GENERATE(bind_tree, bind_entry, entries, bind_cmp_entry)
 
 static void
 bind_add(enum bind_scope scope, int key, const char *command)
@@ -129,7 +129,7 @@
 	b->scope = scope;
 	b->key = key;
 
-	if (SPLAY_INSERT(bind_tree, &bind_tree, b) != NULL)
+	if (RB_INSERT(bind_tree, &bind_tree, b) != NULL)
 		LOG_FATALX("scope %s, key %s: already bound",
 		    bind_scope_to_string(scope),
 		    bind_key_to_string(key, keyname, sizeof keyname));
@@ -149,7 +149,7 @@
 {
 	struct bind_entry *b;
 
-	while ((b = SPLAY_ROOT(&bind_tree)) != NULL)
+	while ((b = RB_ROOT(&bind_tree)) != NULL)
 		bind_remove(b);
 }
 
@@ -172,7 +172,7 @@
 
 	b.key = key;
 	b.scope = scope;
-	return SPLAY_FIND(bind_tree, &bind_tree, &b);
+	return RB_FIND(bind_tree, &bind_tree, &b);
 }
 
 const char *
@@ -214,8 +214,9 @@
 	bind_add(BIND_SCOPE_COMMON, '>', "seek -f 5:00");
 	bind_add(BIND_SCOPE_COMMON, '?', "search-prompt -b");
 	bind_add(BIND_SCOPE_COMMON, '1', "select-view library");
-	bind_add(BIND_SCOPE_COMMON, '2', "select-view queue");
+	bind_add(BIND_SCOPE_COMMON, '2', "select-view playlist");
 	bind_add(BIND_SCOPE_COMMON, '3', "select-view browser");
+	bind_add(BIND_SCOPE_COMMON, '4', "select-view queue");
 	bind_add(BIND_SCOPE_COMMON, ':', "command-prompt");
 	bind_add(BIND_SCOPE_COMMON, '=', "set-volume -i 5");
 	bind_add(BIND_SCOPE_COMMON, 'C', "set continue");
@@ -226,32 +227,29 @@
 	bind_add(BIND_SCOPE_COMMON, 'b', "play-next");
 	bind_add(BIND_SCOPE_COMMON, 'c', "pause");
 	bind_add(BIND_SCOPE_COMMON, 'g', "select-first-entry");
+	bind_add(BIND_SCOPE_COMMON, 'i', "select-active-entry");
 	bind_add(BIND_SCOPE_COMMON, 'j', "select-next-entry");
 	bind_add(BIND_SCOPE_COMMON, 'k', "select-prev-entry");
 	bind_add(BIND_SCOPE_COMMON, 'n', "search-next");
 	bind_add(BIND_SCOPE_COMMON, 'p', "search-prev");
-	bind_add(BIND_SCOPE_COMMON, 'q', "confirm -p Quit quit");
+	bind_add(BIND_SCOPE_COMMON, 'q', "quit");
 	bind_add(BIND_SCOPE_COMMON, 'r', "set repeat-track");
 	bind_add(BIND_SCOPE_COMMON, 'v', "stop");
 	bind_add(BIND_SCOPE_COMMON, 'x', "play");
 	bind_add(BIND_SCOPE_COMMON, 'z', "play-prev");
 
-	bind_add(BIND_SCOPE_LIBRARY, K_DELETE,
-	    "confirm -p \"Delete entry\" delete-entry");
-	bind_add(BIND_SCOPE_LIBRARY, 'd',
-	    "confirm -p \"Delete entry\" delete-entry");
+	bind_add(BIND_SCOPE_LIBRARY, K_DELETE, "delete-entry");
+	bind_add(BIND_SCOPE_LIBRARY, 'd', "delete-entry");
 	bind_add(BIND_SCOPE_LIBRARY, 'a', "add-entry -q");
-	bind_add(BIND_SCOPE_LIBRARY, 'l',
-	    "confirm -p \"Delete all entries\" \"delete-entry -a\"");
+	bind_add(BIND_SCOPE_LIBRARY, 'l', "delete-entry -a");
+
+	bind_add(BIND_SCOPE_PLAYLIST, 'a', "add-entry -q");
 
-	bind_add(BIND_SCOPE_QUEUE, K_DELETE,
-	    "confirm -p \"Delete entry\" delete-entry");
+	bind_add(BIND_SCOPE_QUEUE, K_DELETE, "delete-entry");
 	bind_add(BIND_SCOPE_QUEUE, 'J', "move-entry-down");
 	bind_add(BIND_SCOPE_QUEUE, 'K', "move-entry-up");
-	bind_add(BIND_SCOPE_QUEUE, 'd',
-	    "confirm -p \"Delete entry\" delete-entry");
-	bind_add(BIND_SCOPE_QUEUE, 'l',
-	    "confirm -p \"Delete all entries\" \"delete-entry -a\"");
+	bind_add(BIND_SCOPE_QUEUE, 'd', "delete-entry");
+	bind_add(BIND_SCOPE_QUEUE, 'l', "delete-entry -a");
 
 	bind_add(BIND_SCOPE_BROWSER, K_CTRL('R'), "reread-directory");
 	bind_add(BIND_SCOPE_BROWSER, K_BACKSPACE, "cd ..");
@@ -265,24 +263,24 @@
 	size_t i;
 
 	if (K_IS_CTRL(key)) {
-		(void)xsnprintf(name, namelen, "^%c", K_UNCTRL(key));
+		xsnprintf(name, namelen, "^%c", K_UNCTRL(key));
 		return name;
 	}
 
-	for (i = 0; i < NELEMENTS(bind_key_names); i++)
-		if (key == bind_key_namesi.key) {
-			(void)strlcpy(name, bind_key_namesi.name, namelen);
+	for (i = 0; i < NELEMENTS(bind_keys); i++)
+		if (key == bind_keysi.key) {
+			strlcpy(name, bind_keysi.name, namelen);
 			return name;
 		}
 
-	(void)xsnprintf(name, namelen, "%c", key);
+	xsnprintf(name, namelen, "%c", key);
 	return name;
 }
 
 static void
 bind_remove(struct bind_entry *b)
 {
-	(void)SPLAY_REMOVE(bind_tree, &bind_tree, b);
+	RB_REMOVE(bind_tree, &bind_tree, b);
 	command_free_data(b->command, b->command_data);
 	free(b->command_string);
 	free(b);
@@ -293,12 +291,11 @@
 {
 	size_t i;
 
-	for (i = 0; i < NELEMENTS(bind_scope_names); i++)
-		if (scope == bind_scope_namesi.scope)
-			return bind_scope_namesi.name;
+	for (i = 0; i < NELEMENTS(bind_scopes); i++)
+		if (scope == bind_scopesi.scope)
+			return bind_scopesi.name;
 
 	LOG_FATALX("unknown scope");
-	/* NOTREACHED */
 }
 
 void
@@ -316,7 +313,7 @@
 	b->command = command;
 	b->command_data = command_data;
 	b->command_string = xstrdup(command_string);
-	(void)SPLAY_INSERT(bind_tree, &bind_tree, b);
+	RB_INSERT(bind_tree, &bind_tree, b);
 }
 
 int
@@ -324,9 +321,9 @@
 {
 	size_t i;
 
-	for (i = 0; i < NELEMENTS(bind_scope_names); i++)
-		if (!strcasecmp(name, bind_scope_namesi.name)) {
-			*scope = bind_scope_namesi.scope;
+	for (i = 0; i < NELEMENTS(bind_scopes); i++)
+		if (!strcasecmp(name, bind_scopesi.name)) {
+			*scope = bind_scopesi.scope;
 			return 0;
 		}
 
@@ -343,14 +340,14 @@
 		return str0;
 
 	/* Control characters (ASCII 0 to 31 decimal, and 127 decimal). */
-	if (str0 == '^' && K_IS_CTRL(K_CTRL(toupper((int)str1))) &&
-	    str2 == '\0')
-		return K_CTRL(toupper((int)str1));
+	if (str0 == '^' && K_IS_CTRL(K_CTRL(toupper((unsigned char)str1)))
+	    && str2 == '\0')
+		return K_CTRL(toupper((unsigned char)str1));
 
 	/* Key names. */
-	for (i = 0; i < NELEMENTS(bind_key_names); i++)
-		if (!strcasecmp(str, bind_key_namesi.name))
-			return bind_key_namesi.key;
+	for (i = 0; i < NELEMENTS(bind_keys); i++)
+		if (!strcasecmp(str, bind_keysi.name))
+			return bind_keysi.key;
 
 	return K_NONE;
 }

siren-0.2.tar.gz/browser.c -> siren-0.7.tar.gz/browser.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,19 +17,19 @@
 /* Let glibc expose strcasestr(). */
 #define _GNU_SOURCE
 
-#include <errno.h>
+#ifdef __OpenBSD__
+#include <sys/queue.h>
+#else
+#include "compat/queue.h"
+#endif
+
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "siren.h"
 
-#ifdef HAVE_QUEUE_H
-#include <sys/queue.h>
-#else
-#include "compat/queue.h"
-#endif
-
 struct browser_entry {
 	char		*name;
 	enum file_type	 type;
@@ -37,32 +37,40 @@
 };
 
 static void		 browser_free_entry(void *);
-static void		 browser_get_entry_text(const void *, char *, size_t);
 static void		 browser_read_dir(void);
 static int		 browser_search_entry(const void *, const char *);
 static void		 browser_select_entry(const char *);
 
+static pthread_mutex_t	 browser_menu_mtx = PTHREAD_MUTEX_INITIALIZER;
 static struct menu	*browser_menu;
 static char		*browser_dir;
 
 void
 browser_activate_entry(void)
 {
-	struct browser_entry	*e;
+	struct menu_entry	*me;
+	struct browser_entry	*be;
 	struct track		*t;
 	char			*path;
 
-	if ((e = menu_get_selected_entry_data(browser_menu)) == NULL)
+	if ((me = menu_get_selected_entry(browser_menu)) == NULL)
 		return;
 
-	switch (e->type) {
+	be = menu_get_entry_data(me);
+	switch (be->type) {
 	case FILE_TYPE_DIRECTORY:
-		browser_change_dir(e->name);
+		browser_change_dir(be->name);
 		break;
 	case FILE_TYPE_REGULAR:
-		(void)xasprintf(&path, "%s/%s", browser_dir, e->name);
-		if ((t = track_init(path, e->ip)) != NULL)
+		xasprintf(&path, "%s/%s", browser_dir, be->name);
+		if ((t = track_get(path, be->ip)) != NULL) {
+			XPTHREAD_MUTEX_LOCK(&browser_menu_mtx);
+			menu_activate_entry(browser_menu, me);
+			XPTHREAD_MUTEX_UNLOCK(&browser_menu_mtx);
+			player_set_source(PLAYER_SOURCE_BROWSER);
 			player_play_track(t);
+			browser_print();
+		}
 		free(path);
 		break;
 	default:
@@ -79,7 +87,7 @@
 	if (dir0 == '/')
 		newdir = path_normalise(dir);
 	else {
-		(void)xasprintf(&tmp, "%s/%s", browser_dir, dir);
+		xasprintf(&tmp, "%s/%s", browser_dir, dir);
 		newdir = path_normalise(tmp);
 		free(tmp);
 	}
@@ -101,9 +109,11 @@
 			prevdir = xstrdup(tmp);
 	}
 
+	XPTHREAD_MUTEX_LOCK(&browser_menu_mtx);
 	free(browser_dir);
 	browser_dir = newdir;
 	browser_read_dir();
+	XPTHREAD_MUTEX_UNLOCK(&browser_menu_mtx);
 
 	/* Preselect the subdirectory we were in previously, if applicable. */
 	if (prevdir != NULL) {
@@ -124,13 +134,13 @@
 	if ((e = menu_get_selected_entry_data(browser_menu)) == NULL)
 		return;
 
-	(void)xasprintf(&tmp, "%s/%s", browser_dir, e->name);
+	xasprintf(&tmp, "%s/%s", browser_dir, e->name);
 	path = path_normalise(tmp);
 	free(tmp);
 
 	switch (e->type) {
 	case FILE_TYPE_REGULAR:
-		if ((t = track_init(path, e->ip)) != NULL)
+		if ((t = track_get(path, e->ip)) != NULL)
 			view_add_track(view, t);
 		break;
 	case FILE_TYPE_DIRECTORY:
@@ -151,6 +161,12 @@
 	free(browser_dir);
 }
 
+const char *
+browser_get_dir(void)
+{
+	return browser_dir;
+}
+
 static void
 browser_free_entry(void *e)
 {
@@ -167,9 +183,85 @@
 	const struct browser_entry *be;
 
 	be = e;
-	(void)strlcpy(buf, be->name, bufsize);
+	strlcpy(buf, be->name, bufsize);
 	if (be->type == FILE_TYPE_DIRECTORY)
-		(void)strlcat(buf, "/", bufsize);
+		strlcat(buf, "/", bufsize);
+}
+
+struct track *
+browser_get_next_track(void)
+{
+	struct menu_entry	*me;
+	struct browser_entry	*be;
+	struct track		*t;
+	char			*path;
+
+	XPTHREAD_MUTEX_LOCK(&browser_menu_mtx);
+	if ((me = menu_get_active_entry(browser_menu)) == NULL)
+		t = NULL;
+	else
+		for (;;) {
+			if ((me = menu_get_next_entry(me)) == NULL) {
+				if (!option_get_boolean("repeat-all")) {
+					t = NULL;
+					break;
+				}
+				me = menu_get_first_entry(browser_menu);
+			}
+
+			be = menu_get_entry_data(me);
+			if (be->ip != NULL) {
+				xasprintf(&path, "%s/%s", browser_dir,
+				    be->name);
+				t = track_get(path, be->ip);
+				free(path);
+				if (t != NULL)
+					menu_activate_entry(browser_menu, me);
+				break;
+			}
+		}
+	XPTHREAD_MUTEX_UNLOCK(&browser_menu_mtx);
+
+	browser_print();
+	return t;
+}
+
+struct track *
+browser_get_prev_track(void)
+{
+	struct menu_entry	*me;
+	struct browser_entry	*be;
+	struct track		*t;
+	char			*path;
+
+	XPTHREAD_MUTEX_LOCK(&browser_menu_mtx);
+	if ((me = menu_get_active_entry(browser_menu)) == NULL)
+		t = NULL;
+	else
+		for (;;) {
+			if ((me = menu_get_prev_entry(me)) == NULL) {
+				if (!option_get_boolean("repeat-all")) {
+					t = NULL;
+					break;
+				}
+				me = menu_get_last_entry(browser_menu);
+			}
+
+			be = menu_get_entry_data(me);
+			if (be->ip != NULL) {
+				xasprintf(&path, "%s/%s", browser_dir,
+				    be->name);
+				t = track_get(path, be->ip);
+				free(path);
+				if (t != NULL)
+					menu_activate_entry(browser_menu, me);
+				break;
+			}
+		}
+	XPTHREAD_MUTEX_UNLOCK(&browser_menu_mtx);
+
+	browser_print();
+	return t;
 }
 
 void
@@ -190,6 +282,9 @@
 	}
 }
 
+/*
+ * The browser_menu_mtx mutex must be locked before calling this function.
+ */
 static void
 browser_read_dir(void)
 {
@@ -207,11 +302,6 @@
 	}
 
 	while ((de = dir_get_entry(d)) != NULL) {
-		if (errno) {
-			msg_err("%s", de->name);
-			continue;
-		}
-
 		if (de->type == FILE_TYPE_OTHER &&
 		    !option_get_boolean("show-all-files"))
 			continue;
@@ -225,10 +315,10 @@
 				continue;
 		}
 
-		if (de->type == FILE_TYPE_DIRECTORY ||
-		    option_get_boolean("show-all-files"))
+		if (de->type == FILE_TYPE_DIRECTORY)
 			ip = NULL;
-		else if ((ip = plugin_find_ip(de->path)) == NULL)
+		else if ((ip = plugin_find_ip(de->path)) == NULL &&
+		    !option_get_boolean("show-all-files"))
 			continue;
 
 		be = xmalloc(sizeof *be);
@@ -238,14 +328,7 @@
 
 		MENU_FOR_EACH_ENTRY(browser_menu, me) {
 			mbe = menu_get_entry_data(me);
-			if (option_get_boolean("show-dirs-before-files") &&
-			    be->type != mbe->type) {
-				if (be->type == FILE_TYPE_DIRECTORY) {
-					menu_insert_before(browser_menu, me,
-					    be);
-					break;
-				}
-			} else if (strcmp(be->name, mbe->name) < 0) {
+			if (strcmp(be->name, mbe->name) < 0) {
 				menu_insert_before(browser_menu, me, be);
 				break;
 			}
@@ -259,9 +342,6 @@
 			menu_insert_tail(browser_menu, be);
 	}
 
-	if (errno)
-		msg_err("Cannot read directory");
-
 	dir_close(d);
 }
 
@@ -277,7 +357,9 @@
 	else
 		name = xstrdup(e->name);
 
+	XPTHREAD_MUTEX_LOCK(&browser_menu_mtx);
 	browser_read_dir();
+	XPTHREAD_MUTEX_UNLOCK(&browser_menu_mtx);
 
 	/* Preselect the entry that was selected previously. */
 	if (name != NULL) {
@@ -325,6 +407,13 @@
 	browser_print();
 }
 
+void
+browser_select_active_entry(void)
+{
+	menu_select_active_entry(browser_menu);
+	browser_print();
+}
+
 static void
 browser_select_entry(const char *name)
 {

siren-0.2.tar.gz/cache.c -> siren-0.7.tar.gz/cache.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,329 +14,276 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "siren.h"
 
-#ifdef HAVE_TREE_H
-#include <sys/tree.h>
-#else
-#include "compat/tree.h"
-#endif
-
-#define CACHE_VERSION	0
-
-struct cache_entry {
-	char		*path;
-	char		*album;
-	char		*artist;
-	char		*date;
-	char		*genre;
-	char		*title;
-	char		*tracknumber;
-	unsigned int	 duration;
-	RB_ENTRY(cache_entry) entries;
-};
-
-RB_HEAD(cache_tree, cache_entry);
-
-static int		 cache_cmp_entry(struct cache_entry *,
-			    struct cache_entry *);
-static void		 cache_free_entry(struct cache_entry *);
-static int		 cache_read_file(void);
-static int		 cache_read_number(char **, char *, unsigned int *);
-static int		 cache_read_string(char **, char *, char **);
-static void		 cache_remove_entry(struct cache_entry *);
-static void		 cache_write_number(FILE *, unsigned int);
-static void		 cache_write_string(FILE *, const char *);
-
-RB_PROTOTYPE(cache_tree, cache_entry, entries, cache_cmp_entry)
-
-static struct cache_tree cache_tree = RB_INITIALIZER(cache_tree);
-static int		 cache_modified;
-static char		*cache_file;
-
-RB_GENERATE(cache_tree, cache_entry, entries, cache_cmp_entry)
+#define CACHE_BUFSIZE	4096
+#define CACHE_VERSION	2
 
-static void
-cache_add_entry(struct cache_entry *e)
-{
-	if (RB_INSERT(cache_tree, &cache_tree, e) != NULL) {
-		/* This should not happen. */
-		LOG_ERRX("%s: track is already in cache", e->path);
-		cache_free_entry(e);
-	}
-}
+static int		 cache_open_read(const char *);
+static int		 cache_open_write(const char *);
+static int		 cache_read_number(unsigned int *);
+static int		 cache_read_string(char **);
+static void		 cache_write_number(unsigned int);
+static void		 cache_write_string(const char *);
 
-void
-cache_add_metadata(const struct track *t)
-{
-	struct cache_entry *e;
-
-	e = xmalloc(sizeof *e);
-	e->path = xstrdup(t->path);
-	e->album = t->album == NULL ? NULL : xstrdup(t->album);
-	e->artist = t->artist == NULL ? NULL : xstrdup(t->artist);
-	e->date = t->date == NULL ? NULL : xstrdup(t->date);
-	e->genre = t->genre == NULL ? NULL : xstrdup(t->genre);
-	e->title = t->title == NULL ? NULL : xstrdup(t->title);
-	e->tracknumber = t->tracknumber == NULL ? NULL :
-	    xstrdup(t->tracknumber);
-	e->duration = t->duration;
-
-	cache_add_entry(e);
-	cache_modified = 1;
-}
+static unsigned int	 cache_version;
+static FILE		*cache_fp;
+static size_t		 cache_bufidx;
+static size_t		 cache_buflen;
+static size_t		 cache_bufsize;
+static char		*cache_buf;
 
 void
-cache_clear(void)
+cache_close(void)
 {
-	struct cache_entry *e;
-
-	while ((e = RB_ROOT(&cache_tree)) != NULL)
-		cache_remove_entry(e);
-	cache_modified = 1;
+	fclose(cache_fp);
+	free(cache_buf);
 }
 
-static int
-cache_cmp_entry(struct cache_entry *e1, struct cache_entry *e2)
+int
+cache_open(enum cache_mode mode)
 {
-	return strcmp(e1->path, e2->path);
-}
+	int	 ret;
+	char	*path;
 
-void
-cache_end(void)
-{
-	if (cache_modified)
-		(void)cache_write_file();
+	path = conf_get_path(CACHE_FILE);
 
-	cache_clear();
-	free(cache_file);
-}
+	if (mode == CACHE_MODE_READ)
+		ret = cache_open_read(path);
+	else
+		ret = cache_open_write(path);
 
-static void
-cache_free_entry(struct cache_entry *e)
-{
-	free(e->path);
-	free(e->album);
-	free(e->artist);
-	free(e->date);
-	free(e->genre);
-	free(e->title);
-	free(e->tracknumber);
-	free(e);
+	free(path);
+	return ret;
 }
 
-int
-cache_get_metadata(struct track *t)
+static int
+cache_open_read(const char *path)
 {
-	struct cache_entry *find, search;
-
-	search.path = t->path;
-	if ((find = RB_FIND(cache_tree, &cache_tree, &search)) == NULL)
+	cache_fp = fopen(path, "r");
+	if (cache_fp == NULL) {
+		if (errno != ENOENT) {
+			LOG_ERR("fopen: %s", path);
+			msg_err("Cannot open metadata cache file");
+		}
 		return -1;
+	}
+
+	cache_bufidx = 0;
+	cache_buflen = 0;
+	cache_bufsize = CACHE_BUFSIZE;
+	cache_buf = xmalloc(cache_bufsize);
+
+	if (cache_read_number(&cache_version) == -1) {
+		msg_errx("Cannot read metadata cache file");
+		goto error;
+	}
+
+	LOG_INFO("reading version %u", cache_version);
 
-	t->album = find->album == NULL ? NULL : xstrdup(find->album);
-	t->artist = find->artist == NULL ? NULL : xstrdup(find->artist);
-	t->date = find->date == NULL ? NULL : xstrdup(find->date);
-	t->genre = find->genre == NULL ? NULL : xstrdup(find->genre);
-	t->title = find->title == NULL ? NULL : xstrdup(find->title);
-	t->tracknumber = find->tracknumber == NULL ? NULL :
-	    xstrdup(find->tracknumber);
-	t->duration = find->duration;
+	if (cache_version > CACHE_VERSION) {
+		LOG_ERRX("unsupported metadata cache version");
+		msg_errx("Unsupported metadata cache version");
+		goto error;
+	}
 
 	return 0;
-}
 
-void
-cache_init(void)
-{
-	cache_file = conf_path(CACHE_FILE);
-	if (cache_read_file() == -1)
-		msg_err("Cannot read metadata cache");
+error:
+	free(cache_buf);
+	fclose(cache_fp);
+	return -1;
 }
 
-static void
-cache_read_entries(char *data, char *end)
+static int
+cache_open_write(const char *path)
 {
-	struct cache_entry	*e;
-	int			 ret;
-	unsigned int		 version;
-
-	if (cache_read_number(&data, end, &version) == -1)
-		return;
-
-	if (version != CACHE_VERSION) {
-		LOG_ERRX("%u: unsupported metadata cache version", version);
-		return;
+	cache_fp = fopen(path, "w");
+	if (cache_fp == NULL) {
+		LOG_ERR("fopen: %s", path);
+		msg_err("Cannot open metadata cache file");
+		return -1;
 	}
 
-	for (;;) {
-		e = xmalloc(sizeof *e);
-		ret = 0;
-		ret += cache_read_string(&data, end, &e->path);
-		ret += cache_read_string(&data, end, &e->artist);
-		ret += cache_read_string(&data, end, &e->album);
-		ret += cache_read_string(&data, end, &e->date);
-		ret += cache_read_string(&data, end, &e->tracknumber);
-		ret += cache_read_string(&data, end, &e->title);
-		ret += cache_read_number(&data, end, &e->duration);
-		ret += cache_read_string(&data, end, &e->genre);
-
-		/* Check for EOF or error. */
-		if (ret) {
-			cache_free_entry(e);
-			break;
-		}
+	LOG_INFO("writing version %u", CACHE_VERSION);
 
-		cache_add_entry(e);
-	}
+	cache_buf = NULL;
+	cache_write_number(CACHE_VERSION);
+	return 0;
 }
 
-static int
-cache_read_field(char **data, char *end, char **field)
+int
+cache_read_entry(struct track *t)
 {
-	*field = *data;
+	int ret;
 
-	/* Find end of field. */
-	while (*data < end)
-		if (*(*data)++ == '\0')
-			return 0;
+	t->ip = NULL;
+	t->ipdata = NULL;
 
-	/* EOF or field not NUL-terminated. */
-	return -1;
+	ret = 0;
+	ret |= cache_read_string(&t->path);
+	if (cache_version < 2)
+		t->albumartist = NULL;
+	else
+		ret |= cache_read_string(&t->albumartist);
+	ret |= cache_read_string(&t->artist);
+	ret |= cache_read_string(&t->album);
+	ret |= cache_read_string(&t->date);
+	if (cache_version == 0)
+		t->discnumber = NULL;
+	else
+		ret |= cache_read_string(&t->discnumber);
+	if (cache_version < 2)
+		t->disctotal = NULL;
+	else
+		ret |= cache_read_string(&t->disctotal);
+	ret |= cache_read_string(&t->tracknumber);
+	if (cache_version < 2)
+		t->tracktotal = NULL;
+	else
+		ret |= cache_read_string(&t->tracktotal);
+	ret |= cache_read_string(&t->title);
+	ret |= cache_read_number(&t->duration);
+	ret |= cache_read_string(&t->genre);
+	if (cache_version < 2)
+		t->comment = NULL;
+	else
+		ret |= cache_read_string(&t->comment);
+	return ret;
 }
 
 static int
-cache_read_file(void)
+cache_read_field(char **field)
 {
-	struct stat	 sb;
-	int		 fd;
-	char		*data;
-
-	if ((fd = open(cache_file, O_RDONLY)) == -1) {
-		if (errno == ENOENT)
-			return 0;
-		else {
-			LOG_ERR("open: %s", cache_file);
+	size_t	 fieldlen;
+	char	*sep;
+
+	for (;;) {
+		/* Fill the buffer. */
+		if (cache_buflen < cache_bufsize) {
+			cache_buflen += fread(cache_buf + cache_buflen, 1,
+			    cache_bufsize - cache_buflen, cache_fp);
+			if (ferror(cache_fp)) {
+				LOG_ERR("fread");
+				return -1;
+			}
+			if (feof(cache_fp) && cache_buflen == 0)
+				return -1;
+		}
+
+		/* Find the field separator. */
+		sep = memchr(cache_buf + cache_bufidx, '\0',
+		    cache_buflen - cache_bufidx);
+		if (sep != NULL)
+			break;
+
+		if (feof(cache_fp)) {
+			LOG_ERRX("no field separator at EOF");
 			return -1;
 		}
-	}
 
-	if (fstat(fd, &sb) == -1) {
-		LOG_ERR("fstat: %s", cache_file);
-		(void)close(fd);
-		return -1;
+		if (cache_bufidx > 0) {
+			memmove(cache_buf, cache_buf + cache_bufidx,
+			    cache_buflen - cache_bufidx);
+			cache_buflen -= cache_bufidx;
+			cache_bufidx = 0;
+		} else {
+			if (SIZE_MAX - cache_bufsize < CACHE_BUFSIZE) {
+				LOG_ERRX("buffer size too large");
+				return -1;
+			}
+			cache_bufsize += CACHE_BUFSIZE;
+			cache_buf = xrealloc(cache_buf, cache_bufsize);
+		}
 	}
 
-	if (sb.st_size == 0) {
-		(void)close(fd);
-		return 0;
-	}
+	*field = cache_buf + cache_bufidx;
+	fieldlen = (sep - (cache_buf + cache_bufidx)) + 1;
 
-	if ((data = mmap(0, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) ==
-	    MAP_FAILED) {
-		LOG_ERR("mmap: %s", cache_file);
-		(void)close(fd);
-		return -1;
+	if (cache_bufidx + fieldlen < cache_buflen)
+		cache_bufidx += fieldlen;
+	else {
+		cache_bufidx = 0;
+		cache_buflen = 0;
 	}
 
-	cache_read_entries(data, data + sb.st_size);
-
-	(void)munmap(data, sb.st_size);
-	(void)close(fd);
 	return 0;
 }
 
 static int
-cache_read_number(char **data, char *end, unsigned int *num)
+cache_read_number(unsigned int *num)
 {
 	char		*field;
 	const char	*errstr;
 
-	if (cache_read_field(data, end, &field) == -1)
+	if (cache_read_field(&field) == -1)
 		return -1;
 
-	*num = (unsigned int)strtonum(field, 0, UINT_MAX, &errstr);
-	if (errstr != NULL)
+	*num = strtonum(field, 0, UINT_MAX, &errstr);
+	if (errstr != NULL) {
 		LOG_ERRX("%s: number is %s", field, errstr);
+		return -1;
+	}
 
 	return 0;
 }
 
 static int
-cache_read_string(char **data, char *end, char **str)
+cache_read_string(char **str)
 {
 	char *field;
 
-	if (cache_read_field(data, end, &field) == -1) {
+	if (cache_read_field(&field) == -1) {
 		*str = NULL;
 		return -1;
 	}
 
-	if (field0 == '\0')
-		*str = NULL;
-	else
-		*str = xstrdup(field);
-
+	*str = (field0 == '\0') ? NULL : xstrdup(field);
 	return 0;
 }
 
-static void
-cache_remove_entry(struct cache_entry *e)
+void
+cache_update(void)
 {
-	(void)RB_REMOVE(cache_tree, &cache_tree, e);
-	cache_free_entry(e);
+	if (cache_fp != NULL && cache_version < CACHE_VERSION)
+		track_update_metadata(1);
 }
 
-int
-cache_write_file(void)
+void
+cache_write_entry(const struct track *t)
 {
-	struct cache_entry	*e;
-	FILE			*fp;
-
-	if ((fp = fopen(cache_file, "w")) == NULL) {
-		LOG_ERR("fopen: %s", cache_file);
-		return -1;
-	}
-
-	cache_write_number(fp, CACHE_VERSION);
-	RB_FOREACH(e, cache_tree, &cache_tree) {
-		cache_write_string(fp, e->path);
-		cache_write_string(fp, e->artist);
-		cache_write_string(fp, e->album);
-		cache_write_string(fp, e->date);
-		cache_write_string(fp, e->tracknumber);
-		cache_write_string(fp, e->title);
-		cache_write_number(fp, e->duration);
-		cache_write_string(fp, e->genre);
-	}
-
-	(void)fclose(fp);
-	cache_modified = 0;
-	return 0;
+	cache_write_string(t->path);
+	cache_write_string(t->albumartist);
+	cache_write_string(t->artist);
+	cache_write_string(t->album);
+	cache_write_string(t->date);
+	cache_write_string(t->discnumber);
+	cache_write_string(t->disctotal);
+	cache_write_string(t->tracknumber);
+	cache_write_string(t->tracktotal);
+	cache_write_string(t->title);
+	cache_write_number(t->duration);
+	cache_write_string(t->genre);
+	cache_write_string(t->comment);
 }
 
 static void
-cache_write_number(FILE *fp, unsigned int num)
+cache_write_number(unsigned int num)
 {
-	(void)fprintf(fp, "%u%c", num, '\0');
+	fprintf(cache_fp, "%u%c", num, '\0');
 }
 
 static void
-cache_write_string(FILE *fp, const char *str)
+cache_write_string(const char *str)
 {
 	if (str != NULL)
-		(void)fputs(str, fp);
-	(void)putc('\0', fp);
+		fputs(str, cache_fp);
+	putc('\0', cache_fp);
 }

siren-0.2.tar.gz/command.c -> siren-0.7.tar.gz/command.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -24,10 +24,6 @@
 
 #include "siren.h"
 
-#define COMMAND_CLEAR_HISTORY_ALL	~0
-#define COMMAND_CLEAR_HISTORY_COMMAND	1
-#define COMMAND_CLEAR_HISTORY_SEARCH	2
-
 struct command {
 	const char	*name;
 	int		 (*parse)(int, char **, void **, char **);
@@ -49,24 +45,6 @@
 	char		 *command_string;
 };
 
-struct command_command_prompt_data {
-	char		 *prompt;
-	unsigned int	  nrefs;
-};
-
-struct command_confirm_data {
-	char		 *prompt;
-	struct command	 *command;
-	void		 *command_data;
-	unsigned int	  nrefs;
-};
-
-struct command_search_prompt_data {
-	char		 *prompt;
-	int		  search_backward;
-	unsigned int	  nrefs;
-};
-
 struct command_seek_data {
 	int		 position;
 	int		 relative;
@@ -77,7 +55,7 @@
 	enum option_type  type;
 	union {
 		struct format	*format;
-		enum colour	 colour;
+		int		 colour;
 		int		 attrib;
 		int		 boolean;
 		int		 number;
@@ -118,36 +96,31 @@
 COMMAND_PARSE_PROTOTYPE(bind_key);
 COMMAND_EXEC_PROTOTYPE(cd);
 COMMAND_PARSE_PROTOTYPE(cd);
-COMMAND_EXEC_PROTOTYPE(clear_cache);
-COMMAND_EXEC_PROTOTYPE(clear_history);
-COMMAND_PARSE_PROTOTYPE(clear_history);
 COMMAND_EXEC_PROTOTYPE(command_prompt);
-COMMAND_FREE_PROTOTYPE(command_prompt);
-COMMAND_PARSE_PROTOTYPE(command_prompt);
-COMMAND_EXEC_PROTOTYPE(confirm);
-COMMAND_FREE_PROTOTYPE(confirm);
-COMMAND_PARSE_PROTOTYPE(confirm);
 COMMAND_EXEC_PROTOTYPE(delete_entry);
 COMMAND_PARSE_PROTOTYPE(delete_entry);
 COMMAND_PARSE_PROTOTYPE(generic);
+COMMAND_EXEC_PROTOTYPE(load_playlist);
+COMMAND_PARSE_PROTOTYPE(load_playlist);
 COMMAND_EXEC_PROTOTYPE(move_entry_down);
 COMMAND_EXEC_PROTOTYPE(move_entry_up);
 COMMAND_EXEC_PROTOTYPE(pause);
 COMMAND_EXEC_PROTOTYPE(play);
 COMMAND_EXEC_PROTOTYPE(play_next);
 COMMAND_EXEC_PROTOTYPE(play_prev);
+COMMAND_EXEC_PROTOTYPE(pwd);
 COMMAND_EXEC_PROTOTYPE(quit);
 COMMAND_EXEC_PROTOTYPE(refresh_directory);
 COMMAND_EXEC_PROTOTYPE(refresh_screen);
-COMMAND_EXEC_PROTOTYPE(save_cache);
+COMMAND_EXEC_PROTOTYPE(reopen_output_plugin);
 COMMAND_EXEC_PROTOTYPE(save_library);
+COMMAND_EXEC_PROTOTYPE(save_metadata);
 COMMAND_PARSE_PROTOTYPE(scroll);
 COMMAND_EXEC_PROTOTYPE(scroll_down);
 COMMAND_EXEC_PROTOTYPE(scroll_up);
 COMMAND_EXEC_PROTOTYPE(search_next);
 COMMAND_EXEC_PROTOTYPE(search_prev);
 COMMAND_EXEC_PROTOTYPE(search_prompt);
-COMMAND_FREE_PROTOTYPE(search_prompt);
 COMMAND_PARSE_PROTOTYPE(search_prompt);
 COMMAND_EXEC_PROTOTYPE(seek);
 COMMAND_PARSE_PROTOTYPE(seek);
@@ -167,9 +140,13 @@
 COMMAND_PARSE_PROTOTYPE(show_binding);
 COMMAND_EXEC_PROTOTYPE(show_option);
 COMMAND_PARSE_PROTOTYPE(show_option);
+COMMAND_EXEC_PROTOTYPE(source);
+COMMAND_PARSE_PROTOTYPE(source);
 COMMAND_EXEC_PROTOTYPE(stop);
 COMMAND_EXEC_PROTOTYPE(unbind_key);
 COMMAND_PARSE_PROTOTYPE(unbind_key);
+COMMAND_EXEC_PROTOTYPE(update_metadata);
+COMMAND_PARSE_PROTOTYPE(update_metadata);
 
 static struct command command_list = {
 	{
@@ -203,28 +180,10 @@
 		free
 	},
 	{
-		"clear-cache",
-		command_generic_parse,
-		command_clear_cache_exec,
-		NULL
-	},
-	{
-		"clear-history",
-		command_clear_history_parse,
-		command_clear_history_exec,
-		free
-	},
-	{
 		"command-prompt",
-		command_command_prompt_parse,
+		command_generic_parse,
 		command_command_prompt_exec,
-		command_command_prompt_free
-	},
-	{
-		"confirm",
-		command_confirm_parse,
-		command_confirm_exec,
-		command_confirm_free
+		NULL
 	},
 	{
 		"delete-entry",
@@ -233,6 +192,12 @@
 		free
 	},
 	{
+		"load-playlist",
+		command_load_playlist_parse,
+		command_load_playlist_exec,
+		free
+	},
+	{
 		"move-entry-down",
 		command_generic_parse,
 		command_move_entry_down_exec,
@@ -269,6 +234,12 @@
 		NULL
 	},
 	{
+		"pwd",
+		command_generic_parse,
+		command_pwd_exec,
+		NULL,
+	},
+	{
 		"quit",
 		command_generic_parse,
 		command_quit_exec,
@@ -287,9 +258,9 @@
 		NULL
 	},
 	{
-		"save-cache",
+		"reopen-output-plugin",
 		command_generic_parse,
-		command_save_cache_exec,
+		command_reopen_output_plugin_exec,
 		NULL
 	},
 	{
@@ -299,6 +270,12 @@
 		NULL
 	},
 	{
+		"save-metadata",
+		command_generic_parse,
+		command_save_metadata_exec,
+		NULL
+	},
+	{
 		"scroll-down",
 		command_scroll_parse,
 		command_scroll_down_exec,
@@ -326,7 +303,7 @@
 		"search-prompt",
 		command_search_prompt_parse,
 		command_search_prompt_exec,
-		command_search_prompt_free
+		free
 	},
 	{
 		"seek",
@@ -395,6 +372,12 @@
 		free
 	},
 	{
+		"source",
+		command_source_parse,
+		command_source_exec,
+		free
+	},
+	{
 		"stop",
 		command_generic_parse,
 		command_stop_exec,
@@ -405,10 +388,15 @@
 		command_unbind_key_parse,
 		command_unbind_key_exec,
 		free
+	},
+	{
+		"update-metadata",
+		command_update_metadata_parse,
+		command_update_metadata_exec,
+		free
 	}
 };
 
-/* ARGSUSED */
 static void
 command_activate_entry_exec(UNUSED void *datap)
 {
@@ -442,7 +430,7 @@
 			goto usage;
 		}
 
-	if (argc - optind != 0)
+	if (argc != optind)
 		goto usage;
 
 	*datap = view;
@@ -479,7 +467,7 @@
 			view_add_dir(data->view, data->pathsi);
 			break;
 		case S_IFREG:
-			if ((t = track_init(data->pathsi, NULL)) != NULL)
+			if ((t = track_get(data->pathsi, NULL)) != NULL)
 				view_add_track(data->view, t);
 			break;
 		default:
@@ -530,7 +518,7 @@
 	if (argc == 0)
 		goto usage;
 
-	data->paths = xcalloc(argc + 1, sizeof *data->paths);
+	data->paths = xreallocarray(NULL, argc + 1, sizeof *data->paths);
 	for (i = 0; i < argc; i++)
 		data->pathsi = path_normalise(argvi);
 	data->pathsi = NULL;
@@ -577,13 +565,13 @@
 	data = xmalloc(sizeof *data);
 
 	if (bind_string_to_scope(argv1, &data->scope) == -1) {
-		(void)xasprintf(error, "Invalid scope: %s", argv1);
+		xasprintf(error, "Invalid scope: %s", argv1);
 		free(data);
 		return -1;
 	}
 
 	if ((data->key = bind_string_to_key(argv2)) == K_NONE) {
-		(void)xasprintf(error, "Invalid key: %s", argv2);
+		xasprintf(error, "Invalid key: %s", argv2);
 		free(data);
 		return -1;
 	}
@@ -595,7 +583,7 @@
 	}
 
 	if (data->command == NULL) {
-		(void)xasprintf(error, "Missing command: %s", argv3);
+		xasprintf(error, "Missing command: %s", argv3);
 		free(data);
 		return -1;
 	}
@@ -633,240 +621,56 @@
 	return 0;
 }
 
-/* ARGSUSED */
 static void
-command_clear_cache_exec(UNUSED void *datap)
-{
-	cache_clear();
-	msg_info("Cache cleared");
-}
-
-static void
-command_clear_history_exec(void *datap)
-{
-	int histories;
-
-	histories = *(int *)datap;
-	if (histories & COMMAND_CLEAR_HISTORY_COMMAND)
-		prompt_clear_command_history();
-	if (histories & COMMAND_CLEAR_HISTORY_SEARCH)
-		prompt_clear_search_history();
-}
-
-static int
-command_clear_history_parse(int argc, char **argv, void **datap, char **error)
+command_command_prompt_callback(char *command, UNUSED void *datap)
 {
-	int c, *histories;
-
-	histories = xmalloc(sizeof *histories);
-	*histories = 0;
+	char *error;
 
-	while ((c = getopt(argc, argv, "cs")) != -1)
-		switch (c) {
-		case 'c':
-			*histories |= COMMAND_CLEAR_HISTORY_COMMAND;
-			break;
-		case 's':
-			*histories |= COMMAND_CLEAR_HISTORY_SEARCH;
-			break;
-		default:
-			goto usage;
+	if (command != NULL) {
+		if (command_process(command, &error)) {
+			msg_errx("%s", error);
+			free(error);
 		}
-
-	if (argc - optind != 0)
-		goto usage;
-
-	/* If no history is specified, then clear all histories. */
-	if (*histories == 0)
-		*histories = COMMAND_CLEAR_HISTORY_ALL;
-
-	*datap = histories;
-	return 0;
-
-usage:
-	*error = xstrdup("Usage: clear-history -cs");
-	free(histories);
-	return -1;
-}
-
-static void
-command_command_prompt_callback(char *command, void *datap)
-{
-	struct command_command_prompt_data	*data;
-	char					*error;
-
-	data = datap;
-	if (command != NULL && command_process(command, &error)) {
-		msg_errx("%s", error);
-		free(error);
+		free(command);
 	}
-
-	free(command);
-	command_command_prompt_free(data);
 }
 
 static void
-command_command_prompt_exec(void *datap)
+command_command_prompt_exec(UNUSED void *datap)
 {
-	struct command_command_prompt_data *data;
-
-	data = datap;
-	data->nrefs++;
-	prompt_get_command(data->prompt, command_command_prompt_callback,
-	    data);
+	prompt_get_command(":", command_command_prompt_callback, NULL);
 }
 
 static void
-command_command_prompt_free(void *datap)
+command_delete_entry_callback(char *answer, void *datap)
 {
-	struct command_command_prompt_data *data;
+	int *delete_all;
 
-	data = datap;
-	if (--data->nrefs == 0) {
-		free(data->prompt);
-		free(data);
+	if (*answer == 'y') {
+		delete_all = datap;
+		if (*delete_all)
+			view_delete_all_entries();
+		else
+			view_delete_entry();
 	}
-}
-
-static int
-command_command_prompt_parse(int argc, char **argv, void **datap, char **error)
-{
-	struct command_command_prompt_data	*data;
-	int					 c;
-
-	data = xmalloc(sizeof *data);
-	data->prompt = NULL;
-	data->nrefs = 1;
-
-	while ((c = getopt(argc, argv, "p:")) != -1)
-		switch (c) {
-		case 'p':
-			free(data->prompt);
-			data->prompt = xstrdup(optarg);
-			break;
-		default:
-			goto usage;
-		}
-
-	if (argc - optind != 0)
-		goto usage;
-
-	if (data->prompt == NULL)
-		data->prompt = xstrdup(":");
-
-	*datap = data;
-	return 0;
-
-usage:
-	*error = xstrdup("Usage: command-prompt -p prompt");
-	free(data->prompt);
-	free(data);
-	return -1;
-}
-
-static void
-command_confirm_callback(char *answer, void *datap)
-{
-	struct command_confirm_data *data;
-
-	data = datap;
-	if (*answer == 'y')
-		command_execute(data->command, data->command_data);
-
 	free(answer);
-	command_confirm_free(data);
-}
-
-static void
-command_confirm_exec(void *datap)
-{
-	struct command_confirm_data *data;
-
-	data = datap;
-	data->nrefs++;
-	prompt_get_answer(data->prompt, command_confirm_callback, data);
-}
-
-static void
-command_confirm_free(void *datap)
-{
-	struct command_confirm_data *data;
-
-	data = datap;
-	if (--data->nrefs == 0) {
-		command_free_data(data->command, data->command_data);
-		free(data->prompt);
-		free(data);
-	}
-}
-
-static int
-command_confirm_parse(int argc, char **argv, void **datap, char **error)
-{
-	struct command_confirm_data	*data;
-	int				 c;
-	char				*prompt;
-
-	data = xmalloc(sizeof *data);
-	data->nrefs = 1;
-	prompt = NULL;
-
-	while ((c = getopt(argc, argv, "p:")) != -1)
-		switch (c) {
-		case 'p':
-			prompt = optarg;
-			break;
-		default:
-			goto usage;
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (argc != 1)
-		goto usage;
-
-	if (command_parse_string(argv0, &data->command, &data->command_data,
-	    error))
-		goto error;
-
-	if (data->command == NULL) {
-		(void)xasprintf(error, "Missing command: %s", argv0);
-		goto error;
-	}
-
-	if (prompt != NULL)
-		(void)xasprintf(&data->prompt, "%s? (y/n): ", prompt);
-	else
-		(void)xasprintf(&data->prompt, "Execute \"%s\"? (y/n): ",
-		    argv0);
-
-	*datap = data;
-	return 0;
-
-usage:
-	*error = xstrdup("Usage: confirm -p prompt command");
-
-error:
-	free(data);
-	return -1;
 }
 
 static void
 command_delete_entry_exec(void *datap)
 {
-	int delete_all;
+	int		*delete_all;
+	const char	*prompt;
 
-	delete_all = *(int *)datap;
-	if (delete_all) {
-		view_delete_all_entries();
-	} else
-		view_delete_entry();
+	delete_all = datap;
+	prompt = *delete_all ? "Delete all entries" : "Delete entry";
+	prompt_get_answer(prompt, command_delete_entry_callback, datap);
 }
 
 static int
 command_delete_entry_parse(int argc, char **argv, void **datap, char **error)
 {
-	int	c, *delete_all;
+	int c, *delete_all;
 
 	delete_all = xmalloc(sizeof *delete_all);
 	*delete_all = 0;
@@ -880,7 +684,7 @@
 			goto usage;
 		}
 
-	if (argc - optind != 0)
+	if (argc != optind)
 		goto usage;
 
 	*datap = delete_all;
@@ -909,7 +713,7 @@
 command_generic_parse(int argc, char **argv, void **datap, char **error)
 {
 	if (argc != 1) {
-		(void)xasprintf(error, "Usage: %s", argv0);
+		xasprintf(error, "Usage: %s", argv0);
 		return -1;
 	}
 
@@ -917,14 +721,33 @@
 	return 0;
 }
 
-/* ARGSUSED */
+static void
+command_load_playlist_exec(void *datap)
+{
+	char *file;
+
+	file = datap;
+	playlist_load(file);
+}
+
+static int
+command_load_playlist_parse(int argc, char **argv, void **datap, char **error)
+{
+	if (argc != 2) {
+		*error = xstrdup("Usage: load-playlist file");
+		return -1;
+	}
+
+	*datap = xstrdup(argv1);
+	return 0;
+}
+
 static void
 command_move_entry_down_exec(UNUSED void *datap)
 {
 	view_move_entry_down();
 }
 
-/* ARGSUSED */
 static void
 command_move_entry_up_exec(UNUSED void *datap)
 {
@@ -955,7 +778,7 @@
 		}
 
 	if (*cmd == NULL) {
-		(void)xasprintf(error, "No such command: %s", argv0);
+		xasprintf(error, "No such command: %s", argv0);
 		ret = -1;
 	} else {
 		optind = optreset = 1;
@@ -966,28 +789,24 @@
 	return ret;
 }
 
-/* ARGSUSED */
 static void
 command_pause_exec(UNUSED void *datap)
 {
 	player_pause();
 }
 
-/* ARGSUSED */
 static void
 command_play_exec(UNUSED void *datap)
 {
 	player_play();
 }
 
-/* ARGSUSED */
 static void
 command_play_next_exec(UNUSED void *datap)
 {
 	player_play_next();
 }
 
-/* ARGSUSED */
 static void
 command_play_prev_exec(UNUSED void *datap)
 {
@@ -1010,38 +829,45 @@
 	return 0;
 }
 
-/* ARGSUSED */
+static
+void
+command_pwd_exec(UNUSED void *datap)
+{
+	msg_info("%s", browser_get_dir());
+}
+
+static void
+command_quit_callback(char *answer, UNUSED void *datap)
+{
+	if (*answer == 'y')
+		input_end();
+	free(answer);
+}
+
 static void
 command_quit_exec(UNUSED void *datap)
 {
-	input_end();
+	prompt_get_answer("Quit", command_quit_callback, NULL);
 }
 
-/* ARGSUSED */
 static void
 command_refresh_directory_exec(UNUSED void *datap)
 {
 	browser_refresh_dir();
 }
 
-/* ARGSUSED */
 static void
 command_refresh_screen_exec(UNUSED void *datap)
 {
 	screen_refresh();
 }
 
-/* ARGSUSED */
 static void
-command_save_cache_exec(UNUSED void *datap)
+command_reopen_output_plugin_exec(UNUSED void *datap)
 {
-	if (cache_write_file() == -1)
-		msg_err("Cannot save cache file");
-	else
-		msg_info("Cache saved");
+	player_reopen_op();
 }
 
-/* ARGSUSED */
 static void
 command_save_library_exec(UNUSED void *datap)
 {
@@ -1050,6 +876,15 @@
 }
 
 static void
+command_save_metadata_exec(UNUSED void *datap)
+{
+	if (track_write_cache())
+		msg_err("Cannot save metadata");
+	else
+		msg_info("Metadata saved");
+}
+
+static void
 command_scroll_down_exec(void *datap)
 {
 	enum menu_scroll *scroll;
@@ -1079,8 +914,7 @@
 			*scroll = MENU_SCROLL_PAGE;
 			break;
 		default:
-			(void)xasprintf(error, "Usage: %s -h | -l | -p",
-			    argv0);
+			xasprintf(error, "Usage: %s -h | -l | -p", argv0);
 			free(scroll);
 			return -1;
 		}
@@ -1098,14 +932,12 @@
 	view_scroll_up(*scroll);
 }
 
-/* ARGSUSED */
 static void
 command_search_next_exec(UNUSED void *datap)
 {
 	view_search_next(NULL);
 }
 
-/* ARGSUSED */
 static void
 command_search_prev_exec(UNUSED void *datap)
 {
@@ -1115,80 +947,55 @@
 static void
 command_search_prompt_callback(char *query, void *datap)
 {
-	struct command_search_prompt_data *data;
+	int *backward;
 
-	data = datap;
 	if (query != NULL) {
-		if (data->search_backward)
+		backward = datap;
+		if (*backward)
 			view_search_prev(query);
 		else
 			view_search_next(query);
+		free(query);
 	}
-
-	free(query);
-	command_search_prompt_free(data);
 }
 
 static void
 command_search_prompt_exec(void *datap)
 {
-	struct command_search_prompt_data *data;
-
-	data = datap;
-	data->nrefs++;
-	prompt_get_search_query(data->prompt, command_search_prompt_callback,
-	    data);
-}
-
-static void
-command_search_prompt_free(void *datap)
-{
-	struct command_search_prompt_data *data;
+	int		*backward;
+	const char	*prompt;
 
-	data = datap;
-	if (--data->nrefs == 0) {
-		free(data->prompt);
-		free(data);
-	}
+	backward = datap;
+	prompt = *backward ? "?" : "/";
+	prompt_get_search_query(prompt, command_search_prompt_callback, datap);
 }
 
 static int
 command_search_prompt_parse(int argc, char **argv, void **datap, char **error)
 {
-	struct command_search_prompt_data	*data;
-	int					 c;
+	int *backward, c;
 
-	data = xmalloc(sizeof *data);
-	data->prompt = NULL;
-	data->search_backward = 0;
-	data->nrefs = 1;
+	backward = xmalloc(sizeof *backward);
+	*backward = 0;
 
-	while ((c = getopt(argc, argv, "bp:")) != -1)
+	while ((c = getopt(argc, argv, "b")) != -1)
 		switch (c) {
 		case 'b':
-			data->search_backward = 1;
-			break;
-		case 'p':
-			free(data->prompt);
-			data->prompt = xstrdup(optarg);
+			*backward = 1;
 			break;
 		default:
 			goto usage;
 		}
 
-	if (argc - optind != 0)
+	if (argc != optind)
 		goto usage;
 
-	if (data->prompt == NULL)
-		data->prompt = xstrdup(data->search_backward ? "?" : "/");
-
-	*datap = data;
+	*datap = backward;
 	return 0;
 
 usage:
-	*error = xstrdup("Usage: search-prompt -b -p prompt");
-	free(data->prompt);
-	free(data);
+	*error = xstrdup("Usage: search-prompt -b");
+	free(backward);
 	return -1;
 }
 
@@ -1224,7 +1031,7 @@
 			goto usage;
 		}
 
-	if (argc - optind != 1)
+	if (argc != optind + 1)
 		goto usage;
 
 	/*
@@ -1237,7 +1044,7 @@
 
 	/* Parse the first field. */
 	field = strsep(&position, ":");
-	data->position = (int)strtonum(field, 0, INT_MAX, &errstr);
+	data->position = strtonum(field, 0, INT_MAX, &errstr);
 	if (errstr != NULL)
 		goto error;
 
@@ -1245,7 +1052,7 @@
 	if (position != NULL) {
 		field = strsep(&position, ":");
 		data->position *= 60;
-		data->position += (int)strtonum(field, 0, 59, &errstr);
+		data->position += strtonum(field, 0, 59, &errstr);
 		if (errstr != NULL)
 			goto error;
 
@@ -1253,7 +1060,7 @@
 		if (position != NULL) {
 			field = strsep(&position, ":");
 			data->position *= 60;
-			data->position += (int)strtonum(field, 0, 59, &errstr);
+			data->position += strtonum(field, 0, 59, &errstr);
 			if (errstr != NULL)
 				goto error;
 
@@ -1280,35 +1087,30 @@
 	return -1;
 }
 
-/* ARGSUSED */
 static void
 command_select_active_entry_exec(UNUSED void *datap)
 {
-	library_select_active_entry();
+	view_select_active_entry();
 }
 
-/* ARGSUSED */
 static void
 command_select_first_entry_exec(UNUSED void *datap)
 {
 	view_select_first_entry();
 }
 
-/* ARGSUSED */
 static void
 command_select_last_entry_exec(UNUSED void *datap)
 {
 	view_select_last_entry();
 }
 
-/* ARGSUSED */
 static void
 command_select_next_entry_exec(UNUSED void *datap)
 {
 	view_select_next_entry();
 }
 
-/* ARGSUSED */
 static void
 command_select_prev_entry_exec(UNUSED void *datap)
 {
@@ -1339,10 +1141,12 @@
 		*data = VIEW_ID_BROWSER;
 	else if (!strcmp(argv1, "library"))
 		*data = VIEW_ID_LIBRARY;
+	else if (!strcmp(argv1, "playlist"))
+		*data = VIEW_ID_PLAYLIST;
 	else if (!strcmp(argv1, "queue"))
 		*data = VIEW_ID_QUEUE;
 	else {
-		(void)xasprintf(error, "Invalid view: %s", argv1);
+		xasprintf(error, "Invalid view: %s", argv1);
 		free(data);
 		return -1;
 	}
@@ -1351,7 +1155,6 @@
 	return 0;
 }
 
-/* ARGSUSED */
 static void
 command_set_exec(void *datap)
 {
@@ -1411,12 +1214,12 @@
 	data = xmalloc(sizeof *data);
 
 	if (option_get_type(argv1, &data->type) == -1) {
-		(void)xasprintf(error, "Invalid option: %s", argv1);
+		xasprintf(error, "Invalid option: %s", argv1);
 		goto error;
 	}
 
 	if (argc == 2 && data->type != OPTION_TYPE_BOOLEAN) {
-		(void)xasprintf(error, "Cannot toggle option: %s", argv1);
+		xasprintf(error, "Cannot toggle option: %s", argv1);
 		goto error;
 	}
 
@@ -1431,7 +1234,7 @@
 				/* Empty field. */
 				continue;
 			if ((attrib = option_string_to_attrib(field)) == -1) {
-				(void)xasprintf(error, "Invalid attribute: %s",
+				xasprintf(error, "Invalid attribute: %s",
 				    field);
 				goto error;
 			}
@@ -1448,14 +1251,19 @@
 			data->value.boolean = -1;
 		else if ((data->value.boolean =
 		    option_string_to_boolean(argv2)) == -1) {
-			(void)xasprintf(error, "Invalid boolean: %s", argv2);
+			xasprintf(error, "Invalid boolean: %s", argv2);
 			goto error;
 		}
 		break;
 	case OPTION_TYPE_COLOUR:
 		if (option_string_to_colour(argv2, &data->value.colour) ==
 		    -1) {
-			(void)xasprintf(error, "Invalid colour: %s", argv2);
+			xasprintf(error, "Invalid colour: %s", argv2);
+			goto error;
+		}
+		if (data->value.colour >= screen_get_ncolours()) {
+			xasprintf(error, "Terminal does not support more than "
+			    "%d colours ", screen_get_ncolours());
 			goto error;
 		}
 		break;
@@ -1464,10 +1272,9 @@
 		break;
 	case OPTION_TYPE_NUMBER:
 		option_get_number_range(argv1, &min, &max);
-		data->value.number = (int)strtonum(argv2, min, max, &errstr);
+		data->value.number = strtonum(argv2, min, max, &errstr);
 		if (errstr != NULL) {
-			(void)xasprintf(error, "Number is %s: %s", errstr,
-			    argv2);
+			xasprintf(error, "Number is %s: %s", errstr, argv2);
 			goto error;
 		}
 		break;
@@ -1516,12 +1323,12 @@
 			goto usage;
 		}
 
-	if (argc - optind != 1)
+	if (argc != optind + 1)
 		goto usage;
 
-	data->volume = (int)strtonum(argvoptind, 0, 100, &errstr);
+	data->volume = strtonum(argvoptind, 0, 100, &errstr);
 	if (errstr != NULL) {
-		(void)xasprintf(error, "Volume level is %s: %s", errstr,
+		xasprintf(error, "Volume level is %s: %s", errstr,
 		    argvoptind);
 		free(data);
 		return -1;
@@ -1566,13 +1373,13 @@
 	data = xmalloc(sizeof *data);
 
 	if (bind_string_to_scope(argv1, &data->scope) == -1) {
-		(void)xasprintf(error, "Invalid scope: %s", argv1);
+		xasprintf(error, "Invalid scope: %s", argv1);
 		free(data);
 		return -1;
 	}
 
 	if ((data->key = bind_string_to_key(argv2)) == K_NONE) {
-		(void)xasprintf(error, "Invalid key: %s", argv2);
+		xasprintf(error, "Invalid key: %s", argv2);
 		free(data);
 		return -1;
 	}
@@ -1604,8 +1411,9 @@
 		    option_boolean_to_string(option_get_boolean(name)));
 		break;
 	case OPTION_TYPE_COLOUR:
-		msg_info("%s",
-		    option_colour_to_string(option_get_colour(name)));
+		value = option_colour_to_string(option_get_colour(name));
+		msg_info("%s", value);
+		free(value);
 		break;
 	case OPTION_TYPE_FORMAT:
 		option_lock();
@@ -1636,7 +1444,24 @@
 	return 0;
 }
 
-/* ARGSUSED */
+static void
+command_source_exec(void *datap)
+{
+	conf_source_file(datap);
+}
+
+static int
+command_source_parse(int argc, char **argv, void **datap, char **error)
+{
+	if (argc != 2) {
+		*error = xstrdup("Usage: source file");
+		return -1;
+	}
+
+	*datap = xstrdup(argv1);
+	return 0;
+}
+
 static void
 command_stop_exec(UNUSED void *datap)
 {
@@ -1666,13 +1491,13 @@
 	data = xmalloc(sizeof *data);
 
 	if (bind_string_to_scope(argv1, &data->scope) == -1) {
-		(void)xasprintf(error, "Invalid scope: %s", argv1);
+		xasprintf(error, "Invalid scope: %s", argv1);
 		free(data);
 		return -1;
 	}
 
 	if ((data->key = bind_string_to_key(argv2)) == K_NONE) {
-		(void)xasprintf(error, "Invalid key: %s", argv2);
+		xasprintf(error, "Invalid key: %s", argv2);
 		free(data);
 		return -1;
 	}
@@ -1680,3 +1505,46 @@
 	*datap = data;
 	return 0;
 }
+
+static void
+command_update_metadata_exec(void *datap)
+{
+	int delete;
+
+	delete = *(int *)datap;
+	track_update_metadata(delete);
+	library_update();
+	playlist_update();
+	queue_update();
+	screen_print();
+}
+
+static int
+command_update_metadata_parse(int argc, char **argv, void **datap,
+    char **error)
+{
+	int c, *delete;
+
+	delete = xmalloc(sizeof *delete);
+	*delete = 0;
+
+	while ((c = getopt(argc, argv, "d")) != -1)
+		switch (c) {
+		case 'd':
+			*delete = 1;
+			break;
+		default:
+			goto usage;
+		}
+
+	if (argc != optind)
+		goto usage;
+
+	*datap = delete;
+	return 0;
+
+usage:
+	*error = xstrdup("Usage: update-metadata -d");
+	free(delete);
+	return -1;
+}

siren-0.2.tar.gz/compat.h -> siren-0.7.tar.gz/compat.h Changed

siren-0.2.tar.gz/compat/asprintf.c -> siren-0.7.tar.gz/compat/asprintf.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,25 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../siren.h"
-
-int
-asprintf(char **buf, const char *fmt, ...)
-{
-	va_list	ap;
-	int	ret;
-
-	va_start(ap, fmt);
-	ret = vasprintf(buf, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
 int
 vasprintf(char **buf, const char *fmt, va_list ap)
 {
@@ -43,20 +29,28 @@
 	len = vsnprintf(NULL, 0, fmt, ap2);
 	va_end(ap2);
 
-	if (len < 0)
+	if (len < 0 || len == INT_MAX)
 		return -1;
 
-	/*
-	 * We cannot call xmalloc() here, because xmalloc() might want to call
-	 * us again.
-	 */
-	if ((*buf = malloc((size_t)len + 1)) == NULL)
+	if ((*buf = malloc(len + 1)) == NULL)
 		return -1;
 
-	if (vsnprintf(*buf, (size_t)len + 1, fmt, ap) < 0) {
+	if (vsnprintf(*buf, len + 1, fmt, ap) < 0) {
 		free(*buf);
 		return -1;
 	}
 
 	return len;
 }
+
+int
+asprintf(char **buf, const char *fmt, ...)
+{
+	va_list	ap;
+	int	len;
+
+	va_start(ap, fmt);
+	len = vasprintf(buf, fmt, ap);
+	va_end(ap);
+	return len;
+}

siren-0.2.tar.gz/compat/err.c -> siren-0.7.tar.gz/compat/err.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -22,6 +22,8 @@
 
 #include "../siren.h"
 
+extern char *__progname;
+
 void
 err(int ret, const char *fmt, ...)
 {
@@ -44,7 +46,6 @@
 verr(int ret, const char *fmt, va_list ap)
 {
 	vwarn(fmt, ap);
-	va_end(ap);
 	exit(ret);
 }
 
@@ -52,26 +53,24 @@
 verrx(int ret, const char *fmt, va_list ap)
 {
 	vwarnx(fmt, ap);
-	va_end(ap);
 	exit(ret);
 }
 
 void
 vwarn(const char *fmt, va_list ap)
 {
-	extern char	*__progname;
-	int		 oerrno;
-	char		 errstrSTRERROR_BUFSIZE;
+	int	oerrno;
+	char	errstrSTRERROR_BUFSIZE;
 
 	oerrno = errno;
 
-	(void)fputs(__progname, stderr);
+	fputs(__progname, stderr);
 	if (fmt != NULL) {
-		(void)fputs(": ", stderr);
-		(void)vfprintf(stderr, fmt, ap);
+		fputs(": ", stderr);
+		vfprintf(stderr, fmt, ap);
 	}
-	(void)strerror_r(oerrno, errstr, sizeof errstr);
-	(void)fprintf(stderr, ": %s\n", errstr);
+	strerror_r(oerrno, errstr, sizeof errstr);
+	fprintf(stderr, ": %s\n", errstr);
 
 	errno = oerrno;
 }
@@ -79,14 +78,12 @@
 void
 vwarnx(const char *fmt, va_list ap)
 {
-	extern char *__progname;
-
-	(void)fputs(__progname, stderr);
+	fputs(__progname, stderr);
 	if (fmt != NULL) {
-		(void)fputs(": ", stderr);
-		(void)vfprintf(stderr, fmt, ap);
+		fputs(": ", stderr);
+		vfprintf(stderr, fmt, ap);
 	}
-	(void)putc('\n', stderr);
+	putc('\n', stderr);
 }
 
 void

siren-0.2.tar.gz/compat/fgetln.c -> siren-0.7.tar.gz/compat/fgetln.c Changed

siren-0.2.tar.gz/compat/getopt.c -> siren-0.7.tar.gz/compat/getopt.c Changed

siren-0.2.tar.gz/compat/queue.h -> siren-0.7.tar.gz/compat/queue.h Changed

@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.h,v 1.32 2007/04/30 18:42:34 pedro Exp $	*/
+/*	$OpenBSD: queue.h,v 1.38 2013/07/03 15:05:21 fgsch Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
 
 /*
@@ -117,10 +117,10 @@
 	    (var) != SLIST_END(head);					\
 	    (var) = SLIST_NEXT(var, field))
 
-#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-	for ((varp) = &SLIST_FIRST((head));				\
-	    ((var) = *(varp)) != SLIST_END(head);			\
-	    (varp) = &SLIST_NEXT((var), field))
+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SLIST_FIRST(head);				\
+	    (var) && ((tvar) = SLIST_NEXT(var, field), 1);		\
+	    (var) = (tvar))
 
 /*
  * Singly-linked List functions.
@@ -139,7 +139,7 @@
 	(head)->slh_first = (elm);					\
 } while (0)
 
-#define	SLIST_REMOVE_NEXT(head, elm, field) do {			\
+#define	SLIST_REMOVE_AFTER(elm, field) do {				\
 	(elm)->field.sle_next = (elm)->field.sle_next->field.sle_next;	\
 } while (0)
 
@@ -191,6 +191,11 @@
 	    (var)!= LIST_END(head);					\
 	    (var) = LIST_NEXT(var, field))
 
+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = LIST_FIRST(head);				\
+	    (var) && ((tvar) = LIST_NEXT(var, field), 1);		\
+	    (var) = (tvar))
+
 /*
  * List functions.
  */
@@ -269,6 +274,11 @@
 	    (var) != SIMPLEQ_END(head);					\
 	    (var) = SIMPLEQ_NEXT(var, field))
 
+#define	SIMPLEQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SIMPLEQ_FIRST(head);				\
+	    (var) && ((tvar) = SIMPLEQ_NEXT(var, field), 1);		\
+	    (var) = (tvar))
+
 /*
  * Simple queue functions.
  */
@@ -300,6 +310,92 @@
 		(head)->sqh_last = &(head)->sqh_first;			\
 } while (0)
 
+#define SIMPLEQ_REMOVE_AFTER(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (elm)->field.sqe_next->field.sqe_next) \
+	    == NULL)							\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+} while (0)
+
+/*
+ * XOR Simple queue definitions.
+ */
+#define XSIMPLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *sqx_first;	/* first element */			\
+	struct type **sqx_last;	/* addr of last next element */		\
+	unsigned long sqx_cookie;					\
+}
+
+#define XSIMPLEQ_ENTRY(type)						\
+struct {								\
+	struct type *sqx_next;	/* next element */			\
+}
+
+/*
+ * XOR Simple queue access methods.
+ */
+#define XSIMPLEQ_XOR(head, ptr)	    ((__typeof(ptr))((head)->sqx_cookie ^ \
+					(unsigned long)(ptr)))
+#define	XSIMPLEQ_FIRST(head)	    XSIMPLEQ_XOR(head, ((head)->sqx_first))
+#define	XSIMPLEQ_END(head)	    NULL
+#define	XSIMPLEQ_EMPTY(head)	    (XSIMPLEQ_FIRST(head) == XSIMPLEQ_END(head))
+#define	XSIMPLEQ_NEXT(head, elm, field)    XSIMPLEQ_XOR(head, ((elm)->field.sqx_next))
+
+
+#define XSIMPLEQ_FOREACH(var, head, field)				\
+	for ((var) = XSIMPLEQ_FIRST(head);				\
+	    (var) != XSIMPLEQ_END(head);				\
+	    (var) = XSIMPLEQ_NEXT(head, var, field))
+
+#define	XSIMPLEQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = XSIMPLEQ_FIRST(head);				\
+	    (var) && ((tvar) = XSIMPLEQ_NEXT(head, var, field), 1);	\
+	    (var) = (tvar))
+
+/*
+ * XOR Simple queue functions.
+ */
+#define	XSIMPLEQ_INIT(head) do {					\
+	arc4random_buf(&(head)->sqx_cookie, sizeof((head)->sqx_cookie)); \
+	(head)->sqx_first = XSIMPLEQ_XOR(head, NULL);			\
+	(head)->sqx_last = XSIMPLEQ_XOR(head, &(head)->sqx_first);	\
+} while (0)
+
+#define XSIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.sqx_next = (head)->sqx_first) ==		\
+	    XSIMPLEQ_XOR(head, NULL))					\
+		(head)->sqx_last = XSIMPLEQ_XOR(head, &(elm)->field.sqx_next); \
+	(head)->sqx_first = XSIMPLEQ_XOR(head, (elm));			\
+} while (0)
+
+#define XSIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.sqx_next = XSIMPLEQ_XOR(head, NULL);		\
+	*(XSIMPLEQ_XOR(head, (head)->sqx_last)) = XSIMPLEQ_XOR(head, (elm)); \
+	(head)->sqx_last = XSIMPLEQ_XOR(head, &(elm)->field.sqx_next);	\
+} while (0)
+
+#define XSIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.sqx_next = (listelm)->field.sqx_next) ==	\
+	    XSIMPLEQ_XOR(head, NULL))					\
+		(head)->sqx_last = XSIMPLEQ_XOR(head, &(elm)->field.sqx_next); \
+	(listelm)->field.sqx_next = XSIMPLEQ_XOR(head, (elm));		\
+} while (0)
+
+#define XSIMPLEQ_REMOVE_HEAD(head, field) do {				\
+	if (((head)->sqx_first = XSIMPLEQ_XOR(head,			\
+	    (head)->sqx_first)->field.sqx_next) == XSIMPLEQ_XOR(head, NULL)) \
+		(head)->sqx_last = XSIMPLEQ_XOR(head, &(head)->sqx_first); \
+} while (0)
+
+#define XSIMPLEQ_REMOVE_AFTER(head, elm, field) do {			\
+	if (((elm)->field.sqx_next = XSIMPLEQ_XOR(head,			\
+	    (elm)->field.sqx_next)->field.sqx_next)			\
+	    == XSIMPLEQ_XOR(head, NULL))				\
+		(head)->sqx_last = 					\
+		    XSIMPLEQ_XOR(head, &(elm)->field.sqx_next);		\
+} while (0)
+
+		    
 /*
  * Tail queue definitions.
  */
@@ -337,11 +433,24 @@
 	    (var) != TAILQ_END(head);					\
 	    (var) = TAILQ_NEXT(var, field))
 
+#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = TAILQ_FIRST(head);					\
+	    (var) != TAILQ_END(head) &&					\
+	    ((tvar) = TAILQ_NEXT(var, field), 1);			\
+	    (var) = (tvar))
+
+
 #define TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
 	for((var) = TAILQ_LAST(head, headname);				\
 	    (var) != TAILQ_END(head);					\
 	    (var) = TAILQ_PREV(var, headname, field))
 
+#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
+	for ((var) = TAILQ_LAST(head, headname);			\
+	    (var) != TAILQ_END(head) &&					\
+	    ((tvar) = TAILQ_PREV(var, headname, field), 1);		\
+	    (var) = (tvar))
+
 /*
  * Tail queue functions.
  */
@@ -441,11 +550,23 @@
 	    (var) != CIRCLEQ_END(head);					\
 	    (var) = CIRCLEQ_NEXT(var, field))
 
+#define	CIRCLEQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = CIRCLEQ_FIRST(head);				\
+	    (var) != CIRCLEQ_END(head) &&				\
+	    ((tvar) = CIRCLEQ_NEXT(var, field), 1);			\
+	    (var) = (tvar))
+
 #define CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
 	for((var) = CIRCLEQ_LAST(head);					\
 	    (var) != CIRCLEQ_END(head);					\
 	    (var) = CIRCLEQ_PREV(var, field))
 
+#define	CIRCLEQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
+	for ((var) = CIRCLEQ_LAST(head, headname);			\
+	    (var) != CIRCLEQ_END(head) && 				\
+	    ((tvar) = CIRCLEQ_PREV(var, headname, field), 1);		\
+	    (var) = (tvar))
+
 /*
  * Circular queue functions.
  */
@@ -512,12 +633,12 @@
 #define CIRCLEQ_REPLACE(head, elm, elm2, field) do {			\
 	if (((elm2)->field.cqe_next = (elm)->field.cqe_next) ==		\
 	    CIRCLEQ_END(head))						\
-		(head).cqh_last = (elm2);				\
+		(head)->cqh_last = (elm2);				\
 	else								\
 		(elm2)->field.cqe_next->field.cqe_prev = (elm2);	\
 	if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) ==		\
 	    CIRCLEQ_END(head))						\
-		(head).cqh_first = (elm2);				\
+		(head)->cqh_first = (elm2);				\
 	else								\
 		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
 	_Q_INVALIDATE((elm)->field.cqe_prev);				\

siren-0.7.tar.gz/compat/reallocarray.c Added

@@ -0,0 +1,38 @@
+/*	$OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $	*/
+/*
+ * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/*
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
+ */
+#define MUL_NO_OVERFLOW	((size_t)1 << (sizeof(size_t) * 4))
+
+void *
+reallocarray(void *optr, size_t nmemb, size_t size)
+{
+	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    nmemb > 0 && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return realloc(optr, size * nmemb);
+}

siren-0.2.tar.gz/compat/strlcat.c -> siren-0.7.tar.gz/compat/strlcat.c Changed

@@ -1,7 +1,7 @@
-/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+/*	$OpenBSD: strlcat.c,v 1.14 2015/01/15 03:54:12 millert Exp $	*/
 
 /*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,36 +20,36 @@
 #include <string.h>
 
 /*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * Appends src to string dst of size dsize (unlike strncat, dsize is the
+ * full size of dst, not space left).  At most dsize-1 characters
+ * will be copied.  Always NUL terminates (unless dsize <= strlen(dst)).
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
  * If retval >= siz, truncation occurred.
  */
 size_t
-strlcat(char *dst, const char *src, size_t siz)
+strlcat(char *dst, const char *src, size_t dsize)
 {
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
+	const char *odst = dst;
+	const char *osrc = src;
+	size_t n = dsize;
 	size_t dlen;
 
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
+	/* Find the end of dst and adjust bytes left but don't go past end. */
+	while (n-- != 0 && *dst != '\0')
+		dst++;
+	dlen = dst - odst;
+	n = dsize - dlen;
 
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
+	if (n-- == 0)
+		return(dlen + strlen(src));
+	while (*src != '\0') {
+		if (n != 0) {
+			*dst++ = *src;
 			n--;
 		}
-		s++;
+		src++;
 	}
-	*d = '\0';
+	*dst = '\0';
 
-	return(dlen + (s - src));	/* count does not include NUL */
+	return(dlen + (src - osrc));	/* count does not include NUL */
 }

siren-0.2.tar.gz/compat/strlcpy.c -> siren-0.7.tar.gz/compat/strlcpy.c Changed

@@ -1,7 +1,7 @@
-/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
+/*	$OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $	*/
 
 /*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,32 +20,31 @@
 #include <string.h>
 
 /*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
+ * Copy string src to buffer dst of size dsize.  At most dsize-1
+ * chars will be copied.  Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
  */
 size_t
-strlcpy(char *dst, const char *src, size_t siz)
+strlcpy(char *dst, const char *src, size_t dsize)
 {
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
+	const char *osrc = src;
+	size_t nleft = dsize;
 
-	/* Copy as many bytes as will fit */
-	if (n != 0) {
-		while (--n != 0) {
-			if ((*d++ = *s++) == '\0')
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0) {
+		while (--nleft != 0) {
+			if ((*dst++ = *src++) == '\0')
 				break;
 		}
 	}
 
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0) {
+		if (dsize != 0)
+			*dst = '\0';		/* NUL-terminate dst */
+		while (*src++)
 			;
 	}
 
-	return(s - src - 1);	/* count does not include NUL */
+	return(src - osrc - 1);	/* count does not include NUL */
 }

siren-0.2.tar.gz/compat/strsep.c -> siren-0.7.tar.gz/compat/strsep.c Changed

siren-0.2.tar.gz/compat/strtonum.c -> siren-0.7.tar.gz/compat/strtonum.c Changed

siren-0.2.tar.gz/compat/tree.h -> siren-0.7.tar.gz/compat/tree.h Changed

siren-0.2.tar.gz/conf.c -> siren-0.7.tar.gz/conf.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "siren.h"
 
@@ -40,9 +41,9 @@
 		conf_dir = path_normalise(dir);
 	else {
 		if ((home = path_get_home_dir(NULL)) == NULL)
-			(void)xasprintf(&conf_dir, "/%s", CONF_DIR);
+			xasprintf(&conf_dir, "/%s", CONF_DIR);
 		else {
-			(void)xasprintf(&conf_dir, "%s/%s", home, CONF_DIR);
+			xasprintf(&conf_dir, "%s/%s", home, CONF_DIR);
 			free(home);
 		}
 	}
@@ -55,31 +56,35 @@
 }
 
 char *
-conf_path(const char *file)
+conf_get_path(const char *file)
 {
 	char *path;
 
-	(void)xasprintf(&path, "%s/%s", conf_dir, file);
+	xasprintf(&path, "%s/%s", conf_dir, file);
 	return path;
 }
 
-/*
- * Read the configuration file.
- */
 void
 conf_read_file(void)
 {
+	char *file;
+
+	file = conf_get_path(CONF_FILE);
+	if (access(file, F_OK) == 0 || errno != ENOENT)
+		conf_source_file(file);
+	free(file);
+}
+
+void
+conf_source_file(const char *file)
+{
 	FILE	*fp;
 	size_t	 len, lineno;
-	char	*buf, *error, *file, *lbuf;
+	char	*buf, *error, *lbuf;
 
-	file = conf_path(CONF_FILE);
 	if ((fp = fopen(file, "r")) == NULL) {
-		if (errno != ENOENT) {
-			LOG_ERR("fopen: %s", file);
-			msg_err("Cannot open configuration file");
-		}
-		free(file);
+		LOG_ERR("fopen: %s", file);
+		msg_err("Cannot open %s", file);
 		return;
 	}
 
@@ -101,7 +106,6 @@
 		msg_err("Cannot read configuration file");
 	}
 	free(lbuf);
-	free(file);
 
-	(void)fclose(fp);
+	fclose(fp);
 }

siren-0.2.tar.gz/configure -> siren-0.7.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+# Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -21,7 +21,11 @@
 # $5: compiler options
 check_function()
 {
-	print_check "for $1()"
+	if  "${1#* }" = "$1" ; then
+		print_check "for $1()"
+	else
+		print_check "for $1"
+	fi
 
 	if compile "$4" "$3" "$2" "$5"; then
 		print_result yes
@@ -73,30 +77,29 @@
 	fi
 }
 
-# $1: value of $enable_$2
-# $2: plug-in name
-# $3: plug-in type (either "ip" or "op")
-# $4: packages to check for
+# $1: plug-in name
+# $2: plug-in type (either "ip" or "op")
+# $3: packages to check for
 check_plugin_pkgconfig()
 {
 	local pkg
 
-	 "$1" = no  && return 1
+	eval  "\$enable_$1" = no  && return 1
 
-	for pkg in $4; do
+	for pkg in $3; do
 		check_pkgconfig $pkg || return 1
 	done
 
-	if  "$3" = ip ; then
-		enabled_ips="$enabled_ips $2"
-		makefile_append IP $2
+	if  "$2" = ip ; then
+		enabled_ips="$enabled_ips $1"
+		makefile_append IP $1
 	else
-		enabled_ops="$enabled_ops $2"
-		makefile_append OP $2
+		enabled_ops="$enabled_ops $1"
+		makefile_append OP $1
 	fi
 
-	makefile_assign CPPFLAGS_$2 "$(pkg-config --cflags $4)"
-	makefile_assign LDFLAGS_$2 "$(pkg-config --libs $4)"
+	makefile_assign CPPFLAGS_$1 "$(pkg-config --cflags $3)"
+	makefile_assign LDFLAGS_$1 "$(pkg-config --libs $3)"
 
 	return 0
 }
@@ -105,7 +108,7 @@
 {
 	print_check "for $1"
 
-	if run_command which $1; then
+	if run_command command -v "$1"; then
 		print_result yes
 	else
 		print_result no
@@ -119,9 +122,9 @@
 # $4: compiler options
 compile()
 {
-	local header macro outfile result srcfile
+	local header line macro outfile result srcfile
 
-	outfile=configure-test.o
+	outfile=configure-test.out
 	srcfile=configure-test.c
 
 	rm -f $srcfile
@@ -137,9 +140,9 @@
 	echo "int main(void) { $3; return 0; }" >> $srcfile
 
 	echo compiling test program: >> $logfile
-	echo --- >> $logfile
-	cat $srcfile >> $logfile
-	echo --- >> $logfile
+	while read -r line; do
+		printf "\t%s\n" "$line" >> $logfile
+	done < $srcfile
 
 	run_command $CC $CFLAGS $CPPFLAGS -o $outfile $srcfile $LDFLAGS $4
 	result=$?
@@ -151,6 +154,7 @@
 error()
 {
 	echo "${0##*/}: $@" >& 2
+	printf "\nerror: %s\n" "$@" >> $logfile
 	exit 1
 }
 
@@ -187,8 +191,8 @@
 
 print_check()
 {
-	echo -n "checking $@..."
-	echo "checking $@" >> $logfile
+	printf "checking %s..." "$@"
+	printf "\nchecking %s\n" "$@" >> $logfile
 }
 
 print_result()
@@ -218,86 +222,128 @@
 plugindir_suffix=lib/siren
 
 enable_debug=no
+enable_aac=yes
+enable_ffmpeg=yes
 enable_flac=yes
 enable_mad=yes
+enable_mpg123=yes
+enable_opus=yes
 enable_sndfile=yes
 enable_vorbis=yes
 enable_wavpack=yes
+enable_alsa=yes
 enable_ao=yes
 enable_oss=yes
+enable_portaudio=yes
 enable_pulse=yes
 enable_sndio=yes
 enable_sun=yes
 
-while  $# -gt 0 ; do
-	case "$1" in
+rm -f $logfile $header $makefile
+
+uname -srvm >> $logfile
+
+printf "\narguments:\n" >> $logfile
+if  $# -eq 0 ; then
+	echo "(none)" >> $logfile
+else
+	for arg; do
+		echo "$arg" >> $logfile
+	done
+fi
+
+for arg; do
+	case "$arg" in
 	prefix=*)
-		prefix="${1#*=}"
+		prefix="${arg#*=}"
 		;;
 	bindir=*)
-		bindir="${1#*=}"
+		bindir="${arg#*=}"
 		;;
 	mandir=*)
-		mandir="${1#*=}"
+		mandir="${arg#*=}"
 		;;
 	plugindir=*)
-		plugindir="${1#*=}"
+		plugindir="${arg#*=}"
 		;;
 	debug=*)
-		get_option_value enable_debug "$1"
+		get_option_value enable_debug "$arg"
+		;;
+	aac=*)
+		get_option_value enable_aac "$arg"
 		;;
 	flac=*)
-		get_option_value enable_flac "$1"
+		get_option_value enable_flac "$arg"
 		;;
 	mad=*)
-		get_option_value enable_mad "$1"
+		get_option_value enable_mad "$arg"
+		;;
+	mpg123=*)
+		get_option_value enable_mpg123 "$arg"
+		;;
+	opus=*)
+		get_option_value enable_opus "$arg"
 		;;
 	sndfile=*)
-		get_option_value enable_sndfile "$1"
+		get_option_value enable_sndfile "$arg"
 		;;
 	vorbis=*)
-		get_option_value enable_vorbis "$1"
+		get_option_value enable_vorbis "$arg"
 		;;
 	wavpack=*)
-		get_option_value enable_wavpack "$1"
+		get_option_value enable_wavpack "$arg"
+		;;
+	alsa=*)
+		get_option_value enable_alsa "$arg"
 		;;
 	ao=*)
-		get_option_value enable_ao "$1"
+		get_option_value enable_ao "$arg"
 		;;
 	oss=*)
-		get_option_value enable_oss "$1"
+		get_option_value enable_oss "$arg"
+		;;
+	portaudio=*)
+		get_option_value enable_portaudio "$arg"
 		;;
 	pulse=*)
-		get_option_value enable_pulse "$1"
+		get_option_value enable_pulse "$arg"
 		;;
 	sndio=*)
-		get_option_value enable_sndio "$1"
+		get_option_value enable_sndio "$arg"
 		;;
 	sun=*)
-		get_option_value enable_sun "$1"
+		get_option_value enable_sun "$arg"
 		;;
 	help|-h|--help)
 		error "see the INSTALL file for more information"
 		;;
 	*)
-		error "${1%%=*}: invalid option"
+		error "${arg%%=*}: invalid option"
 		;;
 	esac
-	shift
 done
 
-rm -f $logfile $header $makefile
-
 if  -z "$CC" ; then
 	CC=cc
 else
 	makefile_assign CC "$CC"
 fi
 
+header_define VERSION "\"$(cat version)\""
+
 makefile_assign CFLAGS "$CFLAGS"
 makefile_assign CPPFLAGS "$CPPFLAGS"
 makefile_assign LDFLAGS "$LDFLAGS"
 
+if  "$(uname)" = Darwin ; then
+	makefile_assign LDFLAGS_PROG -lcurses
+	makefile_assign LDFLAGS_LIB "-bundle -bundle_loader siren"
+else
+	makefile_assign LDFLAGS_PROG "-Wl,--export-dynamic -pthread -lcurses"
+	makefile_assign CFLAGS_LIB -fPIC
+	makefile_assign LDFLAGS_LIB "-fPIC -shared"
+fi
+
  -z "$bindir"  && bindir="$prefix/$bindir_suffix"
  -z "$mandir"  && mandir="$prefix/$mandir_suffix"
  -z "$plugindir"  && plugindir="$prefix/$plugindir_suffix"
@@ -320,6 +366,15 @@
 	makefile_append SRCS compat/asprintf.c
 fi
 
+if ! check_function dlopen "dlopen(NULL, 0)" "dlfcn.h stddef.h"; then
+	if check_function "dlopen() in libdl" "dlopen(NULL, 0)" \
+	    "dlfcn.h stddef.h" "" -ldl; then
+		makefile_append LDFLAGS_PROG -ldl
+	else
+		error "cannot determine how to use dlopen()"
+	fi
+fi
+
 if check_function err 'err(0, "")' err.h; then
 	header_define HAVE_ERR
 else
@@ -332,6 +387,20 @@
 	makefile_append SRCS compat/fgetln.c
 fi
 
+if ! check_function initscr "initscr()" curses.h "" -lcurses; then
+	error "cannot determine how to use initscr()"
+fi
+
+if check_function pledge 'pledge("", NULL)' unistd.h; then
+	header_define HAVE_PLEDGE
+fi
+
+if check_function reallocarray "reallocarray(NULL, 0, 0)" stdlib.h; then
+	header_define HAVE_REALLOCARRAY
+else
+	makefile_append SRCS compat/reallocarray.c
+fi
+
 if check_function resizeterm "resizeterm(0, 0)" curses.h "" -lcurses; then
 	header_define HAVE_RESIZETERM
 fi
@@ -368,10 +437,11 @@
 
 if check_function swap16 "swap16(0)" sys/types.h; then
 	header_define HAVE_OPENBSD_SWAP16
-elif check_function "a NetBSD-like bswap16" "bswap16(0)" \
+elif check_function "bswap16() in <machine/bswap.h>" "bswap16(0)" \
     "sys/types.h machine/bswap.h"; then
 	header_define HAVE_NETBSD_BSWAP16
-elif check_function "a FreeBSD-like bswap16" "bswap16(0)" sys/endian.h; then
+elif check_function "bswap16() in <sys/endian.h>" "bswap16(0)" \
+    sys/endian.h; then
 	header_define HAVE_FREEBSD_BSWAP16
 fi
 
@@ -380,24 +450,16 @@
 	header_define HAVE_USE_DEFAULT_COLORS
 fi
 
-print_check "whether <sys/queue.h> is usable"
-if  "$(uname)" = OpenBSD ; then
-	print_result yes
-	header_define HAVE_QUEUE_H
-else
-	print_result no
-fi
-
-print_check "whether <sys/tree.h> is usable"
-if  "$(uname)" = OpenBSD ; then
+print_check "for __progname"
+if compile "" stddef.h "extern char *__progname; __progname = NULL"; then
 	print_result yes
-	header_define HAVE_TREE_H
+	header_define HAVE___PROGNAME
 else
 	print_result no
 fi
 
-print_check "whether getopt() supports optreset"
-if compile "" unistd.h "optreset = 1"; then
+print_check "for optreset"
+if compile "" unistd.h "optreset = 0"; then
 	print_result yes
 	header_define HAVE_OPTRESET
 else
@@ -405,40 +467,49 @@
 	makefile_append SRCS compat/getopt.c
 fi
 
-print_check "whether dlopen() requires libdl"
-if compile "" "dlfcn.h stddef.h" "dlopen(NULL, 0)"; then
-	print_result no
-elif compile "" "dlfcn.h stddef.h" "dlopen(NULL, 0)" -ldl; then
-	print_result yes
-	makefile_append LDFLAGS -ldl
-else
-	print_result no
-	error "cannot determine how to use dlopen()"
+if  "$enable_aac" != no  && check_header neaacdec.h && check_library faad &&
+    check_header mp4v2/mp4v2.h && check_library mp4v2; then
+	makefile_append IP aac
+	makefile_assign LDFLAGS_aac "-lfaad -lmp4v2"
+	enabled_ips="$enabled_ips aac"
 fi
 
-check_plugin_pkgconfig $enable_flac flac ip flac
+check_plugin_pkgconfig ffmpeg ip libavformat
 
-check_plugin_pkgconfig $enable_mad mad ip "mad id3tag"
+if check_plugin_pkgconfig flac ip flac; then
+	# The include path provided by the flac pkg-config file has changed in
+	# flac 1.3.0.
+	if pkg-config --atleast-version 1.3.0 flac; then
+		header_define HAVE_NEW_FLAC_INCLUDE_PATH
+	fi
+fi
 
-if check_plugin_pkgconfig $enable_sndfile sndfile ip sndfile; then
+check_plugin_pkgconfig mad ip "mad id3tag"
+
+check_plugin_pkgconfig mpg123 ip libmpg123
+
+check_plugin_pkgconfig opus ip opusfile
+
+if check_plugin_pkgconfig sndfile ip sndfile; then
 	if pkg-config --atleast-version 1.0.23 sndfile; then
 		header_define HAVE_SF_STR_GENRE
 		header_define HAVE_SF_STR_TRACKNUMBER
 	fi
 fi
 
-check_plugin_pkgconfig $enable_vorbis vorbis ip vorbisfile
+check_plugin_pkgconfig vorbis ip vorbisfile
 
-check_plugin_pkgconfig $enable_wavpack wavpack ip wavpack
+check_plugin_pkgconfig wavpack ip wavpack
 
-if check_plugin_pkgconfig $enable_ao ao op ao; then
+check_plugin_pkgconfig alsa op alsa
+
+if check_plugin_pkgconfig ao op ao; then
 	if pkg-config --atleast-version 1.0.0 ao; then
 		header_define HAVE_AO_MATRIX
 	fi
 fi
 
 if  "$enable_oss" != no ; then
-	# Check for <soundcard.h> first, then for <sys/soundcard.h>.
 	if ! check_header soundcard.h; then
 		if check_header sys/soundcard.h; then
 			header_define HAVE_SYS_SOUNDCARD_H
@@ -456,7 +527,9 @@
 	fi
 fi
 
-check_plugin_pkgconfig $enable_pulse pulse op libpulse-simple
+check_plugin_pkgconfig portaudio op portaudio-2.0
+
+check_plugin_pkgconfig pulse op libpulse-simple
 
 if  "$enable_sndio" != no  && check_header sndio.h; then
 	makefile_append OP sndio
@@ -464,9 +537,8 @@
 	enabled_ops="$enabled_ops sndio"
 fi
 
-if  "$enable_sun" != no ; then
-	# Check for <sys/audioio.h> (NetBSD and OpenBSD) first, then for
-	# <sys/audio.h> (Solaris).
+if  "$enable_sun" != no -a "$(uname)" != OpenBSD ; then
+	# NetBSD has <sys/audioio.h>, Solaris has <sys/audio.h>.
 	if ! check_header sys/audioio.h sys/types.h; then
 		if check_header sys/audio.h; then
 			header_define HAVE_SYS_AUDIO_H

siren-0.2.tar.gz/dir.c -> siren-0.7.tar.gz/dir.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -44,26 +44,23 @@
 	free(d);
 }
 
-/*
- * Return a directory entry. NULL is returned if the end of the directory
- * stream has been reached. On success, errno is set to 0; otherwise, errno is
- * set to indicate the error.
- */
 struct dir_entry *
 dir_get_entry(struct dir *d)
 {
 	struct dirent	*result;
 	struct stat	 sb;
+	int		 ret;
 
-	if ((errno = readdir_r(d->dirp, d->dp, &result)) || result == NULL) {
-		/* Error or end of directory stream. */
-		if (errno)
+	if ((ret = readdir_r(d->dirp, d->dp, &result)) || result == NULL) {
+		if (ret) {
+			errno = ret;
 			LOG_ERR("readdir_r: %s", d->dir);
+		}
 		return NULL;
 	}
 
 	d->entry.name = d->dp->d_name;
-	(void)xsnprintf(d->entry.path, d->entry.pathsize, "%s/%s", d->dir,
+	xsnprintf(d->entry.path, d->entry.pathsize, "%s/%s", d->dir,
 	    d->entry.name);
 
 	if (stat(d->entry.path, &sb) == -1) {
@@ -81,9 +78,6 @@
 			d->entry.type = FILE_TYPE_OTHER;
 			break;
 		}
-
-		/* Set errno to indicate success. */
-		errno = 0;
 	}
 
 	return &d->entry;
@@ -108,13 +102,13 @@
 
 	/*
 	 * In order to allocate space for struct dirent, we need to know the
-	 * maximum length of a file name in the specified directory. If
+	 * maximum length of the file names in the specified directory. If
 	 * NAME_MAX is defined, we use that. Otherwise, we obtain the value
 	 * from fpathconf().
 	 *
 	 * We use dirfd() and fpathconf() instead of pathconf() to avoid a race
 	 * condition. See
-	 * <http://womble.decadentplace.org.uk/readdir_r-advisory.html>.
+	 * <https://womble.decadent.org.uk/readdir_r-advisory.html>.
 	 */
 #ifdef NAME_MAX
 	direntsize = offsetof(struct dirent, d_name) + NAME_MAX + 1;
@@ -125,7 +119,9 @@
 		goto error;
 	}
 
-	if ((namemax = XFPATHCONF(fd, _PC_NAME_MAX)) == -1) {
+	errno = 0;
+	if ((namemax = fpathconf(fd, _PC_NAME_MAX)) == -1) {
+		LOG_ERRX("fpathconf() failed");
 		if (errno == 0)
 			/*
 			 * The value for _PC_NAME_MAX is indeterminate. While

siren-0.2.tar.gz/format.c -> siren-0.7.tar.gz/format.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -123,7 +123,7 @@
 		(*fmt)++;
 	} else
 		/* Explicit fixed width. */
-		while (isdigit((int)**fmt)) {
+		while (isdigit((unsigned char)**fmt)) {
 			fld->width = 10 * fld->width + (**fmt - '0');
 			(*fmt)++;
 		}
@@ -223,8 +223,7 @@
 		if (fld->conditional)
 			condition = (varsi.value.number != 0);
 		else {
-			(void)xsnprintf(buf, bufsize, "%d",
-			    varsi.value.number);
+			xsnprintf(buf, bufsize, "%d", varsi.value.number);
 			value = buf;
 		}
 		break;
@@ -239,12 +238,12 @@
 			condition = (varsi.value.time != 0);
 		else {
 			if (varsi.value.time >= 3600)
-				(void)xsnprintf(buf, bufsize, "%u:%02u:%02u",
+				xsnprintf(buf, bufsize, "%u:%02u:%02u",
 				    HOURS(varsi.value.time),
 				    HMINS(varsi.value.time),
 				    MSECS(varsi.value.time));
 			else
-				(void)xsnprintf(buf, bufsize, "%u:%02u",
+				xsnprintf(buf, bufsize, "%u:%02u",
 				    MINS(varsi.value.time),
 				    MSECS(varsi.value.time));
 
@@ -412,45 +411,73 @@
 }
 
 void
-format_track_snprintf(char *buf, size_t bufsize, const struct format *f,
-    const struct track *t)
+format_track_snprintf(char *buf, size_t bufsize, const struct format *fmt,
+    const struct format *altfmt, const struct track *t)
 {
-	struct format_variable vars8;
+	struct format_variable vars14;
 
-	vars0.lname = "artist";
-	vars0.sname = 'a';
+	vars0.lname = "album";
+	vars0.sname = 'l';
 	vars0.type = FORMAT_VARIABLE_STRING;
-	vars0.value.string = t->artist ? t->artist : "";
-	vars1.lname = "duration";
-	vars1.sname = 'd';
-	vars1.type = FORMAT_VARIABLE_TIME;
-	vars1.value.time = t->duration;
-	vars2.lname = "path";
-	vars2.sname = 'f';
+	vars0.value.string = t->album ? t->album : "";
+	vars1.lname = "albumartist";
+	vars1.sname = 'A';
+	vars1.type = FORMAT_VARIABLE_STRING;
+	vars1.value.string = t->albumartist ? t->albumartist : "";
+	vars2.lname = "artist";
+	vars2.sname = 'a';
 	vars2.type = FORMAT_VARIABLE_STRING;
-	vars2.value.string = t->path;
-	vars3.lname = "genre";
-	vars3.sname = 'g';
+	vars2.value.string = t->artist ? t->artist : "";
+	vars3.lname = "comment";
+	vars3.sname = 'c';
 	vars3.type = FORMAT_VARIABLE_STRING;
-	vars3.value.string = t->genre ? t->genre : "";
-	vars4.lname = "album";
-	vars4.sname = 'l';
+	vars3.value.string = t->comment ? t->comment : "";
+	vars4.lname = "date";
+	vars4.sname = 'y';
 	vars4.type = FORMAT_VARIABLE_STRING;
-	vars4.value.string = t->album ? t->album : "";
-	vars5.lname = "tracknumber";
-	vars5.sname = 'n';
+	vars4.value.string = t->date ? t->date : "";
+	vars5.lname = "discnumber";
+	vars5.sname = 's';
 	vars5.type = FORMAT_VARIABLE_STRING;
-	vars5.value.string = t->tracknumber ? t->tracknumber : "";
-	vars6.lname = "title";
-	vars6.sname = 't';
+	vars5.value.string = t->discnumber ? t->discnumber : "";
+	vars6.lname = "disctotal";
+	vars6.sname = 'S';
 	vars6.type = FORMAT_VARIABLE_STRING;
-	vars6.value.string = t->title ? t->title : "";
-	vars7.lname = "date";
-	vars7.sname = 'y';
-	vars7.type = FORMAT_VARIABLE_STRING;
-	vars7.value.string = t->date ? t->date : "";
-
-	format_snprintf(buf, bufsize, f, vars, NELEMENTS(vars));
+	vars6.value.string = t->disctotal ? t->disctotal : "";
+	vars7.lname = "duration";
+	vars7.sname = 'd';
+	vars7.type = FORMAT_VARIABLE_TIME;
+	vars7.value.time = t->duration;
+	vars8.lname = "filename";
+	vars8.sname = 'F';
+	vars8.type = FORMAT_VARIABLE_STRING;
+	vars8.value.string = t->filename;
+	vars9.lname = "genre";
+	vars9.sname = 'g';
+	vars9.type = FORMAT_VARIABLE_STRING;
+	vars9.value.string = t->genre ? t->genre : "";
+	vars10.lname = "path";
+	vars10.sname = 'f';
+	vars10.type = FORMAT_VARIABLE_STRING;
+	vars10.value.string = t->path;
+	vars11.lname = "title";
+	vars11.sname = 't';
+	vars11.type = FORMAT_VARIABLE_STRING;
+	vars11.value.string = t->title ? t->title : "";
+	vars12.lname = "tracknumber";
+	vars12.sname = 'n';
+	vars12.type = FORMAT_VARIABLE_STRING;
+	vars12.value.string = t->tracknumber ? t->tracknumber : "";
+	vars13.lname = "tracktotal";
+	vars13.sname = 'N';
+	vars13.type = FORMAT_VARIABLE_STRING;
+	vars13.value.string = t->tracktotal ? t->tracktotal : "";
+
+	if ((t->title == NULL || t->title0 == '\0') && altfmt->formatstr0
+	    != '\0')
+		format_snprintf(buf, bufsize, altfmt, vars, NELEMENTS(vars));
+	else
+		format_snprintf(buf, bufsize, fmt, vars, NELEMENTS(vars));
 }
 
 static size_t
@@ -463,7 +490,7 @@
 	if (len > bufsize - off - 1)
 		len = bufsize - off - 1;
 
-	(void)memcpy(buf + off, str, len);
+	memcpy(buf + off, str, len);
 	return len;
 }
 
@@ -481,31 +508,38 @@
 	else
 		valuelen = strlen(value);
 
-	if (fld->width == -1)
+	if (fld->width == -1) {
+		/* Variable-width field specified. */
 		width = varwidth;
-	else if (fld->width == 0)
+		if (valuelen > width)
+			valuelen = width;
+	} else if (fld->width == 0) {
+		/* No width specified; use value length. */
+		if (valuelen > bufsize - off - 1)
+			valuelen = bufsize - off - 1;
 		width = valuelen;
-	else if ((size_t)fld->width > bufsize - off - 1)
-		width = bufsize - off - 1;
-	else
-		width = fld->width;
+	} else {
+		/* Fixed width specified. */
+		if ((unsigned int)fld->width < bufsize - off - 1)
+			width = fld->width;
+		else
+			width = bufsize - off - 1;
+		if (valuelen > width)
+			valuelen = width;
+	}
 
-	if (width < valuelen) {
-		padlen = 0;
-		valuelen = width;
-	} else
-		padlen = width - valuelen;
+	padlen = width - valuelen;
 
 	if (fld->align == FORMAT_ALIGN_RIGHT) {
-		(void)memset(buf + off, fld->padchar, padlen);
+		memset(buf + off, fld->padchar, padlen);
 		off += padlen;
 	}
 	if (value != NULL) {
-		(void)memcpy(buf + off, value, valuelen);
+		memcpy(buf + off, value, valuelen);
 		off += valuelen;
 	}
 	if (fld->align == FORMAT_ALIGN_LEFT)
-		(void)memset(buf + off, fld->padchar, padlen);
+		memset(buf + off, fld->padchar, padlen);
 
 	return width;
 }

siren-0.2.tar.gz/history.c -> siren-0.7.tar.gz/history.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,17 +14,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <string.h>
-
-#include "siren.h"
-
-#ifdef HAVE_QUEUE_H
+#ifdef __OpenBSD__
 #include <sys/queue.h>
 #else
 #include "compat/queue.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
+#include "siren.h"
+
 struct history_entry {
 	char			*line;
 	TAILQ_ENTRY(history_entry) entries;
@@ -35,53 +35,31 @@
 struct history {
 	struct history_list	 list;
 	struct history_entry	*current_entry;
-	unsigned int		 nentries;
 };
 
-static void history_remove(struct history *, struct history_entry *);
-
 void
 history_add(struct history *h, const char *line)
 {
-	struct history_entry	*e;
-	unsigned int		 maxentries;
-
-	maxentries = (unsigned int)option_get_number("max-history-entries");
-	if (maxentries == 0)
-		return;
-
-	/* Don't add the entry if it is identical to the most recent one. */
-	if ((e = TAILQ_FIRST(&h->list)) != NULL && !strcmp(e->line, line))
-		return;
-
-	/*
-	 * Remove the oldest entry if we have reached the maximum number of
-	 * entries.
-	 */
-	if (h->nentries == maxentries) {
-		e = TAILQ_LAST(&h->list, history_list);
-		history_remove(h, e);
-	}
-
-	e = xmalloc(sizeof *e);
-	e->line = xstrdup(line);
-	TAILQ_INSERT_HEAD(&h->list, e, entries);
-	h->nentries++;
-}
-
-void
-history_clear(struct history *h)
-{
 	struct history_entry *e;
 
-	while ((e = TAILQ_FIRST(&h->list)) != NULL)
-		history_remove(h, e);
+	/* Only add the entry if it is different from the last one. */
+	if ((e = TAILQ_FIRST(&h->list)) == NULL || strcmp(e->line, line)) {
+		e = xmalloc(sizeof *e);
+		e->line = xstrdup(line);
+		TAILQ_INSERT_HEAD(&h->list, e, entries);
+	}
 }
 
 void
 history_free(struct history *h)
 {
-	history_clear(h);
+	struct history_entry *e;
+
+	while ((e = TAILQ_FIRST(&h->list)) != NULL) {
+		TAILQ_REMOVE(&h->list, e, entries);
+		free(e->line);
+		free(e);
+	}
 	free(h);
 }
 
@@ -123,31 +101,10 @@
 	h = xmalloc(sizeof *h);
 	TAILQ_INIT(&h->list);
 	h->current_entry = NULL;
-	h->nentries = 0;
 
 	return h;
 }
 
-static void
-history_remove(struct history *h, struct history_entry *e)
-{
-	TAILQ_REMOVE(&h->list, e, entries);
-	free(e->line);
-	free(e);
-	h->nentries--;
-}
-
-void
-history_resize(struct history *h, unsigned int maxentries)
-{
-	struct history_entry *e;
-
-	while (h->nentries > maxentries) {
-		e = TAILQ_LAST(&h->list, history_list);
-		history_remove(h, e);
-	}
-}
-
 void
 history_rewind(struct history *h)
 {

siren-0.2.tar.gz/input.c -> siren-0.7.tar.gz/input.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -42,9 +42,8 @@
 input_init(void)
 {
 	struct sigaction	sa;
-#if defined(VDSUSP) && defined(_PC_VDISABLE)
+#ifdef VDSUSP
 	struct termios		tio;
-	long int		vdisable;
 #endif
 
 	sa.sa_handler = input_handle_signal;
@@ -62,25 +61,20 @@
 		LOG_ERR("sigaction");
 #endif
 
-#if defined(VDSUSP) && defined(_PC_VDISABLE)
+#ifdef VDSUSP
 	/*
 	 * Check if the DSUSP special character is set to ^Y. If it is, disable
 	 * it so that ^Y becomes an ordinary character that can be bound to a
 	 * command.
 	 */
-	if ((vdisable = XFPATHCONF(STDIN_FILENO, _PC_VDISABLE)) == -1)
-		return;
-
-	if (tcgetattr(STDIN_FILENO, &tio) == -1) {
+	if (tcgetattr(STDIN_FILENO, &tio) == -1)
 		LOG_ERR("tcgetattr");
-		return;
-	}
-
-	if (tio.c_ccVDSUSP == K_CTRL('Y')) {
-		tio.c_ccVDSUSP = (cc_t)vdisable;
-		if (tcsetattr(STDIN_FILENO, TCSANOW, &tio) == -1)
-			LOG_ERR("tcsetattr");
-	}
+	else
+		if (tio.c_ccVDSUSP == K_CTRL('Y')) {
+			tio.c_ccVDSUSP = _POSIX_VDISABLE;
+			if (tcsetattr(STDIN_FILENO, TCSANOW, &tio) == -1)
+				LOG_ERR("tcsetattr");
+		}
 #endif
 }

siren-0.7.tar.gz/ip/aac.c Added

@@ -0,0 +1,389 @@
+/*
+ * Copyright (c) 2015 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <mp4v2/mp4v2.h>
+#include <neaacdec.h>
+
+#include "../siren.h"
+
+#if MP4V2_PROJECT_version_hex < 0x00020000
+#define IP_AAC_OLD_MP4V2_API
+#endif
+
+#ifdef IP_AAC_OLD_MP4V2_API
+#define IP_AAC_MP4CLOSE(hdl)	MP4Close(hdl)
+#else
+#define IP_AAC_MP4CLOSE(hdl)	MP4Close(hdl, 0)
+#endif
+
+struct ip_aac_ipdata {
+	MP4FileHandle	 hdl;
+	MP4TrackId	 track;
+	MP4SampleId	 nsamples;
+	MP4SampleId	 sample;
+	MP4Duration	 pos;
+	NeAACDecHandle	 dec;
+	uint32_t	 aacbufsize;
+	uint8_t		*aacbuf;
+	unsigned long	 pcmbuflen;
+	char		*pcmbuf;
+};
+
+static void		 ip_aac_close(struct track *);
+static void		 ip_aac_get_metadata(struct track *);
+static int		 ip_aac_get_position(struct track *, unsigned int *);
+static int		 ip_aac_init(void);
+static int		 ip_aac_open(struct track *);
+static int		 ip_aac_read(struct track *, struct sample_buffer *);
+static void		 ip_aac_seek(struct track *, unsigned int);
+
+static const char	*ip_aac_extensions = { "aac", "m4a", "mp4", NULL };
+
+const struct ip		 ip = {
+	"aac",
+	IP_PRIORITY_AAC,
+	ip_aac_extensions,
+	ip_aac_close,
+	ip_aac_get_metadata,
+	ip_aac_get_position,
+	ip_aac_init,
+	ip_aac_open,
+	ip_aac_read,
+	ip_aac_seek
+};
+
+#ifdef IP_AAC_OLD_MP4V2_API
+static void
+ip_aac_log(UNUSED int loglevel, UNUSED const char *lib, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	LOG_VERRX(fmt, ap);
+	va_end(ap);
+}
+#else
+static void
+ip_aac_log(UNUSED MP4LogLevel loglevel, const char *fmt, va_list ap)
+{
+	LOG_VERRX(fmt, ap);
+}
+#endif
+
+static MP4TrackId
+ip_aac_get_aac_track(MP4FileHandle hdl)
+{
+	uint32_t	 i, ntracks;
+	MP4TrackId	 trk;
+	uint8_t		 obj;
+
+	/* Look for an audio track with AAC audio. */
+	ntracks = MP4GetNumberOfTracks(hdl, MP4_AUDIO_TRACK_TYPE, 0);
+	for (i = 0; i < ntracks; i++) {
+		trk = MP4FindTrackId(hdl, i, MP4_AUDIO_TRACK_TYPE, 0);
+		obj = MP4GetTrackEsdsObjectTypeId(hdl, trk);
+		if (MP4_IS_AAC_AUDIO_TYPE(obj))
+			return trk;
+	}
+
+	return MP4_INVALID_TRACK_ID;
+}
+
+static int
+ip_aac_open_file(const char *path, MP4FileHandle *hdl, MP4TrackId *trk)
+{
+#ifdef IP_AAC_OLD_MP4V2_API
+	*hdl = MP4Read(path, MP4_DETAILS_ERROR);
+#else
+	*hdl = MP4Read(path);
+#endif
+
+	if (*hdl == MP4_INVALID_FILE_HANDLE) {
+		LOG_ERRX("%s: MP4Read() failed", path);
+		msg_errx("%s: Cannot open file", path);
+		return -1;
+	}
+
+	*trk = ip_aac_get_aac_track(*hdl);
+	if (*trk == MP4_INVALID_TRACK_ID) {
+		LOG_ERRX("%s: cannot find AAC track", path);
+		msg_errx("%s: Cannot find AAC track", path);
+		IP_AAC_MP4CLOSE(*hdl);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int
+ip_aac_fill_buffer(struct track *t, struct ip_aac_ipdata *ipd)
+{
+	NeAACDecFrameInfo	 frame;
+	uint32_t		 buflen;
+	char			*errmsg;
+
+	for (;;) {
+		if (ipd->sample > ipd->nsamples)
+			return 0; /* EOF reached */
+
+		buflen = ipd->aacbufsize;
+		if (!MP4ReadSample(ipd->hdl, ipd->track, ipd->sample,
+		    &ipd->aacbuf, &buflen, NULL, NULL, NULL, NULL)) {
+			LOG_ERRX("%s: MP4ReadSample() failed", t->path);
+			msg_errx("Cannot read from file");
+			return -1;
+		}
+
+		ipd->pos += MP4GetSampleDuration(ipd->hdl, ipd->track,
+		    ipd->sample);
+		ipd->sample++;
+
+		ipd->pcmbuf = NeAACDecDecode(ipd->dec, &frame, ipd->aacbuf,
+		    buflen);
+		if (frame.error) {
+			errmsg = NeAACDecGetErrorMessage(frame.error);
+			LOG_ERRX("NeAACDecDecode: %s: %s", t->path, errmsg);
+			msg_errx("Cannot read from file: %s", errmsg);
+			return -1;
+		}
+		if (frame.samples > 0) {
+			/* 16-bit samples */
+			ipd->pcmbuflen = frame.samples * 2;
+			return 1;
+		}
+	}
+}
+
+static void
+ip_aac_close(struct track *t)
+{
+	struct ip_aac_ipdata *ipd;
+
+	ipd = t->ipdata;
+	NeAACDecClose(ipd->dec);
+	IP_AAC_MP4CLOSE(ipd->hdl);
+	free(ipd->aacbuf);
+	free(ipd);
+}
+
+static void
+ip_aac_get_metadata(struct track *t)
+{
+	MP4FileHandle		 hdl;
+	MP4TrackId		 trk;
+	const MP4Tags		*tag;
+
+	if (ip_aac_open_file(t->path, &hdl, &trk) == -1)
+		return;
+
+	tag = MP4TagsAlloc();
+	if (tag == NULL) {
+		LOG_ERRX("%s: MP4TagsAlloc() failed", t->path);
+		msg_errx("%s: Cannot get metadata", t->path);
+		IP_AAC_MP4CLOSE(hdl);
+		return;
+	}
+
+#ifdef IP_AAC_OLD_MP4V2_API
+	MP4TagsFetch(tag, hdl);
+#else
+	if (!MP4TagsFetch(tag, hdl)) {
+		LOG_ERRX("%s: MP4TagsFetch failed", t->path);
+		msg_errx("%s: Cannot get metadata", t->path);
+		MP4TagsFree(tag);
+		IP_AAC_MP4CLOSE(hdl);
+		return;
+	}
+#endif
+
+	if (tag->album != NULL)
+		t->album = xstrdup(tag->album);
+	if (tag->albumArtist != NULL)
+		t->albumartist = xstrdup(tag->albumArtist);
+	if (tag->artist != NULL)
+		t->artist = xstrdup(tag->artist);
+	if (tag->comments != NULL)
+		t->comment = xstrdup(tag->comments);
+	if (tag->releaseDate != NULL)
+		t->date = xstrdup(tag->releaseDate);
+	if (tag->genre != NULL)
+		t->genre = xstrdup(tag->genre);
+	if (tag->name != NULL)
+		t->title = xstrdup(tag->name);
+	if (tag->disk != NULL) {
+		xasprintf(&t->discnumber, "%u", tag->disk->index);
+		xasprintf(&t->disctotal, "%u", tag->disk->total);
+	}
+	if (tag->track != NULL) {
+		xasprintf(&t->tracknumber, "%u", tag->track->index);
+		xasprintf(&t->tracktotal, "%u", tag->track->total);
+	}
+
+	t->duration = MP4ConvertFromTrackDuration(hdl, trk,
+	    MP4GetTrackDuration(hdl, trk), MP4_SECS_TIME_SCALE);
+
+	MP4TagsFree(tag);
+	IP_AAC_MP4CLOSE(hdl);
+}
+
+static int
+ip_aac_get_position(struct track *t, unsigned int *pos)
+{
+	struct ip_aac_ipdata *ipd;
+
+	ipd = t->ipdata;
+	*pos = MP4ConvertFromTrackDuration(ipd->hdl, ipd->track, ipd->pos,
+	    MP4_SECS_TIME_SCALE);
+	return 0;
+}
+
+static int
+ip_aac_init(void)
+{
+#ifdef IP_AAC_OLD_MP4V2_API
+	MP4SetLibFunc(ip_aac_log);
+#else
+	MP4SetLogCallback(ip_aac_log);
+#endif
+	return 0;
+}
+
+static int
+ip_aac_open(struct track *t)
+{
+	struct ip_aac_ipdata		*ipd;
+	NeAACDecConfigurationPtr	 cfg;
+	uint8_t				*esc;
+	uint32_t			 escsize;
+	unsigned long			 rate;
+	unsigned char			 nchan;
+
+	ipd = xmalloc(sizeof *ipd);
+
+	if (ip_aac_open_file(t->path, &ipd->hdl, &ipd->track) == -1)
+		goto error1;
+
+	ipd->aacbufsize = MP4GetTrackMaxSampleSize(ipd->hdl, ipd->track);
+	if (ipd->aacbufsize == 0) {
+		/* Avoid zero-size allocation. */
+		LOG_ERRX("%s: MP4GetTrackMaxSampleSize() returned 0", t->path);
+		goto error2;
+	}
+
+	ipd->dec = NeAACDecOpen();
+	if (ipd->dec == NULL) {
+		LOG_ERRX("%s: NeAACDecOpen() failed", t->path);
+		goto error2;
+	}
+
+	cfg = NeAACDecGetCurrentConfiguration(ipd->dec);
+	cfg->outputFormat = FAAD_FMT_16BIT;
+	cfg->downMatrix = 1; /* Down-matrix 5.1 channels to 2 */
+	if (NeAACDecSetConfiguration(ipd->dec, cfg) != 1) {
+		LOG_ERRX("%s: NeAACDecSetConfiguration() failed", t->path);
+		goto error3;
+	}
+
+	if (!MP4GetTrackESConfiguration(ipd->hdl, ipd->track, &esc,
+	    &escsize)) {
+		LOG_ERRX("%s: MP4GetTrackESConfiguration() failed", t->path);
+		goto error3;
+	}
+
+	if (NeAACDecInit2(ipd->dec, esc, escsize, &rate, &nchan) != 0) {
+		LOG_ERRX("%s: NeAACDecInit2() failed", t->path);
+		free(esc);
+		goto error3;
+	}
+	free(esc);
+
+	ipd->nsamples = MP4GetTrackNumberOfSamples(ipd->hdl, ipd->track);
+	ipd->sample = 1;
+	ipd->pos = 0;
+	ipd->aacbuf = xmalloc(ipd->aacbufsize);
+	ipd->pcmbuflen = 0;
+
+	t->format.nbits = 16;
+	t->format.nchannels = nchan;
+	t->format.rate = rate;
+	t->ipdata = ipd;
+
+	return 0;
+
+error3:
+	NeAACDecClose(ipd->dec);
+error2:
+	IP_AAC_MP4CLOSE(ipd->hdl);
+error1:
+	free(ipd);
+	msg_errx("%s: Cannot open file", t->path);
+	return -1;
+}
+
+static int
+ip_aac_read(struct track *t, struct sample_buffer *sb)
+{
+	struct ip_aac_ipdata	*ipd;
+	char			*buf;
+	size_t			 len, bufsize;
+	int			 ret;
+
+	ipd = t->ipdata;
+	buf = (char *)sb->data;
+	bufsize = sb->size_b;
+
+	while (bufsize > 0) {
+		if (ipd->pcmbuflen == 0) {
+			ret = ip_aac_fill_buffer(t, ipd);
+			if (ret == 0)
+				break;		/* EOF */
+			if (ret == -1)
+				return -1;	/* Error */
+		}
+		len = (bufsize < ipd->pcmbuflen) ? bufsize : ipd->pcmbuflen;
+		memcpy(buf, ipd->pcmbuf, len);
+		buf += len;
+		bufsize -= len;
+		ipd->pcmbuf += len;
+		ipd->pcmbuflen -= len;
+	}
+
+	sb->len_b = sb->size_b - bufsize;
+	sb->len_s = sb->len_b / sb->nbytes;
+	return sb->len_s != 0;
+}
+
+static void
+ip_aac_seek(struct track *t, unsigned int pos)
+{
+	struct ip_aac_ipdata	*ipd;
+	MP4SampleId		 sample;
+	MP4Timestamp		 tim;
+
+	ipd = t->ipdata;
+	tim = MP4ConvertToTrackTimestamp(ipd->hdl, ipd->track, pos,
+	    MP4_SECS_TIME_SCALE);
+	sample = MP4GetSampleIdFromTime(ipd->hdl, ipd->track, tim, true);
+	if (sample != MP4_INVALID_SAMPLE_ID) {
+		ipd->sample = sample;
+		ipd->pos = MP4GetSampleTime(ipd->hdl, ipd->track, sample);
+	}
+}

siren-0.7.tar.gz/ip/ffmpeg.c Added

@@ -0,0 +1,570 @@
+/*
+ * Copyright (c) 2016 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include <libavformat/avformat.h>
+
+#include "../siren.h"
+
+#define IP_FFMPEG_ERROR	-1
+#define IP_FFMPEG_EOF	0
+#define IP_FFMPEG_OK	1
+
+/* Libav does not have av_err2str() */
+#ifdef av_err2str
+#define IP_FFMPEG_LOG(str) \
+    LOG_ERRX("%s: %s: %s", t->path, str, av_err2str(ret))
+#define IP_FFMPEG_MSG(str) \
+    msg_errx("%s: %s: %s", t->path, str, av_err2str(ret))
+#else
+#define IP_FFMPEG_LOG(str) LOG_ERRX("%s: %s", t->path, str)
+#define IP_FFMPEG_MSG(str) msg_errx("%s: %s", t->path, str)
+#endif
+
+struct ip_ffmpeg_ipdata {
+	AVFormatContext	*fmtctx;
+	AVCodecContext	*codecctx;
+	AVPacket	 packet;
+	AVFrame		*frame;
+	int64_t		 timestamp;
+	int		 stream;	/* Audio stream index		*/
+	int		 pdatalen;	/* Remaining packet data length	*/
+	int		 fdatalen;	/* Remaining frame data length	*/
+	uint8_t		*fdata;		/* Remaining frame data		*/
+	int		 sample;	/* Sample index in frame	*/
+};
+
+static void		 ip_ffmpeg_close(struct track *);
+static void		 ip_ffmpeg_get_metadata(struct track *);
+static int		 ip_ffmpeg_get_position(struct track *,
+			    unsigned int *);
+static int		 ip_ffmpeg_init(void);
+static int		 ip_ffmpeg_open(struct track *);
+static int		 ip_ffmpeg_read(struct track *,
+			    struct sample_buffer *);
+static void		 ip_ffmpeg_seek(struct track *, unsigned int);
+
+static const char	*ip_ffmpeg_extensions = {
+	"8svx", "iff", "svx",		/* Commodore Amiga IFF/8SVX */
+	"aa",				/* Audible */
+	"aac",
+	"aif", "aiff",
+	"ape",				/* Monkey's Audio */
+	"asf", "wma", "wmv",		/* Windows Media Audio */
+	"au", "snd",			/* NeXT/Sun audio */
+	"avi",
+	"avr",				/* Audio Visual Research */
+	"caf",				/* Apple Core Audio Format */
+	"flac",
+	"flv",				/* Flash Video */
+	"m4a", "mp4",
+	"mka", "mkv",			/* Matroska */
+	"mp+", "mpc", "mpp",		/* Musepack */
+	"mp1",
+	"mp2",
+	"mp3",
+	"mpeg", "mpg",
+	"nist", "sph",			/* NIST/Sphere WAVE */
+	"oga", "ogg",
+	"opus",
+	"paf",				/* Ensoniq PARIS audio file */
+	"pvf",				/* Portable Voice Format */
+	"ra", "ram", "rm", "rv",	/* RealAudio */
+	"sf",				/* IRCAM SF */
+	"shn",				/* Shorten */
+	"tta",				/* True Audio */
+	"voc",				/* Create Sound Blaster voice */
+	"w64",				/* Sony Sound Forge Wave64 */
+	"wav", "wave",
+	"webm",
+	"wv"				/* WavPack */
+};
+
+const struct ip		 ip = {
+	"ffmpeg",
+	IP_PRIORITY_FFMPEG,
+	ip_ffmpeg_extensions,
+	ip_ffmpeg_close,
+	ip_ffmpeg_get_metadata,
+	ip_ffmpeg_get_position,
+	ip_ffmpeg_init,
+	ip_ffmpeg_open,
+	ip_ffmpeg_read,
+	ip_ffmpeg_seek
+};
+
+static void
+ip_ffmpeg_log(UNUSED void *p, int level, const char *fmt, va_list ap)
+{
+	if (level <= AV_LOG_WARNING)
+		LOG_VERRX(fmt, ap);
+}
+
+/*
+ * Read the next packet from the audio stream (i.e. skip packets from other
+ * streams)
+ */
+static int
+ip_ffmpeg_read_packet(struct track *t, struct ip_ffmpeg_ipdata *ipd)
+{
+	int ret;
+
+	for (;;) {
+		/* Free the previous packet */
+		av_packet_unref(&ipd->packet);
+
+		ret = av_read_frame(ipd->fmtctx, &ipd->packet);
+		if (ret == AVERROR_EOF)
+			return IP_FFMPEG_EOF;
+		if (ret < 0) {
+			IP_FFMPEG_LOG("av_read_frame");
+			IP_FFMPEG_MSG("Cannot read from file");
+			return IP_FFMPEG_ERROR;
+		}
+		if (ipd->packet.stream_index == ipd->stream) {
+			ipd->pdatalen = ipd->packet.size;
+			ipd->timestamp = ipd->packet.pts;
+			return IP_FFMPEG_OK;
+		}
+	}
+}
+
+/*
+ * Decode the next frame in a packet
+ */
+static int
+ip_ffmpeg_decode_frame(struct track *t, struct ip_ffmpeg_ipdata *ipd)
+{
+	int eof, got_frame, ret;
+
+	eof = 0;
+	for (;;) {
+		if (ipd->pdatalen == 0) {
+			ret = ip_ffmpeg_read_packet(t, ipd);
+			if (ret == IP_FFMPEG_ERROR)
+				return ret;
+			if (ret == IP_FFMPEG_EOF) {
+				/* Flush the decoder */
+				eof = 1;
+				ipd->packet.data = NULL;
+				ipd->packet.size = 0;
+			}
+		}
+
+		ret = avcodec_decode_audio4(ipd->codecctx, ipd->frame,
+		    &got_frame, &ipd->packet);
+		if (ret < 0) {
+			IP_FFMPEG_LOG("avcodec_decode_audio4");
+			IP_FFMPEG_MSG("Decoding error");
+			return IP_FFMPEG_ERROR;
+		}
+		ipd->pdatalen -= ret;
+
+		if (got_frame) {
+			ret = av_samples_get_buffer_size(NULL,
+			    ipd->codecctx->channels, ipd->frame->nb_samples,
+			    ipd->codecctx->sample_fmt, 1);
+			if (ret < 0) {
+				IP_FFMPEG_LOG("av_samples_get_buffer_size");
+				IP_FFMPEG_MSG("Decoding error");
+				return IP_FFMPEG_ERROR;
+			}
+
+			ipd->fdatalen = ret;
+			ipd->fdata = ipd->frame->data0;
+			return IP_FFMPEG_OK;
+		}
+
+		if (eof)
+			/* No more frames, so the decoder has been flushed */
+			return IP_FFMPEG_EOF;
+	}
+}
+
+static int
+ip_ffmpeg_read_interleaved(struct track *t, struct ip_ffmpeg_ipdata *ipd,
+    struct sample_buffer *sb)
+{
+	char	*buf;
+	size_t	 bufsize, len;
+	int	 ret;
+
+	ipd = t->ipdata;
+	buf = (char *)sb->data;
+	bufsize = sb->size_b;
+
+	while (bufsize > 0) {
+		if (ipd->fdatalen == 0) {
+			ret = ip_ffmpeg_decode_frame(t, ipd);
+			if (ret == IP_FFMPEG_EOF)
+				break;
+			if (ret == IP_FFMPEG_ERROR)
+				return -1;
+		}
+
+		switch (ipd->codecctx->sample_fmt) {
+		case AV_SAMPLE_FMT_S16:
+		case AV_SAMPLE_FMT_S32:
+			len = (bufsize < (size_t)ipd->fdatalen) ? bufsize :
+			    (size_t)ipd->fdatalen;
+			memcpy(buf, ipd->fdata, len);
+			buf += len;
+			bufsize -= len;
+			ipd->fdata += len;
+			ipd->fdatalen -= len;
+			break;
+		case AV_SAMPLE_FMT_FLT:
+			/* TODO */
+			break;
+		case AV_SAMPLE_FMT_DBL:
+			/* TODO */
+			break;
+		default:
+			break;
+		}
+	}
+
+	sb->len_b = sb->size_b - bufsize;
+	sb->len_s = sb->len_b / sb->nbytes;
+	return sb->len_s != 0;
+}
+
+static int
+ip_ffmpeg_read_planar(struct track *t, struct ip_ffmpeg_ipdata *ipd,
+    struct sample_buffer *sb)
+{
+	double		  d, **data_dbl;
+	float		  f, **data_flt;
+	int32_t		**data_s32;
+	int16_t		**data_s16;
+	size_t		  i;
+	unsigned int	  j;
+	int		  ret;
+
+	ipd = t->ipdata;
+
+	i = 0;
+	while (i + t->format.nchannels <= sb->size_s) {
+		if (ipd->sample == ipd->frame->nb_samples) {
+			ipd->sample = 0;
+			ret = ip_ffmpeg_decode_frame(t, ipd);
+			if (ret == IP_FFMPEG_EOF)
+				break;
+			if (ret == IP_FFMPEG_ERROR)
+				return -1;
+		}
+
+		switch (ipd->codecctx->sample_fmt) {
+		case AV_SAMPLE_FMT_S16P:
+			data_s16 = (int16_t **)ipd->frame->extended_data;
+			for (j = 0; j < t->format.nchannels; j++)
+				sb->data2i++ = data_s16jipd->sample;
+			break;
+		case AV_SAMPLE_FMT_S32P:
+			data_s32 = (int32_t **)ipd->frame->extended_data;
+			for (j = 0; j < t->format.nchannels; j++)
+				sb->data4i++ = data_s32jipd->sample;
+			break;
+		case AV_SAMPLE_FMT_FLTP:
+			/* XXX Assuming float is 32-bit */
+			data_flt = (float **)ipd->frame->extended_data;
+			for (j = 0; j < t->format.nchannels; j++) {
+				f = data_fltjipd->sample;
+				if (f < -1.0f)
+					sb->data2i++ = INT16_MIN;
+				else if (f > 1.0f)
+					sb->data2i++ = INT16_MAX;
+				else
+					sb->data2i++ = f * INT16_MAX;
+			}
+			break;
+		case AV_SAMPLE_FMT_DBLP:
+			/* XXX Assuming double is 64-bit */
+			data_dbl = (double **)ipd->frame->extended_data;
+			for (j = 0; j < t->format.nchannels; j++) {
+				d = data_dbljipd->sample;
+				if (d < -1.0)
+					sb->data2i++ = INT16_MIN;
+				else if (d > 1.0)
+					sb->data2i++ = INT16_MAX;
+				else
+					sb->data2i++ = d * INT16_MAX;
+			}
+			break;
+		default:
+			break;
+		}
+
+		ipd->sample++;
+	}
+
+	sb->len_s = i;
+	sb->len_b = sb->len_s * sb->nbytes;
+	return sb->len_s != 0;
+}
+
+static void
+ip_ffmpeg_parse_metadata(struct track *t, AVDictionary *metadata)
+{
+	AVDictionaryEntry	*tag;
+	char			*number, *total;
+
+	/*
+	 * XXX libavformat/avformat.h: "metadata exported by demuxers isn't
+	 * checked to be valid UTF-8 in most cases"
+	 */
+
+	tag = NULL;
+	while ((tag = av_dict_get(metadata, "", tag, AV_DICT_IGNORE_SUFFIX)) !=
+	    NULL) {
+		number = NULL;
+		total = NULL;
+		if (!strcasecmp(tag->key, "album")) {
+			free(t->album);
+			t->album = xstrdup(tag->value);
+		} else if (!strcasecmp(tag->key, "album_artist")) {
+			free(t->albumartist);
+			t->albumartist = xstrdup(tag->value);
+		} else if (!strcasecmp(tag->key, "artist")) {
+			free(t->artist);
+			t->artist = xstrdup(tag->value);
+		} else if (!strcasecmp(tag->key, "comment")) {
+			free(t->comment);
+			t->comment = xstrdup(tag->value);
+		} else if (!strcasecmp(tag->key, "date")) {
+			free(t->date);
+			t->date = xstrdup(tag->value);
+		} else if (!strcasecmp(tag->key, "disc")) {
+			track_split_tag(tag->value, &number, &total);
+			if (number != NULL) {
+				free(t->discnumber);
+				t->discnumber = number;
+			}
+			if (total != NULL) {
+				free(t->disctotal);
+				t->disctotal = total;
+			}
+		} else if (!strcasecmp(tag->key, "genre")) {
+			free(t->genre);
+			t->genre = xstrdup(tag->value);
+		} else if (!strcasecmp(tag->key, "title")) {
+			free(t->title);
+			t->title = xstrdup(tag->value);
+		} else if (!strcasecmp(tag->key, "track")) {
+			track_split_tag(tag->value, &number, &total);
+			if (number != NULL) {
+				free(t->tracknumber);
+				t->tracknumber = number;
+			}
+			if (total != NULL) {
+				free(t->tracktotal);
+				t->tracktotal = total;
+			}
+		}
+	}
+}
+
+static void
+ip_ffmpeg_close(struct track *t)
+{
+	struct ip_ffmpeg_ipdata *ipd;
+
+	ipd = t->ipdata;
+	av_frame_free(&ipd->frame);
+	avcodec_close(ipd->codecctx);
+	avformat_close_input(&ipd->fmtctx);
+	free(ipd);
+}
+
+static void
+ip_ffmpeg_get_metadata(struct track *t)
+{
+	AVFormatContext	*ctx;
+	int		 ret;
+
+	ctx = NULL;
+	ret = avformat_open_input(&ctx, t->path, NULL, NULL);
+	if (ret != 0) {
+		IP_FFMPEG_LOG("avformat_open_input");
+		IP_FFMPEG_MSG("Cannot open file");
+		return;
+	}
+
+	/* Sometimes necessary to get the duration */
+	ret = avformat_find_stream_info(ctx, NULL);
+	if (ret < 0)
+		IP_FFMPEG_LOG("avformat_find_stream_info");
+
+	/*
+	 * The metadata could be in the format context or they could be in a
+	 * stream. Try both.
+	 */
+
+	ip_ffmpeg_parse_metadata(t, ctx->metadata);
+
+	ret = av_find_best_stream(ctx, AVMEDIA_TYPE_AUDIO, -1, -1, NULL, 0);
+	if (ret < 0)
+		IP_FFMPEG_LOG("av_find_best_stream");
+	else
+		ip_ffmpeg_parse_metadata(t, ctx->streamsret->metadata);
+
+	if (ctx->duration > 0)
+		t->duration = ctx->duration / AV_TIME_BASE;
+
+	avformat_close_input(&ctx);
+}
+
+static int
+ip_ffmpeg_get_position(struct track *t, unsigned int *pos)
+{
+	struct ip_ffmpeg_ipdata *ipd;
+
+	ipd = t->ipdata;
+	*pos = ipd->timestamp *
+	    ipd->fmtctx->streamsipd->stream->time_base.num /
+	    ipd->fmtctx->streamsipd->stream->time_base.den;
+	return 0;
+}
+
+static int
+ip_ffmpeg_init(void)
+{
+	av_log_set_callback(ip_ffmpeg_log);
+	av_register_all();
+	return 0;
+}
+
+static int
+ip_ffmpeg_open(struct track *t)
+{
+	struct ip_ffmpeg_ipdata	*ipd;
+	AVCodec			*codec;
+	int			 ret;
+
+	ipd = xmalloc(sizeof *ipd);
+
+	ipd->fmtctx = NULL;
+	ret = avformat_open_input(&ipd->fmtctx, t->path, NULL, NULL);
+	if (ret != 0) {
+		IP_FFMPEG_LOG("avformat_open_input");
+		IP_FFMPEG_MSG("Cannot open file");
+		goto error1;
+	}
+
+	ret = avformat_find_stream_info(ipd->fmtctx, NULL);
+	if (ret < 0) {
+		IP_FFMPEG_LOG("avformat_find_stream_info");
+		IP_FFMPEG_MSG("Cannot open file");
+		goto error2;
+	}
+
+	ret = av_find_best_stream(ipd->fmtctx, AVMEDIA_TYPE_AUDIO, -1, -1,
+	    NULL, 0);
+	if (ret < 0) {
+		IP_FFMPEG_LOG("av_find_best_stream");
+		IP_FFMPEG_MSG("Cannot open file");
+		goto error2;
+	}
+	ipd->stream = ret;
+
+	ipd->codecctx = ipd->fmtctx->streamsipd->stream->codec;
+	codec = avcodec_find_decoder(ipd->codecctx->codec_id);
+	if (codec == NULL) {
+		LOG_ERRX("%s: cannot find decoder", t->path);
+		msg_errx("%s: Cannot find decoder", t->path);
+		goto error2;
+	}
+
+	ret = avcodec_open2(ipd->codecctx, codec, NULL);
+	if (ret != 0) {
+		IP_FFMPEG_LOG("avcodec_open2() failed");
+		IP_FFMPEG_MSG("Cannot open file");
+		goto error2;
+	}
+
+	switch (ipd->codecctx->sample_fmt) {
+	case AV_SAMPLE_FMT_S16:
+	case AV_SAMPLE_FMT_S16P:
+	case AV_SAMPLE_FMT_DBLP:
+	case AV_SAMPLE_FMT_FLTP:
+		t->format.nbits = 16;
+		break;
+	case AV_SAMPLE_FMT_S32:
+	case AV_SAMPLE_FMT_S32P:
+		t->format.nbits = 32;
+		break;
+	default:
+		LOG_ERRX("%s: %s: unsupported sample format", t->path,
+		    av_get_sample_fmt_name(ipd->codecctx->sample_fmt));
+		msg_errx("%s: Unsupported sample format", t->path);
+		goto error2;
+	}
+
+	av_init_packet(&ipd->packet);
+	ipd->packet.size = 0;
+	ipd->frame = av_frame_alloc();
+	ipd->timestamp = 0;
+	ipd->pdatalen = 0;
+	ipd->fdatalen = 0;
+	ipd->sample = 0;
+
+	t->format.nchannels = ipd->codecctx->channels;
+	t->format.rate = ipd->codecctx->sample_rate;
+	t->ipdata = ipd;
+
+	return 0;
+
+error2:
+	avformat_close_input(&ipd->fmtctx);
+error1:
+	free(ipd);
+	return -1;
+}
+
+static int
+ip_ffmpeg_read(struct track *t, struct sample_buffer *sb)
+{
+	struct ip_ffmpeg_ipdata *ipd;
+
+	ipd = t->ipdata;
+	if (av_sample_fmt_is_planar(ipd->codecctx->sample_fmt))
+		return ip_ffmpeg_read_planar(t, ipd, sb);
+	else
+		return ip_ffmpeg_read_interleaved(t, ipd, sb);
+}
+
+static void
+ip_ffmpeg_seek(struct track *t, unsigned int sec)
+{
+	struct ip_ffmpeg_ipdata	*ipd;
+	int64_t			 timestamp;
+
+	ipd = t->ipdata;
+	timestamp = sec *
+	    ipd->fmtctx->streamsipd->stream->time_base.den /
+	    ipd->fmtctx->streamsipd->stream->time_base.num;
+	if (av_seek_frame(ipd->fmtctx, ipd->stream, timestamp, 0) >= 0) {
+		/* Flush */
+		ipd->pdatalen = 0;
+		ipd->fdatalen = 0;
+		ipd->sample = ipd->frame->nb_samples;
+		avcodec_flush_buffers(ipd->codecctx);
+	}
+}

siren-0.2.tar.gz/ip/flac.c -> siren-0.7.tar.gz/ip/flac.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,15 +14,22 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
 
+#include "../siren.h"
+
+#ifdef HAVE_NEW_FLAC_INCLUDE_PATH
+#include <FLAC/metadata.h>
+#include <FLAC/stream_decoder.h>
+#else
 #include <metadata.h>
 #include <stream_decoder.h>
+#endif
 
-#include "../siren.h"
+#define IP_FLAC_ERROR	-1
+#define IP_FLAC_EOF	0
+#define IP_FLAC_OK	1
 
 struct ip_flac_ipdata {
 	FLAC__StreamDecoder *decoder;
@@ -35,10 +42,10 @@
 };
 
 static void		 ip_flac_close(struct track *);
-static int		 ip_flac_get_metadata(struct track *);
+static void		 ip_flac_get_metadata(struct track *);
 static int		 ip_flac_get_position(struct track *, unsigned int *);
 static int		 ip_flac_open(struct track *);
-static int		 ip_flac_read(struct track *, int16_t *, size_t);
+static int		 ip_flac_read(struct track *, struct sample_buffer *);
 static void		 ip_flac_seek(struct track *, unsigned int);
 static FLAC__StreamDecoderWriteStatus ip_flac_write_cb(
 			    const FLAC__StreamDecoder *, const FLAC__Frame *,
@@ -54,10 +61,12 @@
 
 const struct ip		 ip = {
 	"flac",
+	IP_PRIORITY_FLAC,
 	ip_flac_extensions,
 	ip_flac_close,
 	ip_flac_get_metadata,
 	ip_flac_get_position,
+	NULL,
 	ip_flac_open,
 	ip_flac_read,
 	ip_flac_seek
@@ -69,12 +78,11 @@
 	struct ip_flac_ipdata *ipd;
 
 	ipd = t->ipdata;
-	(void)FLAC__stream_decoder_finish(ipd->decoder);
+	FLAC__stream_decoder_finish(ipd->decoder);
 	FLAC__stream_decoder_delete(ipd->decoder);
 	free(ipd);
 }
 
-/* ARGSUSED */
 static void
 ip_flac_error_cb(UNUSED const FLAC__StreamDecoder *decoder,
     FLAC__StreamDecoderErrorStatus error, void *tp)
@@ -86,41 +94,47 @@
 }
 
 static int
+ip_flac_fill_buffer(const char *path, struct ip_flac_ipdata *ipd)
+{
+	FLAC__bool			ret;
+	FLAC__StreamDecoderState	state;
+
+	ipd->bufidx = 0;
+	ipd->buflen = 0;
+
+	for (;;) {
+		ret = FLAC__stream_decoder_process_single(ipd->decoder);
+		state = FLAC__stream_decoder_get_state(ipd->decoder);
+
+		if (ipd->buflen)
+			return IP_FLAC_OK;
+		if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
+			return IP_FLAC_EOF;
+		if (ret == false) {
+			LOG_ERRX("FLAC__stream_decoder_process_single: %s: %s",
+			    path, ip_flac_state_to_string(state));
+			msg_errx("Cannot read from track: %s",
+			    ip_flac_state_to_string(state));
+			return IP_FLAC_ERROR;
+		}
+	}
+}
+
+static void
 ip_flac_get_metadata(struct track *t)
 {
 	FLAC__StreamMetadata	 streaminfo, *comments;
 	FLAC__uint32		 i;
-	char			*comment;
 
 	if (FLAC__metadata_get_tags(t->path, &comments) == false) {
 		LOG_ERRX("%s: FLAC__metadata_get_tags() failed", t->path);
 		msg_errx("%s: Cannot get metadata", t->path);
-		return -1;
+		return;
 	}
 
-	for (i = 0; i < comments->data.vorbis_comment.num_comments; i++) {
-		comment = (char *)
-		    comments->data.vorbis_comment.commentsi.entry;
-		if (!strncasecmp(comment, "album=", 6)) {
-			free(t->album);
-			t->album = xstrdup(comment + 6);
-		} else if (!strncasecmp(comment, "artist=", 7)) {
-			free(t->artist);
-			t->artist = xstrdup(comment + 7);
-		} else if (!strncasecmp(comment, "date=", 5)) {
-			free(t->date);
-			t->date = xstrdup(comment + 5);
-		} else if (!strncasecmp(comment, "genre=", 6)) {
-			free(t->genre);
-			t->genre = xstrdup(comment + 6);
-		} else if (!strncasecmp(comment, "title=", 6)) {
-			free(t->title);
-			t->title = xstrdup(comment + 6);
-		} else if (!strncasecmp(comment, "tracknumber=", 12)) {
-			free(t->tracknumber);
-			t->tracknumber = xstrdup(comment + 12);
-		}
-	}
+	for (i = 0; i < comments->data.vorbis_comment.num_comments; i++)
+		track_copy_vorbis_comment(t,
+		    (char *)comments->data.vorbis_comment.commentsi.entry);
 
 	FLAC__metadata_object_delete(comments);
 
@@ -128,20 +142,14 @@
 		LOG_ERRX("%s: FLAC__metadata_get_streaminfo() failed",
 		    t->path);
 		msg_errx("%s: Cannot get stream information", t->path);
-		return -1;
+		return;
 	}
 
-	if (streaminfo.data.stream_info.sample_rate == 0)
-		t->duration = 0;
-	else
-		t->duration =
-		    (unsigned int)streaminfo.data.stream_info.total_samples /
+	if (streaminfo.data.stream_info.sample_rate != 0)
+		t->duration = streaminfo.data.stream_info.total_samples /
 		    streaminfo.data.stream_info.sample_rate;
-
-	return 0;
 }
 
-/* ARGSUSED2 */
 static int
 ip_flac_get_position(struct track *t, unsigned int *pos)
 {
@@ -188,7 +196,7 @@
 		    ip_flac_init_status_to_string(status));
 		msg_errx("%s: Cannot initialise FLAC decoder: %s", t->path,
 		    ip_flac_init_status_to_string(status));
-		(void)fclose(fp);
+		fclose(fp);
 		goto error2;
 	}
 
@@ -199,14 +207,7 @@
 		goto error3;
 	}
 
-	if (metadata.data.stream_info.bits_per_sample != 16) {
-		LOG_ERRX("%s: %u: unsupported bit depth", t->path,
-		    metadata.data.stream_info.bits_per_sample);
-		msg_errx("%s: Unsupported bit depth", t->path);
-		goto error3;
-	}
-
-	t->format.nbits = 16;
+	t->format.nbits = metadata.data.stream_info.bits_per_sample;
 	t->format.nchannels = metadata.data.stream_info.channels;
 	t->format.rate = metadata.data.stream_info.sample_rate;
 
@@ -218,7 +219,7 @@
 	return 0;
 
 error3:
-	(void)FLAC__stream_decoder_finish(ipd->decoder);
+	FLAC__stream_decoder_finish(ipd->decoder);
 error2:
 	FLAC__stream_decoder_delete(ipd->decoder);
 error1:
@@ -227,54 +228,46 @@
 }
 
 static int
-ip_flac_read(struct track *t, int16_t *samples, size_t maxsamples)
+ip_flac_read(struct track *t, struct sample_buffer *sb)
 {
-	struct ip_flac_ipdata *ipd;
-	FLAC__StreamDecoderState state;
-	FLAC__bool	ret;
-	size_t		nsamples;
-	unsigned int	i;
-
-	/* Sanity check. */
-	if (maxsamples < (size_t)t->format.nchannels) {
-		LOG_ERRX("%s: sample buffer too small", t->path);
-		msg_errx("Cannot read from track: Sample buffer too small");
-		return -1;
-	}
+	struct ip_flac_ipdata	*ipd;
+	size_t			 i;
+	unsigned int		 j;
+	int			 ret;
 
 	ipd = t->ipdata;
 
-	nsamples = 0;
-	while (nsamples + (size_t)t->format.nchannels <= maxsamples) {
-		/* Fill the buffer. */
-		while (ipd->bufidx == ipd->buflen) {
-			/* Read a new frame. */
-			ret = FLAC__stream_decoder_process_single(
-			    ipd->decoder);
-			state = FLAC__stream_decoder_get_state(ipd->decoder);
-
-			if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
-				/* EOF. */
-				return 0;
-
-			if (ret == false) {
-				/* Error. */
-				LOG_ERRX("FLAC__stream_decoder_process_single:"
-				    " %s: %s", t->path,
-				    ip_flac_state_to_string(state));
-				msg_errx("Cannot read from track: %s",
-				    ip_flac_state_to_string(state));
+	i = 0;
+	while (i + t->format.nchannels <= sb->size_s) {
+		if (ipd->bufidx == ipd->buflen) {
+			ret = ip_flac_fill_buffer(t->path, ipd);
+			if (ret == IP_FLAC_EOF)
+				break;
+			if (ret == IP_FLAC_ERROR)
 				return -1;
-			}
 		}
 
-		for (i = 0; i < t->format.nchannels; i++)
-			samplesnsamples++ =
-			    (int16_t)ipd->bufiipd->bufidx;
+		switch (sb->nbytes) {
+		case 1:
+			for (j = 0; j < t->format.nchannels; j++)
+				sb->data1i++ = ipd->bufjipd->bufidx;
+			break;
+		case 2:
+			for (j = 0; j < t->format.nchannels; j++)
+				sb->data2i++ = ipd->bufjipd->bufidx;
+			break;
+		case 4:
+			for (j = 0; j < t->format.nchannels; j++)
+				sb->data4i++ = ipd->bufjipd->bufidx;
+			break;
+		}
+
 		ipd->bufidx++;
 	}
 
-	return (int)nsamples;
+	sb->len_s = i;
+	sb->len_b = sb->len_s * sb->nbytes;
+	return sb->len_s != 0;
 }
 
 static void
@@ -286,14 +279,13 @@
 
 	ipd = t->ipdata;
 	sample = sec * t->format.rate;
-	nsamples = (unsigned int)FLAC__stream_decoder_get_total_samples(
-	    ipd->decoder);
+	nsamples = FLAC__stream_decoder_get_total_samples(ipd->decoder);
 
 	if (sample >= nsamples)
 		sample = nsamples > 0 ? nsamples - 1 : 0;
 
-	if (FLAC__stream_decoder_seek_absolute(ipd->decoder,
-	    (FLAC__uint64)sample) == false) {
+	if (FLAC__stream_decoder_seek_absolute(ipd->decoder, sample) ==
+	    false) {
 		state = FLAC__stream_decoder_get_state(ipd->decoder);
 
 		LOG_ERRX("FLAC__stream_decoder_seek_absolute: %s: %s", t->path,
@@ -302,7 +294,7 @@
 
 		/* The decoder must be flushed after a seek error. */
 		if (state == FLAC__STREAM_DECODER_SEEK_ERROR) {
-			(void)FLAC__stream_decoder_flush(ipd->decoder);
+			FLAC__stream_decoder_flush(ipd->decoder);
 			ipd->bufidx = 0;
 		}
 	} else {
@@ -312,13 +304,12 @@
 	}
 }
 
-/* ARGSUSED */
 static FLAC__StreamDecoderWriteStatus
 ip_flac_write_cb(UNUSED const FLAC__StreamDecoder *decoder,
     const FLAC__Frame *frame, const FLAC__int32 * const *buffer, void *tp)
 {
-	struct track *t;
-	struct ip_flac_ipdata *ipd;
+	struct track		*t;
+	struct ip_flac_ipdata	*ipd;
 
 	t = tp;
 	ipd = t->ipdata;
@@ -328,11 +319,9 @@
 		ipd->cursample += frame->header.blocksize;
 	else
 		/* Variable blocksize. */
-		ipd->cursample = (unsigned int)
-		    frame->header.number.sample_number;
+		ipd->cursample = frame->header.number.sample_number;
 
 	ipd->buf = buffer;
-	ipd->bufidx = 0;
 	ipd->buflen = frame->header.blocksize;
 
 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
@@ -343,7 +332,7 @@
  * FLAC__StreamDecoderInitStatusString and FLAC__StreamDecoderStateString
  * string arrays do not provide very useful messages, so we use the messages
  * from the functions below instead. The messages are based on information in
- * <http://flac.sourceforge.net/api/group__flac__stream__decoder.html>.
+ * <https://www.xiph.org/flac/api/group__flac__stream__decoder.html>.
  */
 
 static const char *

siren-0.2.tar.gz/ip/mad.c -> siren-0.7.tar.gz/ip/mad.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,7 +27,7 @@
 
 /*
  * This value must be equal to or larger than the largest possible MPEG audio
- * frame size, which, according to <http://marc.info/?m=113584709618786>, is
+ * frame size, which, according to <https://marc.info/?m=113584709618786>, is
  * 2880 bytes.
  */
 #define IP_MAD_BUFSIZE		65536
@@ -36,6 +36,9 @@
 #define IP_MAD_EOF		0
 #define IP_MAD_OK		1
 
+#define IP_MAD_NEED_REFILL(error) \
+    ((error) == MAD_ERROR_BUFLEN || (error) == MAD_ERROR_BUFPTR)
+
 struct ip_mad_ipdata {
 	FILE			*fp;
 
@@ -49,25 +52,27 @@
 };
 
 static void		 ip_mad_close(struct track *);
-static int		 ip_mad_decode_frame_header(FILE *fp,
+static int		 ip_mad_decode_frame_header(FILE *,
 			    struct mad_stream *, struct mad_header *,
-			    unsigned char *, size_t);
+			    unsigned char *);
 static int		 ip_mad_fill_stream(FILE *, struct mad_stream *,
-			    unsigned char *, size_t);
+			    unsigned char *);
 static int		 ip_mad_get_position(struct track *, unsigned int *);
-static int		 ip_mad_get_metadata(struct track *);
+static void		 ip_mad_get_metadata(struct track *);
 static int		 ip_mad_open(struct track *);
-static int		 ip_mad_read(struct track *, int16_t *, size_t);
+static int		 ip_mad_read(struct track *, struct sample_buffer *);
 static void		 ip_mad_seek(struct track *, unsigned int);
 
 static const char	*ip_mad_extensions = { "mp1", "mp2", "mp3", NULL };
 
 const struct ip		 ip = {
 	"mad",
+	IP_PRIORITY_MAD,
 	ip_mad_extensions,
 	ip_mad_close,
 	ip_mad_get_metadata,
 	ip_mad_get_position,
+	NULL,
 	ip_mad_open,
 	ip_mad_read,
 	ip_mad_seek
@@ -100,19 +105,19 @@
 	buf = xmalloc(IP_MAD_BUFSIZE + MAD_BUFFER_GUARD);
 
 	/* Read the whole file and sum the duration of all frames. */
-	while ((ret = ip_mad_decode_frame_header(fp, &stream, &header, buf,
-	    IP_MAD_BUFSIZE)) == IP_MAD_OK)
+	while ((ret = ip_mad_decode_frame_header(fp, &stream, &header, buf)) ==
+	    IP_MAD_OK)
 		mad_timer_add(&timer, header.duration);
 
 	free(buf);
 	mad_header_finish(&header);
 	mad_stream_finish(&stream);
-	(void)fclose(fp);
+	fclose(fp);
 
 	if (ret == IP_MAD_ERROR)
 		return 0;
 
-	return (unsigned int)mad_timer_count(timer, MAD_UNITS_SECONDS);
+	return mad_timer_count(timer, MAD_UNITS_SECONDS);
 }
 
 static void
@@ -125,7 +130,7 @@
 	mad_synth_finish(&ipd->synth);
 	mad_frame_finish(&ipd->frame);
 	mad_stream_finish(&ipd->stream);
-	(void)fclose(ipd->fp);
+	fclose(ipd->fp);
 
 	free(ipd->buf);
 	free(ipd);
@@ -134,88 +139,67 @@
 static int
 ip_mad_decode_frame(struct ip_mad_ipdata *ipd)
 {
-	int ret;
+	int		 ret;
+	const char	*errstr;
 
 	for (;;) {
-		/* Fill the stream buffer if necessary. */
-		if (ipd->stream.buffer == NULL || ipd->stream.error ==
-		    MAD_ERROR_BUFLEN) {
+		if (mad_frame_decode(&ipd->frame, &ipd->stream) == 0) {
+			mad_synth_frame(&ipd->synth, &ipd->frame);
+			ipd->sampleidx = 0;
+			return IP_MAD_OK;
+		}
+		if (IP_MAD_NEED_REFILL(ipd->stream.error)) {
 			ret = ip_mad_fill_stream(ipd->fp, &ipd->stream,
-			    ipd->buf, IP_MAD_BUFSIZE);
+			    ipd->buf);
 			if (ret == IP_MAD_EOF || ret == IP_MAD_ERROR)
 				return ret;
+		} else if (!MAD_RECOVERABLE(ipd->stream.error)) {
+			errstr = mad_stream_errorstr(&ipd->stream);
+			LOG_ERRX("mad_frame_decode: %s", errstr);
+			msg_errx("Cannot decode frame: %s", errstr);
+			return IP_MAD_ERROR;
 		}
-
-		if (mad_frame_decode(&ipd->frame, &ipd->stream) == -1) {
-			/* Error encountered. */
-			if (MAD_RECOVERABLE(ipd->stream.error) ||
-			    ipd->stream.error == MAD_ERROR_BUFLEN)
-				/* Non-fatal error: try again. */
-				continue;
-			else {
-				/* Fatal error. */
-				LOG_ERRX("mad_frame_decode: %s",
-				    mad_stream_errorstr(&ipd->stream));
-				msg_errx("Cannot decode frame: %s",
-				    mad_stream_errorstr(&ipd->stream));
-				return IP_MAD_ERROR;
-			}
-		}
-
-		/* Success. */
-		return IP_MAD_OK;
 	}
 }
 
 static int
 ip_mad_decode_frame_header(FILE *fp, struct mad_stream *stream,
-    struct mad_header *header, unsigned char *buf, size_t bufsize)
+    struct mad_header *header, unsigned char *buf)
 {
-	int ret;
+	int		 ret;
+	const char	*errstr;
 
 	for (;;) {
-		/* Fill the stream buffer if necessary. */
-		if (stream->buffer == NULL || stream->error ==
-		    MAD_ERROR_BUFLEN) {
-			ret = ip_mad_fill_stream(fp, stream, buf, bufsize);
+		if (mad_header_decode(header, stream) == 0)
+			return IP_MAD_OK;
+		if (IP_MAD_NEED_REFILL(stream->error)) {
+			ret = ip_mad_fill_stream(fp, stream, buf);
 			if (ret == IP_MAD_EOF || ret == IP_MAD_ERROR)
 				return ret;
+		} else if (!MAD_RECOVERABLE(stream->error)) {
+			errstr = mad_stream_errorstr(stream);
+			LOG_ERRX("mad_frame_decode: %s", errstr);
+			msg_errx("Cannot decode frame: %s", errstr);
+			return IP_MAD_ERROR;
 		}
-
-		if (mad_header_decode(header, stream) == -1) {
-			/* Error encountered. */
-			if (MAD_RECOVERABLE(stream->error) ||
-			    stream->error == MAD_ERROR_BUFLEN)
-				/* Non-fatal error: try again. */
-				continue;
-			else {
-				/* Fatal error. */
-				LOG_ERRX("mad_header_decode: %s",
-				    mad_stream_errorstr(stream));
-				msg_errx("Cannot decode frame header: %s",
-				    mad_stream_errorstr(stream));
-				return IP_MAD_ERROR;
-			}
-		}
-
-		/* Success. */
-		return IP_MAD_OK;
 	}
 }
 
 static int
-ip_mad_fill_stream(FILE *fp, struct mad_stream *stream, unsigned char *buf,
-    size_t bufsize)
+ip_mad_fill_stream(FILE *fp, struct mad_stream *stream, unsigned char *buf)
 {
 	size_t buffree, buflen, nread;
 
+	if (feof(fp))
+		return IP_MAD_EOF;
+
 	if (stream->next_frame == NULL)
 		buflen = 0;
 	else {
 		buflen = stream->bufend - stream->next_frame;
-		(void)memmove(buf, stream->next_frame, buflen);
+		memmove(buf, stream->next_frame, buflen);
 	}
-	buffree = bufsize - buflen;
+	buffree = IP_MAD_BUFSIZE - buflen;
 
 	if ((nread = fread(buf + buflen, 1, buffree, fp)) < buffree) {
 		if (ferror(fp)) {
@@ -224,11 +208,7 @@
 			return IP_MAD_ERROR;
 		}
 		if (feof(fp)) {
-			if (nread == 0)
-				return IP_MAD_EOF;
-
-			(void)memset(buf + buflen + nread, 0,
-			    MAD_BUFFER_GUARD);
+			memset(buf + buflen + nread, 0, MAD_BUFFER_GUARD);
 			buflen += MAD_BUFFER_GUARD;
 		}
 	}
@@ -255,7 +235,7 @@
 		fixed = -MAD_F_ONE;
 
 	/* Save the sign bit and the 15 most significant fraction bits. */
-	return (int16_t)(fixed >> (MAD_F_FRACBITS - 15));
+	return fixed >> (MAD_F_FRACBITS - 15);
 }
 
 static char *
@@ -282,10 +262,10 @@
 		return NULL;
 
 	/*
-	 * Note that id3_ucs4_latin1duplicate() returns NULL if its call to
+	 * Note that id3_ucs4_utf8duplicate() returns NULL if its call to
 	 * malloc() failed.
 	 */
-	return (char *)id3_ucs4_latin1duplicate(value);
+	return (char *)id3_ucs4_utf8duplicate(value);
 }
 
 static char *
@@ -305,44 +285,47 @@
 	if (genre0 == '\0')
 		return NULL;
 
-	return (char *)id3_ucs4_latin1duplicate(genre);
+	return (char *)id3_ucs4_utf8duplicate(genre);
 }
 
-static int
+static void
 ip_mad_get_metadata(struct track *t)
 {
 	struct id3_file		*file;
 	struct id3_tag		*tag;
-	char			*tlen;
+	char			*tlen, *val;
 	const char		*errstr;
 
 	if ((file = id3_file_open(t->path, ID3_FILE_MODE_READONLY)) == NULL) {
 		LOG_ERRX("%s: id3_file_open() failed", t->path);
 		msg_errx("%s: Cannot open file", t->path);
-		return IP_MAD_ERROR;
+		return;
 	}
 
 	tag = id3_file_tag(file);
 
 	t->album = ip_mad_get_id3_frame(tag, ID3_FRAME_ALBUM);
+	t->albumartist = ip_mad_get_id3_frame(tag, "TPE2");
 	t->artist = ip_mad_get_id3_frame(tag, ID3_FRAME_ARTIST);
+	t->comment = ip_mad_get_id3_frame(tag, ID3_FRAME_COMMENT);
 	t->date = ip_mad_get_id3_frame(tag, ID3_FRAME_YEAR);
 	t->title = ip_mad_get_id3_frame(tag, ID3_FRAME_TITLE);
-	t->tracknumber = ip_mad_get_id3_frame(tag, ID3_FRAME_TRACK);
 	t->genre = ip_mad_get_id3_genre(tag);
 
-	/*
-	 * ID3 allows track numbers of the form "x/y". We ignore the slash and
-	 * everything after it.
-	 */
-	if (t->tracknumber != NULL)
-		t->tracknumberstrcspn(t->tracknumber, "/") = '\0';
+	if ((val = ip_mad_get_id3_frame(tag, "TPOS")) != NULL) {
+		track_split_tag(val, &t->discnumber, &t->disctotal);
+		free(val);
+	}
+
+	if ((val = ip_mad_get_id3_frame(tag, ID3_FRAME_TRACK)) != NULL) {
+		track_split_tag(val, &t->tracknumber, &t->tracktotal);
+		free(val);
+	}
 
 	if ((tlen = ip_mad_get_id3_frame(tag, "TLEN")) == NULL)
 		t->duration = ip_mad_calculate_duration(t->path);
 	else {
-		t->duration = (unsigned int)strtonum(tlen, 0, UINT_MAX,
-		    &errstr);
+		t->duration = strtonum(tlen, 0, UINT_MAX, &errstr);
 		if (errstr != NULL)
 			LOG_ERRX("%s: %s: TLEN frame is %s", t->path, tlen,
 			    errstr);
@@ -353,8 +336,6 @@
 
 	if (id3_file_close(file) == -1)
 		LOG_ERRX("%s: id3_file_close() failed", t->path);
-
-	return 0;
 }
 
 static int
@@ -363,49 +344,14 @@
 	struct ip_mad_ipdata *ipd;
 
 	ipd = t->ipdata;
-	*pos = (unsigned int)mad_timer_count(ipd->timer, MAD_UNITS_SECONDS);
+	*pos = mad_timer_count(ipd->timer, MAD_UNITS_SECONDS);
 	return 0;
 }
 
 static int
-ip_mad_get_sample_format(const char *file, struct sample_format *sf,
-    unsigned char *buf, size_t bufsize)
-{
-	FILE			*fp;
-	struct mad_stream	 stream;
-	struct mad_header	 header;
-	int			 ret;
-
-	if ((fp = fopen(file, "r")) == NULL) {
-		LOG_ERR("fopen: %s", file);
-		msg_err("%s: Cannot open track", file);
-		return IP_MAD_ERROR;
-	}
-
-	mad_stream_init(&stream);
-	mad_header_init(&header);
-
-	ret = ip_mad_decode_frame_header(fp, &stream, &header, buf, bufsize);
-	if (ret == IP_MAD_EOF)
-		msg_errx("File is empty");
-	else if (ret == IP_MAD_OK) {
-		sf->nbits = 16;
-		sf->nchannels = MAD_NCHANNELS(&header);
-		sf->rate = header.samplerate;
-	}
-
-	mad_header_finish(&header);
-	mad_stream_finish(&stream);
-	(void)fclose(fp);
-
-	return ret == IP_MAD_OK ? 0 : -1;
-}
-
-static int
 ip_mad_open(struct track *t)
 {
-	struct ip_mad_ipdata	*ipd;
-	int			 ret;
+	struct ip_mad_ipdata *ipd;
 
 	ipd = xmalloc(sizeof *ipd);
 
@@ -425,56 +371,46 @@
 	mad_synth_init(&ipd->synth);
 	mad_timer_reset(&ipd->timer);
 
-	if ((ret = ip_mad_get_sample_format(t->path, &t->format, ipd->buf,
-	    IP_MAD_BUFSIZE))) {
+	if (ip_mad_decode_frame(ipd) != IP_MAD_OK) {
 		ip_mad_close(t);
-		return ret;
+		return -1;
 	}
+	t->format.nbits = 16;
+	t->format.nchannels = MAD_NCHANNELS(&ipd->frame.header);
+	t->format.rate = ipd->frame.header.samplerate;
 
 	return 0;
 }
 
 static int
-ip_mad_read(struct track *t, int16_t *samples, size_t maxsamples)
+ip_mad_read(struct track *t, struct sample_buffer *sb)
 {
 	struct ip_mad_ipdata	*ipd;
-	size_t			 nsamples;
 	int			 ret;
-
-	/* Sanity check. */
-	if (maxsamples < (size_t)t->format.nchannels) {
-		LOG_ERRX("%s: sample buffer to small", t->path);
-		msg_errx("Cannot read from track: Sample buffer too small");
-		return -1;
-	}
+	unsigned short		 i;
 
 	ipd = t->ipdata;
 
-	nsamples = 0;
-	while (nsamples + (size_t)t->format.nchannels <= maxsamples) {
+	sb->len_s = 0;
+	while (sb->len_s + t->format.nchannels <= sb->size_s) {
 		if (ipd->sampleidx == ipd->synth.pcm.length) {
+			mad_timer_add(&ipd->timer, ipd->frame.header.duration);
 			ret = ip_mad_decode_frame(ipd);
-			if (ret == IP_MAD_EOF || ret == IP_MAD_ERROR)
+			if (ret == IP_MAD_EOF)
+				break;
+			if (ret == IP_MAD_ERROR)
 				return ret;
-
-			mad_synth_frame(&ipd->synth, &ipd->frame);
-			mad_timer_add(&ipd->timer, ipd->frame.header.duration);
-			ipd->sampleidx = 0;
 		}
 
-		/* Left channel (or mono). */
-		samplesnsamples++ = ip_mad_fixed_to_int(
-		    ipd->synth.pcm.samples0ipd->sampleidx);
-
-		if (ipd->synth.pcm.channels > 1)
-			/* Right channel. */
-			samplesnsamples++ = ip_mad_fixed_to_int(
-			    ipd->synth.pcm.samples1ipd->sampleidx);
+		for (i = 0; i < ipd->synth.pcm.channels; i++)
+			sb->data2sb->len_s++ = ip_mad_fixed_to_int(
+			    ipd->synth.pcm.samplesiipd->sampleidx);
 
 		ipd->sampleidx++;
 	}
 
-	return (int)nsamples;
+	sb->len_b = sb->len_s * sb->nbytes;
+	return sb->len_s != 0;
 }
 
 static void
@@ -486,7 +422,7 @@
 
 	ipd = t->ipdata;
 
-	pos = (unsigned int)mad_timer_count(ipd->timer, MAD_UNITS_SECONDS);
+	pos = mad_timer_count(ipd->timer, MAD_UNITS_SECONDS);
 	if (pos > seekpos) {
 		if (fseek(ipd->fp, 0, SEEK_SET) == -1) {
 			LOG_ERR("fseek: %s", t->path);
@@ -503,7 +439,7 @@
 		if (pos >= seekpos)
 			break;
 		if (ip_mad_decode_frame_header(ipd->fp, &ipd->stream, &header,
-		    ipd->buf, IP_MAD_BUFSIZE) != IP_MAD_OK)
+		    ipd->buf) != IP_MAD_OK)
 			break;
 		mad_timer_add(&ipd->timer, header.duration);
 		pos = mad_timer_count(ipd->timer, MAD_UNITS_SECONDS);

siren-0.7.tar.gz/ip/mpg123.c Added

@@ -0,0 +1,551 @@
+/*
+ * Copyright (c) 2014 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <mpg123.h>
+
+#include "../siren.h"
+
+struct ip_mpg123_ipdata {
+	mpg123_handle	*hdl;
+	int		 fd;
+};
+
+static void	 ip_mpg123_close(struct track *);
+static void	 ip_mpg123_close_fd_handle(int fd, mpg123_handle *);
+static int	 ip_mpg123_get_position(struct track *, unsigned int *);
+static void	 ip_mpg123_get_metadata(struct track *);
+static int	 ip_mpg123_init(void);
+static int	 ip_mpg123_open(struct track *);
+static int	 ip_mpg123_open_fd_handle(const char *, int *fd,
+		    mpg123_handle **);
+static int	 ip_mpg123_read(struct track *, struct sample_buffer *);
+static void	 ip_mpg123_seek(struct track *, unsigned int);
+
+static const char *ip_mpg123_extensions = { "mp1", "mp2", "mp3", NULL };
+
+static const char *ip_mpg123_genres = {
+	/*
+	 * ID3v1 genres (based on http://id3.org/id3v2.4.0-frames)
+	 */
+
+	"Blues",
+	"Classic Rock",
+	"Country",
+	"Dance",
+	"Disco",
+	"Funk",
+	"Grunge",
+	"Hip-Hop",
+	"Jazz",
+	"Metal",
+	"New Age",
+	"Oldies",
+	"Other",
+	"Pop",
+	"R&B",
+	"Rap",
+	"Reggae",
+	"Rock",
+	"Techno",
+	"Industrial",
+	"Alternative",
+	"Ska",
+	"Death Metal",
+	"Pranks",
+	"Soundtrack",
+	"Euro-Techno",
+	"Ambient",
+	"Trip-Hop",
+	"Vocal",
+	"Jazz+Funk",
+	"Fusion",
+	"Trance",
+	"Classical",
+	"Instrumental",
+	"Acid",
+	"House",
+	"Game",
+	"Sound Clip",
+	"Gospel",
+	"Noise",
+	"AlternRock",
+	"Bass",
+	"Soul",
+	"Punk",
+	"Space",
+	"Meditative",
+	"Instrumental Pop",
+	"Instrumental Rock",
+	"Ethnic",
+	"Gothic",
+	"Darkwave",
+	"Techno-Industrial",
+	"Electronic",
+	"Pop-Folk",
+	"Eurodance",
+	"Dream",
+	"Southern Rock",
+	"Comedy",
+	"Cult",
+	"Gangsta",
+	"Top 40",
+	"Christian Rap",
+	"Pop/Funk",
+	"Jungle",
+	"Native American",
+	"Cabaret",
+	"New Wave",
+	"Psychedelic",
+	"Rave",
+	"Showtunes",
+	"Trailer",
+	"Lo-Fi",
+	"Tribal",
+	"Acid Punk",
+	"Acid Jazz",
+	"Polka",
+	"Retro",
+	"Musical",
+	"Rock & Roll",
+	"Hard Rock",
+
+	/*
+	 * Winamp extensions (based on https://en.wikipedia.org/wiki/ID3)
+	 */
+
+	"Folk",
+	"Folk Rock",
+	"National Folk",
+	"Swing",
+	"Fast Fusion",
+	"Bebop",
+	"Latin",
+	"Revival",
+	"Celtic",
+	"Bluegrass",
+	"Avantgarde",
+	"Gothic Rock",
+	"Progressive Rock",
+	"Psychedelic Rock",
+	"Symphonic Rock",
+	"Slow Rock",
+	"Big Band",
+	"Chorus",
+	"Easy Listening",
+	"Acoustic",
+	"Humour",
+	"Speech",
+	"Chanson",
+	"Opera",
+	"Chamber Music",
+	"Sonata",
+	"Symphony",
+	"Booty Bass",
+	"Primus",
+	"Porn Groove",
+	"Satire",
+	"Slow Jam",
+	"Club",
+	"Tango",
+	"Samba",
+	"Folklore",
+	"Ballad",
+	"Power Ballad",
+	"Rhythmic Soul",
+	"Freestyle",
+	"Duet",
+	"Punk Rock",
+	"Drum Solo",
+	"A Cappella",
+	"Euro-House",
+	"Dance Hall",
+	"Goa",
+	"Drum & Bass",
+	"Club-House",
+	"Hardcore",
+	"Terror",
+	"Indie",
+	"Britpop",
+	"Afro-punk",
+	"Polsk Punk",
+	"Beat",
+	"Christian Gangsta Rap",
+	"Heavy Metal",
+	"Black Metal",
+	"Crossover",
+	"Contemporary Christian",
+	"Christian Rock",
+	"Merengue",
+	"Salsa",
+	"Thrash Metal",
+	"Anime",
+	"Jpop",
+	"Synthpop",
+	"Abstract",
+	"Art Rock",
+	"Baroque",
+	"Bhangra",
+	"Big Beat",
+	"Breakbeat",
+	"Chillout",
+	"Downtempo",
+	"Dub",
+	"EBM",
+	"Eclectic",
+	"Electro",
+	"Electroclash",
+	"Emo",
+	"Experimental",
+	"Garage",
+	"Global",
+	"IDM",
+	"Illbient",
+	"Industro-Goth",
+	"Jam Band",
+	"Krautrock",
+	"Leftfield",
+	"Lounge",
+	"Math Rock",
+	"New Romantic",
+	"Nu-Breakz",
+	"Post-Punk",
+	"Post-Rock",
+	"Psytrance",
+	"Shoegaze",
+	"Space Rock",
+	"Trop Rock",
+	"World Music",
+	"Neoclassical",
+	"Audiobook",
+	"Audio Theatre",
+	"Neue Deutsche Welle",
+	"Podcast",
+	"Indie Rock",
+	"G-Funk",
+	"Dubstep",
+	"Garage Rock",
+	"Psybient"
+};
+
+const struct ip	 ip = {
+	"mpg123",
+	IP_PRIORITY_MPG123,
+	ip_mpg123_extensions,
+	ip_mpg123_close,
+	ip_mpg123_get_metadata,
+	ip_mpg123_get_position,
+	ip_mpg123_init,
+	ip_mpg123_open,
+	ip_mpg123_read,
+	ip_mpg123_seek
+};
+
+static void
+ip_mpg123_close(struct track *t)
+{
+	struct ip_mpg123_ipdata *ipd;
+
+	ipd = t->ipdata;
+
+	ip_mpg123_close_fd_handle(ipd->fd, ipd->hdl);
+	free(ipd);
+}
+
+static void
+ip_mpg123_close_fd_handle(int fd, mpg123_handle *hdl)
+{
+	mpg123_close(hdl);
+	mpg123_delete(hdl);
+	close(fd);
+}
+
+static char *
+ip_mpg123_get_genre(mpg123_string *s)
+{
+	int		 idx;
+	char		*t;
+	const char	*errstr;
+
+	/*
+	 * If the TCON (genre) frame is of the form "n" or "(n)" where "n" is
+	 * a numerical string, then assume "n" is an ID3v1 genre index.
+	 */
+
+	if (s->p0 != '(')
+		t = s->p;
+	else {
+		t = s->p + 1;
+		tstrcspn(t, ")") = '\0';
+	}
+
+	idx = strtonum(t, 0, NELEMENTS(ip_mpg123_genres) - 1, &errstr);
+	if (errstr == NULL)
+		return xstrdup(ip_mpg123_genresidx);
+	else
+		return xstrdup(s->p);
+}
+
+static void
+ip_mpg123_get_metadata(struct track *t)
+{
+	mpg123_handle	*hdl;
+	mpg123_id3v1	*v1;
+	mpg123_id3v2	*v2;
+	off_t		 length;
+	size_t		 i;
+	long		 rate;
+	int		 encoding, fd, nchannels;
+
+	if (ip_mpg123_open_fd_handle(t->path, &fd, &hdl) == -1)
+		return;
+
+	if (mpg123_getformat(hdl, &rate, &nchannels, &encoding) != MPG123_OK) {
+		LOG_ERRX("mpg123_getformat: %s: %s", t->path,
+		    mpg123_strerror(hdl));
+		msg_errx("%s: Cannot get format: %s", t->path,
+		    mpg123_strerror(hdl));
+		goto out;
+	}
+
+	if (mpg123_scan(hdl) != MPG123_OK) {
+		LOG_ERRX("msg123_scan: %s: %s", t->path, mpg123_strerror(hdl));
+		msg_errx("%s: Cannot scan track: %s", t->path,
+		    mpg123_strerror(hdl));
+		goto out;
+	}
+
+	length = mpg123_length(hdl);
+	if (length > 0 && rate > 0)
+		t->duration = length / rate;
+
+	if (mpg123_id3(hdl, &v1, &v2) != MPG123_OK) {
+		LOG_ERRX("mpg123_id3: %s: %s", t->path, mpg123_strerror(hdl));
+		msg_errx("%s: Cannot get metadata: %s", t->path,
+		    mpg123_strerror(hdl));
+		goto out;
+	}
+
+	if (v2 != NULL) {
+		for (i = 0; i < v2->texts; i++)
+			if (!strncmp(v2->texti.id, "TALB", 4))
+				t->album = xstrdup(v2->texti.text.p);
+			else if (!strncmp(v2->texti.id, "TPE2", 4))
+				t->albumartist = xstrdup(v2->texti.text.p);
+			else if (!strncmp(v2->texti.id, "TPE1", 4))
+				t->artist = xstrdup(v2->texti.text.p);
+			else if (!strncmp(v2->texti.id, "COMM", 4))
+				t->comment = xstrdup(v2->texti.text.p);
+			else if (!strncmp(v2->texti.id, "TDRC", 4) ||
+			    !strncmp(v2->texti.id, "TYER", 4))
+				t->date = xstrdup(v2->texti.text.p);
+			else if (!strncmp(v2->texti.id, "TPOS", 4))
+				track_split_tag(v2->texti.text.p,
+				    &t->discnumber, &t->disctotal);
+			else if (!strncmp(v2->texti.id, "TCON", 4))
+				t->genre =
+				    ip_mpg123_get_genre(&v2->texti.text);
+			else if (!strncmp(v2->texti.id, "TIT2", 4))
+				t->title = xstrdup(v2->texti.text.p);
+			else if (!strncmp(v2->texti.id, "TRCK", 4))
+				track_split_tag(v2->texti.text.p,
+				    &t->tracknumber, &t->tracktotal);
+	} else if (v1 != NULL) {
+		t->album = xstrndup(v1->album, sizeof v1->album);
+		t->artist = xstrndup(v1->artist, sizeof v1->artist);
+		t->date = xstrndup(v1->year, sizeof v1->year);
+		t->title = xstrndup(v1->title, sizeof v1->title);
+
+		if (v1->genre < NELEMENTS(ip_mpg123_genres))
+			t->genre = xstrdup(ip_mpg123_genresv1->genre);
+
+		/*
+		 * ID3v1.1 allows the track number to be stored in the comment
+		 * field: if byte 28 is 0, then byte 29 is the track number.
+		 */
+		if (v1->comment28 == '\0')
+			xasprintf(&t->tracknumber, "%d", v1->comment29);
+	}
+
+out:
+	ip_mpg123_close_fd_handle(fd, hdl);
+}
+
+static int
+ip_mpg123_get_position(struct track *t, unsigned int *pos)
+{
+	struct ip_mpg123_ipdata	*ipd;
+	off_t			 samplepos;
+
+	ipd = t->ipdata;
+
+	samplepos = mpg123_tell(ipd->hdl);
+	*pos = samplepos / t->format.rate;
+	return 0;
+}
+
+static int
+ip_mpg123_init(void)
+{
+	int ret;
+
+	ret = mpg123_init();
+	if (ret == MPG123_OK)
+		return 0;
+	else {
+		LOG_ERRX("mpg123_init: %s", mpg123_plain_strerror(ret));
+		msg_errx("Cannot initialise libmpg123: %s",
+		    mpg123_plain_strerror(ret));
+		return -1;
+	}
+
+}
+
+static int
+ip_mpg123_open(struct track *t)
+{
+	struct ip_mpg123_ipdata	*ipd;
+	mpg123_handle		*hdl;
+	long			 rate;
+	int			 encoding, fd, nchannels;
+
+	if (ip_mpg123_open_fd_handle(t->path, &fd, &hdl) == -1)
+		return -1;
+
+	if (mpg123_getformat(hdl, &rate, &nchannels, &encoding) != MPG123_OK) {
+		LOG_ERRX("mpg123_getformat: %s: %s", t->path,
+		    mpg123_strerror(hdl));
+		msg_errx("%s: Cannot get format: %s", t->path,
+		    mpg123_strerror(hdl));
+		goto error;
+	}
+
+	switch (encoding) {
+	case MPG123_ENC_SIGNED_8:
+		t->format.nbits = 8;
+		break;
+	case MPG123_ENC_SIGNED_16:
+		t->format.nbits = 16;
+		break;
+	case MPG123_ENC_SIGNED_24:
+		t->format.nbits = 24;
+		break;
+	case MPG123_ENC_SIGNED_32:
+		t->format.nbits = 32;
+		break;
+	default:
+		LOG_ERRX("%s: %#x: unsupported encoding", t->path, encoding);
+		msg_errx("%s: Unsupported encoding", t->path);
+		goto error;
+	}
+
+	/* Ensure the output format will not change. */
+	mpg123_format_none(hdl);
+	mpg123_format(hdl, rate, nchannels, encoding);
+
+	t->format.nchannels = nchannels;
+	t->format.rate = rate;
+
+	ipd = xmalloc(sizeof *ipd);
+	ipd->hdl = hdl;
+	ipd->fd = fd;
+	t->ipdata = ipd;
+
+	return 0;
+
+error:
+	ip_mpg123_close_fd_handle(fd, hdl);
+	return -1;
+}
+
+static int
+ip_mpg123_open_fd_handle(const char *path, int *fd, mpg123_handle **hdl)
+{
+	int err;
+
+	*fd = open(path, O_RDONLY);
+	if (*fd == -1) {
+		LOG_ERR("open: %s", path);
+		msg_err("%s: Cannot open track", path);
+		return -1;
+	}
+
+	*hdl = mpg123_new(NULL, &err);
+	if (*hdl == NULL) {
+		LOG_ERRX("mpg123_new: %s", mpg123_plain_strerror(err));
+		msg_errx("Cannot create handle: %s",
+		    mpg123_plain_strerror(err));
+		close(*fd);
+		return -1;
+	}
+
+	/* Thank you for not writing to stderr. */
+	mpg123_param(*hdl, MPG123_ADD_FLAGS, MPG123_QUIET, 0.0);
+
+	if (mpg123_open_fd(*hdl, *fd) != MPG123_OK) {
+		LOG_ERRX("mpg123_open_fd: %s: %s", path,
+		    mpg123_strerror(*hdl));
+		msg_errx("%s: Cannot open track: %s", path,
+		    mpg123_strerror(*hdl));
+		mpg123_delete(*hdl);
+		close(*fd);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int
+ip_mpg123_read(struct track *t, struct sample_buffer *sb)
+{
+	struct ip_mpg123_ipdata	*ipd;
+	int			 ret;
+
+	ipd = t->ipdata;
+
+	ret = mpg123_read(ipd->hdl, (unsigned char *)sb->data, sb->size_b,
+	    &sb->len_b);
+	if (ret != MPG123_OK && ret != MPG123_DONE) {
+		LOG_ERRX("%s: mpg123_read: %s", t->path,
+		    mpg123_strerror(ipd->hdl));
+		msg_errx("Cannot read from track: %s",
+		    mpg123_strerror(ipd->hdl));
+		return -1;
+	}
+
+	sb->len_s = sb->len_b / sb->nbytes;
+	return sb->len_s != 0;
+}
+
+static void
+ip_mpg123_seek(struct track *t, unsigned int pos)
+{
+	struct ip_mpg123_ipdata	*ipd;
+	off_t			 samplepos;
+
+	ipd = t->ipdata;
+
+	samplepos = pos * t->format.rate;
+	if (mpg123_seek(ipd->hdl, samplepos, SEEK_SET) < 0) {
+		LOG_ERRX("mpg123_seek: %s: %s", t->path,
+		    mpg123_strerror(ipd->hdl));
+		msg_errx("Cannot seek: %s", mpg123_strerror(ipd->hdl));
+	}
+}

siren-0.7.tar.gz/ip/opus.c Added

@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2015 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <opusfile.h>
+
+#include "../siren.h"
+
+#define IP_OPUS_RATE	48000
+
+static void		 ip_opus_close(struct track *);
+static void		 ip_opus_get_metadata(struct track *);
+static int		 ip_opus_get_position(struct track *, unsigned int *);
+static int		 ip_opus_open(struct track *);
+static int		 ip_opus_read(struct track *, struct sample_buffer *);
+static void		 ip_opus_seek(struct track *, unsigned int);
+
+static const char	*ip_opus_extensions = { "opus", NULL };
+
+const struct ip		 ip = {
+	"opus",
+	IP_PRIORITY_OPUS,
+	ip_opus_extensions,
+	ip_opus_close,
+	ip_opus_get_metadata,
+	ip_opus_get_position,
+	NULL,
+	ip_opus_open,
+	ip_opus_read,
+	ip_opus_seek
+};
+
+static void
+ip_opus_close(struct track *t)
+{
+	OggOpusFile *oof;
+
+	oof = t->ipdata;
+	op_free(oof);
+}
+
+static void
+ip_opus_get_metadata(struct track *t)
+{
+	OggOpusFile	*oof;
+	const OpusTags	*tags;
+	int		 error, i;
+
+	oof = op_open_file(t->path, &error);
+	if (oof == NULL) {
+		LOG_ERRX("op_open_file: %s: error %d", t->path, error);
+		msg_errx("%s: Cannot open track", t->path);
+		return;
+	}
+
+	tags = op_tags(oof, -1);
+	if (tags != NULL)
+		for (i = 0; i < tags->comments; i++)
+			track_copy_vorbis_comment(t, tags->user_commentsi);
+
+	t->duration = op_pcm_total(oof, -1) / IP_OPUS_RATE;
+
+	op_free(oof);
+}
+
+static int
+ip_opus_get_position(struct track *t, unsigned int *pos)
+{
+	OggOpusFile	*oof;
+	ogg_int64_t	 offset;
+
+	oof = t->ipdata;
+	offset = op_pcm_tell(oof);
+	if (offset < 0) {
+		LOG_ERRX("op_pcm_tell: %s: error %" PRId64, t->path,
+		    (int64_t)offset);
+		msg_errx("Cannot get track position");
+		return -1;
+	}
+
+	*pos = offset / IP_OPUS_RATE;
+	return 0;
+}
+
+static int
+ip_opus_open(struct track *t)
+{
+	OggOpusFile	*oof;
+	int		 error;
+
+	oof = op_open_file(t->path, &error);
+	if (oof == NULL) {
+		LOG_ERRX("op_open_file: %s: error %d", t->path, error);
+		msg_errx("%s: Cannot open track", t->path);
+		return -1;
+	}
+
+	t->format.nbits = 16;
+	t->format.nchannels = op_channel_count(oof, -1);
+	t->format.rate = IP_OPUS_RATE;
+
+	t->ipdata = oof;
+	return 0;
+}
+
+static int
+ip_opus_read(struct track *t, struct sample_buffer *sb)
+{
+	OggOpusFile	*oof;
+	int		 ret;
+
+	oof = t->ipdata;
+	sb->len_s = 0;
+
+	for (;;) {
+		ret = op_read(oof, sb->data2 + sb->len_s,
+		    sb->size_s - sb->len_s, NULL);
+		if (ret == OP_HOLE)
+			LOG_ERRX("op_read: %s: hole in data", t->path);
+		else if (ret < 0) {
+			LOG_ERRX("op_read: %s: error %d", t->path, ret);
+			msg_errx("Cannot read from track");
+			return -1;
+		} else {
+			sb->len_s += ret * op_channel_count(oof, -1);
+			if (ret == 0 || sb->len_s == sb->size_s) {
+				sb->len_b = sb->len_s * 2;
+				return sb->len_s != 0;
+			}
+		}
+	}
+}
+
+static void
+ip_opus_seek(struct track *t, unsigned int sec)
+{
+	OggOpusFile	*oof;
+	int		 ret;
+
+	oof = t->ipdata;
+	ret = op_pcm_seek(oof, sec * IP_OPUS_RATE);
+	if (ret < 0) {
+		LOG_ERRX("op_pcm_seek: %s: error %d", t->path, ret);
+		msg_errx("Cannot seek");
+	}
+}

siren-0.2.tar.gz/ip/sndfile.c -> siren-0.7.tar.gz/ip/sndfile.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,6 @@
 #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 0
 
 #include <fcntl.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -26,26 +25,18 @@
 
 #include "../siren.h"
 
-#define IP_SNDFILE_BUFSIZE 4096
-
 struct ip_sndfile_ipdata {
 	SNDFILE		*sffp;
-	SF_INFO		 sfinfo;
-
-	short int	*buf;
-	sf_count_t	 bufidx;
-	sf_count_t	 buflen;
-
-	/* Current position in track, measured in samples. */
-	sf_count_t	 position;
+	sf_count_t	 position;	/* Current position, in samples. */
 };
 
 static void		 ip_sndfile_close(struct track *);
-static int		 ip_sndfile_get_metadata(struct track *);
+static void		 ip_sndfile_get_metadata(struct track *);
 static int		 ip_sndfile_get_position(struct track *,
 			    unsigned int *);
 static int		 ip_sndfile_open(struct track *);
-static int		 ip_sndfile_read(struct track *, int16_t *, size_t);
+static int		 ip_sndfile_read(struct track *,
+			    struct sample_buffer *);
 static void		 ip_sndfile_seek(struct track *, unsigned int);
 
 /*
@@ -78,10 +69,12 @@
 
 const struct ip		 ip = {
 	"sndfile",
+	IP_PRIORITY_SNDFILE,
 	ip_sndfile_extensions,
 	ip_sndfile_close,
 	ip_sndfile_get_metadata,
 	ip_sndfile_get_position,
+	NULL,
 	ip_sndfile_open,
 	ip_sndfile_read,
 	ip_sndfile_seek
@@ -94,12 +87,11 @@
 
 	ipd = t->ipdata;
 
-	(void)sf_close(ipd->sffp);
-	free(ipd->buf);
+	sf_close(ipd->sffp);
 	free(ipd);
 }
 
-static int
+static void
 ip_sndfile_get_metadata(struct track *t)
 {
 	SNDFILE		*sffp;
@@ -110,7 +102,7 @@
 	if ((fd = open(t->path, O_RDONLY)) == -1) {
 		LOG_ERR("open: %s", t->path);
 		msg_err("%s: Cannot open track", t->path);
-		return -1;
+		return;
 	}
 
 	sfinfo.format = 0;
@@ -118,14 +110,16 @@
 		LOG_ERRX("sf_open_fd: %s: %s", t->path, sf_strerror(sffp));
 		msg_errx("%s: Cannot open track: %s", t->path,
 		    sf_strerror(sffp));
-		(void)close(fd);
-		return -1;
+		close(fd);
+		return;
 	}
 
 	if ((value = sf_get_string(sffp, SF_STR_ALBUM)) != NULL)
 		t->album = xstrdup(value);
 	if ((value = sf_get_string(sffp, SF_STR_ARTIST)) != NULL)
 		t->artist = xstrdup(value);
+	if ((value = sf_get_string(sffp, SF_STR_COMMENT)) != NULL)
+		t->comment = xstrdup(value);
 	if ((value = sf_get_string(sffp, SF_STR_DATE)) != NULL)
 		t->date = xstrdup(value);
 #ifdef HAVE_SF_STR_GENRE
@@ -139,14 +133,10 @@
 		t->tracknumber = xstrdup(value);
 #endif
 
-	if (sfinfo.frames < 0 || sfinfo.samplerate <= 0)
-		t->duration = 0;
-	else
+	if (sfinfo.frames > 0 && sfinfo.samplerate > 0)
 		t->duration = sfinfo.frames / sfinfo.samplerate;
 
-	(void)sf_close(sffp);
-
-	return 0;
+	sf_close(sffp);
 }
 
 static int
@@ -156,11 +146,10 @@
 
 	ipd = t->ipdata;
 
-	if (ipd->sfinfo.channels <= 0 || ipd->sfinfo.samplerate <= 0)
+	if (t->format.nchannels == 0 || t->format.rate == 0)
 		*pos = 0;
 	else
-		*pos = (unsigned int)(ipd->position / ipd->sfinfo.channels /
-		    ipd->sfinfo.samplerate);
+		*pos = ipd->position / t->format.nchannels / t->format.rate;
 
 	return 0;
 }
@@ -169,7 +158,8 @@
 ip_sndfile_open(struct track *t)
 {
 	struct ip_sndfile_ipdata *ipd;
-	int fd;
+	SF_INFO	sfinfo;
+	int	fd;
 
 	if ((fd = open(t->path, O_RDONLY)) == -1) {
 		LOG_ERR("open: %s", t->path);
@@ -178,66 +168,68 @@
 	}
 
 	ipd = xmalloc(sizeof *ipd);
+	ipd->position = 0;
 
-	ipd->sfinfo.format = 0;
-	if ((ipd->sffp = sf_open_fd(fd, SFM_READ, &ipd->sfinfo, SF_TRUE)) ==
-	    NULL) {
+	sfinfo.format = 0;
+	if ((ipd->sffp = sf_open_fd(fd, SFM_READ, &sfinfo, SF_TRUE)) == NULL) {
 		LOG_ERRX("sf_open_fd: %s: %s", t->path,
 		    sf_strerror(ipd->sffp));
 		msg_errx("%s: Cannot open track: %s", t->path,
 		    sf_strerror(ipd->sffp));
 		free(ipd);
-		(void)close(fd);
+		close(fd);
 		return -1;
 	}
 
-	t->format.nbits = 16;
-	t->format.nchannels = ipd->sfinfo.channels;
-	t->format.rate = ipd->sfinfo.samplerate;
+	switch (sfinfo.format & SF_FORMAT_SUBMASK) {
+	case SF_FORMAT_DPCM_8:
+	case SF_FORMAT_PCM_S8:
+	case SF_FORMAT_PCM_U8:
+	case SF_FORMAT_DPCM_16:
+	case SF_FORMAT_DWVW_12:
+	case SF_FORMAT_DWVW_16:
+	case SF_FORMAT_PCM_16:
+		t->format.nbits = 16;
+		break;
+	default:
+		t->format.nbits = 32;
+		break;
+	}
 
-	ipd->buf = xcalloc(IP_SNDFILE_BUFSIZE, sizeof *ipd->buf);
-	ipd->bufidx = 0;
-	ipd->buflen = 0;
-	ipd->position = 0;
+	t->format.nchannels = sfinfo.channels;
+	t->format.rate = sfinfo.samplerate;
 
 	t->ipdata = ipd;
 	return 0;
 }
 
 static int
-ip_sndfile_read(struct track *t, int16_t *samples, size_t maxsamples)
+ip_sndfile_read(struct track *t, struct sample_buffer *sb)
 {
 	struct ip_sndfile_ipdata *ipd;
-	size_t nsamples;
 
 	ipd = t->ipdata;
 
-	for (nsamples = 0; nsamples < maxsamples; nsamples++) {
-		if (ipd->bufidx == ipd->buflen) {
-			/* Fill the buffer. */
-			ipd->bufidx = 0;
-			ipd->buflen = sf_read_short(ipd->sffp, ipd->buf,
-			    IP_SNDFILE_BUFSIZE);
-
-			/* Check for error. */
-			if (sf_error(ipd->sffp) != SF_ERR_NO_ERROR) {
-				LOG_ERRX("sf_read_short: %s: %s", t->path,
-				    sf_strerror(ipd->sffp));
-				msg_errx("%s: Cannot read from track: %s",
-				    t->path, sf_strerror(ipd->sffp));
-				return -1;
-			}
-
-			/* Check for EOF. */
-			if (ipd->buflen == 0)
-				break;
-		}
-
-		samplesnsamples = (int16_t)ipd->bufipd->bufidx++;
+	/*
+	 * Assume, like libsndfile does, that short ints and ints always are 2
+	 * and 4 bytes long, respectively.
+	 */
+	if (sb->nbytes == 2)
+		sb->len_s = sf_read_short(ipd->sffp, (short int *)sb->data2,
+		    sb->size_s);
+	else
+		sb->len_s = sf_read_int(ipd->sffp, (int *)sb->data4,
+		    sb->size_s);
+
+	if (sf_error(ipd->sffp) != SF_ERR_NO_ERROR) {
+		LOG_ERRX("sf_read_*: %s: %s", t->path, sf_strerror(ipd->sffp));
+		msg_errx("Cannot read from track: %s", sf_strerror(ipd->sffp));
+		return -1;
 	}
 
-	ipd->position += nsamples;
-	return (int)nsamples;
+	ipd->position += sb->len_s;
+	sb->len_b = sb->len_s * sb->nbytes;
+	return sb->len_s != 0;
 }
 
 static void
@@ -248,15 +240,11 @@
 
 	ipd = t->ipdata;
 
-	seekframe = (sf_count_t)pos * ipd->sfinfo.samplerate;
-	if ((frame = sf_seek(ipd->sffp, seekframe, SEEK_SET)) == -1) {
+	seekframe = pos * t->format.rate;
+	if ((frame = sf_seek(ipd->sffp, seekframe, SEEK_SET)) >= 0)
+		ipd->position = frame * t->format.nchannels;
+	else {
 		LOG_ERRX("sf_seek: %s: %s", t->path, sf_strerror(ipd->sffp));
 		msg_errx("Cannot seek: %s", sf_strerror(ipd->sffp));
-	} else {
-		ipd->position = frame * ipd->sfinfo.channels;
-
-		/* Discard buffered samples from the old position. */
-		ipd->bufidx = 0;
-		ipd->buflen = 0;
 	}
 }

siren-0.2.tar.gz/ip/vorbis.c -> siren-0.7.tar.gz/ip/vorbis.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,41 +20,33 @@
  */
 #define OV_EXCLUDE_STATIC_CALLBACKS
 
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
 
 #include <vorbis/vorbisfile.h>
 
 #include "../siren.h"
 
-#define IP_VORBIS_BUFSIZE 4096
-
-struct ip_vorbis_ipdata {
-	OggVorbis_File	 ovf;
-	char		*buf;
-	unsigned int	 bufidx;
-	unsigned int	 buflen;
-};
-
 static void		 ip_vorbis_close(struct track *);
 static const char	*ip_vorbis_error(int);
-static int		 ip_vorbis_get_metadata(struct track *);
+static void		 ip_vorbis_get_metadata(struct track *);
 static int		 ip_vorbis_get_position(struct track *,
 			    unsigned int *);
 static int		 ip_vorbis_open(struct track *);
-static int		 ip_vorbis_read(struct track *, int16_t *, size_t);
+static int		 ip_vorbis_read(struct track *,
+			    struct sample_buffer *);
 static void		 ip_vorbis_seek(struct track *, unsigned int);
 
 static const char	*ip_vorbis_extensions = { "oga", "ogg", NULL };
 
 const struct ip		 ip = {
 	"vorbis",
+	IP_PRIORITY_VORBIS,
 	ip_vorbis_extensions,
 	ip_vorbis_close,
 	ip_vorbis_get_metadata,
 	ip_vorbis_get_position,
+	NULL,
 	ip_vorbis_open,
 	ip_vorbis_read,
 	ip_vorbis_seek
@@ -63,20 +55,19 @@
 static void
 ip_vorbis_close(struct track *t)
 {
-	struct ip_vorbis_ipdata *ipd;
+	OggVorbis_File *ovf;
 
-	ipd = t->ipdata;
-	(void)ov_clear(&ipd->ovf);
-	free(ipd->buf);
-	free(ipd);
+	ovf = t->ipdata;
+	ov_clear(ovf);
+	free(ovf);
 }
 
 static const char *
 ip_vorbis_error(int errnum)
 {
 	/*
-	 * See <http://www.xiph.org/vorbis/doc/vorbis-errors.txt> and
-	 * <http://www.xiph.org/vorbis/doc/libvorbis/return.html>.
+	 * See <https://www.xiph.org/vorbis/doc/vorbis-errors.txt> and
+	 * <https://www.xiph.org/vorbis/doc/libvorbis/return.html>.
 	 */
 	switch (errnum) {
 	case OV_EOF:
@@ -112,101 +103,76 @@
 	}
 }
 
-static int
+static void
 ip_vorbis_get_metadata(struct track *t)
 {
-	OggVorbis_File	  ovf;
-	vorbis_comment	 *vc;
-	FILE		 *fp;
-	double		  duration;
-	int		  ret;
-	char		**c;
+	OggVorbis_File	 ovf;
+	vorbis_comment	*vc;
+	FILE		*fp;
+	double		 duration;
+	int		 i, ret;
 
 	if ((fp = fopen(t->path, "r")) == NULL) {
 		LOG_ERR("fopen: %s", t->path);
 		msg_err("%s: Cannot open track", t->path);
-		return -1;
+		return;
 	}
 
 	if ((ret = ov_open(fp, &ovf, NULL, 0)) != 0) {
 		LOG_ERRX("ov_open: %s: %s", t->path, ip_vorbis_error(ret));
 		msg_errx("%s: Cannot open track: %s", t->path,
 		    ip_vorbis_error(ret));
-		return -1;
+		fclose(fp);
+		return;
 	}
 
 	if ((vc = ov_comment(&ovf, -1)) == NULL) {
 		LOG_ERRX("%s: ov_comment() failed", t->path);
 		msg_errx("%s: Cannot get Vorbis comments", t->path);
-		(void)ov_clear(&ovf);
-		return -1;
+		ov_clear(&ovf);
+		return;
 	}
 
-	/*
-	 * A comment field may appear more than once, so we always have to free
-	 * the previous field value before setting a new one.
-	 */
-	for (c = vc->user_comments; *c != NULL; c++)
-		if (!strncasecmp(*c, "album=", 6)) {
-			free(t->album);
-			t->album = xstrdup(*c + 6);
-		} else if (!strncasecmp(*c, "artist=", 7)) {
-			free(t->artist);
-			t->artist = xstrdup(*c + 7);
-		} else if (!strncasecmp(*c, "date=", 5)) {
-			free(t->date);
-			t->date = xstrdup(*c + 5);
-		} else if (!strncasecmp(*c, "genre=", 6)) {
-			free(t->genre);
-			t->genre = xstrdup(*c + 6);
-		} else if (!strncasecmp(*c, "title=", 6)) {
-			free(t->title);
-			t->title = xstrdup(*c + 6);
-		} else if (!strncasecmp(*c, "tracknumber=", 12)) {
-			free(t->tracknumber);
-			t->tracknumber = xstrdup(*c + 12);
-		}
-
-	if ((duration = ov_time_total(&ovf, -1)) == OV_EINVAL) {
+	for (i = 0; i < vc->comments; i++)
+		track_copy_vorbis_comment(t, vc->user_commentsi);
+
+	if ((duration = ov_time_total(&ovf, -1)) != OV_EINVAL)
+		t->duration = duration;
+	else {
 		LOG_ERRX("%s: ov_time_total() failed", t->path);
 		msg_errx("%s: Cannot get track duration", t->path);
-		(void)ov_clear(&ovf);
-		return -1;
 	}
 
-	t->duration = (unsigned int)duration;
-
-	(void)ov_clear(&ovf);
-	return 0;
+	ov_clear(&ovf);
 }
 
 static int
 ip_vorbis_get_position(struct track *t, unsigned int *pos)
 {
-	struct ip_vorbis_ipdata *ipd;
-	double ret;
+	OggVorbis_File	*ovf;
+	double		 ret;
 
-	ipd = t->ipdata;
-	if ((ret = ov_time_tell(&ipd->ovf)) == OV_EINVAL) {
+	ovf = t->ipdata;
+	if ((ret = ov_time_tell(ovf)) == OV_EINVAL) {
 		LOG_ERRX("ov_time_tell: %s: %s", t->path,
-		    ip_vorbis_error((int)ret));
+		    ip_vorbis_error(ret));
 		msg_errx("Cannot get track position: %s",
-		    ip_vorbis_error((int)ret));
+		    ip_vorbis_error(ret));
 		*pos = 0;
 		return -1;
 	}
 
-	*pos = (unsigned int)ret;
+	*pos = ret;
 	return 0;
 }
 
 static int
 ip_vorbis_open(struct track *t)
 {
-	struct ip_vorbis_ipdata	*ipd;
-	vorbis_info		*info;
-	FILE			*fp;
-	int			 ret;
+	OggVorbis_File	*ovf;
+	vorbis_info	*info;
+	FILE		*fp;
+	int		 ret;
 
 	if ((fp = fopen(t->path, "r")) == NULL) {
 		LOG_ERR("fopen: %s", t->path);
@@ -214,89 +180,66 @@
 		return -1;
 	}
 
-	ipd = xmalloc(sizeof *ipd);
+	ovf = xmalloc(sizeof *ovf);
 
-	if ((ret = ov_open(fp, &ipd->ovf, NULL, 0)) != 0) {
+	if ((ret = ov_open(fp, ovf, NULL, 0)) != 0) {
 		LOG_ERRX("ov_open: %s: %s", t->path, ip_vorbis_error(ret));
 		msg_errx("%s: Cannot open track: %s", t->path,
 		    ip_vorbis_error(ret));
-		free(ipd);
+		fclose(fp);
+		free(ovf);
 		return -1;
 	}
 
-	if ((info = ov_info(&ipd->ovf, -1)) == NULL) {
+	if ((info = ov_info(ovf, -1)) == NULL) {
 		LOG_ERRX("%s: ov_info() failed", t->path);
 		msg_errx("%s: Cannot get bitstream information", t->path);
-		(void)ov_clear(&ipd->ovf);
-		free(ipd);
+		ov_clear(ovf);
+		free(ovf);
 		return -1;
 	}
 
 	t->format.nbits = 16;
-	t->format.nchannels = (unsigned int)info->channels;
-	t->format.rate = (unsigned int)info->rate;
+	t->format.nchannels = info->channels;
+	t->format.rate = info->rate;
 
-	ipd->buf = xcalloc(IP_VORBIS_BUFSIZE, sizeof *ipd->buf);
-	ipd->bufidx = 0;
-	ipd->buflen = 0;
-
-	t->ipdata = ipd;
+	t->ipdata = ovf;
 	return 0;
 }
 
 static int
-ip_vorbis_read(struct track *t, int16_t *samples, size_t maxsamples)
+ip_vorbis_read(struct track *t, struct sample_buffer *sb)
 {
-	struct ip_vorbis_ipdata *ipd;
-	size_t nsamples;
-	int ret, stream;
-
-	ipd = t->ipdata;
-
-	for (nsamples = 0; nsamples < maxsamples; nsamples++) {
-		if (ipd->bufidx + 1 >= ipd->buflen) {
-			/* Fill buffer. */
-			for (;;) {
-				ret = (int)ov_read(&ipd->ovf, ipd->buf,
-				    IP_VORBIS_BUFSIZE, 1, 2, 1, &stream);
-				if (ret == OV_HOLE)
-					LOG_ERRX("ov_read: %s: %s", t->path,
-					    ip_vorbis_error(ret));
-				else
-					break;
-			}
-
-			if (ret == 0)
-				break;
-			if (ret < 0) {
-				LOG_ERRX("ov_read: %s: %s", t->path,
-				    ip_vorbis_error(ret));
-				msg_errx("%s: Cannot read from track: %s",
-				    t->path, ip_vorbis_error(ret));
-				return -1;
-			}
-
-			ipd->bufidx = 0;
-			ipd->buflen = (unsigned int)ret;
-		}
-
-		samplesnsamples =
-		    (int16_t)((unsigned char)ipd->bufipd->bufidx << 8 |
-		    (unsigned char)ipd->bufipd->bufidx + 1);
-		ipd->bufidx += 2;
+	OggVorbis_File	*ovf;
+	int		 endian, ret, stream;
+
+	ovf = t->ipdata;
+	endian = t->format.byte_order == BYTE_ORDER_BIG;
+	sb->len_b = 0;
+
+	do
+		ret = ov_read(ovf, (char *)sb->data + sb->len_b,
+		    sb->size_b - sb->len_b, endian, 2, 1, &stream);
+	while (ret > 0 && (sb->len_b += ret) < sb->size_b);
+
+	if (ret < 0) {
+		LOG_ERRX("ov_read: %s: %s", t->path, ip_vorbis_error(ret));
+		msg_errx("Cannot read from track: %s", ip_vorbis_error(ret));
+		return -1;
 	}
 
-	return (int)nsamples;
+	sb->len_s = sb->len_b / sb->nbytes;
+	return sb->len_b != 0;
 }
 
 static void
 ip_vorbis_seek(struct track *t, unsigned int sec)
 {
-	struct ip_vorbis_ipdata *ipd;
-	int ret;
+	OggVorbis_File	*ovf;
+	int		 ret;
 
-	ipd = t->ipdata;
-	if ((ret = ov_time_seek_lap(&ipd->ovf, sec)) != 0) {
+	ovf = t->ipdata;
+	if ((ret = ov_time_seek_lap(ovf, sec)) != 0) {
 		LOG_ERRX("ov_time_seek_lap: %s: %s", t->path,
 		    ip_vorbis_error(ret));
 		msg_errx("Cannot seek: %s", ip_vorbis_error(ret));

siren-0.2.tar.gz/ip/wavpack.c -> siren-0.7.tar.gz/ip/wavpack.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2012 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,6 +19,7 @@
  * channel" (i.e. a frame).
  */
 
+#include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,36 +28,38 @@
 
 #include "../siren.h"
 
-#define IP_WAVPACK_BUFSIZE	2048
+#define IP_WAVPACK_BUFSIZE	2048	/* Buffer size, in frames */
 #define IP_WAVPACK_ERRSTRLEN	80	/* As per the documentation */
 
 struct ip_wavpack_ipdata {
 	WavpackContext	*wpc;
 	int		 float_samples;
 	int32_t		*buf;
-	uint32_t	 bufsize;	/* Buffer size, in frames */
 	uint32_t	 bufidx;	/* Current sample */
 	uint32_t	 buflen;	/* Buffer length, in samples */
 };
 
 static void		 ip_wavpack_close(struct track *);
-static int		 ip_wavpack_get_metadata(struct track *);
+static void		 ip_wavpack_get_metadata(struct track *);
 static int		 ip_wavpack_get_position(struct track *,
 			    unsigned int *);
-static char		*ip_wavpack_get_tag_item_value(WavpackContext *,
+static char		*ip_wavpack_get_tag_item(WavpackContext *,
 			    const char *);
 static int		 ip_wavpack_open(struct track *);
-static int		 ip_wavpack_read(struct track *, int16_t *, size_t);
+static int		 ip_wavpack_read(struct track *,
+			    struct sample_buffer *);
 static void		 ip_wavpack_seek(struct track *, unsigned int);
 
 static const char	*ip_wavpack_extensions = { "wv", NULL };
 
 const struct ip		 ip = {
 	"wavpack",
+	IP_PRIORITY_WAVPACK,
 	ip_wavpack_extensions,
 	ip_wavpack_close,
 	ip_wavpack_get_metadata,
 	ip_wavpack_get_position,
+	NULL,
 	ip_wavpack_open,
 	ip_wavpack_read,
 	ip_wavpack_seek
@@ -68,92 +71,64 @@
 	struct ip_wavpack_ipdata *ipd;
 
 	ipd = t->ipdata;
-	(void)WavpackCloseFile(ipd->wpc);
+	WavpackCloseFile(ipd->wpc);
 	free(ipd->buf);
 	free(ipd);
 }
 
-/*
- * Perform a rudimentary conversion of a 32-bit IEEE 754 floating-point value
- * between -1 and 1 to an integral value between -32767 and 32767.
- */
-
-#define IP_WAVPACK_FLOAT_SIGN(flt)	((flt) & 0x80000000)
-#define IP_WAVPACK_FLOAT_EXP(flt)	(((flt) & 0x7f800000) >> 23)
-#define IP_WAVPACK_FLOAT_FRAC(flt)	((flt) & 0x007fffff)
-
-static int16_t
-ip_wavpack_float_to_int(int32_t flt)
-{
-	int32_t exp, frac;
-
-	exp = IP_WAVPACK_FLOAT_EXP(flt);
-	frac = IP_WAVPACK_FLOAT_FRAC(flt);
-
-	/* Handle the value 0. */
-	if (exp == 0 && frac == 0)
-		return 0;
-
-	/* Unbias the exponent. */
-	exp -= 127;
-
-	/* Handle the values -1 or less and 1 or greater. */
-	if (exp >= 0) {
-		if (IP_WAVPACK_FLOAT_SIGN(flt))
-			return -INT16_MAX;
-		else
-			return INT16_MAX;
-	}
-
-	/* Add the implicit 24th bit. */
-	frac |= 1 << 23;
-
-	/* Perform exponentiation. */
-	frac >>= -exp;
-
-	/* There is room only for 16 bits, so discard the 8 LSBs. */
-	frac >>= 8;
-
-	if (IP_WAVPACK_FLOAT_SIGN(flt))
-		frac = -frac;
-
-	return (int16_t)frac;
-}
-
-static int
+static void
 ip_wavpack_get_metadata(struct track *t)
 {
 	WavpackContext	*wpc;
 	uint32_t	 nframes, rate;
-	char		 errstrIP_WAVPACK_ERRSTRLEN;
+	char		 errstrIP_WAVPACK_ERRSTRLEN, *val;
 
 	wpc = WavpackOpenFileInput(t->path, errstr, OPEN_TAGS, 0);
 	if (wpc == NULL) {
 		LOG_ERRX("WavpackOpenFileInput: %s: %s", t->path, errstr);
 		msg_errx("%s: Cannot open track: %s", t->path, errstr);
-		return -1;
+		return;
 	}
 
-	t->album = ip_wavpack_get_tag_item_value(wpc, "album");
-	t->artist = ip_wavpack_get_tag_item_value(wpc, "artist");
-	t->date = ip_wavpack_get_tag_item_value(wpc, "year");
-	t->genre = ip_wavpack_get_tag_item_value(wpc, "genre");
-	t->title = ip_wavpack_get_tag_item_value(wpc, "title");
-	t->tracknumber = ip_wavpack_get_tag_item_value(wpc, "track");
+	t->album = ip_wavpack_get_tag_item(wpc, "album");
+	t->artist = ip_wavpack_get_tag_item(wpc, "artist");
+	t->comment = ip_wavpack_get_tag_item(wpc, "comment");
+	t->date = ip_wavpack_get_tag_item(wpc, "year");
+	t->genre = ip_wavpack_get_tag_item(wpc, "genre");
+	t->title = ip_wavpack_get_tag_item(wpc, "title");
+
+	val = ip_wavpack_get_tag_item(wpc, "track");
+	if (val != NULL) {
+		track_split_tag(val, &t->tracknumber, &t->tracktotal);
+		free(val);
+	}
+
+	/*
+	 * APEv2 doesn't have a standard key for the disc number. Try the
+	 * "disc" and "part" keys.
+	 */
+	val = ip_wavpack_get_tag_item(wpc, "disc");
+	if (val == NULL)
+		val = ip_wavpack_get_tag_item(wpc, "part");
+	if (val != NULL) {
+		track_split_tag(val, &t->discnumber, &t->disctotal);
+		free(val);
+	}
 
-	/* The track number may be of the form "x/y". Ignore the "/y" part. */
-	if (t->tracknumber != NULL)
-		t->tracknumberstrcspn(t->tracknumber, "/") = '\0';
+	/*
+	 * APEv2 doesn't have a standard key for the album artist. Try the
+	 * "albumartist" and "album artist" keys.
+	 */
+	t->albumartist = ip_wavpack_get_tag_item(wpc, "albumartist");
+	if (t->albumartist == NULL)
+		t->albumartist = ip_wavpack_get_tag_item(wpc, "album artist");
 
 	nframes = WavpackGetNumSamples(wpc);
 	rate = WavpackGetSampleRate(wpc);
-	if (nframes == (uint32_t)-1 || rate == 0)
-		t->duration = 0;
-	else
+	if (nframes != (uint32_t)-1 && rate != 0)
 		t->duration = nframes / rate;
 
-	(void)WavpackCloseFile(wpc);
-	return 0;
+	WavpackCloseFile(wpc);
 }
 
 static int
@@ -173,17 +148,19 @@
  * Return the value of the APEv2 or ID3v1 tag item with the specified key.
  */
 static char *
-ip_wavpack_get_tag_item_value(WavpackContext *wpc, const char *key)
+ip_wavpack_get_tag_item(WavpackContext *wpc, const char *key)
 {
 	int	 len;
 	char	*value;
 
 	len = WavpackGetTagItem(wpc, key, NULL, 0);
-	if (len == 0)
+	if (len <= 0)
 		value = NULL;
 	else {
-		value = xmalloc(len + 1);
-		(void)WavpackGetTagItem(wpc, key, value, len + 1);
+		if (len < INT_MAX)
+			len++;
+		value = xmalloc(len);
+		WavpackGetTagItem(wpc, key, value, len);
 	}
 
 	return value;
@@ -208,7 +185,7 @@
 	float_samples = WavpackGetMode(wpc) & MODE_FLOAT;
 	if (float_samples)
 		t->format.nbits = 16;
-	else {
+	else
 		/*
 		 * WavPack aligns samples whose bit depth is not a multiple of
 		 * 8 on the MSB rather than the LSB. Therefore, determine the
@@ -216,17 +193,6 @@
 		 */
 		t->format.nbits = 8 * WavpackGetBytesPerSample(wpc);
 
-		/* Only 16-bit samples or less are supported at the moment. */
-		if (t->format.nbits > 16) {
-			LOG_ERRX("%s: %d bits per sample not supported",
-			    t->path, t->format.nbits);
-			msg_errx("%s: %d bits per sample not supported",
-			    t->path, t->format.nbits);
-			(void)WavpackCloseFile(wpc);
-			return -1;
-		}
-	}
-
 	t->format.nchannels = WavpackGetNumChannels(wpc);
 	t->format.rate = WavpackGetSampleRate(wpc);
 
@@ -235,48 +201,61 @@
 	ipd->float_samples = float_samples;
 	ipd->bufidx = 0;
 	ipd->buflen = 0;
-	ipd->bufsize = IP_WAVPACK_BUFSIZE;
-	ipd->buf = xcalloc(ipd->bufsize * t->format.nchannels,
-	    sizeof *ipd->buf);
+	ipd->buf = xreallocarray(NULL,
+	    IP_WAVPACK_BUFSIZE * t->format.nchannels, sizeof *ipd->buf);
 
 	t->ipdata = ipd;
 	return 0;
 }
 
 static int
-ip_wavpack_read(struct track *t, int16_t *samples, size_t maxsamples)
+ip_wavpack_read(struct track *t, struct sample_buffer *sb)
 {
 	struct ip_wavpack_ipdata	*ipd;
 	uint32_t			 ret;
-	size_t				 i;
+	float				 f;
 
 	ipd = t->ipdata;
 
-	for (i = 0; i < maxsamples; i++) {
+	for (sb->len_s = 0; sb->len_s < sb->size_s; sb->len_s++) {
 		if (ipd->bufidx == ipd->buflen) {
 			ret = WavpackUnpackSamples(ipd->wpc, ipd->buf,
-			    ipd->bufsize);
+			    IP_WAVPACK_BUFSIZE);
 			if (ret == 0)
 				/* EOF reached. */
 				break;
-
-			/*
-			 * WavpackUnpackSamples() returns the number of frames
-			 * read. We need the number of samples read, so
-			 * multiply by the number of channels.
-			 */
 			ipd->buflen = ret * t->format.nchannels;
 			ipd->bufidx = 0;
 		}
 
-		if (ipd->float_samples)
-			samplesi =
-			    ip_wavpack_float_to_int(ipd->bufipd->bufidx++);
-		else
-			samplesi = (int16_t)ipd->bufipd->bufidx++;
+		if (!ipd->float_samples)
+			switch (sb->nbytes) {
+			case 1:
+				sb->data1sb->len_s = ipd->bufipd->bufidx;
+				break;
+			case 2:
+				sb->data2sb->len_s = ipd->bufipd->bufidx;
+				break;
+			case 4:
+				sb->data4sb->len_s = ipd->bufipd->bufidx;
+				break;
+			}
+		else {
+			/* We assume floats use IEEE 754 representation. */
+			f = *(float *)&ipd->bufipd->bufidx * -INT16_MIN;
+			if (f < INT16_MIN)
+				sb->data2sb->len_s = INT16_MIN;
+			else if (f > INT16_MAX)
+				sb->data2sb->len_s = INT16_MAX;
+			else
+				sb->data2sb->len_s = f;
+		}
+
+		ipd->bufidx++;
 	}
 
-	return (int)i;
+	sb->len_b = sb->len_s * sb->nbytes;
+	return sb->len_s != 0;
 }
 
 static void

siren-0.2.tar.gz/library.c -> siren-0.7.tar.gz/library.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,17 +20,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "siren.h"
 
-static void		 library_free_entry(void *);
-static void		 library_get_entry_text(const void *, char *, size_t);
 static int		 library_search_entry(const void *, const char *);
 
 static pthread_mutex_t	 library_menu_mtx = PTHREAD_MUTEX_INITIALIZER;
+static struct format	*library_altformat;
 static struct format	*library_format;
 static struct menu	*library_menu;
 static unsigned int	 library_duration;
+static int		 library_modified;
 
 void
 library_activate_entry(void)
@@ -44,11 +45,11 @@
 	if ((e = menu_get_selected_entry(library_menu)) != NULL) {
 		menu_activate_entry(library_menu, e);
 		t = menu_get_entry_data(e);
-		track_hold(t);
 	}
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
 
 	if (t != NULL) {
+		player_set_source(PLAYER_SOURCE_LIBRARY);
 		player_play_track(t);
 		library_print();
 	}
@@ -67,18 +68,13 @@
 	}
 
 	while ((de = dir_get_entry(d)) != NULL) {
-		if (errno) {
-			msg_err("%s", de->path);
-			continue;
-		}
-
 		switch (de->type) {
 		case FILE_TYPE_DIRECTORY:
 			if (strcmp(de->name, ".") && strcmp(de->name, ".."))
 				library_add_dir(de->path);
 			break;
 		case FILE_TYPE_REGULAR:
-			if ((t = track_init(de->path, NULL)) != NULL)
+			if ((t = track_get(de->path, NULL)) != NULL)
 				library_add_track(t);
 			break;
 		default:
@@ -87,9 +83,6 @@
 		}
 	}
 
-	if (errno)
-		msg_err("%s", path);
-
 	dir_close(d);
 }
 
@@ -112,6 +105,7 @@
 		menu_insert_tail(library_menu, t);
 
 	library_duration += t->duration;
+	library_modified = 1;
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
 	library_print();
 }
@@ -125,10 +119,8 @@
 		return;
 
 	XPTHREAD_MUTEX_LOCK(&library_menu_mtx);
-	if ((t = menu_get_selected_entry_data(library_menu)) != NULL) {
-		track_hold(t);
+	if ((t = menu_get_selected_entry_data(library_menu)) != NULL)
 		view_add_track(view, t);
-	}
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
 }
 
@@ -138,6 +130,7 @@
 	XPTHREAD_MUTEX_LOCK(&library_menu_mtx);
 	menu_remove_all_entries(library_menu);
 	library_duration = 0;
+	library_modified = 1;
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
 	library_print();
 }
@@ -151,8 +144,9 @@
 	XPTHREAD_MUTEX_LOCK(&library_menu_mtx);
 	if ((e = menu_get_selected_entry(library_menu)) != NULL) {
 		t = menu_get_entry_data(e);
-		library_duration -= t->duration;
 		menu_remove_selected_entry(library_menu);
+		library_duration -= t->duration;
+		library_modified = 1;
 	}
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
 	library_print();
@@ -161,17 +155,10 @@
 void
 library_end(void)
 {
-	(void)library_write_file();
-	menu_free(library_menu);
-}
+	if (library_modified)
+		library_write_file();
 
-static void
-library_free_entry(void *e)
-{
-	struct track *t;
-
-	t = e;
-	track_free(t);
+	menu_free(library_menu);
 }
 
 static void
@@ -180,7 +167,8 @@
 	const struct track *t;
 
 	t = e;
-	format_track_snprintf(buf, bufsize, library_format, t);
+	format_track_snprintf(buf, bufsize, library_format, library_altformat,
+	    t);
 }
 
 struct track *
@@ -202,7 +190,6 @@
 		else {
 			menu_activate_entry(library_menu, me);
 			t = menu_get_entry_data(me);
-			track_hold(t);
 		}
 	}
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
@@ -229,7 +216,6 @@
 		else {
 			menu_activate_entry(library_menu, me);
 			t = menu_get_entry_data(me);
-			track_hold(t);
 		}
 	}
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
@@ -240,7 +226,7 @@
 void
 library_init(void)
 {
-	library_menu = menu_init(library_free_entry, library_get_entry_text,
+	library_menu = menu_init(NULL, library_get_entry_text,
 	    library_search_entry);
 }
 
@@ -259,6 +245,7 @@
 	    MSECS(library_duration));
 	option_lock();
 	library_format = option_get_format("library-format");
+	library_altformat = option_get_format("library-format-alt");
 	menu_print(library_menu);
 	option_unlock();
 	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
@@ -267,12 +254,14 @@
 void
 library_read_file(void)
 {
-	struct track	*t;
-	FILE		*fp;
-	size_t		 len, lineno;
-	char		*buf, *file, *lbuf;
+	struct menu_entry	*e;
+	struct track		*et, *t;
+	FILE			*fp;
+	size_t			 len;
+	time_t			 lasttime;
+	char			*buf, *file, *lbuf;
 
-	file = conf_path(LIBRARY_FILE);
+	file = conf_get_path(LIBRARY_FILE);
 	if ((fp = fopen(file, "r")) == NULL) {
 		if (errno != ENOENT) {
 			LOG_ERR("fopen: %s", file);
@@ -282,8 +271,9 @@
 		return;
 	}
 
+	lasttime = time(NULL);
 	lbuf = NULL;
-	for (lineno = 1; (buf = fgetln(fp, &len)) != NULL; lineno++) {
+	while ((buf = fgetln(fp, &len)) != NULL) {
 		if (buflen - 1 != '\n') {
 			lbuf = xmalloc(len + 1);
 			buf = memcpy(lbuf, buf, len++);
@@ -291,12 +281,28 @@
 		buflen - 1 = '\0';
 
 		if (buf0 != '/') {
-			LOG_ERRX("%s:%zu: invalid entry", file, lineno);
+			LOG_ERRX("%s: %s: invalid entry", file, buf);
 			continue;
 		}
 
-		if ((t = track_init(buf, NULL)) != NULL)
-			library_add_track(t);
+		if ((t = track_require(buf)) == NULL)
+			continue;
+
+		MENU_FOR_EACH_ENTRY_REVERSE(library_menu, e) {
+			et = menu_get_entry_data(e);
+			if (track_cmp(t, et) > 0) {
+				menu_insert_after(library_menu, e, t);
+				break;
+			}
+		}
+		if (e == NULL)
+			menu_insert_head(library_menu, t);
+		library_duration += t->duration;
+
+		if (time(NULL) > lasttime) {
+			library_print();
+			lasttime = time(NULL);
+		}
 	}
 	if (ferror(fp)) {
 		LOG_ERR("fgetln: %s", file);
@@ -305,7 +311,9 @@
 	free(lbuf);
 	free(file);
 
-	(void)fclose(fp);
+	fclose(fp);
+
+	library_print();
 }
 
 void
@@ -326,6 +334,15 @@
 	library_print();
 }
 
+static int
+library_search_entry(const void *e, const char *search)
+{
+	const struct track *t;
+
+	t = e;
+	return track_search(t, search);
+}
+
 void
 library_search_next(const char *search)
 {
@@ -344,15 +361,6 @@
 	library_print();
 }
 
-static int
-library_search_entry(const void *e, const char *search)
-{
-	const struct track *t;
-
-	t = e;
-	return track_search(t, search);
-}
-
 void
 library_select_active_entry(void)
 {
@@ -398,6 +406,42 @@
 	library_print();
 }
 
+/* Resort the tracks and recalculate the duration. */
+void
+library_update(void)
+{
+	struct menu_entry	*be, *e, *ne, *pe;
+	struct track		*pt, *t;
+
+	XPTHREAD_MUTEX_LOCK(&library_menu_mtx);
+
+	library_duration = 0;
+
+	e = menu_get_first_entry(library_menu);
+	while (e != NULL) {
+		t = menu_get_entry_data(e);
+		library_duration += t->duration;
+
+		ne = menu_get_next_entry(e);
+
+		be = NULL;
+		pe = e;
+		while ((pe = menu_get_prev_entry(pe)) != NULL) {
+			pt = menu_get_entry_data(pe);
+			if (track_cmp(t, pt) < 0)
+				be = pe;
+			else
+				break;
+		}
+		if (be != NULL)
+			menu_move_entry_before(library_menu, be, e);
+
+		e = ne;
+	}
+
+	XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
+}
+
 int
 library_write_file(void)
 {
@@ -407,7 +451,7 @@
 	int			 ret;
 	char			*file;
 
-	file = conf_path(LIBRARY_FILE);
+	file = conf_get_path(LIBRARY_FILE);
 	if ((fp = fopen(file, "w")) == NULL) {
 		LOG_ERR("fopen: %s", file);
 		msg_err("Cannot save library");
@@ -416,14 +460,15 @@
 		XPTHREAD_MUTEX_LOCK(&library_menu_mtx);
 		MENU_FOR_EACH_ENTRY(library_menu, entry) {
 			t = menu_get_entry_data(entry);
-			(void)fprintf(fp, "%s\n", t->path);
+			fprintf(fp, "%s\n", t->path);
 		}
 		XPTHREAD_MUTEX_UNLOCK(&library_menu_mtx);
 
-		(void)fclose(fp);
+		fclose(fp);
 		ret = 0;
 	}
 
 	free(file);
+	library_modified = 0;
 	return ret;
 }

siren-0.2.tar.gz/log.c -> siren-0.7.tar.gz/log.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -44,7 +44,7 @@
 log_end(void)
 {
 	if (log_enabled)
-		(void)fclose(log_fp);
+		fclose(log_fp);
 }
 
 void
@@ -108,7 +108,7 @@
 	char		*file;
 
 	if (enable) {
-		(void)xasprintf(&file, "siren-%ld.log", (long int)getpid());
+		xasprintf(&file, "siren-%ld.log", (long int)getpid());
 		if ((log_fp = fopen(file, "w")) == NULL)
 			err(1, "fopen: %s", file);
 		free(file);
@@ -122,7 +122,7 @@
 	}
 }
 
-static void
+PRINTFLIKE(2, 3) static void
 log_printf(const char *func, const char *fmt, ...)
 {
 	va_list ap;
@@ -139,26 +139,29 @@
 	char	errstrSTRERROR_BUFSIZE, *msg;
 
 	oerrno = errno;
-	(void)strerror_r(errno, errstr, sizeof errstr);
-	(void)xvasprintf(&msg, fmt, ap);
+	strerror_r(errno, errstr, sizeof errstr);
+	xvasprintf(&msg, fmt, ap);
 	log_printf(func, "%s: %s", msg, errstr);
 	free(msg);
 	errno = oerrno;
 }
 
+void
+log_verrx(const char *func, const char *fmt, va_list ap)
+{
+	log_vprintf(func, fmt, ap);
+}
+
 static void
 log_vprintf(const char *func, const char *fmt, va_list ap)
 {
 	if (log_enabled) {
-		(void)pthread_mutex_lock(&log_fp_mtx);
+		pthread_mutex_lock(&log_fp_mtx);
 		if (func != NULL)
-			if (fprintf(log_fp, "%s: ", func) == -1)
-				errx(1, "fprintf() failed");
+			fprintf(log_fp, "%s: ", func);
 		if (fmt != NULL)
-			if (vfprintf(log_fp, fmt, ap) == -1)
-				errx(1, "vfprintf() failed");
-		if (putc('\n', log_fp) == EOF)
-			err(1, "putc");
-		(void)pthread_mutex_unlock(&log_fp_mtx);
+			vfprintf(log_fp, fmt, ap);
+		putc('\n', log_fp);
+		pthread_mutex_unlock(&log_fp_mtx);
 	}
 }

siren-0.2.tar.gz/menu.c -> siren-0.7.tar.gz/menu.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,17 +14,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <limits.h>
-#include <stdlib.h>
-
-#include "siren.h"
-
-#ifdef HAVE_QUEUE_H
+#ifdef __OpenBSD__
 #include <sys/queue.h>
 #else
 #include "compat/queue.h"
 #endif
 
+#include <limits.h>
+#include <stdlib.h>
+
+#include "siren.h"
+
 #define MENU_NENTRIES_MAX UINT_MAX
 
 struct menu {
@@ -78,7 +78,7 @@
 		while (m->top->index != m->selected->index - nrows + 1);
 	/*
 	 * If the viewport extends below the last entry, then, if possible,
-	 * move the last entry to the bottom of the viewport if possible.
+	 * move the last entry to the bottom of the viewport.
 	 */
 	else
 		while (m->top->index > 0 &&
@@ -167,6 +167,33 @@
 }
 
 void
+menu_insert_after(struct menu *m, struct menu_entry *le, void *data)
+{
+	struct menu_entry *e;
+
+	if (m->nentries == MENU_NENTRIES_MAX)
+		return;
+
+	e = xmalloc(sizeof *e);
+	e->data = data;
+	e->index = le->index + 1;
+
+	TAILQ_INSERT_AFTER(&m->list, le, e, entries);
+	m->nentries++;
+
+	if (m->nentries == 1)
+		/*
+		 * This is the first entry in the menu: make it the top entry
+		 * and the selected entry.
+		 */
+		m->top = m->selected = e;
+
+	/* Increment the index of the entries after the inserted entry. */
+	while ((e = TAILQ_NEXT(e, entries)) != NULL)
+		e->index++;
+}
+
+void
 menu_insert_before(struct menu *m, struct menu_entry *le, void *data)
 {
 	struct menu_entry *e;
@@ -194,6 +221,33 @@
 }
 
 void
+menu_insert_head(struct menu *m, void *data)
+{
+	struct menu_entry *e;
+
+	if (m->nentries == MENU_NENTRIES_MAX)
+		return;
+
+	e = xmalloc(sizeof *e);
+	e->data = data;
+	e->index = 0;
+
+	TAILQ_INSERT_HEAD(&m->list, e, entries);
+	m->nentries++;
+
+	if (m->nentries == 1)
+		/*
+		 * This is the first entry in the menu: make it the top entry
+		 * and the selected entry.
+		 */
+		m->top = m->selected = e;
+
+	/* Increment the index of the entries after the inserted entry. */
+	while ((e = TAILQ_NEXT(e, entries)) != NULL)
+		e->index++;
+}
+
+void
 menu_insert_tail(struct menu *m, void *data)
 {
 	struct menu_entry *e;
@@ -216,30 +270,39 @@
 		m->top = m->selected = e;
 }
 
+/* Move entry e before entry be. */
 void
-menu_move_entry_down(struct menu_entry *e)
+menu_move_entry_before(struct menu *m, struct menu_entry *be,
+    struct menu_entry *e)
 {
-	struct menu_entry	*f;
-	void			*data;
+	struct menu_entry *f;
 
-	if ((f = TAILQ_NEXT(e, entries)) != NULL) {
-		data = e->data;
-		e->data = f->data;
-		f->data = data;
-	}
+	/* Update the index of each relevant entry. */
+	e->index = be->index;
+	for (f = be; f != e; f = TAILQ_NEXT(f, entries))
+		f->index++;
+
+	/* Move the entry to its new position. */
+	TAILQ_REMOVE(&m->list, e, entries);
+	TAILQ_INSERT_BEFORE(be, e, entries);
 }
 
 void
-menu_move_entry_up(struct menu_entry *e)
+menu_move_entry_down(struct menu *m, struct menu_entry *e)
 {
-	struct menu_entry	*f;
-	void			*data;
+	struct menu_entry *f;
 
-	if ((f = TAILQ_PREV(e, menu_list, entries)) != NULL) {
-		data = e->data;
-		e->data = f->data;
-		f->data = data;
-	}
+	if ((f = TAILQ_NEXT(e, entries)) != NULL)
+		menu_move_entry_before(m, e, f);
+}
+
+void
+menu_move_entry_up(struct menu *m, struct menu_entry *e)
+{
+	struct menu_entry *f;
+
+	if ((f = TAILQ_PREV(e, menu_list, entries)) != NULL)
+		menu_move_entry_before(m, f, e);
 }
 
 void

siren-0.2.tar.gz/msg.c -> siren-0.7.tar.gz/msg.c Changed

siren-0.7.tar.gz/op/alsa.c Added

@@ -0,0 +1,409 @@
+/*
+ * Copyright (c) 2013 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include <alsa/asoundlib.h>
+
+#include "../siren.h"
+
+#define OP_ALSA_PCM_DEVICE	"default"
+#define OP_ALSA_MIXER_DEVICE	"default"
+#define OP_ALSA_MIXER_ELEM	"PCM"
+
+static void		 op_alsa_close(void);
+static size_t		 op_alsa_get_buffer_size(void);
+static int		 op_alsa_get_volume(void);
+static int		 op_alsa_get_volume_support(void);
+static int		 op_alsa_init(void);
+static int		 op_alsa_open(void);
+static void		 op_alsa_set_volume(unsigned int);
+static int		 op_alsa_start(struct sample_format *);
+static int		 op_alsa_stop(void);
+static int		 op_alsa_write(struct sample_buffer *);
+
+const struct op		 op = {
+	"alsa",
+	OP_PRIORITY_ALSA,
+	NULL,
+	op_alsa_close,
+	op_alsa_get_buffer_size,
+	op_alsa_get_volume,
+	op_alsa_get_volume_support,
+	op_alsa_init,
+	op_alsa_open,
+	op_alsa_set_volume,
+	op_alsa_start,
+	op_alsa_stop,
+	op_alsa_write
+};
+
+static snd_pcm_t	*op_alsa_pcm_handle;
+static snd_mixer_t	*op_alsa_mixer_handle;
+static snd_mixer_elem_t	*op_alsa_mixer_elem;
+static char		*op_alsa_mixer_dev;
+static size_t		 op_alsa_bufsize;
+static size_t		 op_alsa_framesize;
+
+static void
+op_alsa_close(void)
+{
+	snd_pcm_close(op_alsa_pcm_handle);
+
+	if (op_alsa_mixer_handle != NULL) {
+		snd_mixer_free(op_alsa_mixer_handle);
+		snd_mixer_detach(op_alsa_mixer_handle, op_alsa_mixer_dev);
+		snd_mixer_close(op_alsa_mixer_handle);
+		free(op_alsa_mixer_dev);
+	}
+}
+
+static size_t
+op_alsa_get_buffer_size(void)
+{
+	return op_alsa_bufsize;
+}
+
+static int
+op_alsa_get_volume(void)
+{
+	long int	volume;
+	int		ret;
+
+	if (op_alsa_mixer_handle == NULL)
+		return -1;
+
+	ret = snd_mixer_handle_events(op_alsa_mixer_handle);
+	if (ret < 0)
+		LOG_ERRX("snd_mixer_handle_events: %s", snd_strerror(ret));
+
+	/*
+	 * SND_MIXER_SCHN_MONO is an alias for SND_MIXER_SCHN_FRONT_LEFT. We
+	 * assume all channels have the same value.
+	 */
+	ret = snd_mixer_selem_get_playback_volume(op_alsa_mixer_elem,
+	    SND_MIXER_SCHN_MONO, &volume);
+	if (ret) {
+		LOG_ERRX("snd_mixer_get_playback_volume: %s",
+		    snd_strerror(ret));
+		msg_errx("Cannot get volume: %s", snd_strerror(ret));
+		return -1;
+	}
+
+	return volume;
+}
+
+static int
+op_alsa_get_volume_support(void)
+{
+	return op_alsa_mixer_handle != NULL;
+}
+
+static void
+op_alsa_handle_error(const char *file, int line, const char *func, int errnum,
+    const char *fmt, ...)
+{
+	va_list	 ap;
+	char	*msg;
+
+	va_start(ap, fmt);
+	xvasprintf(&msg, fmt, ap);
+	va_end(ap);
+
+	if (errnum == 0)
+		LOG_ERRX("%s:%d: %s: %s", file, line, func, msg);
+	else {
+		errno = errnum;
+		LOG_ERR("%s:%d: %s: %s", file, line, func, msg);
+	}
+
+	free(msg);
+}
+
+static int
+op_alsa_init(void)
+{
+	option_add_string("alsa-mixer-device", OP_ALSA_MIXER_DEVICE,
+	    player_reopen_op);
+	option_add_string("alsa-mixer-element", OP_ALSA_MIXER_ELEM,
+	    player_reopen_op);
+	option_add_string("alsa-pcm-device", OP_ALSA_PCM_DEVICE,
+	    player_reopen_op);
+	snd_lib_error_set_handler(op_alsa_handle_error);
+	return 0;
+}
+
+static int
+op_alsa_open(void)
+{
+	int	 ret;
+	char	*dev, *elem;
+
+	/*
+	 * Open the PCM device.
+	 */
+
+	dev = option_get_string("alsa-pcm-device");
+
+	ret = snd_pcm_open(&op_alsa_pcm_handle, dev, SND_PCM_STREAM_PLAYBACK,
+	    0);
+	if (ret) {
+		LOG_ERRX("snd_pcm_open: %s: %s", dev, snd_strerror(ret));
+		msg_errx("Cannot open device %s: %s", dev, snd_strerror(ret));
+		free(dev);
+		return -1;
+	}
+
+	LOG_INFO("using %s PCM device", dev);
+	free(dev);
+
+	/*
+	 * Open the mixer device.
+	 */
+
+	op_alsa_mixer_handle = NULL;
+
+	/* Open an empty mixer. */
+	ret = snd_mixer_open(&op_alsa_mixer_handle, 0);
+	if (ret) {
+		LOG_ERRX("snd_mixer_open: %s", snd_strerror(ret));
+		msg_errx("Cannot open mixer: %s", snd_strerror(ret));
+		return 0;
+	}
+
+	op_alsa_mixer_dev = option_get_string("alsa-mixer-device");
+
+	/* Attach to the mixer device. */
+	ret = snd_mixer_attach(op_alsa_mixer_handle, op_alsa_mixer_dev);
+	if (ret) {
+		LOG_ERRX("snd_mixer_attach: %s: %s", op_alsa_mixer_dev,
+		    snd_strerror(ret));
+		msg_errx("Cannot attach to mixer device %s: %s",
+		    op_alsa_mixer_dev, snd_strerror(ret));
+		goto error1;
+	}
+
+	LOG_INFO("using %s mixer device", op_alsa_mixer_dev);
+
+	/* Register mixer elements. */
+	ret = snd_mixer_selem_register(op_alsa_mixer_handle, NULL, NULL);
+	if (ret) {
+		LOG_ERRX("snd_mixer_selem_register: %s", snd_strerror(ret));
+		goto error2;
+	}
+
+	/* Load mixer elements. */
+	ret = snd_mixer_load(op_alsa_mixer_handle);
+	if (ret) {
+		LOG_ERRX("snd_mixer_load: %s", snd_strerror(ret));
+		goto error2;
+	}
+
+	elem = option_get_string("alsa-mixer-element");
+
+	/* Search for the specified mixer element. */
+	op_alsa_mixer_elem = snd_mixer_first_elem(op_alsa_mixer_handle);
+	while (op_alsa_mixer_elem != NULL) {
+		if (!strcmp(elem,
+		    snd_mixer_selem_get_name(op_alsa_mixer_elem)))
+			break;
+		op_alsa_mixer_elem = snd_mixer_elem_next(op_alsa_mixer_elem);
+	}
+
+	if (op_alsa_mixer_elem == NULL) {
+		LOG_ERRX("%s: mixer element not found", elem);
+		msg_errx("Mixer element not found: %s", elem);
+		free(elem);
+		goto error3;
+	}
+
+	LOG_INFO("using %s mixer element", elem);
+	free(elem);
+
+	/* Check if the mixer element has a playback-volume control. */
+	if (!snd_mixer_selem_has_playback_volume(op_alsa_mixer_elem)) {
+		LOG_ERRX("mixer element does not have playback volume");
+		goto error3;
+	}
+
+	/* Set the volume range to 0-100. */
+	ret = snd_mixer_selem_set_playback_volume_range(op_alsa_mixer_elem, 0,
+	    100);
+	if (ret) {
+		LOG_ERRX("snd_mixer_selem_set_playback_volume_range: %s",
+		    snd_strerror(ret));
+		goto error3;
+	}
+
+	return 0;
+
+error3:
+	snd_mixer_free(op_alsa_mixer_handle);
+
+error2:
+	snd_mixer_detach(op_alsa_mixer_handle, op_alsa_mixer_dev);
+
+error1:
+	snd_mixer_close(op_alsa_mixer_handle);
+	op_alsa_mixer_handle = NULL;
+	free(op_alsa_mixer_dev);
+
+	return 0;
+}
+
+static void
+op_alsa_set_volume(unsigned int volume)
+{
+	int ret;
+
+	if (op_alsa_mixer_handle == NULL)
+		return;
+
+	ret = snd_mixer_selem_set_playback_volume_all(op_alsa_mixer_elem,
+	    volume);
+	if (ret) {
+		LOG_ERRX("snd_mixer_selem_set_playback_volume_all: %s",
+		    snd_strerror(ret));
+		msg_errx("Cannot set volume: %s", snd_strerror(ret));
+	}
+}
+
+static int
+op_alsa_start(struct sample_format *sf)
+{
+	snd_pcm_hw_params_t	*params;
+	snd_pcm_format_t	 format;
+	snd_pcm_uframes_t	 nframes;
+	int			 dir, ret;
+	unsigned int		 rate;
+
+	/* Allocate memory. */
+	ret = snd_pcm_hw_params_malloc(&params);
+	if (ret) {
+		LOG_ERRX("snd_pcm_hw_malloc: %s", snd_strerror(ret));
+		goto error;
+	}
+
+	/* Set defaults. */
+	snd_pcm_hw_params_any(op_alsa_pcm_handle, params);
+
+	/* Set access type. */
+	ret = snd_pcm_hw_params_set_access(op_alsa_pcm_handle, params,
+	    SND_PCM_ACCESS_RW_INTERLEAVED);
+	if (ret) {
+		LOG_ERRX("snd_pcm_hw_params_set_access: %s",
+		    snd_strerror(ret));
+		goto error;
+	}
+
+	/* Determine format. */
+	if (sf->nbits <= 8)
+		format = SND_PCM_FORMAT_S8;
+	else if (sf->nbits <= 16)
+		format = SND_PCM_FORMAT_S16;
+	else if (sf->nbits <= 24)
+		format = SND_PCM_FORMAT_S24;
+	else
+		format = SND_PCM_FORMAT_S32;
+
+	/* Set format. */
+	ret = snd_pcm_hw_params_set_format(op_alsa_pcm_handle, params, format);
+	if (ret) {
+		LOG_ERRX("snd_pcm_hw_params_set: %s", snd_strerror(ret));
+		goto error;
+	}
+
+	/* Set number of channels. */
+	ret = snd_pcm_hw_params_set_channels(op_alsa_pcm_handle, params,
+	    sf->nchannels);
+	if (ret) {
+		LOG_ERRX("snd_pcm_hw_params_set_channels: %s",
+		    snd_strerror(ret));
+		goto error;
+	}
+
+	/* Set sampling rate. */
+	dir = 0;
+	rate = sf->rate;
+	ret = snd_pcm_hw_params_set_rate_near(op_alsa_pcm_handle, params,
+	    &rate, &dir);
+	if (ret) {
+		LOG_ERRX("snd_pcm_hw_params_set_rate_near: %s",
+		    snd_strerror(ret));
+		goto error;
+	}
+
+	/* Configure the device. */
+	ret = snd_pcm_hw_params(op_alsa_pcm_handle, params);
+	if (ret) {
+		LOG_ERRX("snd_pcm_hw_params: %s", snd_strerror(ret));
+		goto error;
+	}
+
+	/*
+	 * The ALSA application buffer is divided into periods. Determine the
+	 * size of 1 period and use that as the size of our buffer.
+	 */
+	snd_pcm_hw_params_get_period_size(params, &nframes, &dir);
+	op_alsa_framesize = ((sf->nbits + 7) / 8) * sf->nchannels;
+	op_alsa_bufsize = nframes * op_alsa_framesize;
+
+	snd_pcm_hw_params_free(params);
+
+	sf->byte_order = player_get_byte_order();
+
+	LOG_INFO("format=%s, channels=%u, rate=%u, bufsize=%zu",
+	    snd_pcm_format_name(format), sf->nchannels, rate, op_alsa_bufsize);
+	return 0;
+
+error:
+	snd_pcm_hw_params_free(params);
+	msg_errx("Cannot start playback: %s", snd_strerror(ret));
+	return -1;
+}
+
+static int
+op_alsa_stop(void)
+{
+	snd_pcm_drain(op_alsa_pcm_handle);
+	return 0;
+}
+
+static int
+op_alsa_write(struct sample_buffer *sb)
+{
+	snd_pcm_sframes_t ret;
+
+	ret = snd_pcm_writei(op_alsa_pcm_handle, sb->data,
+	    sb->len_b / op_alsa_framesize);
+	if (ret == -EPIPE) {
+		/* An underrun occurred; attempt to recover. */
+		LOG_ERRX("snd_pcm_writei: %s", snd_strerror(ret));
+		ret = snd_pcm_prepare(op_alsa_pcm_handle);
+		if (ret) {
+			LOG_ERRX("snd_pcm_prepare: %s", snd_strerror(ret));
+			msg_errx("Playback error: %s", snd_strerror(ret));
+			return -1;
+		}
+	} else if (ret < 0) {
+		LOG_ERRX("snd_pcm_writei: %s", snd_strerror(ret));
+		msg_errx("Playback error: %s", snd_strerror(ret));
+		return -1;
+	}
+	return 0;
+}

siren-0.2.tar.gz/op/ao.c -> siren-0.7.tar.gz/op/ao.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -22,20 +22,21 @@
 
 #include "../siren.h"
 
-#define OP_AO_BUFSIZE			4096
+#define OP_AO_BUFSIZE	4096
 
 static void		 op_ao_close(void);
 static size_t		 op_ao_get_buffer_size(void);
 static int		 op_ao_get_volume_support(void);
-static void		 op_ao_init(void);
+static int		 op_ao_init(void);
 static int		 op_ao_open(void);
 static int		 op_ao_start(struct sample_format *);
 static int		 op_ao_stop(void);
-static int		 op_ao_write(void *, size_t);
+static int		 op_ao_write(struct sample_buffer *);
 
 const struct op		 op = {
 	"ao",
 	OP_PRIORITY_AO,
+	"prot_exec",
 	op_ao_close,
 	op_ao_get_buffer_size,
 	NULL,
@@ -49,9 +50,7 @@
 };
 
 static ao_device	*op_ao_device;
-static int		 op_ao_byte_format;
 static int		 op_ao_driver_id;
-static int		 op_ao_driver_type;
 
 static void
 op_ao_close(void)
@@ -63,7 +62,7 @@
 static size_t
 op_ao_get_buffer_size(void)
 {
-	return (size_t)option_get_number("ao-buffer-size");
+	return option_get_number("ao-buffer-size");
 }
 
 static int
@@ -72,19 +71,20 @@
 	return 0;
 }
 
-static void
+static int
 op_ao_init(void)
 {
-	option_add_number("ao-buffer-size", OP_AO_BUFSIZE, 1, INT_MAX, NULL);
-	option_add_string("ao-driver", "", NULL);
-	option_add_string("ao-file", "", NULL);
+	option_add_number("ao-buffer-size", OP_AO_BUFSIZE, 1, INT_MAX,
+	    player_reopen_op);
+	option_add_string("ao-driver", "", player_reopen_op);
+	return 0;
 }
 
 static int
 op_ao_open(void)
 {
-	ao_info		*info;
-	char		*driver;
+	ao_info	*info;
+	char	*driver;
 
 	ao_initialize();
 
@@ -113,17 +113,6 @@
 		return -1;
 	}
 
-	op_ao_driver_type = info->type;
-
-	if (info->preferred_byte_format != AO_FMT_NATIVE)
-		op_ao_byte_format = info->preferred_byte_format;
-	else {
-		if (player_get_byte_order() == BYTE_ORDER_BIG)
-			op_ao_byte_format = AO_FMT_BIG;
-		else
-			op_ao_byte_format = AO_FMT_LITTLE;
-	}
-
 	LOG_INFO("using %s driver", info->short_name);
 
 	return 0;
@@ -132,84 +121,51 @@
 static int
 op_ao_start(struct sample_format *sf)
 {
-	ao_sample_format	 aosf;
-	int			 error;
-	char			*file;
+	ao_sample_format aosf;
 
-	aosf.bits = 16;
-	aosf.byte_format = op_ao_byte_format;
+	aosf.bits = sf->nbits;
+	aosf.byte_format = AO_FMT_NATIVE;
 	aosf.channels = sf->nchannels;
 	aosf.rate = sf->rate;
 #ifdef HAVE_AO_MATRIX
 	aosf.matrix = NULL;
 #endif
 
-	if (op_ao_driver_type == AO_TYPE_LIVE)
-		op_ao_device = ao_open_live(op_ao_driver_id, &aosf, NULL);
-	else {
-		file = option_get_string("ao-file");
-		op_ao_device = ao_open_file(op_ao_driver_id, file, 0, &aosf,
-		    NULL);
-		free(file);
-	}
-
-	if (op_ao_device == NULL) {
-		error = errno;
-		LOG_ERRX("ao_open_%s() failed: error %d",
-		    op_ao_driver_type == AO_TYPE_LIVE ? "live" : "file",
-		    error);
-
-		switch (error) {
-		/* Errors specific to live output drivers. */
+	if ((op_ao_device = ao_open_live(op_ao_driver_id, &aosf, NULL)) ==
+	    NULL) {
+		switch (errno) {
 		case AO_ENOTLIVE:
+			LOG_ERRX("ao_open_live: not a live output driver");
 			msg_errx("Driver is not a live output driver");
 			break;
 		case AO_EOPENDEVICE:
+			LOG_ERRX("ao_open_live: cannot open device");
 			msg_errx("Cannot open device");
 			break;
-
-		/* Errors specific to file output drivers. */
-		case AO_ENOTFILE:
-			msg_errx("Driver is not a file output driver");
-			break;
-		case AO_EFILEEXISTS:
-			msg_errx("Output file already exists");
-			break;
-		case AO_EOPENFILE:
-			msg_errx("Cannot open output file");
-			break;
-
-		/* Common errors. */
 		case AO_EBADFORMAT:
+			LOG_ERRX("ao_open_live: unsupported sample format");
 			msg_errx("Sample format not supported");
 			break;
 		case AO_EBADOPTION:
+			LOG_ERRX("ao_open_live: invalid option value");
 			msg_errx("An ao option has an invalid value");
 			break;
 		case AO_ENODRIVER:
+			LOG_ERRX("ao_open_live: cannot find driver");
 			msg_errx("Cannot find driver");
+			break;
 		case AO_EFAIL:
 		default:
+			LOG_ERRX("ao_open_live: unknown error");
 			msg_errx("Unknown error");
 			break;
 		}
 		return -1;
 	}
 
-	switch (aosf.byte_format) {
-	case AO_FMT_BIG:
-		sf->byte_order = BYTE_ORDER_BIG;
-		break;
-	case AO_FMT_LITTLE:
-		sf->byte_order = BYTE_ORDER_LITTLE;
-		break;
-	case AO_FMT_NATIVE:
-	default:
-		sf->byte_order = player_get_byte_order();
-		break;
-	}
+	sf->byte_order = player_get_byte_order();
 
-	LOG_DEBUG("bits=%d, rate=%d, channels=%d, byte_format=%d", aosf.bits,
+	LOG_INFO("bits=%d, rate=%d, channels=%d, byte_format=%d", aosf.bits,
 	    aosf.rate, aosf.channels, aosf.byte_format);
 
 	return 0;
@@ -227,9 +183,9 @@
 }
 
 static int
-op_ao_write(void *buf, size_t bufsize)
+op_ao_write(struct sample_buffer *sb)
 {
-	if (ao_play(op_ao_device, buf, bufsize) == 0) {
+	if (ao_play(op_ao_device, sb->data, sb->len_b) == 0) {
 		LOG_ERRX("ao_play() failed");
 		msg_errx("Playback error");
 		return -1;

siren-0.2.tar.gz/op/oss.c -> siren-0.7.tar.gz/op/oss.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2012 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -39,11 +39,11 @@
 static void		 op_oss_close(void);
 static size_t		 op_oss_get_buffer_size(void);
 static int		 op_oss_get_volume_support(void);
-static void		 op_oss_init(void);
+static int		 op_oss_init(void);
 static int		 op_oss_open(void);
 static int		 op_oss_start(struct sample_format *);
 static int		 op_oss_stop(void);
-static int		 op_oss_write(void *, size_t);
+static int		 op_oss_write(struct sample_buffer *);
 #ifdef OP_OSS_HAVE_VOLUME_SUPPORT
 static int		 op_oss_get_volume(void);
 static void		 op_oss_set_volume(unsigned int);
@@ -52,6 +52,7 @@
 struct op		 op = {
 	"oss",
 	OP_PRIORITY_OSS,
+	NULL,
 	op_oss_close,
 	op_oss_get_buffer_size,
 #ifdef OP_OSS_HAVE_VOLUME_SUPPORT
@@ -128,10 +129,11 @@
 #endif
 }
 
-static void
+static int
 op_oss_init(void)
 {
-	option_add_string("oss-device", OP_OSS_DEVICE, NULL);
+	option_add_string("oss-device", OP_OSS_DEVICE, player_reopen_op);
+	return 0;
 }
 
 static int
@@ -150,7 +152,7 @@
 	}
 
 	op_oss_volume = op_oss_get_volume();
-	(void)close(op_oss_fd);
+	close(op_oss_fd);
 	op_oss_fd = -1;
 #endif
 
@@ -168,7 +170,7 @@
 		    "closed");
 	else {
 		/* Set the volume level for the left and right channels. */
-		arg = (int)volume | ((int)volume << 8);
+		arg = volume | (volume << 8);
 		if (ioctl(op_oss_fd, SNDCTL_DSP_SETPLAYVOL, &arg) == -1) {
 			LOG_ERR("ioctl: SNDCTL_DSP_SETPLAYVOL");
 			msg_err("Cannot set volume");
@@ -180,7 +182,7 @@
 static int
 op_oss_start(struct sample_format *sf)
 {
-	int arg;
+	int arg, want_arg;
 
 	op_oss_fd = open(op_oss_device, O_WRONLY);
 	if (op_oss_fd == -1) {
@@ -208,14 +210,28 @@
 	}
 
 	/* Set format. */
-	arg = AFMT_S16_NE;
+	if (sf->nbits <= 8)
+		arg = AFMT_S8;
+	else if (sf->nbits <= 16)
+		arg = AFMT_S16_NE;
+	else {
+#ifdef AFMT_S32_NE
+		arg = AFMT_S32_NE;
+#else
+		LOG_ERRX("%u bits per sample not supported", sf->nbits);
+		msg_errx("%u bits per sample not supported", sf->nbits);
+		goto error;
+#endif
+	}
+
+	want_arg = arg;
 	if (ioctl(op_oss_fd, SNDCTL_DSP_SETFMT, &arg) == -1) {
 		LOG_ERR("ioctl: SNDCTL_DSP_SETFMT");
 		msg_err("Cannot set audio format");
 		goto error;
 	}
-	if (arg != AFMT_S16_NE) {
-		LOG_ERRX("AFMT_S16_NE not supported");
+	if (arg != want_arg) {
+		LOG_ERRX("%d: audio format not supported", want_arg);
 		msg_errx("Audio format not supported");
 		goto error;
 	}
@@ -227,7 +243,7 @@
 		msg_err("Cannot set sampling rate");
 		goto error;
 	}
-	/* Allow a deviation of 5% in the sampling rate. */
+	/* Allow a 0.5% deviation in the sampling rate. */
 	if ((unsigned int)arg < sf->rate * 995 / 1000 ||
 	    (unsigned int)arg > sf->rate * 1005 / 1000) {
 		LOG_ERRX("sampling rate (%u Hz) not supported", sf->rate);
@@ -236,10 +252,11 @@
 	}
 
 	/* Set byte order of sample format. */
-	if (AFMT_S16_NE == AFMT_S16_BE)
-		sf->byte_order = BYTE_ORDER_BIG;
-	else
-		sf->byte_order = BYTE_ORDER_LITTLE;
+#if AFMT_S16_NE == AFMT_S16_BE
+	sf->byte_order = BYTE_ORDER_BIG;
+#else
+	sf->byte_order = BYTE_ORDER_LITTLE;
+#endif
 
 	/*
 	 * Determine the optimal buffer size. This is not relevant on OSS 4,
@@ -249,12 +266,12 @@
 		LOG_ERR("ioctl: SNDCTL_DSP_GETBLKSIZE");
 		op_oss_buffer_size = OP_OSS_BUFSIZE;
 	} else
-		op_oss_buffer_size = (size_t)arg;
+		op_oss_buffer_size = arg;
 
 	return 0;
 
 error:
-	(void)close(op_oss_fd);
+	close(op_oss_fd);
 	op_oss_fd = -1;
 	return -1;
 }
@@ -273,15 +290,15 @@
 	}
 #endif
 
-	(void)close(op_oss_fd);
+	close(op_oss_fd);
 	op_oss_fd = -1;
 	return 0;
 }
 
 static int
-op_oss_write(void *buf, size_t bufsize)
+op_oss_write(struct sample_buffer *sb)
 {
-	if (write(op_oss_fd, buf, bufsize) == -1) {
+	if (write(op_oss_fd, sb->data, sb->len_b) == -1) {
 		LOG_ERR("write: %s", op_oss_device);
 		msg_err("Playback error");
 		return -1;

siren-0.7.tar.gz/op/portaudio.c Added

@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2015 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <limits.h>
+
+#include <portaudio.h>
+
+#include "../siren.h"
+
+#define OP_PORTAUDIO_BUFSIZE 4096
+
+static void	 op_portaudio_close(void);
+static size_t	 op_portaudio_get_buffer_size(void);
+static int	 op_portaudio_get_volume_support(void);
+static int	 op_portaudio_init(void);
+static int	 op_portaudio_open(void);
+static int	 op_portaudio_start(struct sample_format *);
+static int	 op_portaudio_stop(void);
+static int	 op_portaudio_write(struct sample_buffer *);
+
+const struct op	 op = {
+	"portaudio",
+	OP_PRIORITY_PORTAUDIO,
+	NULL,
+	op_portaudio_close,
+	op_portaudio_get_buffer_size,
+	NULL,
+	op_portaudio_get_volume_support,
+	op_portaudio_init,
+	op_portaudio_open,
+	NULL,
+	op_portaudio_start,
+	op_portaudio_stop,
+	op_portaudio_write
+};
+
+PaStream	*op_portaudio_stream;
+size_t		 op_portaudio_framesize;
+
+static void
+op_portaudio_close(void)
+{
+	PaError error;
+
+	error = Pa_Terminate();
+	if (error != paNoError) {
+		LOG_ERRX("Pa_Terminate: %s", Pa_GetErrorText(error));
+		msg_errx("Cannot terminate PortAudio: %s",
+		    Pa_GetErrorText(error));
+	}
+}
+
+static size_t
+op_portaudio_get_buffer_size(void)
+{
+	return option_get_number("portaudio-buffer-size");
+}
+
+static int
+op_portaudio_get_volume_support(void)
+{
+	return 0;
+}
+
+static int
+op_portaudio_init(void)
+{
+	option_add_number("portaudio-buffer-size", OP_PORTAUDIO_BUFSIZE, 1,
+	    INT_MAX, player_reopen_op);
+	return 0;
+}
+
+static int
+op_portaudio_open(void)
+{
+	PaError error;
+
+	error = Pa_Initialize();
+	if (error != paNoError) {
+		LOG_ERRX("Pa_Initialize: %s", Pa_GetErrorText(error));
+		msg_errx("Cannot initialise PortAudio: %s",
+		    Pa_GetErrorText(error));
+		return -1;
+	}
+	return 0;
+}
+
+static int
+op_portaudio_start(struct sample_format *sf)
+{
+	const PaDeviceInfo	*devinfo;
+	const PaHostApiInfo	*hostinfo;
+	PaSampleFormat		 sfmt;
+	PaError			 error;
+
+	devinfo = Pa_GetDeviceInfo(Pa_GetDefaultOutputDevice());
+	if (devinfo == NULL) {
+		LOG_ERRX("Pa_GetDeviceInfo() failed");
+		msg_errx("Cannot get device information");
+		return -1;
+	}
+
+	hostinfo = Pa_GetHostApiInfo(devinfo->hostApi);
+	if (hostinfo == NULL) {
+		LOG_ERRX("Pa_GetHostApiInfo() failed");
+		msg_errx("Cannot get host API information");
+		return -1;
+	}
+
+	LOG_INFO("using %s device on %s host API", devinfo->name,
+	    hostinfo->name);
+
+	if (sf->nbits <= 8) {
+		sfmt = paInt8;
+		op_portaudio_framesize = sf->nchannels;
+	} else if (sf->nbits <= 16) {
+		sfmt = paInt16;
+		op_portaudio_framesize = sf->nchannels * 2;
+	} else {
+		sfmt = paInt32;
+		op_portaudio_framesize = sf->nchannels * 4;
+	}
+
+	error = Pa_OpenDefaultStream(&op_portaudio_stream, 0, sf->nchannels,
+	    sfmt, sf->rate, paFramesPerBufferUnspecified, NULL, NULL);
+	if (error != paNoError) {
+		LOG_ERRX("Pa_OpenDefaultStream: %s", Pa_GetErrorText(error));
+		msg_errx("Cannot open stream: %s", Pa_GetErrorText(error));
+		return -1;
+	}
+
+	error = Pa_StartStream(op_portaudio_stream);
+	if (error != paNoError) {
+		LOG_ERRX("Pa_StartStream: %s", Pa_GetErrorText(error));
+		msg_errx("Cannot start stream: %s", Pa_GetErrorText(error));
+		error = Pa_CloseStream(op_portaudio_stream);
+		if (error != paNoError) {
+			LOG_ERRX("Pa_CloseStream: %s", Pa_GetErrorText(error));
+			msg_errx("Cannot close stream: %s",
+			    Pa_GetErrorText(error));
+		}
+		return -1;
+	}
+
+	sf->byte_order = player_get_byte_order();
+	return 0;
+}
+
+static int
+op_portaudio_stop(void)
+{
+	PaError error;
+
+	error = Pa_StopStream(op_portaudio_stream);
+	if (error != paNoError) {
+		LOG_ERRX("Pa_StopStream: %s", Pa_GetErrorText(error));
+		msg_errx("Cannot stop stream: %s", Pa_GetErrorText(error));
+		return -1;
+	}
+
+	error = Pa_CloseStream(op_portaudio_stream);
+	if (error != paNoError) {
+		LOG_ERRX("Pa_CloseStream: %s", Pa_GetErrorText(error));
+		msg_errx("Cannot close stream: %s", Pa_GetErrorText(error));
+		return -1;
+	}
+
+	return 0;
+}
+
+static int
+op_portaudio_write(struct sample_buffer *sb)
+{
+	PaError error;
+
+	error = Pa_WriteStream(op_portaudio_stream, sb->data,
+	    sb->len_b / op_portaudio_framesize);
+	if (error != paNoError && error != paOutputUnderflowed) {
+		LOG_ERRX("Pa_WriteStream: %s", Pa_GetErrorText(error));
+		msg_errx("Playback error: %s", Pa_GetErrorText(error));
+		return -1;
+	}
+	return 0;
+}

siren-0.2.tar.gz/op/pulse.c -> siren-0.7.tar.gz/op/pulse.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -26,15 +26,16 @@
 static void		 op_pulse_close(void);
 static size_t		 op_pulse_get_buffer_size(void);
 static int		 op_pulse_get_volume_support(void);
-static void		 op_pulse_init(void);
+static int		 op_pulse_init(void);
 static int		 op_pulse_open(void);
 static int		 op_pulse_start(struct sample_format *);
 static int		 op_pulse_stop(void);
-static int		 op_pulse_write(void *, size_t);
+static int		 op_pulse_write(struct sample_buffer *);
 
 const struct op		 op = {
 	"pulse",
 	OP_PRIORITY_PULSE,
+	"ps proc",
 	op_pulse_close,
 	op_pulse_get_buffer_size,
 	NULL,
@@ -58,7 +59,7 @@
 static size_t
 op_pulse_get_buffer_size(void)
 {
-	return (size_t)option_get_number("pulse-buffer-size");
+	return option_get_number("pulse-buffer-size");
 }
 
 static int
@@ -67,11 +68,12 @@
 	return 0;
 }
 
-static void
+static int
 op_pulse_init(void)
 {
 	option_add_number("pulse-buffer-size", OP_PULSE_BUFSIZE, 1, INT_MAX,
-	    NULL);
+	    player_reopen_op);
+	return 0;
 }
 
 static int
@@ -86,9 +88,18 @@
 	pa_sample_spec	spec;
 	int		error;
 
-	sf->byte_order = player_get_byte_order();
-	spec.format = sf->byte_order == BYTE_ORDER_BIG ? PA_SAMPLE_S16BE :
-	    PA_SAMPLE_S16LE;
+	if (sf->nbits <= 8) {
+		/* PulseAudio doesn't support signed 8-bit samples. */
+		LOG_ERRX("8 bits or less per sample not supported");
+		msg_errx("8 bits or less per sample not supported");
+		return -1;
+	} else if (sf->nbits <= 16)
+		spec.format = PA_SAMPLE_S16NE;
+	else if (sf->nbits <= 24)
+		spec.format = PA_SAMPLE_S24_32NE;
+	else
+		spec.format = PA_SAMPLE_S32NE;
+
 	spec.channels = sf->nchannels;
 	spec.rate = sf->rate;
 
@@ -99,7 +110,9 @@
 		return -1;
 	}
 
-	LOG_DEBUG("format=%s, rate=%u, channels=%u",
+	sf->byte_order = player_get_byte_order();
+
+	LOG_INFO("format=%s, rate=%u, channels=%u",
 	    pa_sample_format_to_string(spec.format), spec.rate,
 	    spec.channels);
 
@@ -122,11 +135,11 @@
 }
 
 static int
-op_pulse_write(void *buf, size_t bufsize)
+op_pulse_write(struct sample_buffer *sb)
 {
 	int error;
 
-	if (pa_simple_write(op_pulse_conn, buf, bufsize, &error) < 0) {
+	if (pa_simple_write(op_pulse_conn, sb->data, sb->len_b, &error) < 0) {
 		LOG_ERRX("pa_simple_write: %s", pa_strerror(error));
 		msg_errx("Playback error: %s", pa_strerror(error));
 		return -1;

siren-0.2.tar.gz/op/sndio.c -> siren-0.7.tar.gz/op/sndio.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,17 +27,18 @@
 static size_t		 op_sndio_get_buffer_size(void);
 static int		 op_sndio_get_volume(void);
 static int		 op_sndio_get_volume_support(void);
-static void		 op_sndio_init(void);
+static int		 op_sndio_init(void);
 static int		 op_sndio_open(void);
 static void		 op_sndio_set_volume(unsigned int);
 static int		 op_sndio_start(struct sample_format *);
 static int		 op_sndio_stop(void);
 static void		 op_sndio_volume_cb(void *, unsigned int);
-static int		 op_sndio_write(void *, size_t);
+static int		 op_sndio_write(struct sample_buffer *);
 
 struct op		 op = {
 	"sndio",
 	OP_PRIORITY_SNDIO,
+	"inet unix dns audio",
 	op_sndio_close,
 	op_sndio_get_buffer_size,
 	op_sndio_get_volume,
@@ -50,7 +51,7 @@
 	op_sndio_write
 };
 
-static struct sio_hdl	*op_sndio_handle = NULL;
+static struct sio_hdl	*op_sndio_handle;
 static struct sio_par	 op_sndio_par;
 static unsigned int	 op_sndio_volume;
 static int		 op_sndio_volume_support;
@@ -70,14 +71,13 @@
 	 * the number of channels and the number of bytes per sample to get the
 	 * buffer size in bytes.
 	 */
-	return (size_t)(op_sndio_par.appbufsz * op_sndio_par.pchan *
-	    op_sndio_par.bps);
+	return op_sndio_par.appbufsz * op_sndio_par.pchan * op_sndio_par.bps;
 }
 
 static int
 op_sndio_get_volume(void)
 {
-	return (int)op_sndio_volume;
+	return op_sndio_volume;
 }
 
 static int
@@ -86,10 +86,11 @@
 	return op_sndio_volume_support;
 }
 
-static void
+static int
 op_sndio_init(void)
 {
-	option_add_string("sndio-device", "", NULL);
+	option_add_string("sndio-device", SIO_DEVANY, player_reopen_op);
+	return 0;
 }
 
 static int
@@ -98,13 +99,8 @@
 	char *device;
 
 	device = option_get_string("sndio-device");
-	if (device0 == '\0') {
-		LOG_INFO("using default device");
-		op_sndio_handle = sio_open(NULL, SIO_PLAY, 0);
-	} else {
-		LOG_INFO("using %s device", device);
-		op_sndio_handle = sio_open(device, SIO_PLAY, 0);
-	}
+	LOG_INFO("using %s device", device);
+	op_sndio_handle = sio_open(device, SIO_PLAY, 0);
 	free(device);
 
 	if (op_sndio_handle == NULL) {
@@ -138,7 +134,6 @@
 	op_sndio_par.pchan = sf->nchannels;
 	op_sndio_par.rate = sf->rate;
 	op_sndio_par.sig = 1U;
-	op_sndio_par.bps = 2U;
 
 	if (!sio_setpar(op_sndio_handle, &op_sndio_par)) {
 		LOG_ERRX("sio_setpar() failed");
@@ -153,20 +148,28 @@
 	}
 
 	if (op_sndio_par.bits != sf->nbits ||
-	    op_sndio_par.bps != 2U ||
 	    op_sndio_par.pchan != sf->nchannels ||
-	    op_sndio_par.rate != sf->rate ||
 	    op_sndio_par.sig != 1U) {
 		LOG_ERRX("cannot negotiate stream parameters");
 		msg_errx("Cannot negotiate stream parameters");
 		return -1;
 	}
 
+	/* Allow a 0.5% deviation in the sampling rate. */
+	if (op_sndio_par.rate < sf->rate * 995 / 1000 ||
+	    op_sndio_par.rate > sf->rate * 1005 / 1000) {
+		LOG_ERRX("cannot set sampling rate");
+		msg_errx("Cannot set sampling rate");
+		return -1;
+	}
+
 	sf->byte_order = op_sndio_par.le ? BYTE_ORDER_LITTLE : BYTE_ORDER_BIG;
 
-	LOG_DEBUG("bits=%u, sig=%u, le=%u, pchan=%u, rate=%u, appbufsz=%u",
-	    op_sndio_par.bits, op_sndio_par.sig, op_sndio_par.le,
-	    op_sndio_par.pchan, op_sndio_par.rate, op_sndio_par.appbufsz);
+	LOG_INFO("bits=%u, bps=%u, sig=%u, le=%u, pchan=%u, rate=%u, "
+	    "appbufsz=%u",
+	    op_sndio_par.bits, op_sndio_par.bps, op_sndio_par.sig,
+	    op_sndio_par.le, op_sndio_par.pchan, op_sndio_par.rate,
+	    op_sndio_par.appbufsz);
 
 	if (!sio_start(op_sndio_handle)) {
 		LOG_ERRX("sio_start() failed");
@@ -188,7 +191,6 @@
 	return 0;
 }
 
-/* ARGSUSED */
 static void
 op_sndio_volume_cb(UNUSED void *p, unsigned int volume)
 {
@@ -197,11 +199,12 @@
 }
 
 static int
-op_sndio_write(void *buf, size_t bufsize)
+op_sndio_write(struct sample_buffer *sb)
 {
 	size_t nwritten;
 
-	if ((nwritten = sio_write(op_sndio_handle, buf, bufsize)) != bufsize)
-		LOG_ERRX("only %zu of %zu bytes written", nwritten, bufsize);
+	nwritten = sio_write(op_sndio_handle, sb->data, sb->len_b);
+	if (nwritten != sb->len_b)
+		LOG_ERRX("only %zu of %zu bytes written", nwritten, sb->len_b);
 	return 0;
 }

siren-0.2.tar.gz/op/sun.c -> siren-0.7.tar.gz/op/sun.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2012 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -24,7 +24,7 @@
 
 #include "../siren.h"
 
-/* NetBSD and OpenBSD have <sys/audioio.h>; Solaris has <sys/audio.h>. */
+/* NetBSD has <sys/audioio.h>; Solaris has <sys/audio.h>. */
 #ifdef HAVE_SYS_AUDIO_H
 #include <sys/audio.h>
 #else
@@ -45,16 +45,17 @@
 static size_t		 op_sun_get_buffer_size(void);
 static int		 op_sun_get_volume(void);
 static int		 op_sun_get_volume_support(void);
-static void		 op_sun_init(void);
+static int		 op_sun_init(void);
 static int		 op_sun_open(void);
 static void		 op_sun_set_volume(unsigned int);
 static int		 op_sun_start(struct sample_format *);
 static int		 op_sun_stop(void);
-static int		 op_sun_write(void *, size_t);
+static int		 op_sun_write(struct sample_buffer *);
 
 struct op		 op = {
 	"sun",
 	OP_PRIORITY_SUN,
+	NULL,
 	op_sun_close,
 	op_sun_get_buffer_size,
 	op_sun_get_volume,
@@ -99,7 +100,7 @@
 		return -1;
 	}
 
-	return OP_SUN_GAIN_TO_PERCENT((int)info.play.gain);
+	return OP_SUN_GAIN_TO_PERCENT(info.play.gain);
 }
 
 static int
@@ -108,10 +109,11 @@
 	return 1;
 }
 
-static void
+static int
 op_sun_init(void)
 {
-	option_add_string("sun-device", OP_SUN_DEVICE, NULL);
+	option_add_string("sun-device", OP_SUN_DEVICE, player_reopen_op);
+	return 0;
 }
 
 static int
@@ -130,7 +132,7 @@
 
 	op_sun_volume = op_sun_get_volume();
 
-	(void)close(op_sun_fd);
+	close(op_sun_fd);
 	op_sun_fd = -1;
 
 	if (op_sun_volume == -1) {
@@ -158,13 +160,6 @@
 	if (ioctl(op_sun_fd, AUDIO_SETINFO, &info) == -1) {
 		LOG_ERR("ioctl: AUDIO_SETINFO");
 		msg_err("Cannot set volume");
-		return;
-	}
-
-	if (ioctl(op_sun_fd, AUDIO_GETINFO, &info) == -1) {
-		LOG_ERR("ioctl: AUDIO_GETINFO");
-		msg_err("Cannot get volume");
-		return;
 	}
 }
 
@@ -182,7 +177,7 @@
 
 	AUDIO_INITINFO(&info);
 	info.play.channels = sf->nchannels;
-	info.play.precision = 16;
+	info.play.precision = sf->nbits;
 	info.play.sample_rate = sf->rate;
 #ifdef AUDIO_ENCODING_SLINEAR
 	info.play.encoding = AUDIO_ENCODING_SLINEAR;
@@ -202,7 +197,7 @@
 		goto error;
 	}
 
-	LOG_DEBUG("sample_rate=%u, channels=%u, precision=%u, encoding=%u",
+	LOG_INFO("sample_rate=%u, channels=%u, precision=%u, encoding=%u",
 	    info.play.sample_rate, info.play.channels, info.play.precision,
 	    info.play.encoding);
 
@@ -212,13 +207,13 @@
 		goto error;
 	}
 
-	if (info.play.precision != 16) {
-		LOG_ERRX("16 bits per sample not supported");
-		msg_errx("16 bits per sample not supported");
+	if (info.play.precision != sf->nbits) {
+		LOG_ERRX("%u bits per sample not supported", sf->nbits);
+		msg_errx("%u bits per sample not supported", sf->nbits);
 		goto error;
 	}
 
-	/* Allow a deviation of 5% in the sampling rate. */
+	/* Allow a 0.5% deviation in the sampling rate. */
 	if (info.play.sample_rate < sf->rate * 995 / 1000 ||
 	    info.play.sample_rate > sf->rate * 1005 / 1000) {
 		LOG_ERRX("sampling rate (%u Hz) not supported", sf->rate);
@@ -249,7 +244,7 @@
 	return 0;
 
 error:
-	(void)close(op_sun_fd);
+	close(op_sun_fd);
 	op_sun_fd = -1;
 	return -1;
 }
@@ -258,15 +253,15 @@
 op_sun_stop(void)
 {
 	op_sun_volume = op_sun_get_volume();
-	(void)close(op_sun_fd);
+	close(op_sun_fd);
 	op_sun_fd = -1;
 	return 0;
 }
 
 static int
-op_sun_write(void *buf, size_t bufsize)
+op_sun_write(struct sample_buffer *sb)
 {
-	if (write(op_sun_fd, buf, bufsize) == -1) {
+	if (write(op_sun_fd, sb->data, sb->len_b) < 0) {
 		LOG_ERR("write: %s", op_sun_device);
 		msg_err("Playback error");
 		return -1;

siren-0.2.tar.gz/option.c -> siren-0.7.tar.gz/option.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef __OpenBSD__
+#include <sys/tree.h>
+#else
+#include "compat/tree.h"
+#endif
+
 #include <limits.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -22,12 +28,6 @@
 
 #include "siren.h"
 
-#ifdef HAVE_TREE_H
-#include <sys/tree.h>
-#else
-#include "compat/tree.h"
-#endif
-
 /*
  * Maximum size of any string created by option_attrib_to_string(). The longest
  * possible string is "blink,bold,dim,reverse,standout,underline", which
@@ -46,31 +46,31 @@
 		} number;
 
 		struct format		*format;
-		enum colour		 colour;
+		int			 colour;
 		int			 attrib;
 		int			 boolean;
 		char			*string;
 	} value;
 	void			 (*callback)(void);
 
-	SPLAY_ENTRY(option_entry) entries;
+	RB_ENTRY(option_entry)	 entries;
 };
 
-SPLAY_HEAD(option_tree, option_entry);
+RB_HEAD(option_tree, option_entry);
 
 static int			 option_cmp_entry(struct option_entry *,
 				    struct option_entry *);
 static void			 option_insert_entry(struct option_entry *);
 
-SPLAY_PROTOTYPE(option_tree, option_entry, entries, option_cmp_entry)
+RB_PROTOTYPE(option_tree, option_entry, entries, option_cmp_entry)
 
-static struct option_tree	option_tree = SPLAY_INITIALIZER(option_tree);
+static struct option_tree	option_tree = RB_INITIALIZER(option_tree);
 static pthread_mutex_t		option_tree_mtx = PTHREAD_MUTEX_INITIALIZER;
 
 static const struct {
 	const int		 attrib;
 	const char		*name;
-} option_attrib_names = {
+} option_attribs = {
 	{ ATTRIB_BLINK,		"blink" },
 	{ ATTRIB_BOLD,		"bold" },
 	{ ATTRIB_DIM,		"dim" },
@@ -83,7 +83,7 @@
 static const struct {
 	const enum colour	 colour;
 	const char		*name;
-} option_colour_names = {
+} option_colours = {
 	{ COLOUR_BLACK,		"black" },
 	{ COLOUR_BLUE,		"blue" },
 	{ COLOUR_CYAN,		"cyan" },
@@ -98,7 +98,7 @@
 static const struct {
 	const int		 boolean;
 	const char		*name;
-} option_boolean_names = {
+} option_booleans = {
 	{ 0,			"false" },
 	{ 1,			"true" },
 	/* Aliases for the above two names. */
@@ -110,7 +110,7 @@
 	{ 1,			"yes" }
 };
 
-SPLAY_GENERATE(option_tree, option_entry, entries, option_cmp_entry)
+RB_GENERATE(option_tree, option_entry, entries, option_cmp_entry)
 
 static void
 option_add_attrib(const char *name, int value, void (*callback)(void))
@@ -139,7 +139,7 @@
 }
 
 static void
-option_add_colour(const char *name, enum colour value, void (*callback)(void))
+option_add_colour(const char *name, int value, void (*callback)(void))
 {
 	struct option_entry *o;
 
@@ -208,13 +208,12 @@
 	char	strOPTION_ATTRIB_MAXLEN;
 
 	str0 = '\0';
-	for (i = 0; i < NELEMENTS(option_attrib_names); i++)
-		if (attrib & option_attrib_namesi.attrib ||
-		    attrib == option_attrib_namesi.attrib) {
+	for (i = 0; i < NELEMENTS(option_attribs); i++)
+		if (attrib & option_attribsi.attrib ||
+		    attrib == option_attribsi.attrib) {
 			if (str0 != '\0')
-				(void)strlcat(str, ",", sizeof str);
-			(void)strlcat(str, option_attrib_namesi.name,
-			    sizeof str);
+				strlcat(str, ",", sizeof str);
+			strlcat(str, option_attribsi.name, sizeof str);
 		}
 
 	return xstrdup(str);
@@ -225,12 +224,11 @@
 {
 	size_t i;
 
-	for (i = 0; i < NELEMENTS(option_boolean_names); i++)
-		if (boolean == option_boolean_namesi.boolean)
-			return option_boolean_namesi.name;
+	for (i = 0; i < NELEMENTS(option_booleans); i++)
+		if (boolean == option_booleansi.boolean)
+			return option_booleansi.name;
 
 	LOG_FATALX("unknown boolean");
-	/* NOTREACHED */
 }
 
 static int
@@ -239,17 +237,22 @@
 	return strcmp(o1->name, o2->name);
 }
 
-const char *
-option_colour_to_string(enum colour colour)
+char *
+option_colour_to_string(int colour)
 {
-	size_t i;
+	size_t	 i;
+	char	*str;
+
+	if (colour >= 0) {
+		xasprintf(&str, "colour%d", colour);
+		return str;
+	}
 
-	for (i = 0; i < NELEMENTS(option_colour_names); i++)
-		if (colour == option_colour_namesi.colour)
-			return option_colour_namesi.name;
+	for (i = 0; i < NELEMENTS(option_colours); i++)
+		if (colour == option_coloursi.colour)
+			return xstrdup(option_coloursi.name);
 
-	LOG_FATALX("unknown colour");
-	/* NOTREACHED */
+	LOG_FATALX("unknown colour: %d", colour);
 }
 
 void
@@ -257,8 +260,8 @@
 {
 	struct option_entry *o;
 
-	while ((o = SPLAY_ROOT(&option_tree)) != NULL) {
-		(void)SPLAY_REMOVE(option_tree, &option_tree, o);
+	while ((o = RB_ROOT(&option_tree)) != NULL) {
+		RB_REMOVE(option_tree, &option_tree, o);
 		free(o->name);
 		switch (o->type) {
 		case OPTION_TYPE_FORMAT:
@@ -284,7 +287,7 @@
 	struct option_entry find, *o;
 
 	find.name = xstrdup(name);
-	o = SPLAY_FIND(option_tree, &option_tree, &find);
+	o = RB_FIND(option_tree, &option_tree, &find);
 	free(find.name);
 	return o;
 }
@@ -336,11 +339,11 @@
 	return boolean;
 }
 
-enum colour
+int
 option_get_colour(const char *name)
 {
 	struct option_entry	*o;
-	enum colour		 colour;
+	int			 colour;
 
 	XPTHREAD_MUTEX_LOCK(&option_tree_mtx);
 	o = option_find_type(name, OPTION_TYPE_COLOUR);
@@ -423,22 +426,24 @@
 option_init(void)
 {
 	option_add_boolean("continue", 1, player_print);
-	option_add_number("max-history-entries", 100, 0, INT_MAX,
-	    prompt_resize_histories);
 	option_add_format("library-format", "%-*a %-*l %4y %2n. %-*t %5d",
 	    library_print);
+	option_add_format("library-format-alt", "%-*F %5d", library_print);
 	option_add_string("output-plugin", "default", player_change_op);
 	option_add_format("player-status-format",
-	    "%-7s  %5p / %5d  %3v%%%{?c,  continue,}%{?r,  repeat-all,}"
+	    "%-7s  %5p / %5d  %3v%%  %u%{?c,  continue,}%{?r,  repeat-all,}"
 	    "%{?t,  repeat-track,}", player_print);
 	option_add_format("player-track-format", "%a - %l (%y) - %n. %t",
 	    player_print);
+	option_add_format("player-track-format-alt", "%F", player_print);
+	option_add_format("playlist-format", "%-*a %-*t %5d", playlist_print);
+	option_add_format("playlist-format-alt", "%-*F %5d", playlist_print);
 	option_add_format("queue-format", "%-*a %-*t %5d", queue_print);
+	option_add_format("queue-format-alt", "%-*F %5d", queue_print);
 	option_add_boolean("repeat-all", 1, player_print);
 	option_add_boolean("repeat-track", 0, player_print);
 	option_add_boolean("show-all-files", 0, browser_refresh_dir);
 	option_add_boolean("show-cursor", 0, screen_configure_cursor);
-	option_add_boolean("show-dirs-before-files", 0, browser_refresh_dir);
 	option_add_boolean("show-hidden-files", 0, browser_refresh_dir);
 
 	option_add_attrib("active-attr", ATTRIB_NORMAL,
@@ -496,7 +501,7 @@
 option_insert_entry(struct option_entry *o)
 {
 	XPTHREAD_MUTEX_LOCK(&option_tree_mtx);
-	if (SPLAY_INSERT(option_tree, &option_tree, o) != NULL)
+	if (RB_INSERT(option_tree, &option_tree, o) != NULL)
 		LOG_FATALX("%s: option already exists", o->name);
 	XPTHREAD_MUTEX_UNLOCK(&option_tree_mtx);
 }
@@ -529,10 +534,10 @@
 {
 	struct option_entry *o;
 
-	if (value != 0 && value != 1) {
-		LOG_DEBUG_ERRX("%d: invalid value", value);
-		value = 1;
-	}
+#ifdef DEBUG
+	if (value != 0 && value != 1)
+		LOG_FATALX("%s: %d: invalid value", name, value);
+#endif
 
 	XPTHREAD_MUTEX_LOCK(&option_tree_mtx);
 	o = option_find_type(name, OPTION_TYPE_BOOLEAN);
@@ -547,7 +552,7 @@
 }
 
 void
-option_set_colour(const char *name, enum colour value)
+option_set_colour(const char *name, int value)
 {
 	struct option_entry *o;
 
@@ -618,9 +623,9 @@
 {
 	size_t i;
 
-	for (i = 0; i < NELEMENTS(option_attrib_names); i++)
-		if (!strcasecmp(name, option_attrib_namesi.name))
-			return option_attrib_namesi.attrib;
+	for (i = 0; i < NELEMENTS(option_attribs); i++)
+		if (!strcasecmp(name, option_attribsi.name))
+			return option_attribsi.attrib;
 	return -1;
 }
 
@@ -629,22 +634,29 @@
 {
 	size_t i;
 
-	for (i = 0; i < NELEMENTS(option_boolean_names); i++)
-		if (!strcasecmp(name, option_boolean_namesi.name))
-			return option_boolean_namesi.boolean;
+	for (i = 0; i < NELEMENTS(option_booleans); i++)
+		if (!strcasecmp(name, option_booleansi.name))
+			return option_booleansi.boolean;
 	return -1;
 }
 
 int
-option_string_to_colour(const char *name, enum colour *colour)
+option_string_to_colour(const char *name, int *colour)
 {
-	size_t i;
+	size_t		 i;
+	const char	*errstr;
 
-	for (i = 0; i < NELEMENTS(option_colour_names); i++)
-		if (!strcasecmp(name, option_colour_namesi.name)) {
-			*colour = option_colour_namesi.colour;
+	if (!strncasecmp(name, "colour", 6)) {
+		*colour = strtonum(name + 6, 0, INT_MAX, &errstr);
+		return errstr == NULL ? 0 : -1;
+	}
+
+	for (i = 0; i < NELEMENTS(option_colours); i++)
+		if (!strcasecmp(name, option_coloursi.name)) {
+			*colour = option_coloursi.colour;
 			return 0;
 		}
+
 	return -1;
 }

siren-0.2.tar.gz/path.c -> siren-0.7.tar.gz/path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -36,8 +36,10 @@
 #ifdef PATH_MAX
 	pathsize = PATH_MAX;
 #else
-	if ((pathsize = XPATHCONF("/", _PC_PATH_MAX)) == -1)
+	if ((pathsize = pathconf("/", _PC_PATH_MAX)) == -1) {
+		LOG_ERRX("pathconf() failed");
 		return xstrdup("/");
+	}
 
 	/*
 	 * The size returned by pathconf() is relative to the root directory,
@@ -62,6 +64,31 @@
 }
 
 char *
+path_get_dirname(const char *path)
+{
+	size_t i;
+
+	if (path == NULL || path0 == '\0')
+		return xstrdup(".");
+
+	i = strlen(path) - 1;
+
+	while (pathi == '/' && i > 0)
+		i--;
+
+	while (pathi != '/' && i > 0)
+		i--;
+
+	if (pathi != '/')
+		return xstrdup(".");
+
+	while (pathi == '/' && i > 0)
+		i--;
+
+	return xstrndup(path, i + 1);
+}
+
+char *
 path_get_home_dir(const char *user)
 {
 	struct passwd	 pw, *pwp;
@@ -75,8 +102,10 @@
 			return xstrdup(home);
 	}
 
-	if ((bufsize = XSYSCONF(_SC_GETPW_R_SIZE_MAX)) == -1)
+	if ((bufsize = sysconf(_SC_GETPW_R_SIZE_MAX)) == -1) {
+		LOG_ERRX("sysconf() failed");
 		return NULL;
+	}
 
 	buf = xmalloc(bufsize);
 
@@ -113,7 +142,7 @@
 	tmp = NULL;
 	if (path0 != '/') {
 		cwd = path_get_cwd();
-		(void)xasprintf(&tmp, "%s/%s", cwd, path);
+		xasprintf(&tmp, "%s/%s", cwd, path);
 		free(cwd);
 		path = tmp;
 	}

siren-0.2.tar.gz/player.c -> siren-0.7.tar.gz/player.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -35,11 +35,15 @@
 #endif
 
 #if defined(HAVE_FREEBSD_BSWAP16) || defined(HAVE_NETBSD_BSWAP16)
-#define PLAYER_SWAP16(i)	bswap16((uint16_t)(i))
+#define PLAYER_SWAP16(i)	bswap16(i)
+#define PLAYER_SWAP32(i)	bswap32(i)
 #elif defined(HAVE_OPENBSD_SWAP16)
-#define PLAYER_SWAP16(i)	swap16((u_int16_t)(i))
+#define PLAYER_SWAP16(i)	swap16(i)
+#define PLAYER_SWAP32(i)	swap32(i)
 #else
 #define PLAYER_SWAP16(i)	((uint16_t)(i) >> 8 | (uint16_t)(i) << 8)
+#define PLAYER_SWAP32(i)	\
+	((i) >> 24 | ((i) & 0xff0000) >> 16 | ((i) & 0xff00) << 8 | (i) << 24)
 #endif
 
 #define PLAYER_FMT_CONTINUE	0
@@ -47,9 +51,10 @@
 #define PLAYER_FMT_POSITION	2
 #define PLAYER_FMT_REPEAT_ALL	3
 #define PLAYER_FMT_REPEAT_TRACK	4
-#define PLAYER_FMT_STATE	5
-#define PLAYER_FMT_VOLUME	6
-#define PLAYER_FMT_NVARS	7
+#define PLAYER_FMT_SOURCE	5
+#define PLAYER_FMT_STATE	6
+#define PLAYER_FMT_VOLUME	7
+#define PLAYER_FMT_NVARS	8
 
 enum player_command {
 	PLAYER_COMMAND_PAUSE,
@@ -64,13 +69,6 @@
 	PLAYER_STATE_STOPPED
 };
 
-struct player_sample_buffer {
-	int16_t			*samples;
-	size_t			 maxsamples;
-	size_t			 nsamples;
-	int			 swap;
-};
-
 static void			 player_close_op(void);
 static int			 player_open_op(void);
 static void			*player_playback_handler(void *);
@@ -87,6 +85,9 @@
 static pthread_cond_t		 player_command_cond =
 				    PTHREAD_COND_INITIALIZER;
 
+static pthread_mutex_t		 player_source_mtx = PTHREAD_MUTEX_INITIALIZER;
+static enum player_source	 player_source = PLAYER_SOURCE_LIBRARY;
+
 static const struct op		*player_op = NULL;
 static int			 player_op_opened;
 static pthread_mutex_t		 player_op_mtx = PTHREAD_MUTEX_INITIALIZER;
@@ -100,47 +101,67 @@
  * The player_state_mtx mutex must be locked before calling this function.
  */
 static int
-player_begin_playback(struct player_sample_buffer *buf)
+player_begin_playback(struct sample_buffer *sb)
 {
 	XPTHREAD_MUTEX_LOCK(&player_track_mtx);
 	XPTHREAD_MUTEX_LOCK(&player_op_mtx);
 
 	if (player_track == NULL)
-		goto error;
+		goto error1;
+
+	if (player_track->ip == NULL) {
+		msg_errx("%s: Unsupported file format", player_track->path);
+		goto error1;
+	}
 
 	if (player_track->ip->open(player_track))
-		goto error;
+		goto error1;
 
-	if (player_open_op() == -1) {
-		player_track->ip->close(player_track);
-		goto error;
-	}
+	LOG_DEBUG("rate=%u, nchannels=%u, nbits=%u", player_track->format.rate,
+	    player_track->format.nchannels, player_track->format.nbits);
 
-	if (player_op->start(&player_track->format) == -1) {
-		player_track->ip->close(player_track);
-		goto error;
-	}
+	if (player_open_op() == -1)
+		goto error2;
 
-	/*
-	 * The buffer size is returned in bytes. Only 16-bit samples are
-	 * supported at the moment, so divide by 2 to get the maximum number of
-	 * samples that fit in the buffer.
-	 */
-	buf->maxsamples = player_op->get_buffer_size() / 2;
-	if (buf->maxsamples == 0) {
+	if (player_op->start(&player_track->format) == -1)
+		goto error2;
+
+	if (player_track->format.nbits <= 8)
+		sb->nbytes = 1;
+	else if (player_track->format.nbits <= 16)
+		sb->nbytes = 2;
+	else
+		sb->nbytes = 4;
+
+	sb->size_b = player_op->get_buffer_size();
+	sb->size_s = sb->size_b / sb->nbytes;
+
+	if (sb->size_s == 0) {
 		msg_errx("Output buffer too small");
-		player_track->ip->close(player_track);
-		goto error;
+		goto error2;
 	}
 
-	buf->samples = xcalloc(buf->maxsamples, sizeof *buf->samples);
-	buf->swap = player_track->format.byte_order != player_byte_order;
+	sb->data = xmalloc(sb->size_b);
+	sb->data1 = sb->data;
+	sb->data2 = sb->data;
+	sb->data4 = sb->data;
+
+	if (player_track->format.byte_order == player_byte_order ||
+	    sb->nbytes == 1)
+		sb->swap = 0;
+	else
+		sb->swap = 1;
+
+	LOG_DEBUG("size_b=%zu, size_s=%zu, nbytes=%u, swap=%d", sb->size_b,
+	    sb->size_s, sb->nbytes, sb->swap);
 
 	XPTHREAD_MUTEX_UNLOCK(&player_op_mtx);
 	XPTHREAD_MUTEX_UNLOCK(&player_track_mtx);
 	return 0;
 
-error:
+error2:
+	player_track->ip->close(player_track);
+error1:
 	XPTHREAD_MUTEX_UNLOCK(&player_op_mtx);
 	XPTHREAD_MUTEX_UNLOCK(&player_track_mtx);
 	return -1;
@@ -149,24 +170,13 @@
 void
 player_change_op(void)
 {
-	const struct op	*op;
-	char		*name;
+	player_stop();
 
-	name = option_get_string("output-plugin");
-	if ((op = plugin_find_op(name)) == NULL)
-		msg_errx("Output plug-in not found: %s", name);
-	else {
-		player_stop();
-		XPTHREAD_MUTEX_LOCK(&player_op_mtx);
-		player_close_op();
-		LOG_INFO("opening %s output plug-in", op->name);
-		if (op->open() == 0) {
-			player_op = op;
-			player_op_opened = 1;
-		}
-		XPTHREAD_MUTEX_UNLOCK(&player_op_mtx);
-	}
-	free(name);
+	XPTHREAD_MUTEX_LOCK(&player_op_mtx);
+	player_close_op();
+	player_op = NULL;
+	player_open_op();
+	XPTHREAD_MUTEX_UNLOCK(&player_op_mtx);
 
 	XPTHREAD_MUTEX_LOCK(&player_state_mtx);
 	player_print_status();
@@ -203,11 +213,10 @@
 	player_quit();
 	XPTHREAD_JOIN(player_playback_thd, NULL);
 	player_close_op();
-	track_free(player_track);
 }
 
 static void
-player_end_playback(struct player_sample_buffer *buf)
+player_end_playback(struct sample_buffer *sb)
 {
 	XPTHREAD_MUTEX_LOCK(&player_track_mtx);
 	player_track->ip->close(player_track);
@@ -218,7 +227,7 @@
 		player_close_op();
 	XPTHREAD_MUTEX_UNLOCK(&player_op_mtx);
 
-	free(buf->samples);
+	free(sb->data);
 }
 
 enum byte_order
@@ -233,12 +242,26 @@
 	struct track *t;
 
 	if (!option_get_boolean("repeat-track")) {
-		if ((t = queue_get_next_track()) == NULL &&
-		    (t = library_get_next_track()) == NULL)
-			return -1;
+		if ((t = queue_get_next_track()) == NULL) {
+			XPTHREAD_MUTEX_LOCK(&player_source_mtx);
+			switch (player_source) {
+			case PLAYER_SOURCE_BROWSER:
+				t = browser_get_next_track();
+				break;
+			case PLAYER_SOURCE_LIBRARY:
+				t = library_get_next_track();
+				break;
+			case PLAYER_SOURCE_PLAYLIST:
+				t = playlist_get_next_track();
+				break;
+			}
+			XPTHREAD_MUTEX_UNLOCK(&player_source_mtx);
+
+			if (t == NULL)
+				return -1;
+		}
 
 		XPTHREAD_MUTEX_LOCK(&player_track_mtx);
-		track_free(player_track);
 		player_track = t;
 		XPTHREAD_MUTEX_UNLOCK(&player_track_mtx);
 	}
@@ -276,7 +299,7 @@
 		free(name);
 	}
 
-	LOG_INFO("opening %s output plug-in", player_op->name);
+	LOG_INFO("opening %s", player_op->name);
 	if (player_op->open() == -1)
 		return -1;
 
@@ -316,7 +339,24 @@
 {
 	struct track *t;
 
-	if ((t = library_get_next_track()) != NULL)
+	XPTHREAD_MUTEX_LOCK(&player_source_mtx);
+	switch (player_source) {
+	case PLAYER_SOURCE_BROWSER:
+		t = browser_get_next_track();
+		break;
+	case PLAYER_SOURCE_LIBRARY:
+		t = library_get_next_track();
+		break;
+	case PLAYER_SOURCE_PLAYLIST:
+		t = playlist_get_next_track();
+		break;
+	default:
+		t = NULL;
+		break;
+	}
+	XPTHREAD_MUTEX_UNLOCK(&player_source_mtx);
+
+	if (t != NULL)
 		player_play_track(t);
 }
 
@@ -325,19 +365,35 @@
 {
 	struct track *t;
 
-	if ((t = library_get_prev_track()) != NULL)
+	XPTHREAD_MUTEX_LOCK(&player_source_mtx);
+	switch (player_source) {
+	case PLAYER_SOURCE_BROWSER:
+		t = browser_get_prev_track();
+		break;
+	case PLAYER_SOURCE_LIBRARY:
+		t = library_get_prev_track();
+		break;
+	case PLAYER_SOURCE_PLAYLIST:
+		t = playlist_get_prev_track();
+		break;
+	default:
+		t = NULL;
+		break;
+	}
+	XPTHREAD_MUTEX_UNLOCK(&player_source_mtx);
+
+	if (t != NULL)
 		player_play_track(t);
 }
 
 static int
-player_play_sample_buffer(struct player_sample_buffer *buf)
+player_play_sample_buffer(struct sample_buffer *sb)
 {
 	size_t	i;
 	int	ret;
 
 	XPTHREAD_MUTEX_LOCK(&player_track_mtx);
-	ret = player_track->ip->read(player_track, buf->samples,
-	    buf->maxsamples);
+	ret = player_track->ip->read(player_track, sb);
 	XPTHREAD_MUTEX_UNLOCK(&player_track_mtx);
 
 	if (ret == 0)
@@ -348,18 +404,17 @@
 		/* Error encountered. */
 		goto error;
 
-	buf->nsamples = ret;
-
-	if (buf->swap)
-		for (i = 0; i < buf->nsamples; i++)
-			buf->samplesi = PLAYER_SWAP16(buf->samplesi);
+	if (sb->swap) {
+		if (sb->nbytes == 2)
+			for (i = 0; i < sb->len_s; i++)
+				sb->data2i = PLAYER_SWAP16(sb->data2i);
+		else
+			for (i = 0; i < sb->len_s; i++)
+				sb->data4i = PLAYER_SWAP32(sb->data4i);
+	}
 
 	XPTHREAD_MUTEX_LOCK(&player_op_mtx);
-	/*
-	 * Only 16-bit samples are supported at the moment, so multiply by 2 to
-	 * get the size in bytes.
-	 */
-	ret = player_op->write(buf->samples, buf->nsamples * 2);
+	ret = player_op->write(sb);
 	XPTHREAD_MUTEX_UNLOCK(&player_op_mtx);
 
 	if (ret == -1)
@@ -379,17 +434,15 @@
 {
 	player_stop();
 	XPTHREAD_MUTEX_LOCK(&player_track_mtx);
-	track_free(player_track);
 	player_track = t;
 	XPTHREAD_MUTEX_UNLOCK(&player_track_mtx);
 	player_play();
 }
 
-/* ARGSUSED */
 static void *
 player_playback_handler(UNUSED void *p)
 {
-	struct player_sample_buffer buf;
+	struct sample_buffer sb;
 
 	/*
 	 * Block all signals in this thread so that they can be handled in the
@@ -413,7 +466,7 @@
 			player_print_track();
 		}
 
-		if (player_begin_playback(&buf) == -1) {
+		if (player_begin_playback(&sb) == -1) {
 			player_command = PLAYER_COMMAND_STOP;
 			continue;
 		}
@@ -422,7 +475,7 @@
 		XPTHREAD_MUTEX_UNLOCK(&player_state_mtx);
 
 		for (;;) {
-			if (player_play_sample_buffer(&buf) == -1) {
+			if (player_play_sample_buffer(&sb) == -1) {
 				XPTHREAD_MUTEX_LOCK(&player_state_mtx);
 				break;
 			}
@@ -446,7 +499,7 @@
 			XPTHREAD_MUTEX_UNLOCK(&player_state_mtx);
 		}
 
-		player_end_playback(&buf);
+		player_end_playback(&sb);
 		player_state = PLAYER_STATE_STOPPED;
 		player_print_status();
 
@@ -493,6 +546,9 @@
 	varsPLAYER_FMT_REPEAT_TRACK.lname = "repeat-track";
 	varsPLAYER_FMT_REPEAT_TRACK.sname = 't';
 	varsPLAYER_FMT_REPEAT_TRACK.type = FORMAT_VARIABLE_STRING;
+	varsPLAYER_FMT_SOURCE.lname = "source";
+	varsPLAYER_FMT_SOURCE.sname = 'u';
+	varsPLAYER_FMT_SOURCE.type = FORMAT_VARIABLE_STRING;
 	varsPLAYER_FMT_STATE.lname = "state";
 	varsPLAYER_FMT_STATE.sname = 's';
 	varsPLAYER_FMT_STATE.type = FORMAT_VARIABLE_STRING;
@@ -516,18 +572,21 @@
 	XPTHREAD_MUTEX_LOCK(&player_track_mtx);
 
 	/* Set the position variable. */
-	if (player_state == PLAYER_STATE_STOPPED ||
+	if (player_state == PLAYER_STATE_STOPPED || player_track->ip == NULL ||
 	    player_track->ip->get_position(player_track, &pos) == -1)
-		varsPLAYER_FMT_POSITION.value.number = 0;
+		varsPLAYER_FMT_POSITION.value.time = 0;
 	else
-		varsPLAYER_FMT_POSITION.value.number = pos;
+		varsPLAYER_FMT_POSITION.value.time = pos;
 
 	/* Set the duration variable. */
 	if (player_track == NULL)
-		varsPLAYER_FMT_DURATION.value.number = 0;
-	else
-		varsPLAYER_FMT_DURATION.value.number =
+		varsPLAYER_FMT_DURATION.value.time = 0;
+	else {
+		track_lock_metadata();
+		varsPLAYER_FMT_DURATION.value.time =
 		    player_track->duration;
+		track_unlock_metadata();
+	}
 
 	XPTHREAD_MUTEX_UNLOCK(&player_track_mtx);
 
@@ -558,6 +617,21 @@
 	else
 		varsPLAYER_FMT_REPEAT_TRACK.value.string = "";
 
+	/* Set the player-source variable. */
+	XPTHREAD_MUTEX_LOCK(&player_source_mtx);
+	switch (player_source) {
+	case PLAYER_SOURCE_BROWSER:
+		varsPLAYER_FMT_SOURCE.value.string = "browser";
+		break;
+	case PLAYER_SOURCE_LIBRARY:
+		varsPLAYER_FMT_SOURCE.value.string = "library";
+		break;
+	case PLAYER_SOURCE_PLAYLIST:
+		varsPLAYER_FMT_SOURCE.value.string = "playlist";
+		break;
+	}
+	XPTHREAD_MUTEX_UNLOCK(&player_source_mtx);
+
 	/* Print the status. */
 	option_lock();
 	format = option_get_format("player-status-format");
@@ -571,11 +645,14 @@
 static void
 player_print_track(void)
 {
-	struct format *format;
+	struct format *altfmt, *fmt;
 
 	option_lock();
-	format = option_get_format("player-track-format");
-	screen_player_track_printf(format, player_track);
+	track_lock_metadata();
+	fmt = option_get_format("player-track-format");
+	altfmt = option_get_format("player-track-format-alt");
+	screen_player_track_printf(fmt, altfmt, player_track);
+	track_unlock_metadata();
 	option_unlock();
 }
 
@@ -590,6 +667,21 @@
 }
 
 void
+player_reopen_op(void)
+{
+	player_stop();
+
+	XPTHREAD_MUTEX_LOCK(&player_op_mtx);
+	if (player_op_opened) {
+		LOG_INFO("reopening %s", player_op->name);
+		player_op->close();
+		if (player_op->open() != 0)
+			player_op_opened = 0;
+	}
+	XPTHREAD_MUTEX_UNLOCK(&player_op_mtx);
+}
+
+void
 player_seek(int pos, int relative)
 {
 	unsigned int curpos;
@@ -624,8 +716,16 @@
 {
 	sigset_t ss;
 
-	(void)sigfillset(&ss);
-	(void)pthread_sigmask(SIG_BLOCK, &ss, NULL);
+	sigfillset(&ss);
+	pthread_sigmask(SIG_BLOCK, &ss, NULL);
+}
+
+void
+player_set_source(enum player_source source)
+{
+	XPTHREAD_MUTEX_LOCK(&player_source_mtx);
+	player_source = source;
+	XPTHREAD_MUTEX_UNLOCK(&player_source_mtx);
 }
 
 void

siren-0.7.tar.gz/playlist.c Added

@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 2014 Tim van der Molen <tim@kariliq.nl>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "siren.h"
+
+static int		 playlist_search_entry(const void *, const char *);
+
+static pthread_mutex_t	 playlist_menu_mtx = PTHREAD_MUTEX_INITIALIZER;
+static struct format	*playlist_altformat;
+static struct format	*playlist_format;
+static struct menu	*playlist_menu;
+static unsigned int	 playlist_duration;
+static char		*playlist_file;
+
+void
+playlist_activate_entry(void)
+{
+	struct menu_entry	*e;
+	struct track		*t;
+
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	if ((e = menu_get_selected_entry(playlist_menu)) == NULL)
+		t = NULL;
+	else {
+		menu_activate_entry(playlist_menu, e);
+		t = menu_get_entry_data(e);
+	}
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+
+	if (t != NULL) {
+		player_set_source(PLAYER_SOURCE_PLAYLIST);
+		player_play_track(t);
+		playlist_print();
+	}
+}
+
+void
+playlist_copy_entry(enum view_id view)
+{
+	struct track *t;
+
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	if ((t = menu_get_selected_entry_data(playlist_menu)) != NULL)
+		view_add_track(view, t);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+}
+
+void
+playlist_end(void)
+{
+	menu_free(playlist_menu);
+	free(playlist_file);
+}
+
+static void
+playlist_get_entry_text(const void *e, char *buf, size_t bufsize)
+{
+	const struct track *t;
+
+	t = e;
+	format_track_snprintf(buf, bufsize, playlist_format,
+	    playlist_altformat, t);
+}
+
+struct track *
+playlist_get_next_track(void)
+{
+	struct menu_entry	*e;
+	struct track		*t;
+
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	if ((e = menu_get_active_entry(playlist_menu)) == NULL)
+		t = NULL;
+	else {
+		if ((e = menu_get_next_entry(e)) == NULL &&
+		    option_get_boolean("repeat-all"))
+			e = menu_get_first_entry(playlist_menu);
+
+		if (e == NULL)
+			t = NULL;
+		else {
+			menu_activate_entry(playlist_menu, e);
+			t = menu_get_entry_data(e);
+		}
+	}
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+
+	playlist_print();
+	return t;
+}
+
+struct track *
+playlist_get_prev_track(void)
+{
+	struct menu_entry	*e;
+	struct track		*t;
+
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	if ((e = menu_get_active_entry(playlist_menu)) == NULL)
+		t = NULL;
+	else {
+		if ((e = menu_get_prev_entry(e)) == NULL &&
+		    option_get_boolean("repeat-all"))
+			e = menu_get_last_entry(playlist_menu);
+
+		if (e == NULL)
+			t = NULL;
+		else {
+			menu_activate_entry(playlist_menu, e);
+			t = menu_get_entry_data(e);
+		}
+	}
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+
+	playlist_print();
+	return t;
+}
+
+void
+playlist_init(void)
+{
+	playlist_menu = menu_init(NULL, playlist_get_entry_text,
+	    playlist_search_entry);
+}
+
+void
+playlist_load(const char *file)
+{
+	struct track		*t;
+	FILE			*fp;
+	size_t			 len;
+	char			*buf, *dir, *lbuf, *path, *tmp;
+
+	if ((fp = fopen(file, "r")) == NULL) {
+		LOG_ERR("fopen: %s", file);
+		msg_err("Cannot open playlist: %s", file);
+		return;
+	}
+
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+
+	menu_remove_all_entries(playlist_menu);
+	free(playlist_file);
+	playlist_file = path_normalise(file);
+	dir = path_get_dirname(playlist_file);
+
+	lbuf = NULL;
+	while ((buf = fgetln(fp, &len)) != NULL) {
+		/* Strip both \n and \r\n EOLs. */
+		if (buflen - 1 == '\n') {
+			len--;
+			if (len > 0 && buflen - 1 == '\r')
+				len--;
+		} else {
+			lbuf = xmalloc(len + 1);
+			buf = memcpy(lbuf, buf, len);
+		}
+		buflen = '\0';
+
+		if (buf0 == '#' || buf0 == '\0')
+			continue;
+
+		if (buf0 == '/')
+			path = path_normalise(buf);
+		else {
+			xasprintf(&tmp, "%s/%s", dir, buf);
+			path = path_normalise(tmp);
+			free(tmp);
+		}
+
+		if ((t = track_require(path)) != NULL) {
+			menu_insert_tail(playlist_menu, t);
+			playlist_duration += t->duration;
+		}
+
+		free(path);
+	}
+
+	if (ferror(fp)) {
+		LOG_ERR("fgetln: %s", file);
+		msg_err("Cannot read playlist: %s", file);
+	}
+
+	free(lbuf);
+	free(dir);
+
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+
+	fclose(fp);
+
+	playlist_print();
+}
+
+void
+playlist_print(void)
+{
+	if (view_get_id() != VIEW_ID_PLAYLIST)
+		return;
+
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	screen_view_title_printf("Playlist: %s (%u track%s, %u:%02u:%02u)",
+	    playlist_file != NULL ? playlist_file : "None",
+	    menu_get_nentries(playlist_menu),
+	    menu_get_nentries(playlist_menu) == 1 ? "" : "s",
+	    HOURS(playlist_duration),
+	    HMINS(playlist_duration),
+	    MSECS(playlist_duration));
+	option_lock();
+	playlist_format = option_get_format("playlist-format");
+	playlist_altformat = option_get_format("playlist-format-alt");
+	menu_print(playlist_menu);
+	option_unlock();
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+}
+
+void
+playlist_scroll_down(enum menu_scroll scroll)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_scroll_down(playlist_menu, scroll);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+void
+playlist_scroll_up(enum menu_scroll scroll)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_scroll_up(playlist_menu, scroll);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+static int
+playlist_search_entry(const void *e, const char *search)
+{
+	const struct track *t;
+
+	t = e;
+	return track_search(t, search);
+}
+
+void
+playlist_search_next(const char *search)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_search_next(playlist_menu, search);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+void
+playlist_search_prev(const char *search)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_search_prev(playlist_menu, search);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+void
+playlist_select_active_entry(void)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_select_active_entry(playlist_menu);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+void
+playlist_select_first_entry(void)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_select_first_entry(playlist_menu);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+void
+playlist_select_last_entry(void)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_select_last_entry(playlist_menu);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+void
+playlist_select_next_entry(void)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_select_next_entry(playlist_menu);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+void
+playlist_select_prev_entry(void)
+{
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	menu_select_prev_entry(playlist_menu);
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+	playlist_print();
+}
+
+/* Recalculate the duration. */
+void
+playlist_update(void)
+{
+	struct menu_entry	*e;
+	struct track		*t;
+
+	XPTHREAD_MUTEX_LOCK(&playlist_menu_mtx);
+	playlist_duration = 0;
+	MENU_FOR_EACH_ENTRY(playlist_menu, e) {
+		t = menu_get_entry_data(e);
+		playlist_duration += t->duration;
+	}
+	XPTHREAD_MUTEX_UNLOCK(&playlist_menu_mtx);
+}

siren-0.2.tar.gz/plugin.c -> siren-0.7.tar.gz/plugin.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,20 +14,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef __OpenBSD__
+#include <sys/queue.h>
+#else
+#include "compat/queue.h"
+#endif
+
 #include <dlfcn.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 
 #include "siren.h"
 
-#ifdef HAVE_QUEUE_H
-#include <sys/queue.h>
-#else
-#include "compat/queue.h"
-#endif
-
 struct plugin_ip_entry {
 	void		*handle;
 	const struct ip	*ip;
@@ -41,14 +40,14 @@
 };
 
 static void plugin_load_dir(const char *, const char *,
-    void (*)(void *, void *));
+    int (*)(void *, void *));
 
 static SLIST_HEAD(, plugin_ip_entry) plugin_ip_list =
     SLIST_HEAD_INITIALIZER(plugin_ip_list);
 static SLIST_HEAD(, plugin_op_entry) plugin_op_list =
     SLIST_HEAD_INITIALIZER(plugin_op_list);
 
-static void
+static int
 plugin_add_ip(void *handle, void *ip)
 {
 	struct plugin_ip_entry *ipe;
@@ -56,11 +55,18 @@
 	ipe = xmalloc(sizeof *ipe);
 	ipe->handle = handle;
 	ipe->ip = ip;
-	SLIST_INSERT_HEAD(&plugin_ip_list, ipe, entries);
 	LOG_INFO("loaded %s", ipe->ip->name);
+
+	if (ipe->ip->init != NULL && ipe->ip->init() != 0) {
+		free(ipe);
+		return -1;
+	}
+
+	SLIST_INSERT_HEAD(&plugin_ip_list, ipe, entries);
+	return 0;
 }
 
-static void
+static int
 plugin_add_op(void *handle, void *op)
 {
 	struct plugin_op_entry *ope;
@@ -68,13 +74,33 @@
 	ope = xmalloc(sizeof *ope);
 	ope->handle = handle;
 	ope->op = op;
-	SLIST_INSERT_HEAD(&plugin_op_list, ope, entries);
 	LOG_INFO("loaded %s", ope->op->name);
 
-	if (ope->op->init != NULL)
-		ope->op->init();
+	if (ope->op->init != NULL && ope->op->init() != 0) {
+		free(ope);
+		return -1;
+	}
+
+	SLIST_INSERT_HEAD(&plugin_op_list, ope, entries);
+	return 0;
 }
 
+#ifdef HAVE_PLEDGE
+void
+plugin_append_promises(char **promises)
+{
+	struct plugin_op_entry	*ope;
+	char			*tmp;
+
+	SLIST_FOREACH(ope, &plugin_op_list, entries)
+		if (ope->op->promises != NULL) {
+			xasprintf(&tmp, "%s %s", *promises, ope->op->promises);
+			free(*promises);
+			*promises = tmp;
+		}
+}
+#endif
+
 void
 plugin_end(void)
 {
@@ -83,13 +109,13 @@
 
 	while ((ipe = SLIST_FIRST(&plugin_ip_list)) != NULL) {
 		SLIST_REMOVE_HEAD(&plugin_ip_list, entries);
-		(void)dlclose(ipe->handle);
+		dlclose(ipe->handle);
 		free(ipe);
 	}
 
 	while ((ope = SLIST_FIRST(&plugin_op_list)) != NULL) {
 		SLIST_REMOVE_HEAD(&plugin_op_list, entries);
-		(void)dlclose(ope->handle);
+		dlclose(ope->handle);
 		free(ope);
 	}
 }
@@ -101,18 +127,24 @@
 plugin_find_ip(const char *file)
 {
 	struct plugin_ip_entry	*ipe;
+	const struct ip		*ip;
 	int			 i;
 	char			*ext;
 
 	if ((ext = strrchr(file, '.')) == NULL || *++ext == '\0')
 		return NULL;
 
+	ip = NULL;
 	SLIST_FOREACH(ipe, &plugin_ip_list, entries)
 		for (i = 0; ipe->ip->extensionsi != NULL; i++)
-			if (!strcasecmp(ext, ipe->ip->extensionsi))
-				return ipe->ip;
+			if (!strcasecmp(ext, ipe->ip->extensionsi)) {
+				if (ip == NULL ||
+				    ip->priority > ipe->ip->priority)
+					ip = ipe->ip;
+				break;
+			}
 
-	return NULL;
+	return ip;
 }
 
 /*
@@ -159,7 +191,7 @@
 
 static void
 plugin_load_dir(const char *dir, const char *symbol,
-    void (*add)(void *, void *))
+    int (*add)(void *, void *))
 {
 	struct dir		*d;
 	struct dir_entry	*de;
@@ -172,11 +204,6 @@
 	}
 
 	while ((de = dir_get_entry(d)) != NULL) {
-		if (errno) {
-			msg_err("%s", de->path);
-			continue;
-		}
-
 		if (de->type != FILE_TYPE_REGULAR)
 			continue;
 
@@ -192,15 +219,13 @@
 
 		if ((plugin = dlsym(handle, symbol)) == NULL) {
 			LOG_ERRX("dlsym: %s: %s", de->path, dlerror());
-			(void)dlclose(handle);
+			dlclose(handle);
 			continue;
 		}
 
-		add(handle, plugin);
+		if (add(handle, plugin) == -1)
+			dlclose(handle);
 	}
 
-	if (errno)
-		msg_err("%s", dir);
-
 	dir_close(d);
 }

siren-0.2.tar.gz/prompt.c -> siren-0.7.tar.gz/prompt.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -47,7 +47,7 @@
 static size_t		 prompt_scroll_offset;
 static char		*prompt_line;
 
-static const char	*prompt_prompt;
+static char		*prompt_prompt;
 static size_t		 prompt_promptlen;
 
 void			 (*prompt_callback)(char *, void *);
@@ -86,18 +86,6 @@
 }
 
 void
-prompt_clear_command_history(void)
-{
-	history_clear(prompt_command_history);
-}
-
-void
-prompt_clear_search_history(void)
-{
-	history_clear(prompt_search_history);
-}
-
-void
 prompt_end(void)
 {
 	history_free(prompt_command_history);
@@ -228,12 +216,12 @@
 		break;
 	case K_CTRL('W'):
 		i = 0;
-		while (prompt_linepos - i > 0 &&
-		    !isalnum((int)prompt_lineprompt_linepos - i - 1))
+		while (i < prompt_linepos && !isalnum(
+		    (unsigned char)prompt_lineprompt_linepos - i - 1))
 			i++;
 
-		while (prompt_linepos - i > 0 &&
-		    isalnum((int)prompt_lineprompt_linepos - i - 1))
+		while (i < prompt_linepos && isalnum(
+		    (unsigned char)prompt_lineprompt_linepos - i - 1))
 			i++;
 
 		prompt_linepos -= i;
@@ -284,7 +272,7 @@
 		 * Ignore control characters and function keys not handled
 		 * above.
 		 */
-		if (iscntrl(key) || key > 127)
+		if (iscntrl((unsigned char)key) || key > 127)
 			break;
 
 		if (++prompt_linelen == prompt_linesize) {
@@ -295,7 +283,7 @@
 		for (i = prompt_linelen; i > prompt_linepos; i--)
 			prompt_linei = prompt_linei - 1;
 
-		prompt_lineprompt_linepos++ = (char)key;
+		prompt_lineprompt_linepos++ = key;
 		break;
 	}
 
@@ -322,12 +310,14 @@
 		history_rewind(prompt_history);
 
 	prompt_mode = mode;
-	if (prompt_mode == PROMPT_MODE_CHAR)
+	if (prompt_mode == PROMPT_MODE_CHAR) {
+		xasprintf(&prompt_prompt, "%s? (y/n): ", prompt);
 		prompt_linesize = 1;
-	else
+	} else {
+		prompt_prompt = xstrdup(prompt);
 		prompt_linesize = PROMPT_LINESIZE;
+	}
 
-	prompt_prompt = prompt;
 	prompt_promptlen = strlen(prompt_prompt);
 	prompt_callback = callback;
 	prompt_callback_data = callback_data;
@@ -347,6 +337,7 @@
 {
 	screen_prompt_end();
 	input_set_mode(INPUT_MODE_VIEW);
+	free(prompt_prompt);
 	prompt_callback(prompt_line, prompt_callback_data);
 }
 
@@ -361,13 +352,3 @@
 	screen_prompt_printf(cursorpos, "%s%s", prompt_prompt,
 	    prompt_line + prompt_scroll_offset);
 }
-
-void
-prompt_resize_histories(void)
-{
-	unsigned int maxentries;
-
-	maxentries = (unsigned int)option_get_number("max-history-entries");
-	history_resize(prompt_command_history, maxentries);
-	history_resize(prompt_search_history, maxentries);
-}

siren-0.2.tar.gz/queue.c -> siren-0.7.tar.gz/queue.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,11 +20,10 @@
 
 #include "siren.h"
 
-static void		 queue_free_entry(void *);
-static void		 queue_get_entry_text(const void *, char *, size_t);
 static int		 queue_search_entry(const void *, const char *);
 
 static pthread_mutex_t	 queue_menu_mtx = PTHREAD_MUTEX_INITIALIZER;
+static struct format	*queue_altformat;
 static struct format	*queue_format;
 static struct menu	*queue_menu;
 static unsigned int	 queue_duration;
@@ -36,7 +35,6 @@
 
 	XPTHREAD_MUTEX_LOCK(&queue_menu_mtx);
 	if ((t = menu_get_selected_entry_data(queue_menu)) != NULL) {
-		track_hold(t);
 		queue_duration -= t->duration;
 		menu_remove_selected_entry(queue_menu);
 	}
@@ -61,18 +59,13 @@
 	}
 
 	while ((de = dir_get_entry(d)) != NULL) {
-		if (errno) {
-			msg_err("%s", de->path);
-			continue;
-		}
-
 		switch (de->type) {
 		case FILE_TYPE_DIRECTORY:
 			if (strcmp(de->name, ".") && strcmp(de->name, ".."))
 				queue_add_dir(de->path);
 			break;
 		case FILE_TYPE_REGULAR:
-			if ((t = track_init(de->path, NULL)) != NULL)
+			if ((t = track_get(de->path, NULL)) != NULL)
 				queue_add_track(t);
 			break;
 		default:
@@ -81,9 +74,6 @@
 		}
 	}
 
-	if (errno)
-		msg_err("%s", path);
-
 	dir_close(d);
 }
 
@@ -106,10 +96,8 @@
 		return;
 
 	XPTHREAD_MUTEX_LOCK(&queue_menu_mtx);
-	if ((t = menu_get_selected_entry_data(queue_menu)) != NULL) {
-		track_hold(t);
+	if ((t = menu_get_selected_entry_data(queue_menu)) != NULL)
 		view_add_track(view, t);
-	}
 	XPTHREAD_MUTEX_UNLOCK(&queue_menu_mtx);
 }
 
@@ -144,18 +132,12 @@
 }
 
 static void
-queue_free_entry(void *e)
-{
-	track_free((struct track *)e);
-}
-
-static void
 queue_get_entry_text(const void *e, char *buf, size_t bufsize)
 {
 	const struct track *t;
 
 	t = e;
-	format_track_snprintf(buf, bufsize, queue_format, t);
+	format_track_snprintf(buf, bufsize, queue_format, queue_altformat, t);
 }
 
 struct track *
@@ -169,7 +151,6 @@
 		t = NULL;
 	else {
 		t = menu_get_entry_data(me);
-		track_hold(t);
 		queue_duration -= t->duration;
 		menu_remove_entry(queue_menu, me);
 	}
@@ -184,8 +165,7 @@
 void
 queue_init(void)
 {
-	queue_menu = menu_init(queue_free_entry, queue_get_entry_text,
-	    queue_search_entry);
+	queue_menu = menu_init(NULL, queue_get_entry_text, queue_search_entry);
 }
 
 void
@@ -194,10 +174,8 @@
 	struct menu_entry *e;
 
 	XPTHREAD_MUTEX_LOCK(&queue_menu_mtx);
-	if ((e = menu_get_selected_entry(queue_menu)) != NULL) {
-		menu_move_entry_down(e);
-		menu_select_next_entry(queue_menu);
-	}
+	if ((e = menu_get_selected_entry(queue_menu)) != NULL)
+		menu_move_entry_down(queue_menu, e);
 	XPTHREAD_MUTEX_UNLOCK(&queue_menu_mtx);
 	queue_print();
 }
@@ -208,10 +186,8 @@
 	struct menu_entry *e;
 
 	XPTHREAD_MUTEX_LOCK(&queue_menu_mtx);
-	if ((e = menu_get_selected_entry(queue_menu)) != NULL) {
-		menu_move_entry_up(e);
-		menu_select_prev_entry(queue_menu);
-	}
+	if ((e = menu_get_selected_entry(queue_menu)) != NULL)
+		menu_move_entry_up(queue_menu, e);
 	XPTHREAD_MUTEX_UNLOCK(&queue_menu_mtx);
 	queue_print();
 }
@@ -231,6 +207,7 @@
 	    MSECS(queue_duration));
 	option_lock();
 	queue_format = option_get_format("queue-format");
+	queue_altformat = option_get_format("queue-format-alt");
 	menu_print(queue_menu);
 	option_unlock();
 	XPTHREAD_MUTEX_UNLOCK(&queue_menu_mtx);
@@ -254,6 +231,15 @@
 	queue_print();
 }
 
+static int
+queue_search_entry(const void *e, const char *search)
+{
+	const struct track *t;
+
+	t = e;
+	return track_search(t, search);
+}
+
 void
 queue_search_next(const char *search)
 {
@@ -272,15 +258,6 @@
 	queue_print();
 }
 
-static int
-queue_search_entry(const void *e, const char *search)
-{
-	const struct track *t;
-
-	t = e;
-	return track_search(t, search);
-}
-
 void
 queue_select_first_entry(void)
 {
@@ -316,3 +293,19 @@
 	XPTHREAD_MUTEX_UNLOCK(&queue_menu_mtx);
 	queue_print();
 }
+
+/* Recalculate the duration. */
+void
+queue_update(void)
+{
+	struct menu_entry	*e;
+	struct track		*t;
+
+	XPTHREAD_MUTEX_LOCK(&queue_menu_mtx);
+	queue_duration = 0;
+	MENU_FOR_EACH_ENTRY(queue_menu, e) {
+		t = menu_get_entry_data(e);
+		queue_duration += t->duration;
+	}
+	XPTHREAD_MUTEX_UNLOCK(&queue_menu_mtx);
+}

siren-0.2.tar.gz/screen.c -> siren-0.7.tar.gz/screen.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,6 +15,7 @@
  */
 
 #include <curses.h>
+#include <errno.h>
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -44,12 +45,7 @@
 #define SCREEN_TITLE_ROW	0
 #define SCREEN_VIEW_ROW		1
 
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-#undef clrtoeol
-#define clrtoeol		screen_clrtoeol
-#endif
-
-static short int		 screen_get_colour(const char *, enum colour);
+static short int		 screen_get_colour(const char *, int);
 static void			 screen_msg_vprintf(int, const char *,
 				    va_list);
 static void			 screen_print_row(const char *);
@@ -165,24 +161,6 @@
 	{ A_NORMAL, 9, "view-attr",       "view-bg",       "view-fg" }
 };
 
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-/*
- * NetBSD's clrtoeol() does not set the background attributes of the characters
- * it clears. This will be fixed in NetBSD 6.0. We work around this by using
- * our own version which simply writes spaces to the end of the row.
- */
-static void
-screen_clrtoeol(void)
-{
-	int col, i, row;
-
-	getyx(stdscr, row, col);
-	for (i = col; i < COLS; i++)
-		(void)addch(' ');
-	(void)move(row, col);
-}
-#endif
-
 static void
 screen_configure_attribs(void)
 {
@@ -190,7 +168,6 @@
 	int	 attr;
 	chtype	 cattr;
 
-	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
 	for (i = 0; i < NELEMENTS(screen_objects); i++) {
 		attr = option_get_attrib(screen_objectsi.option_attr);
 		cattr = A_NORMAL;
@@ -199,9 +176,10 @@
 			if (attr & screen_attribsj.attrib)
 				cattr |= screen_attribsj.curses_attrib;
 
+		XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
 		screen_objectsi.attr = cattr;
+		XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 	}
-	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
 
 static void
@@ -213,37 +191,28 @@
 	if (!screen_have_colours)
 		return;
 
-	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
 	for (i = 0; i < NELEMENTS(screen_objects); i++) {
 		bg = screen_get_colour(screen_objectsi.option_bg,
 		    COLOUR_BLACK);
 		fg = screen_get_colour(screen_objectsi.option_fg,
 		    COLOUR_WHITE);
 
+		XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
 		if (init_pair(screen_objectsi.colour_pair, fg, bg) == OK)
 			screen_objectsi.attr |=
-			    (chtype)COLOR_PAIR(screen_objectsi.colour_pair);
+			    COLOR_PAIR(screen_objectsi.colour_pair);
+		XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 	}
-	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
 
 void
 screen_configure_cursor(void)
 {
-	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
-	if (option_get_boolean("show-cursor"))
-		(void)curs_set(1);
-	else
-		(void)curs_set(0);
+	int show;
 
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-	/*
-	 * NetBSD's curs_set() does not let the cursor-visibility change take
-	 * effect immediately. This will be fixed in NetBSD 6.0. We work around
-	 * this by calling refresh() after curs_set().
-	 */
-	(void)refresh();
-#endif
+	show = option_get_boolean("show-cursor");
+	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
+	curs_set(show);
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
 
@@ -284,7 +253,7 @@
 void
 screen_end(void)
 {
-	(void)endwin();
+	endwin();
 	free(screen_row);
 }
 
@@ -292,9 +261,13 @@
 screen_get_colour(const char *option, enum colour default_colour)
 {
 	size_t		i;
-	enum colour	colour;
+	int		colour;
 
 	colour = option_get_colour(option);
+
+	if (colour >= 0 && colour < COLORS)
+		return colour;
+
 #ifdef HAVE_USE_DEFAULT_COLORS
 	if (colour == COLOUR_DEFAULT && !screen_have_default_colours)
 #else
@@ -306,8 +279,7 @@
 		if (colour == screen_coloursi.colour)
 			return screen_coloursi.curses_colour;
 
-	LOG_FATALX("unknown colour");
-	/* NOTREACHED */
+	LOG_FATALX("unknown colour: %d", colour);
 }
 
 int
@@ -333,29 +305,40 @@
 	return K_NONE;
 }
 
+int
+screen_get_ncolours(void)
+{
+	return screen_have_colours ? COLORS : 0;
+}
+
 unsigned int
 screen_get_ncols(void)
 {
-	return (unsigned int)COLS;
+	return COLS;
 }
 
 void
 screen_init(void)
 {
-	(void)initscr();
-	(void)cbreak();
-	(void)noecho();
-	(void)nonl();
-	(void)keypad(stdscr, TRUE);
+	if (initscr() == NULL)
+		LOG_FATALX("cannot initialise screen");
+
+	cbreak();
+	noecho();
+	nonl();
+	keypad(stdscr, TRUE);
 
 	if (has_colors() == TRUE) {
 		if (start_color() == ERR)
 			LOG_ERRX("start_color() failed");
 		else {
 			screen_have_colours = 1;
+			LOG_INFO("terminal supports %d colours", COLORS);
 #ifdef HAVE_USE_DEFAULT_COLORS
-			if (use_default_colors() == OK)
+			if (use_default_colors() == OK) {
 				screen_have_default_colours = 1;
+				LOG_INFO("terminal supports default colours");
+			}
 #endif
 		}
 	}
@@ -398,8 +381,8 @@
 	if (move(screen_status_row, 0) == OK) {
 		bkgdset(screen_objectsobj.attr);
 		screen_vprintf(fmt, ap);
-		(void)move(row, col);
-		(void)refresh();
+		move(row, col);
+		refresh();
 	}
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
@@ -416,14 +399,15 @@
 	if (move(screen_player_row + 1, 0) == OK) {
 		bkgdset(screen_objectsSCREEN_OBJ_PLAYER.attr);
 		screen_print_row(screen_row);
-		(void)move(row, col);
-		(void)refresh();
+		move(row, col);
+		refresh();
 	}
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
 
 void
-screen_player_track_printf(const struct format *fmt, const struct track *track)
+screen_player_track_printf(const struct format *fmt,
+    const struct format *altfmt, const struct track *track)
 {
 	int col, row;
 
@@ -431,14 +415,15 @@
 	if (track == NULL)
 		screen_row0 = '\0';
 	else
-		format_track_snprintf(screen_row, screen_rowsize, fmt, track);
+		format_track_snprintf(screen_row, screen_rowsize, fmt, altfmt,
+		    track);
 
 	getyx(stdscr, row, col);
 	if (move(screen_player_row, 0) == OK) {
 		bkgdset(screen_objectsSCREEN_OBJ_PLAYER.attr);
 		screen_print_row(screen_row);
-		(void)move(row, col);
-		(void)refresh();
+		move(row, col);
+		refresh();
 	}
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
@@ -462,10 +447,10 @@
 {
 	int col UNUSED, row;
 
-	(void)addnstr(s, COLS);
+	addnstr(s, COLS);
 
 	if (strlen(s) < (size_t)COLS)
-		(void)clrtoeol();
+		clrtoeol();
 	else {
 		/*
 		 * If the length of the printed string is equal to the screen
@@ -473,7 +458,7 @@
 		 * moving the cursor back to the original row.
 		 */
 		getyx(stdscr, row, col);
-		(void)move(row - 1, COLS - 1);
+		move(row - 1, COLS - 1);
 	}
 }
 
@@ -481,7 +466,7 @@
 screen_prompt_begin(void)
 {
 	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
-	(void)curs_set(1);
+	curs_set(1);
 	screen_status_col = 0;
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
@@ -489,12 +474,15 @@
 void
 screen_prompt_end(void)
 {
+	int show;
+
+	show = option_get_boolean("show-cursor");
 	screen_status_clear();
 	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
-	if (!option_get_boolean("show-cursor"))
-		(void)curs_set(0);
-	(void)move(screen_view_selected_row, 0);
-	(void)refresh();
+	if (!show)
+		curs_set(0);
+	move(screen_view_selected_row, 0);
+	refresh();
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
 
@@ -508,13 +496,13 @@
 	if ((int)cursorpos >= COLS && COLS > 0)
 		screen_status_col = COLS - 1;
 	else
-		screen_status_col = (int)cursorpos;
+		screen_status_col = cursorpos;
 
 	if (move(screen_status_row, 0) == OK) {
 		bkgdset(screen_objectsSCREEN_OBJ_PROMPT.attr);
 		screen_vprintf(fmt, ap);
-		(void)move(screen_status_row, screen_status_col);
-		(void)refresh();
+		move(screen_status_row, screen_status_col);
+		refresh();
 	}
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 	va_end(ap);
@@ -524,7 +512,7 @@
 screen_refresh(void)
 {
 	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
-	(void)clear();
+	clear();
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 #if defined(HAVE_RESIZETERM) && defined(TIOCGWINSZ)
 	screen_resize();
@@ -572,9 +560,9 @@
 	getyx(stdscr, row, col);
 	if (move(screen_status_row, 0) == OK) {
 		bkgdset(screen_objectsSCREEN_OBJ_STATUS.attr);
-		(void)clrtoeol();
-		(void)move(row, col);
-		(void)refresh();
+		clrtoeol();
+		move(row, col);
+		refresh();
 	}
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
@@ -582,7 +570,7 @@
 unsigned int
 screen_view_get_nrows(void)
 {
-	return (unsigned int)screen_view_nrows;
+	return screen_view_nrows;
 }
 
 void
@@ -610,8 +598,8 @@
 	/* Clear the view area. */
 	bkgdset(screen_objectsSCREEN_OBJ_VIEW.attr);
 	for (i = 0; i < screen_view_nrows; i++) {
-		(void)move(SCREEN_VIEW_ROW + i, 0);
-		(void)clrtoeol();
+		move(SCREEN_VIEW_ROW + i, 0);
+		clrtoeol();
 	}
 	screen_view_current_row = screen_view_selected_row = SCREEN_VIEW_ROW;
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
@@ -622,10 +610,10 @@
 {
 	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
 	if (input_get_mode() == INPUT_MODE_PROMPT)
-		(void)move(screen_status_row, screen_status_col);
+		move(screen_status_row, screen_status_col);
 	else
-		(void)move(screen_view_selected_row, 0);
-	(void)refresh();
+		move(screen_view_selected_row, 0);
+	refresh();
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 }
 
@@ -636,7 +624,7 @@
 screen_view_print_row(chtype attr, const char *s)
 {
 	bkgdset(attr);
-	(void)move(screen_view_current_row++, 0);
+	move(screen_view_current_row++, 0);
 	screen_print_row(s);
 }
 
@@ -673,11 +661,9 @@
 
 	va_start(ap, fmt);
 	XPTHREAD_MUTEX_LOCK(&screen_curses_mtx);
+	bkgdset(screen_objectsSCREEN_OBJ_TITLE.attr);
 	len = xvsnprintf(screen_row, screen_rowsize, fmt, ap);
-	if (len < COLS)
-		(void)mvaddstr(SCREEN_TITLE_ROW, COLS - len, screen_row);
-	else
-		(void)mvaddstr(SCREEN_TITLE_ROW, 0, screen_row + len - COLS);
+	mvaddstr(SCREEN_TITLE_ROW, (len < COLS) ? (COLS - len) : 0, screen_row);
 	/* No refresh() yet; screen_view_print_end() will do that. */
 	XPTHREAD_MUTEX_UNLOCK(&screen_curses_mtx);
 	va_end(ap);
@@ -686,16 +672,16 @@
 /*
  * The screen_curses_mtx mutex must be locked before calling this function.
  */
-static void
+PRINTFLIKE(1, 0) static void
 screen_vprintf(const char *fmt, va_list ap)
 {
 	int col UNUSED, len, row;
 
 	len = xvsnprintf(screen_row, screen_rowsize, fmt, ap);
-	(void)addnstr(screen_row, COLS);
+	addnstr(screen_row, COLS);
 
 	if (len < COLS)
-		(void)clrtoeol();
+		clrtoeol();
 	else {
 		/*
 		 * If the length of the printed string is equal to the screen
@@ -703,6 +689,6 @@
 		 * moving the cursor back to the original row.
 		 */
 		getyx(stdscr, row, col);
-		(void)move(row - 1, COLS - 1);
+		move(row - 1, COLS - 1);
 	}
 }

siren-0.2.tar.gz/siren.1 -> siren-0.7.tar.gz/siren.1 Changed

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+.\" Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd September 16, 2012
+.Dd November 8, 2014
 .Dt SIREN 1
 .Os
 .Sh NAME
@@ -36,12 +36,8 @@
 .Pa ~/.siren .
 .It Fl l
 Log error and informational messages to a file.
-If
-.Nm
-is compiled with debugging support, then debugging messages are saved to this
-file, too.
 The file is created in the current directory and named
-.Pa siren-%d.log ,
+.Pa siren-%d.log
 where
 .Pa %d
 is replaced with
@@ -53,29 +49,41 @@
 .Sh USER INTERFACE
 .Nm Ap s
 user interface consists of three areas.
-The bottom line is the status line, which is used to display error and
-informational messages and to enter commands and search queries.
+.Pp
+The bottom line is the status line.
+It is used to display error and informational messages and to enter commands
+and search queries.
+.Pp
 The two lines above the status line show playback-related information, such as
-the metadata of the currently playing track and the sound volume.
+the currently playing track and the volume level.
+.Pp
 The remainder of the screen is used to display a view.
-A view displays a specific type of information.
-Only one view can be displayed at a time, but each view can be selected by
-using the
+Only one view can be displayed at a time, but each view can be selected with
+the
 .Ic select-view
-command or the default key bindings.
+command
+.Po
+see
+.Sx COMMANDS
+below
+.Pc
+or the default key bindings.
 .Pp
 The available views are as follows.
 .Bl -tag -width Ds
 .It Sy Library view
-The library view shows all tracks that have been added to the library.
-It can be displayed by pressing the
+The library view shows all tracks in the library.
+The
+.Ic add-path
+command may be used to add tracks.
+The library view can be displayed by pressing the
 .Ic 1
 key.
-.It Sy Queue view
-The queue view shows all tracks that have been added to the queue.
-Tracks in the queue will be played back before those in the library.
-A track will be removed from the queue as soon as it is being played back.
-The queue view can be displayed by pressing the
+.It Sy Playlist view
+The playlist view shows the playlist loaded with the
+.Ic load-playlist
+command.
+It can be displayed by pressing the
 .Ic 2
 key.
 .It Sy Browser view
@@ -86,7 +94,19 @@
 The browser view can be displayed by pressing the
 .Ic 3
 key.
+.It Sy Queue view
+The queue view shows all tracks that have been added to the queue.
+Tracks in the queue will be played back before those in other views.
+A track will be removed from the queue as soon as it is being played back.
+The queue view can be displayed by pressing the
+.Ic 4
+key.
 .El
+.Pp
+The playback source is the view that provides the tracks for playback.
+The library, playlist and browser views each can act as a playback source.
+A view implicitly becomes the playback source whenever a track from that view
+is selected for playback.
 .Sh KEY BINDINGS
 .Nm
 supports configurable key bindings.
@@ -114,9 +134,9 @@
 .It v
 Stop.
 .It z
-Play the previous track in the library.
+Play the previous track.
 .It b
-Play the next track in the library.
+Play the next track.
 .It left
 Skip backward 5 seconds.
 .It ,
@@ -140,17 +160,21 @@
 .It C
 Toggle playback continuation.
 .It R
-Toggle the repeated playback of the library.
+Toggle the repeated playback of all tracks.
 .It r
 Toggle the repeated playback of the current track.
 .It 1
 Select the library view.
 .It 2
-Select the play queue view.
+Select the playlist view.
 .It 3
-Select the file browser view.
+Select the browser view.
+.It 4
+Select the queue view.
 .It enter
 Activate the selected entry.
+.It i
+Select the active entry.
 .It k, up
 Select the previous entry.
 .It j, down
@@ -193,16 +217,10 @@
 .It l
 Delete all entries.
 .El
-.It Sy Queue view key bindings
+.It Sy Playlist view key bindings
 .Bl -tag -width "^F, page-down" -compact
-.It J
-Move the selected entry downward.
-.It K
-Move the selected entry upward.
-.It d, delete
-Delete the selected entry.
-.It l
-Delete all entries.
+.It a
+Add the selected entry to the queue.
 .El
 .It Sy Browser view key bindings
 .Bl -tag -width "^F, page-down" -compact
@@ -215,9 +233,19 @@
 .It backspace
 Enter the parent directory.
 .El
+.It Sy Queue view key bindings
+.Bl -tag -width "^F, page-down" -compact
+.It J
+Move the selected entry downward.
+.It K
+Move the selected entry upward.
+.It d, delete
+Delete the selected entry.
+.It l
+Delete all entries.
+.El
 .It Sy Prompt key bindings
 The key bindings for the prompt currently cannot be changed.
-This will be fixed in a future version.
 .Pp
 .Bl -tag -width "^F, page-down" -compact
 .It enter
@@ -276,14 +304,14 @@
 .Sq \&? ,
 .Sq \& ,
 .Sq \e ,
-.Sq \(aq
+.Sq \&'
 and
 .Sq \&"
 characters and the space and tab characters are special characters.
 A special character can be escaped by prepending it with a
 .Sq \e
 character or by enclosing it by matching
-.Sq \(aq
+.Sq \&'
 or
 .Sq \&"
 characters.
@@ -292,11 +320,11 @@
 .Bl -tag -width Ds
 .It Ic activate-entry
 Activate the selected entry in the current view.
-In the library view, an activated entry is played back.
-In the queue view, an activated entry is played back and removed from the
-queue.
+In the library and playlist views, an activated entry is played back.
 In the browser view, if the activated entry is a directory, it is entered.
 Otherwise, if it is a file, it is played back.
+In the queue view, an activated entry is played back and removed from the
+queue.
 .It Ic add-entry Op Fl l | q
 Add the selected entry to the library or the queue.
 The options are as follows.
@@ -311,7 +339,7 @@
 .It Xo
 .Ic add-path
 .Op Fl l | q
-.Ar path Ar ...
+.Ar path ...
 .Xc
 Add an audio file or a directory to the library or the queue.
 The options are as follows.
@@ -342,17 +370,15 @@
 It should be one of
 .Ar browser ,
 .Ar library ,
+.Ar playlist ,
 .Ar queue
 or
 .Ar common .
+.Pp
 A key binding is first looked up in the scope of the current view.
 If no key binding is found in that scope, then it is looked up in the
 .Ar common
 scope.
-If a key is bound in both the
-.Ar common
-scope and the scope of the current view, then the scope of the current view
-takes precedence.
 .Pp
 The
 .Ar key
@@ -366,7 +392,7 @@
 .It
 The ASCII control characters: these are the ASCII character codes between 0 and
 31 decimal.
-They are represented in case-insensitive caret notation.
+They are specified in case-insensitive caret notation.
 For example,
 .Ar ^A
 and
@@ -406,52 +432,9 @@
 If
 .Ar directory
 is not specified, the user's home directory is used instead.
-.It Ic clear-cache
-Clear the metadata cache.
-.It Ic clear-history Op Fl cs
-Clear one or more histories.
-The options are as follows.
-.Pp
-.Bl -tag -width Ds -compact
-.It Fl c
-Clear the command history.
-.It Fl s
-Clear the search history.
-.El
-.Pp
-If no history is specified, all histories are cleared.
-.It Ic command-prompt Op Fl p Ar prompt
+.It Ic command-prompt
 Enter the command prompt.
 The command prompt can be used to enter and execute commands.
-The options are as follows.
-.Pp
-.Bl -tag -width Ds -compact
-.It Fl p Ar prompt
-Use the string
-.Ar prompt
-as the prompt.
-The default is
-.Sq \&: .
-.El
-.It Xo
-.Ic confirm
-.Op Fl p Ar prompt
-.Ar command
-.Xc
-Ask for confirmation before executing
-.Ar command .
-The options are as follows.
-.Pp
-.Bl -tag -width Ds -compact
-.It Fl p Ar prompt
-Use the string
-.Ar prompt
-as the prompt.
-The default is
-.Sq Execute Qq Ar command .
-The prompt will be followed by the string
-.Sq ? (y/n):\~ .
-.El
 .It Ic delete-entry Op Fl a
 Delete the selected entry in the current view.
 This command is supported in the library and queue views only.
@@ -461,6 +444,16 @@
 .It Fl a
 Delete all entries in the current view.
 .El
+.It Ic load-playlist Ar file
+Load the playlist
+.Ar file
+into the playlist view.
+Each line of
+.Ar file
+should contain the path to a track.
+Empty lines and lines starting with the
+.Sq #
+character are ignored.
 .It Ic move-entry-down
 Move the selected entry after its succeeding entry.
 This command is supported in the queue view only.
@@ -468,30 +461,34 @@
 Move the entry before its preceding entry.
 This command is supported in the queue view only.
 .It Ic pause
-Pause or, if already paused, resume playback.
+Pause or resume playback.
 .It Ic play
 Start, restart or resume playback.
 .It Ic play-next
-Play the next track in the library.
+Play the next track in the playback source.
 .It Ic play-prev
-Play the previous track in the library.
+Play the previous track in the playback source.
+.It Ic pwd
+Print the current working directory.
 .It Ic quit
 Quit
 .Nm .
 .It Ic refresh-screen
 Refresh the screen.
+.It Ic reopen-output-plugin
+Reopen the output plug-in.
 .It Ic reread-directory
 Reread the current directory in the browser view.
-.It Ic save-cache
-Save the metadata cache to disc.
-The metadata cache is automatically saved when
-.Nm
-quits.
 .It Ic save-library
-Save the library to disc.
+Save the library to disk.
 The library is automatically saved when
 .Nm
 quits.
+.It Ic save-metadata
+Save the metadata cache to disk.
+The metadata cache is automatically saved when
+.Nm
+quits.
 .It Xo
 .Ic scroll-down
 .Op Fl h | l | p
@@ -524,11 +521,7 @@
 Search for the previous occurrence of the text earlier specified with the
 .Ic search-prompt
 command.
-.It Xo
-.Ic search-prompt
-.Op Fl b
-.Op Fl p Ar prompt
-.Xc
+.It Ic search-prompt Op Fl b
 Enter the search prompt.
 The search prompt can be used to search in the current view.
 The options are as follows.
@@ -537,16 +530,6 @@
 .It Fl b
 Search backward.
 The default is to search forward.
-.It Fl p Ar prompt
-Use
-.Ar prompt
-as the prompt.
-The default is
-.Sq /
-if searching forward
-and
-.Sq \&?
-if searching backward.
 .El
 .It Xo
 .Ic seek
@@ -563,7 +546,7 @@
 Seek forward by adding the specified position to the current position.
 .El
 .It Ic select-active-entry
-Select the active entry in the library view.
+Select the active entry in the current view.
 .It Ic select-first-entry
 Select the first entry in the current view.
 .It Ic select-last-entry
@@ -577,10 +560,11 @@
 The
 .Ar name
 argument must be one of
+.Em browser ,
 .Em library ,
-.Em queue
+.Em playlist
 or
-.Em browser .
+.Em queue .
 .It Ic set Ar option Op Ar value
 Set
 .Ar option
@@ -593,14 +577,13 @@
 is not specified, it is toggled.
 See
 .Sx OPTIONS
-for a list of available options.
+below for a list of available options.
 .It Xo
 .Ic set-volume
 .Op Fl d | i
 .Ar level
 .Xc
-Set the volume level to
-.Ar level .
+Set the volume level.
 The
 .Ar level
 argument should be an integer value between 0 and 100.
@@ -608,14 +591,26 @@
 .Pp
 .Bl -tag -width Ds -compact
 .It Fl d
-Decrease the current volume level by subtracting
+Decrease the volume level by
 .Ar level .
 .It Fl i
-Increase the current volume level by adding
+Increase the volume level by
 .Ar level .
 .El
 .Pp
-Not all output plug-ins support setting the volume.
+Not all output plug-ins have volume support.
+.Pp
+When using the
+.Em oss
+output plug-in on FreeBSD, the volume level may be reset every time a track is
+played back.
+To preserve the volume level, set the
+.Em hw.snd.vpc_autoreset
+.Xr sysctl 8
+variable to 0.
+See
+.Xr sound 4
+for more information.
 .It Ic show-binding Ar scope key
 Show the command bound to
 .Ar key .
@@ -629,6 +624,9 @@
 .It Ic show-option Ar option
 Show the value of
 .Ar option .
+.It Ic source Ar file
+Execute the commands in
+.Ar file .
 .It Ic stop
 Stop playback.
 .It Ic unbind-key Ar scope key
@@ -641,6 +639,14 @@
 arguments are analogous to those of the
 .Ic bind-key
 command.
+.It Ic update-metadata Op Fl d
+Update the metadata cache.
+The options are as follows.
+.Pp
+.Bl -tag -width Ds -compact
+.It Fl d
+Delete the metadata of tracks that cannot be found on the file system.
+.El
 .El
 .Sh OPTIONS
 The appearance and behaviour of
@@ -674,13 +680,19 @@
 .Em black ,
 .Em blue ,
 .Em cyan ,
-.Em default ,
 .Em green ,
 .Em magenta ,
 .Em red ,
-.Em white
+.Em white ,
+.Em yellow ,
+.Em default
 and
-.Em yellow .
+.Em colour0
+to
+.Em colourN
+where
+.Em N
++ 1 is the number of colours supported by the terminal.
 .Pp
 If supported by the terminal, the colour
 .Em default
@@ -693,8 +705,7 @@
 .Em white
 when used as a foreground colour.
 .It Sy Boolean options
-Boolean options are used to enable or disable certain behaviour.
-Valid values are
+Valid values of Boolean options are
 .Em true
 and
 .Em false .
@@ -708,15 +719,14 @@
 .Em 0
 are accepted as well.
 .It Sy Number options
-Number options have numeric values.
-Their allowed range is option-specific.
+Valid values of number options are non-negative integers.
+The maximum value is option-specific.
 .It Sy String options
-String options have textual values.
-Their allowed values are option-specific.
-.It Sy Format options
-Format options are strings that control the formatting of information displayed
-on the screen.
-Their syntax is reminiscent of that of the
+Valid values of string options are option-specific.
+.It Sy Format-string options
+Format-string options control the formatting of information displayed on the
+screen.
+The syntax is reminiscent of that of the
 .Xr printf 3
 family of functions.
 .Pp
@@ -742,8 +752,7 @@
 An optional sequence of numeric characters to specify the field width.
 If the
 .Sq *
-character is specified, the width is variable and will be as large as the
-available space allows.
+character is specified, the width is variable and will be so long as possible.
 If there are two or more fields with a variable width, the available space will
 be divided equally between them.
 .It
@@ -756,7 +765,7 @@
 characters
 .Pc .
 Some variables also have a one-character alias.
-If this alias is specified, the braces can be omitted.
+If this alias is specified, the braces may be omitted.
 Which variables are available is dependent on the option.
 .Pp
 Conditional fields are also supported.
@@ -767,7 +776,7 @@
 displayed; otherwise, the second value.
 For example,
 .Sq %{?artist,yes,no}
-yields
+displays
 .Sq yes
 if
 .Em artist
@@ -805,22 +814,37 @@
 Background colour for informational messages.
 .It Cm info-fg Pq colour
 Foreground colour for informational messages.
-.It Cm library-format Pq format
+.It Cm library-format Pq format string
 The format used to display tracks in the library.
 The following variables are available.
-.Bl -column "tracknumber" "alias"
+.Bl -column tracknumber alias
 .It Sy Name Ta Sy Alias Ta Sy Description
 .It album Ta l Ta Album
+.It albumartist Ta A Ta Album artist
 .It artist Ta a Ta Artist
+.It comment Ta c Ta Comment
 .It date Ta y Ta Date or year
+.It discnumber Ta s Ta Disc number
+.It disctotal Ta S Ta Total number of discs
 .It duration Ta d Ta Duration Pq as So m:ss Sc or So h:mm:ss Sc
+.It filename Ta F Ta Filename
 .It genre Ta g Ta Genre
 .It path Ta f Ta File path
 .It title Ta t Ta Title
 .It tracknumber Ta n Ta Track number
+.It tracktotal Ta N Ta Total number of tracks
 .El
-.It Cm max-history-entries Pq number
-The maximum number of entries saved in the command and search histories.
+.It Cm library-format-alt Pq format string
+The alternative format used to display tracks in the library that have a
+missing or empty
+.Em title
+metadata field.
+See the
+.Cm library-format
+option for a list of available variables.
+If this option is empty, the
+.Cm library-format
+option is used.
 .It Cm output-plugin Pq string
 The name of the output plug-in to use.
 If the special name
@@ -831,19 +855,23 @@
 options used.
 They are listed in descending order of priority.
 .Pp
-.Bl -tag -width Ds -compact
+.Bl -tag -width portaudio -compact
 .It sndio
 OpenBSD
 .Xr sndio 7
-output plug-in.
+output plug-in
 .It pulse
-PulseAudio output plug-in.
+PulseAudio output plug-in
 .It sun
-Sun output plug-in.
+Sun output plug-in
+.It alsa
+ALSA output plug-in
 .It oss
-OSS output plug-in.
+OSS output plug-in
 .It ao
-libao output plug-in.
+libao output plug-in
+.It portaudio
+PortAudio output plug-in
 .El
 .It Cm player-attr Pq attribute
 Character attributes for the player area.
@@ -851,10 +879,10 @@
 Background colour for the player area.
 .It Cm player-fg Pq colour
 Foreground colour of the player area.
-.It Cm player-status-format Pq format
+.It Cm player-status-format Pq format string
 The format used to display the player status.
 The following variables are available.
-.Bl -column "repeat-track" "alias"
+.Bl -column repeat-track alias
 .It Sy Name Ta Sy Alias Ta Sy Description
 .It continue Ta c Ta
 Expands to
@@ -880,6 +908,8 @@
 or the empty string, depending on the value of the
 .Cm repeat-track
 option
+.It source Ta u Ta
+Playback source
 .It state Ta s Ta
 Expands to
 .Sq Playing ,
@@ -889,24 +919,62 @@
 depending on the playback state
 .It volume Ta v Ta Sound volume
 .El
-.It Cm player-track-format Pq format
+.It Cm player-track-format Pq format string
 The format used to display the currently playing track.
 See the
 .Cm library-format
 option for a list of available variables.
+.It Cm player-track-format-alt Pq format string
+The alternative format used to display the currently playing track if it has a
+missing or empty
+.Em title
+metadata field.
+See the
+.Cm library-format
+option for a list of available variables.
+If this option is empty, the
+.Cm player-track-format
+option is used.
+.It Cm playlist-format Pq format string
+The format used to display tracks in the playlist view.
+See the
+.Cm library-format
+option for a list of available variables.
+.It Cm playlist-format-alt Pq format string
+The alternative format used to display tracks in the playlist that have a
+missing or empty
+.Em title
+metadata field.
+See the
+.Cm library-format
+option for a list of available variables.
+If this option is empty, the
+.Cm playlist-format
+option is used.
 .It Cm prompt-attr Pq attribute
-Character attributes for the command, confirmation and search prompts.
+Character attributes for the prompt.
 .It Cm prompt-bg Pq colour
-Background colour for the command, confirmation and search prompts.
+Background colour for the prompt.
 .It Cm prompt-fg Pq colour
-Foreground colour for the command, confirmation and search prompts.
-.It Cm queue-format Pq format
+Foreground colour for the prompt.
+.It Cm queue-format Pq format string
 The format used to display tracks in the queue.
 See the
 .Cm library-format
 option for a list of available variables.
+.It Cm queue-format-alt Pq format string
+The alternative format used to display tracks in the queue that have a
+missing or empty
+.Em title
+metadata field.
+See the
+.Cm library-format
+option for a list of available variables.
+If this option is empty, the
+.Cm queue-format
+option is used.
 .It Cm repeat-all Pq Boolean
-Whether to repeat playback of the library.
+Whether to repeat playback of all tracks in the playback source.
 .It Cm repeat-track Pq Boolean
 Whether to repeat playback of the current track.
 This option takes precedence over the
@@ -919,16 +987,14 @@
 .It Cm selection-fg Pq colour
 Foreground colour for the selection indicator.
 .It Cm show-all-files Pq Boolean
-Whether to show all files in the file browser.
+Whether to show all files in the browser view.
 If set to
 .Em false ,
 only directories and supported audio files are shown.
 .It Cm show-cursor Pq Boolean
-Whether to always show the cursor.
-.It Cm show-dirs-before-files Pq Boolean
-Whether to list directories before files in the file browser.
+Whether always to show the cursor.
 .It Cm show-hidden-files Pq Boolean
-Whether to show hidden files and directories in the file browser.
+Whether to show hidden files and directories in the browser view.
 .It Cm status-attr Pq attribute
 Character attributes for the status line.
 .It Cm status-bg Pq colour
@@ -950,6 +1016,18 @@
 .El
 .Pp
 The following options are specific to the
+.Em alsa
+output plug-in.
+.Bl -tag -width Ds
+.It Cm alsa-mixer-device Pq string
+The name of the mixer device to use.
+.It Cm alsa-mixer-element Pq string
+The name of the mixer element to use.
+.It Cm alsa-pcm-device Pq string
+The name of the PCM device to use.
+.El
+.Pp
+The following options are specific to the
 .Em ao
 output plug-in.
 .Bl -tag -width Ds
@@ -961,12 +1039,8 @@
 See
 .Xr libao.conf 5
 and
-.Lk http://www.xiph.org/ao/doc/drivers.html
+.Lk https://www.xiph.org/ao/doc/drivers.html
 for possible values.
-.It Cm ao-file Pq string
-The path of the file to write the audio output to.
-If the file already exists, it is not overwritten.
-This option is relevant only if using a file output driver.
 .El
 .Pp
 The following options are specific to the
@@ -978,6 +1052,14 @@
 .El
 .Pp
 The following options are specific to the
+.Em portaudio
+output plug-in.
+.Bl -tag -width Ds
+.It Cm portaudio-buffer-size Pq number
+The size of the output buffer, specified in bytes.
+.El
+.Pp
+The following options are specific to the
 .Em pulse
 output plug-in.
 .Bl -tag -width Ds
@@ -991,7 +1073,6 @@
 .Bl -tag -width Ds
 .It Cm sndio-device Pq string
 The name of the device to use.
-If empty, the default device will be used.
 See
 .Xr sndio 7
 for possible values.
@@ -1016,7 +1097,7 @@
 .Pq see Sx COMMANDS
 which are executed in sequence.
 .Sh FILES
-.Bl -tag -width Ds -compact
+.Bl -tag -width ~/.siren/metadata -compact
 .It Pa ~/.siren/config
 Configuration file.
 .It Pa ~/.siren/library
@@ -1026,9 +1107,10 @@
 .El
 .Sh SEE ALSO
 .Xr pulseaudio 1 ,
+.Xr sound 4 ,
 .Xr libao.conf 5 ,
 .Xr sndio 7
 .Pp
-.Lk http://www.kariliq.nl/siren/
+.Lk https://www.kariliq.nl/siren/
 .Sh AUTHORS
-.An Tim van der Molen Aq Mt tbvdm@xs4all.nl
+.An Tim van der Molen Aq Mt tim@kariliq.nl

siren-0.2.tar.gz/siren.c -> siren-0.7.tar.gz/siren.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,31 +20,52 @@
 
 #include "siren.h"
 
+#if defined(HAVE_PLEDGE) && defined(HAVE_ERR)
+#include <err.h>
+#endif
+
+#if defined(DEBUG) && defined(__OpenBSD__)
+extern const char	*malloc_options;
+#endif
+
+#ifdef HAVE___PROGNAME
+extern char		*__progname;
+#else
+const char		*__progname;
+#endif
+
 NORETURN static void
 usage(void)
 {
-	extern char *__progname;
-
-	(void)fprintf(stderr, "usage: %s -lv -c directory\n", __progname);
+	fprintf(stderr, "usage: %s -lv -c directory\n", __progname);
 	exit(1);
 }
 
 NORETURN static void
 version(void)
 {
-	(void)printf("siren %s\n", VERSION);
+	printf("siren %s\n", VERSION);
 	exit(0);
 }
 
 int
 main(int argc, char **argv)
 {
-	int			 c, lflag;
-	char			*confdir;
+	int	 c, lflag;
+	char	*confdir;
+#ifdef HAVE_PLEDGE
+	char	*promises;
+#endif
+
 #if defined(DEBUG) && defined(__OpenBSD__)
-	extern const char	*malloc_options;
+	malloc_options = "CFGJPRS";
+#endif
 
-	malloc_options = "AFGJPRS";
+#ifndef HAVE___PROGNAME
+	if (argv0 != NULL && argv00 != '\0')
+		__progname = argv0;
+	else
+		__progname = "siren";
 #endif
 
 	confdir = NULL;
@@ -65,7 +86,7 @@
 			break;
 		}
 
-	if (argc - optind)
+	if (argc != optind)
 		usage();
 
 	opterr = 0;
@@ -77,24 +98,38 @@
 	conf_init(confdir);
 	screen_init();
 	plugin_init();
-	cache_init();
+	track_init();
 	library_init();
+	playlist_init();
 	queue_init();
 	browser_init();
 	player_init();
 	prompt_init();
 
+#ifdef HAVE_PLEDGE
+	promises = xstrdup("stdio rpath wpath cpath getpw tty");
+	plugin_append_promises(&promises);
+	LOG_INFO("pledging %s", promises);
+
+	if (pledge(promises, NULL) == -1)
+		err(1, "pledge");
+
+	free(promises);
+#endif
+
 	screen_print();
 	conf_read_file();
 	library_read_file();
+	cache_update();
 	input_handle_key();
 
 	prompt_end();
 	player_end();
 	browser_end();
 	queue_end();
+	playlist_end();
 	library_end();
-	cache_end();
+	track_end();
 	plugin_end();
 	screen_end();
 	conf_end();

siren-0.2.tar.gz/siren.h -> siren-0.7.tar.gz/siren.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -33,12 +33,25 @@
 #define PLUGIN_IP_DIR		PLUGIN_DIR "/ip"
 #define PLUGIN_OP_DIR		PLUGIN_DIR "/op"
 
+/* Priority of input plug-ins. */
+#define IP_PRIORITY_FLAC	0
+#define IP_PRIORITY_MAD		0
+#define IP_PRIORITY_OPUS	0
+#define IP_PRIORITY_SNDFILE	0
+#define IP_PRIORITY_VORBIS	0
+#define IP_PRIORITY_WAVPACK	0
+#define IP_PRIORITY_MPG123	1
+#define IP_PRIORITY_FFMPEG	2
+#define IP_PRIORITY_AAC		3
+
 /* Priority of output plug-ins. */
-#define OP_PRIORITY_SNDIO	1
-#define OP_PRIORITY_PULSE	2
-#define OP_PRIORITY_SUN		3
+#define OP_PRIORITY_SNDIO	0
+#define OP_PRIORITY_PULSE	1
+#define OP_PRIORITY_SUN		2
+#define OP_PRIORITY_ALSA	3
 #define OP_PRIORITY_OSS		4
 #define OP_PRIORITY_AO		5
+#define OP_PRIORITY_PORTAUDIO	6
 
 /* Size of the buffer to be passed to strerror_r(). The value is arbitrary. */
 #define STRERROR_BUFSIZE	256
@@ -113,6 +126,11 @@
 	    (entry) != NULL;						\
 	    (entry) = menu_get_next_entry(entry))
 
+#define MENU_FOR_EACH_ENTRY_REVERSE(menu, entry)			\
+	for ((entry) = menu_get_last_entry(menu);			\
+	    (entry) != NULL;						\
+	    (entry) = menu_get_prev_entry(entry))
+
 /* Number of elements in an array. */
 #define NELEMENTS(x)		(sizeof (x) / sizeof (x)0)
 
@@ -125,26 +143,15 @@
 #define LOG_FATAL(...)		log_fatal(__func__, __VA_ARGS__)
 #define LOG_FATALX(...)		log_fatalx(__func__, __VA_ARGS__)
 #define LOG_INFO(...)		log_info(__func__, __VA_ARGS__)
+#define LOG_VERRX(...)		log_verrx(__func__, __VA_ARGS__)
 
 #ifndef DEBUG
 #define LOG_DEBUG(...)
-#define LOG_DEBUG_ERR(...)
-#define LOG_DEBUG_ERRX(...)
 #else
 #define LOG_DEBUG(...)		log_info(__func__, __VA_ARGS__)
-#define LOG_DEBUG_ERR(...)	log_err(__func__, __VA_ARGS__)
-#define LOG_DEBUG_ERRX(...)	log_errx(__func__, __VA_ARGS__)
 #endif
 
 /*
- * Wrappers for xfpathconf(), xpathconf() and xsysconf().
- */
-
-#define XFPATHCONF(fd, name)	xfpathconf(fd, name, #name)
-#define XPATHCONF(path, name)	xpathconf(path, name, #name)
-#define XSYSCONF(name)		xsysconf(name, #name)
-
-/*
  * Wrappers for pthreads functions.
  */
 
@@ -170,6 +177,7 @@
 	BIND_SCOPE_BROWSER,
 	BIND_SCOPE_LIBRARY,
 	BIND_SCOPE_MENU,
+	BIND_SCOPE_PLAYLIST,
 	BIND_SCOPE_PROMPT,
 	BIND_SCOPE_QUEUE
 };
@@ -179,16 +187,21 @@
 	BYTE_ORDER_LITTLE
 };
 
+enum cache_mode {
+	CACHE_MODE_READ,
+	CACHE_MODE_WRITE
+};
+
 enum colour {
-	COLOUR_BLACK,
-	COLOUR_BLUE,
-	COLOUR_CYAN,
-	COLOUR_DEFAULT,
-	COLOUR_GREEN,
-	COLOUR_MAGENTA,
-	COLOUR_RED,
-	COLOUR_WHITE,
-	COLOUR_YELLOW
+	COLOUR_BLACK	= -1,
+	COLOUR_BLUE	= -2,
+	COLOUR_CYAN	= -3,
+	COLOUR_DEFAULT	= -4,
+	COLOUR_GREEN	= -5,
+	COLOUR_MAGENTA	= -6,
+	COLOUR_RED	= -7,
+	COLOUR_WHITE	= -8,
+	COLOUR_YELLOW	= -9
 };
 
 enum file_type {
@@ -217,9 +230,16 @@
 	OPTION_TYPE_STRING
 };
 
+enum player_source {
+	PLAYER_SOURCE_BROWSER,
+	PLAYER_SOURCE_LIBRARY,
+	PLAYER_SOURCE_PLAYLIST
+};
+
 enum view_id {
 	VIEW_ID_BROWSER,
 	VIEW_ID_LIBRARY,
+	VIEW_ID_PLAYLIST,
 	VIEW_ID_QUEUE
 };
 
@@ -257,6 +277,21 @@
 	} value;
 };
 
+struct sample_buffer {
+	void		*data;
+	int8_t		*data1;
+	int16_t		*data2;
+	int32_t		*data4;
+
+	size_t		 size_b;
+	size_t		 size_s;
+	size_t		 len_b;
+	size_t		 len_s;
+
+	unsigned int	 nbytes;
+	int		 swap;
+};
+
 struct sample_format {
 	enum byte_order	 byte_order;
 	unsigned int	 nbits;
@@ -271,28 +306,35 @@
 	void		*ipdata;
 
 	char		*album;
+	char		*albumartist;
 	char		*artist;
+	char		*comment;
 	char		*date;
+	char		*discnumber;
+	char		*disctotal;
+	char		*filename;
 	char		*genre;
 	char		*title;
 	char		*tracknumber;
+	char		*tracktotal;
 	unsigned int	 duration;
 
 	struct sample_format format;
-
-	unsigned int	 nrefs;
 };
 
 /* Input plug-in. */
 struct ip {
 	const char	 *name;
+	const int	  priority;
 	const char	**extensions;
 	void		  (*close)(struct track *) NONNULL();
-	int		  (*get_metadata)(struct track *) NONNULL();
+	void		  (*get_metadata)(struct track *) NONNULL();
 	int		  (*get_position)(struct track *, unsigned int *)
 			    NONNULL();
+	int		  (*init)(void);
 	int		  (*open)(struct track *) NONNULL();
-	int		  (*read)(struct track *, int16_t *, size_t) NONNULL();
+	int		  (*read)(struct track *, struct sample_buffer *)
+			    NONNULL();
 	void		  (*seek)(struct track *, unsigned int) NONNULL();
 };
 
@@ -300,16 +342,17 @@
 struct op {
 	const char	*name;
 	const int	 priority;
+	const char	*promises;
 	void		 (*close)(void);
 	size_t		 (*get_buffer_size)(void);
 	int		 (*get_volume)(void);
 	int		 (*get_volume_support)(void);
-	void		 (*init)(void);
+	int		 (*init)(void);
 	int		 (*open)(void);
 	void		 (*set_volume)(unsigned int);
 	int		 (*start)(struct sample_format *) NONNULL();
 	int		 (*stop)(void);
-	int		 (*write)(void *, size_t) NONNULL();
+	int		 (*write)(struct sample_buffer *) NONNULL();
 };
 
 const char	*argv_error(int);
@@ -331,24 +374,27 @@
 void		 browser_change_dir(const char *);
 void		 browser_copy_entry(enum view_id);
 void		 browser_end(void);
+const char	*browser_get_dir(void);
+struct track	*browser_get_next_track(void);
+struct track	*browser_get_prev_track(void);
 void		 browser_init(void);
 void		 browser_print(void);
 void		 browser_refresh_dir(void);
-void		 browser_search_next(const char *);
-void		 browser_search_prev(const char *);
 void		 browser_scroll_down(enum menu_scroll);
 void		 browser_scroll_up(enum menu_scroll);
+void		 browser_search_next(const char *);
+void		 browser_search_prev(const char *);
+void		 browser_select_active_entry(void);
 void		 browser_select_first_entry(void);
 void		 browser_select_last_entry(void);
 void		 browser_select_next_entry(void);
 void		 browser_select_prev_entry(void);
 
-void		 cache_add_metadata(const struct track *) NONNULL();
-void		 cache_clear(void);
-void		 cache_end(void);
-int		 cache_get_metadata(struct track *) NONNULL();
-void		 cache_init(void);
-int		 cache_write_file(void);
+void		 cache_close(void);
+int		 cache_open(enum cache_mode);
+int		 cache_read_entry(struct track *) NONNULL();
+void		 cache_update(void);
+void		 cache_write_entry(const struct track *) NONNULL();
 
 void		 command_execute(struct command *, void *) NONNULL(1);
 void		 command_free_data(struct command *, void *) NONNULL(1);
@@ -358,8 +404,9 @@
 
 void		 conf_end(void);
 void		 conf_init(const char *);
-char		*conf_path(const char *) NONNULL();
+char		*conf_get_path(const char *) NONNULL();
 void		 conf_read_file(void);
+void		 conf_source_file(const char *) NONNULL();
 
 void		 dir_close(struct dir *) NONNULL();
 struct dir_entry *dir_get_entry(struct dir *) NONNULL();
@@ -371,15 +418,13 @@
 		    const struct format_variable *, size_t) NONNULL();
 const char	*format_to_string(const struct format *) NONNULL();
 void		 format_track_snprintf(char *, size_t, const struct format *,
-		    const struct track *) NONNULL();
+		    const struct format *, const struct track *) NONNULL();
 
 void		 history_add(struct history *, const char *) NONNULL();
-void		 history_clear(struct history *) NONNULL();
 void		 history_free(struct history *) NONNULL();
 const char	*history_get_next(struct history *) NONNULL();
 const char	*history_get_prev(struct history *) NONNULL();
 struct history	*history_init(void);
-void		 history_resize(struct history *, unsigned int) NONNULL();
 void		 history_rewind(struct history *) NONNULL();
 
 void		 input_end(void);
@@ -400,15 +445,16 @@
 void		 library_init(void);
 void		 library_print(void);
 void		 library_read_file(void);
-void		 library_search_next(const char *);
-void		 library_search_prev(const char *);
 void		 library_scroll_down(enum menu_scroll);
 void		 library_scroll_up(enum menu_scroll);
+void		 library_search_next(const char *);
+void		 library_search_prev(const char *);
 void		 library_select_active_entry(void);
 void		 library_select_first_entry(void);
 void		 library_select_last_entry(void);
 void		 library_select_next_entry(void);
 void		 library_select_prev_entry(void);
+void		 library_update(void);
 int		 library_write_file(void);
 
 void		 log_end(void);
@@ -420,6 +466,8 @@
 		    PRINTFLIKE(2, 3);
 void		 log_info(const char *, const char *, ...) PRINTFLIKE(2, 3);
 void		 log_init(int);
+void		 log_verrx(const char *, const char *, va_list)
+		    PRINTFLIKE(2, 0);
 
 void		 menu_activate_entry(struct menu *, struct menu_entry *)
 		    NONNULL();
@@ -436,11 +484,18 @@
 struct menu	*menu_init(void (*)(void *),
 		    void (*)(const void *, char *, size_t),
 		    int (*)(const void *, const char *));
+void		 menu_insert_after(struct menu *, struct menu_entry *, void *)
+		    NONNULL();
 void		 menu_insert_before(struct menu *, struct menu_entry *,
 		    void *) NONNULL();
+void		 menu_insert_head(struct menu *, void *) NONNULL();
 void		 menu_insert_tail(struct menu *, void *) NONNULL();
-void		 menu_move_entry_down(struct menu_entry *) NONNULL();
-void		 menu_move_entry_up(struct menu_entry *) NONNULL();
+void		 menu_move_entry_before(struct menu *, struct menu_entry *,
+		    struct menu_entry *) NONNULL();
+void		 menu_move_entry_down(struct menu *, struct menu_entry *)
+		    NONNULL();
+void		 menu_move_entry_up(struct menu *, struct menu_entry *)
+		    NONNULL();
 void		 menu_print(struct menu *) NONNULL();
 void		 menu_remove_all_entries(struct menu *) NONNULL();
 void		 menu_remove_entry(struct menu *, struct menu_entry *)
@@ -469,12 +524,12 @@
 		    void (*)(void)) NONNULL(1, 2);
 char		*option_attrib_to_string(int);
 const char	*option_boolean_to_string(int);
-const char	*option_colour_to_string(enum colour);
+char		*option_colour_to_string(int);
 void		 option_end(void);
 const char	*option_format_to_string(const struct format *) NONNULL();
 int		 option_get_attrib(const char *) NONNULL();
 int		 option_get_boolean(const char *) NONNULL();
-enum colour	 option_get_colour(const char *) NONNULL();
+int		 option_get_colour(const char *) NONNULL();
 struct format	*option_get_format(const char *) NONNULL();
 int		 option_get_number(const char *) NONNULL();
 void		 option_get_number_range(const char *, int *, int *) NONNULL();
@@ -484,18 +539,19 @@
 void		 option_lock(void);
 void		 option_set_attrib(const char *, int) NONNULL();
 void		 option_set_boolean(const char *, int) NONNULL();
-void		 option_set_colour(const char *, enum colour) NONNULL();
+void		 option_set_colour(const char *, int) NONNULL();
 void		 option_set_format(const char *, struct format *) NONNULL();
 void		 option_set_number(const char *, int) NONNULL();
 void		 option_set_string(const char *, const char *) NONNULL();
 int		 option_string_to_attrib(const char *) NONNULL();
 int		 option_string_to_boolean(const char *) NONNULL();
-int		 option_string_to_colour(const char *, enum colour *)
+int		 option_string_to_colour(const char *, int *)
 		    NONNULL();
 void		 option_toggle_boolean(const char *) NONNULL();
 void		 option_unlock(void);
 
 char		*path_get_cwd(void);
+char		*path_get_dirname(const char *);
 char		*path_get_home_dir(const char *);
 char		*path_normalise(const char *) NONNULL();
 
@@ -509,17 +565,39 @@
 void		 player_play_prev(void);
 void		 player_play_track(struct track *) NONNULL();
 void		 player_print(void);
+void		 player_reopen_op(void);
 void		 player_seek(int, int);
+void		 player_set_source(enum player_source);
 void		 player_set_volume(int, int);
 void		 player_stop(void);
 
+void		 playlist_activate_entry(void);
+void		 playlist_copy_entry(enum view_id);
+void		 playlist_end(void);
+struct track	*playlist_get_next_track(void);
+struct track	*playlist_get_prev_track(void);
+void		 playlist_init(void);
+void		 playlist_load(const char *) NONNULL();
+void		 playlist_print(void);
+void		 playlist_scroll_down(enum menu_scroll);
+void		 playlist_scroll_up(enum menu_scroll);
+void		 playlist_search_next(const char *);
+void		 playlist_search_prev(const char *);
+void		 playlist_select_active_entry(void);
+void		 playlist_select_first_entry(void);
+void		 playlist_select_last_entry(void);
+void		 playlist_select_next_entry(void);
+void		 playlist_select_prev_entry(void);
+void		 playlist_update(void);
+
+#ifdef HAVE_PLEDGE
+void		 plugin_append_promises(char **) NONNULL();
+#endif
 void		 plugin_end(void);
 void		 plugin_init(void);
 const struct ip	*plugin_find_ip(const char *) NONNULL();
 const struct op	*plugin_find_op(const char *) NONNULL();
 
-void		 prompt_clear_command_history(void);
-void		 prompt_clear_search_history(void);
 void		 prompt_end(void);
 void		 prompt_get_answer(const char *, void (*)(char *, void *),
 		    void *) NONNULL(1, 2);
@@ -530,7 +608,6 @@
 void		 prompt_handle_key(int);
 void		 prompt_init(void);
 void		 prompt_print(void);
-void		 prompt_resize_histories(void);
 
 void		 queue_activate_entry(void);
 void		 queue_add_dir(const char *) NONNULL();
@@ -552,11 +629,13 @@
 void		 queue_select_last_entry(void);
 void		 queue_select_next_entry(void);
 void		 queue_select_prev_entry(void);
+void		 queue_update(void);
 
 void		 screen_configure_cursor(void);
 void		 screen_configure_objects(void);
 void		 screen_end(void);
 int		 screen_get_key(void);
+int		 screen_get_ncolours(void);
 unsigned int	 screen_get_ncols(void);
 void		 screen_init(void);
 void		 screen_msg_error_printf(const char *, ...) NONNULL()
@@ -568,7 +647,7 @@
 void		 screen_player_status_printf(const struct format *,
 		    const struct format_variable *, size_t) NONNULL();
 void		 screen_player_track_printf(const struct format *,
-		    const struct track *) NONNULL(1);
+		    const struct format *, const struct track *) NONNULL(1, 2);
 void		 screen_print(void);
 void		 screen_prompt_begin(void);
 void		 screen_prompt_end(void);
@@ -581,17 +660,24 @@
 void		 screen_view_print_active(const char *) NONNULL();
 void		 screen_view_print_begin(void);
 void		 screen_view_print_end(void);
-void		 screen_view_print_selected(const char *s) NONNULL();
+void		 screen_view_print_selected(const char *) NONNULL();
 void		 screen_view_title_printf(const char *, ...) PRINTFLIKE(1, 2);
 void		 screen_view_title_printf_right(const char *, ...)
 		    PRINTFLIKE(1, 2);
 
 int		 track_cmp(const struct track *, const struct track *)
 		    NONNULL();
-void		 track_free(struct track *);
-void		 track_hold(struct track *) NONNULL();
-struct track	*track_init(const char *, const struct ip *) NONNULL(1);
+void		 track_copy_vorbis_comment(struct track *, const char *);
+void		 track_end(void);
+struct track	*track_get(char *, const struct ip *) NONNULL(1);
+void		 track_init(void);
+void		 track_lock_metadata(void);
+struct track	*track_require(char *);
 int		 track_search(const struct track *, const char *);
+void		 track_split_tag(const char *, char **, char **);
+void		 track_unlock_metadata(void);
+void		 track_update_metadata(int);
+int		 track_write_cache(void);
 
 void		 view_activate_entry(void);
 void		 view_add_dir(enum view_id, const char *) NONNULL();
@@ -608,6 +694,7 @@
 void		 view_scroll_up(enum menu_scroll);
 void		 view_search_next(const char *);
 void		 view_search_prev(const char *);
+void		 view_select_active_entry(void);
 void		 view_select_first_entry(void);
 void		 view_select_last_entry(void);
 void		 view_select_next_entry(void);
@@ -616,10 +703,9 @@
 
 int		 xasprintf(char **, const char *, ...) NONNULL()
 		    PRINTFLIKE(2, 3);
-void		*xcalloc(size_t, size_t);
 void		*xmalloc(size_t);
 void		*xrealloc(void *, size_t);
-void		*xrecalloc(void *, size_t, size_t);
+void		*xreallocarray(void *, size_t, size_t);
 int		 xsnprintf(char *, size_t, const char *, ...) PRINTFLIKE(3, 4);
 char		*xstrdup(const char *) NONNULL();
 char		*xstrndup(const char *, size_t) NONNULL();
@@ -627,7 +713,3 @@
 		    PRINTFLIKE(2, 0);
 int		 xvsnprintf(char *, size_t, const char *, va_list) NONNULL()
 		    PRINTFLIKE(3, 0);
-
-long int	 xfpathconf(int, int, const char *) NONNULL();
-long int	 xpathconf(const char *, int, const char *) NONNULL();
-long int	 xsysconf(int, const char *) NONNULL();

siren-0.2.tar.gz/track.c -> siren-0.7.tar.gz/track.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,151 +17,446 @@
 /* Let glibc expose strcasestr(). */
 #define _GNU_SOURCE
 
-#include <ctype.h>
+#ifdef __OpenBSD__
+#include <sys/tree.h>
+#else
+#include "compat/tree.h"
+#endif
+
 #include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <unistd.h>
 
 #include "siren.h"
 
-static int track_cmp_number(const char *, const char *);
-static int track_cmp_string(const char *, const char *);
+struct track_entry {
+	struct track		track;
+	int			delete;
+	RB_ENTRY(track_entry)	entries;
+};
+
+RB_HEAD(track_tree, track_entry);
+
+static int		 track_cmp_entry(struct track_entry *,
+			    struct track_entry *);
+static int		 track_cmp_number(const char *, const char *);
+static int		 track_cmp_string(const char *, const char *);
+static void		 track_free_entry(struct track_entry *);
+static void		 track_free_metadata(struct track_entry *);
+static void		 track_init_metadata(struct track_entry *);
+static void		 track_read_cache(void);
+
+RB_PROTOTYPE(track_tree, track_entry, entries, track_cmp_entry)
+
+static pthread_mutex_t	 track_metadata_mtx = PTHREAD_MUTEX_INITIALIZER;
+static struct track_tree track_tree = RB_INITIALIZER(track_tree);
+static size_t		 track_nentries;
+static int		 track_tree_modified;
+
+RB_GENERATE(track_tree, track_entry, entries, track_cmp_entry)
+
+static int
+track_add_entry(struct track_entry *te)
+{
+	if (track_nentries == SIZE_MAX)
+		return -1;
+
+	if (RB_INSERT(track_tree, &track_tree, te) != NULL) {
+		/* This should not happen. */
+		LOG_ERRX("%s: track already in tree", te->track.path);
+		return -1;
+	}
+
+	te->track.filename = strrchr(te->track.path, '/');
+	if (te->track.filename != NULL)
+		te->track.filename++;
+	else
+		te->track.filename = te->track.path;
+
+	track_nentries++;
+	return 0;
+}
+
+static struct track *
+track_add_new_entry(char *path, const struct ip *ip)
+{
+	struct track_entry *te;
+
+	te = xmalloc(sizeof *te);
+	te->delete = 0;
+	te->track.path = xstrdup(path);
+	te->track.ip = (ip != NULL) ? ip : plugin_find_ip(path);
+	te->track.ipdata = NULL;
+	track_init_metadata(te);
+
+	if (te->track.ip != NULL)
+		te->track.ip->get_metadata(&te->track);
+
+	if (track_add_entry(te) == -1) {
+		track_free_entry(te);
+		return NULL;
+	}
+
+	track_tree_modified = 1;
+	return &te->track;
+}
+
+void
+track_copy_vorbis_comment(struct track *t, const char *com)
+{
+	char *number, *total;
+
+	number = NULL;
+	total = NULL;
+	if (!strncasecmp(com, "album=", 6)) {
+		free(t->album);
+		t->album = xstrdup(com + 6);
+	} else if (!strncasecmp(com, "albumartist=", 12)) {
+		free(t->albumartist);
+		t->albumartist = xstrdup(com + 12);
+	} else if (!strncasecmp(com, "album artist=", 13) ||
+	    !strncasecmp(com, "album_artist=", 13)) {
+		free(t->albumartist);
+		t->albumartist = xstrdup(com + 13);
+	} else if (!strncasecmp(com, "artist=", 7)) {
+		free(t->artist);
+		t->artist = xstrdup(com + 7);
+	} else if (!strncasecmp(com, "comment=", 8)) {
+		free(t->comment);
+		t->comment = xstrdup(com + 8);
+	} else if (!strncasecmp(com, "date=", 5)) {
+		free(t->date);
+		t->date = xstrdup(com + 5);
+	} else if (!strncasecmp(com, "discnumber=", 11)) {
+		track_split_tag(com + 11, &number, &total);
+		if (number != NULL) {
+			free(t->discnumber);
+			t->discnumber = number;
+		}
+		if (total != NULL) {
+			free(t->disctotal);
+			t->disctotal = total;
+		}
+	} else if (!strncasecmp(com, "disctotal=", 10)) {
+		free(t->disctotal);
+		t->disctotal = xstrdup(com + 10);
+	} else if (!strncasecmp(com, "genre=", 6)) {
+		free(t->genre);
+		t->genre = xstrdup(com + 6);
+	} else if (!strncasecmp(com, "title=", 6)) {
+		free(t->title);
+		t->title = xstrdup(com + 6);
+	} else if (!strncasecmp(com, "totaldiscs=", 11)) {
+		free(t->disctotal);
+		t->disctotal = xstrdup(com + 11);
+	} else if (!strncasecmp(com, "totaltracks=", 12)) {
+		free(t->tracktotal);
+		t->tracktotal = xstrdup(com + 12);
+	} else if (!strncasecmp(com, "tracknumber=", 12)) {
+		track_split_tag(com + 12, &number, &total);
+		if (number != NULL) {
+			free(t->tracknumber);
+			t->tracknumber = number;
+		}
+		if (total != NULL) {
+			free(t->tracktotal);
+			t->tracktotal = total;
+		}
+	} else if (!strncasecmp(com, "tracktotal=", 11)) {
+		free(t->tracktotal);
+		t->tracktotal = xstrdup(com + 11);
+	}
+}
 
 int
 track_cmp(const struct track *t1, const struct track *t2)
 {
-	int ret;
+	int		 ret;
+	const char	*artist1, *artist2;
 
-	if ((ret = track_cmp_string(t1->artist, t2->artist)))
-		return ret;
+	artist1 = (t1->albumartist != NULL) ? t1->albumartist : t1->artist;
+	artist2 = (t2->albumartist != NULL) ? t2->albumartist : t2->artist;
 
+	if ((ret = track_cmp_string(artist1, artist2)))
+		return ret;
 	if ((ret = track_cmp_number(t1->date, t2->date)))
 		return ret;
-
 	if ((ret = track_cmp_string(t1->album, t2->album)))
 		return ret;
-
+	if ((ret = track_cmp_number(t1->discnumber, t2->discnumber)))
+		return ret;
 	if ((ret = track_cmp_number(t1->tracknumber, t2->tracknumber)))
 		return ret;
-
 	if ((ret = track_cmp_string(t1->title, t2->title)))
 		return ret;
-
 	return strcmp(t1->path, t2->path);
 }
 
 static int
+track_cmp_entry(struct track_entry *t1, struct track_entry *t2)
+{
+	return strcmp(t1->track.path, t2->track.path);
+}
+
+static int
 track_cmp_number(const char *s1, const char *s2)
 {
 	int		 i1, i2;
 	const char	*errstr;
 
 	if (s1 == NULL)
-		return s2 == NULL ? 0 : -1;
+		return (s2 == NULL) ? 0 : -1;
 	if (s2 == NULL)
 		return 1;
 
-	i1 = (int)strtonum(s1, 0, INT_MAX, &errstr);
+	i1 = strtonum(s1, 0, INT_MAX, &errstr);
 	if (errstr != NULL)
-		/*
-		 * Numerical comparison failed; fall back to a lexicographical
-		 * comparison.
-		 */
-		return track_cmp_string(s1, s2);
+		return strcasecmp(s1, s2);
 
-	i2 = (int)strtonum(s2, 0, INT_MAX, &errstr);
+	i2 = strtonum(s2, 0, INT_MAX, &errstr);
 	if (errstr != NULL)
-		return track_cmp_string(s1, s2);
+		return strcasecmp(s1, s2);
 
-	return i1 < i2 ? -1 : i1 > i2;
+	return (i1 < i2) ? -1 : (i1 > i2);
 }
 
 static int
 track_cmp_string(const char *s1, const char *s2)
 {
 	if (s1 == NULL)
-		return s2 == NULL ? 0: -1;
+		return (s2 == NULL) ? 0: -1;
 	if (s2 == NULL)
 		return 1;
 	return strcasecmp(s1, s2);
 }
 
 void
-track_free(struct track *t)
+track_end(void)
 {
-	if (t != NULL && --t->nrefs == 0) {
-		free(t->album);
-		free(t->artist);
-		free(t->date);
-		free(t->genre);
-		free(t->path);
-		free(t->title);
-		free(t->tracknumber);
-		free(t);
+	struct track_entry *te;
+
+	if (track_tree_modified)
+		track_write_cache();
+
+	while ((te = RB_ROOT(&track_tree)) != NULL) {
+		RB_REMOVE(track_tree, &track_tree, te);
+		track_free_entry(te);
 	}
 }
 
-void
-track_hold(struct track *t)
+static struct track_entry *
+track_find_entry(char *path, const struct ip *ip)
+{
+	struct track_entry search, *te;
+
+	search.track.path = path;
+	te = RB_FIND(track_tree, &track_tree, &search);
+	if (te != NULL && te->track.ip == NULL)
+		te->track.ip = (ip != NULL) ? ip : plugin_find_ip(path);
+	return te;
+}
+
+static void
+track_free_entry(struct track_entry *te)
 {
-	t->nrefs++;
+	track_free_metadata(te);
+	free(te->track.path);
+	free(te);
+}
+
+static void
+track_free_metadata(struct track_entry *te)
+{
+	free(te->track.album);
+	free(te->track.albumartist);
+	free(te->track.artist);
+	free(te->track.comment);
+	free(te->track.date);
+	free(te->track.discnumber);
+	free(te->track.disctotal);
+	free(te->track.genre);
+	free(te->track.title);
+	free(te->track.tracknumber);
+	free(te->track.tracktotal);
 }
 
 struct track *
-track_init(const char *path, const struct ip *ip)
+track_get(char *path, const struct ip *ip)
 {
-	struct track *t;
+	struct track_entry *te;
 
-	if (ip == NULL && (ip = plugin_find_ip(path)) == NULL) {
-		msg_errx("%s: Unsupported file format", path);
-		return NULL;
+	te = track_find_entry(path, ip);
+	if (te != NULL) {
+		if (te->track.ip != NULL)
+			return &te->track;
+		else {
+			msg_errx("%s: Unsupported file format", path);
+			return NULL;
+		}
 	}
 
-	t = xmalloc(sizeof *t);
-	t->path = xstrdup(path);
-	t->ip = ip;
-	t->ipdata = NULL;
-	t->nrefs = 1;
-
-	t->album = NULL;
-	t->artist = NULL;
-	t->date = NULL;
-	t->genre = NULL;
-	t->title = NULL;
-	t->tracknumber = NULL;
-	t->duration = 0;
-
-	if (cache_get_metadata(t) == 0)
-		return t;
-
-	if (t->ip->get_metadata(t)) {
-		free(t->path);
-		free(t);
-		return NULL;
+	if (ip == NULL) {
+		ip = plugin_find_ip(path);
+		if (ip == NULL) {
+			msg_errx("%s: Unsupported file format", path);
+			return NULL;
+		}
 	}
 
-	cache_add_metadata(t);
+	return track_add_new_entry(path, ip);
+}
+
+void
+track_init(void)
+{
+	track_read_cache();
+}
+
+static void
+track_init_metadata(struct track_entry *te)
+{
+	te->track.album = NULL;
+	te->track.albumartist = NULL;
+	te->track.artist = NULL;
+	te->track.comment = NULL;
+	te->track.date = NULL;
+	te->track.discnumber = NULL;
+	te->track.disctotal = NULL;
+	te->track.genre = NULL;
+	te->track.title = NULL;
+	te->track.tracknumber = NULL;
+	te->track.tracktotal = NULL;
+	te->track.duration = 0;
+}
+
+void
+track_lock_metadata(void)
+{
+	XPTHREAD_MUTEX_LOCK(&track_metadata_mtx);
+}
+
+static void
+track_read_cache(void)
+{
+	struct track_entry *te;
+
+	if (cache_open(CACHE_MODE_READ) == -1)
+		return;
+
+	for (;;) {
+		te = xmalloc(sizeof *te);
+		te->delete = 0;
+		if (cache_read_entry(&te->track) == -1) {
+			track_free_entry(te);
+			break;
+		}
+		if (track_add_entry(te) == -1)
+			track_free_entry(te);
+	}
 
-	return t;
+	cache_close();
+}
+
+struct track *
+track_require(char *path)
+{
+	struct track_entry *te;
+
+	te = track_find_entry(path, NULL);
+	return (te != NULL) ? &te->track : track_add_new_entry(path, NULL);
 }
 
 int
 track_search(const struct track *t, const char *search)
 {
-	if (t->album && strcasestr(t->album, search))
+	if (t->album != NULL && strcasestr(t->album, search))
 		return 0;
-	if (t->artist && strcasestr(t->artist, search))
+	if (t->artist != NULL && strcasestr(t->artist, search))
 		return 0;
-	if (t->date && strcasestr(t->date, search))
+	if (t->date != NULL && strcasestr(t->date, search))
 		return 0;
-	if (t->genre && strcasestr(t->genre, search))
+	if (t->genre != NULL && strcasestr(t->genre, search))
 		return 0;
-	if (t->title && strcasestr(t->title, search))
+	if (t->title != NULL && strcasestr(t->title, search))
 		return 0;
-	if (t->tracknumber && strcasestr(t->tracknumber, search))
+	if (t->tracknumber != NULL && strcasestr(t->tracknumber, search))
 		return 0;
 	if (strcasestr(t->path, search))
 		return 0;
 	return -1;
 }
+
+void
+track_split_tag(const char *tag, char **fld1, char **fld2)
+{
+	size_t pos;
+
+	pos = strcspn(tag, "/");
+	if (pos > 0)
+		*fld1 = xstrndup(tag, pos);
+	if (tagpos == '/' && tagpos + 1 != '\0')
+		*fld2 = xstrdup(tag + pos + 1);
+}
+
+void
+track_unlock_metadata(void)
+{
+	XPTHREAD_MUTEX_UNLOCK(&track_metadata_mtx);
+}
+
+void
+track_update_metadata(int delete)
+{
+	struct track_entry	*te;
+	size_t			 i;
+
+	i = 1;
+	RB_FOREACH(te, track_tree, &track_tree) {
+		msg_info("Updating track %zu of %zu (%zu%%)", i,
+		    track_nentries, 100 * i / track_nentries);
+		i++;
+
+		if (access(te->track.path, F_OK) == -1) {
+			if (delete)
+				te->delete = 1;
+			continue;
+		}
+
+		if (te->track.ip == NULL) {
+			te->track.ip = plugin_find_ip(te->track.path);
+			if (te->track.ip == NULL) {
+				LOG_ERRX("%s: no ip found", te->track.path);
+				continue;
+			}
+		}
+
+		track_lock_metadata();
+		track_free_metadata(te);
+		track_init_metadata(te);
+		te->track.ip->get_metadata(&te->track);
+		track_unlock_metadata();
+	}
+
+	msg_clear();
+	track_tree_modified = 1;
+}
+
+int
+track_write_cache(void)
+{
+	struct track_entry *te;
+
+	if (cache_open(CACHE_MODE_WRITE) == -1)
+		return -1;
+
+	RB_FOREACH(te, track_tree, &track_tree)
+		if (!te->delete)
+			cache_write_entry(&te->track);
+
+	cache_close();
+	track_tree_modified = 0;
+	return 0;
+}

siren-0.2.tar.gz/version -> siren-0.7.tar.gz/version Changed

siren-0.2.tar.gz/view.c -> siren-0.7.tar.gz/view.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,6 +30,7 @@
 	void		 (*move_entry_up)(void);
 	void		 (*search_next)(const char *);
 	void		 (*search_prev)(const char *);
+	void		 (*select_active_entry)(void);
 	void		 (*select_prev_entry)(void);
 	void		 (*select_next_entry)(void);
 	void		 (*select_first_entry)(void);
@@ -38,7 +39,7 @@
 	void		 (*scroll_up)(enum menu_scroll);
 };
 
-struct view_entry	view_list = {
+static struct view_entry view_list = {
 	{
 		VIEW_ID_LIBRARY,
 		BIND_SCOPE_LIBRARY,
@@ -51,6 +52,7 @@
 		NULL,
 		library_search_next,
 		library_search_prev,
+		library_select_active_entry,
 		library_select_prev_entry,
 		library_select_next_entry,
 		library_select_first_entry,
@@ -59,6 +61,26 @@
 		library_scroll_up
 	},
 	{
+		VIEW_ID_PLAYLIST,
+		BIND_SCOPE_PLAYLIST,
+		playlist_print,
+		playlist_activate_entry,
+		playlist_copy_entry,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		playlist_search_next,
+		playlist_search_prev,
+		playlist_select_active_entry,
+		playlist_select_prev_entry,
+		playlist_select_next_entry,
+		playlist_select_first_entry,
+		playlist_select_last_entry,
+		playlist_scroll_down,
+		playlist_scroll_up
+	},
+	{
 		VIEW_ID_QUEUE,
 		BIND_SCOPE_QUEUE,
 		queue_print,
@@ -70,6 +92,7 @@
 		queue_move_entry_up,
 		queue_search_next,
 		queue_search_prev,
+		NULL,
 		queue_select_prev_entry,
 		queue_select_next_entry,
 		queue_select_first_entry,
@@ -89,6 +112,7 @@
 		NULL,
 		browser_search_next,
 		browser_search_prev,
+		browser_select_active_entry,
 		browser_select_prev_entry,
 		browser_select_next_entry,
 		browser_select_first_entry,
@@ -247,6 +271,13 @@
 }
 
 void
+view_select_active_entry(void)
+{
+	if (view_listview_sel.select_active_entry != NULL)
+		view_listview_sel.select_active_entry();
+}
+
+void
 view_select_first_entry(void)
 {
 	view_listview_sel.select_first_entry();

siren-0.2.tar.gz/xmalloc.c -> siren-0.7.tar.gz/xmalloc.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Tim van der Molen <tbvdm@xs4all.nl>
+ * Copyright (c) 2011 Tim van der Molen <tim@kariliq.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -39,20 +39,12 @@
 }
 
 void *
-xcalloc(size_t nmemb, size_t size)
-{
-	void *p;
-
-	if ((p = calloc(nmemb, size)) == NULL)
-		LOG_FATAL("calloc");
-	return p;
-}
-
-void *
 xmalloc(size_t size)
 {
 	void *p;
 
+	if (size == 0)
+		LOG_FATALX("zero-size allocation");
 	if ((p = malloc(size)) == NULL)
 		LOG_FATAL("malloc");
 	return p;
@@ -61,22 +53,21 @@
 void *
 xrealloc(void *p, size_t size)
 {
-	void *newp;
-
-	if ((newp = realloc(p, size)) == NULL)
+	if (size == 0)
+		LOG_FATALX("zero-size allocation");
+	if ((p = realloc(p, size)) == NULL)
 		LOG_FATAL("realloc");
-	return newp;
+	return p;
 }
 
 void *
-xrecalloc(void *p, size_t nmemb, size_t size)
+xreallocarray(void *p, size_t nmemb, size_t size)
 {
 	if (nmemb == 0 || size == 0)
-		LOG_FATALX("requested memory size is 0");
-	if (nmemb > SIZE_MAX / size)
-		LOG_FATALX("requested memory size too large");
-
-	return xrealloc(p, nmemb * size);
+		LOG_FATALX("zero-size allocation");
+	if ((p = reallocarray(p, nmemb, size)) == NULL)
+		LOG_FATAL("reallocarray");
+	return p;
 }
 
 int
@@ -117,7 +108,7 @@
 {
 	int ret;
 
-	if ((ret = vasprintf(buf, fmt, ap)) == -1)
+	if ((ret = vasprintf(buf, fmt, ap)) < 0)
 		LOG_FATALX("vasprintf() failed");
 	return ret;
 }
@@ -127,7 +118,7 @@
 {
 	int ret;
 
-	if ((ret = vsnprintf(buf, size, fmt, ap)) == -1)
+	if ((ret = vsnprintf(buf, size, fmt, ap)) < 0)
 		LOG_FATALX("vsnprintf() failed");
 	return ret;
 }

Overview

Request 2921 (accepted)

Request History