oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: add option --enable-solaris-output

Browse Source 
Allow enabling the plugin explicitly without running Solaris, to test
the build.
This commit is contained in:
Max Kellermann
2011-09-19 07:39:27 +02:00
parent df1152ee0f
commit 1d8840412f
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -2,6 +2,7 @@ ver 0.16.5 (2010/??/??)
* configure.ac * configure.ac
- disable assertions in the non-debugging build - disable assertions in the non-debugging build
- show solaris plugin result correctly - show solaris plugin result correctly
- add option --enable-solaris-output
* pcm_format: fix 32-to-24 bit conversion (the "silence" bug) * pcm_format: fix 32-to-24 bit conversion (the "silence" bug)
* input: * input:
- rewind: reduce heap usage - rewind: reduce heap usage

13
configure.ac
View File

@@ -324,6 +324,11 @@ AC_ARG_ENABLE(sndfile,
[enable sndfile support]),, [enable sndfile support]),,
enable_sndfile=auto) enable_sndfile=auto)
AC_ARG_ENABLE(solaris_output,
AS_HELP_STRING([--enable-solaris-output],
[enables the Solaris /dev/audio output]),,
[enable_solaris_output=auto])
AC_ARG_ENABLE(sqlite, AC_ARG_ENABLE(sqlite,
AS_HELP_STRING([--enable-sqlite], AS_HELP_STRING([--enable-sqlite],
[enable support for the SQLite database]),, [enable support for the SQLite database]),,
@@ -1370,9 +1375,10 @@ fi
AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes)
dnl --------------------------------- Solaris --------------------------------- dnl --------------------------------- Solaris ---------------------------------
if test x$enable_solaris_output = xauto; then
case "$host_os" in case "$host_os" in
solaris*) solaris*)
AC_DEFINE(ENABLE_SOLARIS_OUTPUT, 1, [Define to enable Solaris /dev/audio support])
enable_solaris_output=yes enable_solaris_output=yes
;; ;;
@@ -1380,6 +1386,11 @@ case "$host_os" in
enable_solaris_output=no enable_solaris_output=no
;; ;;
esac esac
fi
if test x$enable_solaris_output = xyes; then
AC_DEFINE(ENABLE_SOLARIS_OUTPUT, 1, [Define to enable Solaris /dev/audio support])
fi
AM_CONDITIONAL(ENABLE_SOLARIS_OUTPUT, test x$enable_solaris_output = xyes) AM_CONDITIONAL(ENABLE_SOLARIS_OUTPUT, test x$enable_solaris_output = xyes)

20
src/output/solaris_output_plugin.c
View File

@@ -23,7 +23,6 @@
#include <glib.h> #include <glib.h>
#include <sys/audio.h>
#include <sys/stropts.h> #include <sys/stropts.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -31,6 +30,25 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#ifdef __sun
#include <sys/audio.h>
#else
/* some fake declarations that allow build this plugin on systems
other than Solaris, just to see if it compiles */
#define AUDIO_GETINFO 0
#define AUDIO_SETINFO 0
#define AUDIO_ENCODING_LINEAR 0
struct audio_info {
struct {
unsigned sample_rate, channels, precision, encoding;
} play;
};
#endif
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "solaris_output" #define G_LOG_DOMAIN "solaris_output"