From 0a2d56ae1baedd512a8fe6104124d3d33feabe46 Mon Sep 17 00:00:00 2001
From: arpi
Date: Mon, 3 Dec 2001 01:13:48 +0000
Subject: -ao NAS support by Tobias Diedrich
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3277 b3059339-0415-0410-9bf9-f77b7e298cf2
---
DOCS/German/sound.html | 1 +
DOCS/sound.html | 1 +
Makefile | 2 +-
configure | 24 ++++
libao2/ao_nas.c | 333 +++++++++++++++++++++++++++++++++++++++++++++++++
libao2/audio_out.c | 6 +
6 files changed, 366 insertions(+), 1 deletion(-)
create mode 100644 libao2/ao_nas.c
diff --git a/DOCS/German/sound.html b/DOCS/German/sound.html
index a2030f1a97..3478f479d5 100644
--- a/DOCS/German/sound.html
+++ b/DOCS/German/sound.html
@@ -14,6 +14,7 @@ zur Zeit diese Treiber:
| oss | | OSS (ioctl) Treiber |
| sdl | | SDL Treiber (unterstützt Up-/Downsampling, ESD, ARTS usw.) |
+ | nas | | NAS (Network Audio System) Treiber |
| alsa5 | | ALSA 0.5 Treiber |
| alsa9 | | ALSA 0.9 Treiber (funkioniert, macht aber Probleme -> verwende OSS) |
| sun | | SUN Audio-Treiber (/dev/audio) für BSD und Solaris8 Anwender |
diff --git a/DOCS/sound.html b/DOCS/sound.html
index 3389a0c93b..7b9b8f7f96 100644
--- a/DOCS/sound.html
+++ b/DOCS/sound.html
@@ -14,6 +14,7 @@ contains these drivers :
| oss | | OSS (ioctl) driver |
| sdl | | SDL driver (supports up/downsampling, ESD, ARTS etc) |
+ | nas | | NAS (Network Audio System) driver |
| alsa5 | | native ALSA 0.5 driver |
| alsa9 | | native ALSA 0.9 driver (works, but has problems -> use OSS) |
| sun | | SUN audio driver (/dev/audio) for BSD and Solaris8 users |
diff --git a/Makefile b/Makefile
index 001e944cce..82c02aa5c8 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo2 $(EXTRA_INC) # -Wall
VO_LIBS = -Llibvo2 -lvo2 $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB)
endif
-A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
+A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
OSDEP_LIBS = -Llinux -losdep
PP_LIBS = -Lpostproc -lpostproc
diff --git a/configure b/configure
index a2e2583a66..f54ac07513 100755
--- a/configure
+++ b/configure
@@ -646,6 +646,7 @@ _x11=auto
_dga=auto # 1 2 no auto
_xv=auto
_sdl=auto
+_nas=auto
_png=auto
_gl=auto
_ggi=auto
@@ -714,6 +715,8 @@ for ac_option do
--disable-xv) _xv=no ;;
--enable-sdl) _sdl=yes ;;
--disable-sdl) _sdl=no ;;
+ --enable-nas) _nas=yes ;;
+ --disable-nas) _nas=no ;;
--enable-png) _png=yes ;;
--disable-png) _png=no ;;
--enable-gl) _gl=yes ;;
@@ -1768,6 +1771,24 @@ else
fi
echores "$_sdl (with $_sdlconfig)"
+echocheck "NAS"
+if test "$_nas" = auto || test "$_nas" = yes ; then
+ cat > $TMPC << EOF
+#include