Menu
▾
▴
alpp-cvs — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(8) |
Mar
(7) |
Apr
(14) |
May
(6) |
Jun
(3) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(13) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
(14) |
Dec
|
| 2005 |
Jan
(2) |
Feb
(9) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tom...@us...> - 2003-03-07 20:33:54
|
Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1747
Modified Files:
netupdater.cpp
Log Message:
The updater should work whatever size the network messages (packets)
that it receives are. When enough is received, it is sent to OpenAL
Also added a few lines, so that when enough data isn't received, the
buffer is filled up with zeros and sent to OpenAL. Unfortunately, the
timeout isn't calculated in any way yet; it's just set to 100 ms...
Index: netupdater.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/netupdater.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** netupdater.cpp 18 Oct 2002 07:50:14 -0000 1.4
--- netupdater.cpp 7 Mar 2003 20:33:49 -0000 1.5
***************
*** 30,56 ****
const ALuint buffer1,ALuint buffer2,
ALenum format,unsigned int frequency,
! unsigned int packetsize)
: StreamUpdater(buffer1,buffer2,format,frequency), socket_(socket)
! , controlsocket_(controlsocket), packetsize_(packetsize) {
}
void NetUpdater::run() {
! void *buffer=malloc(packetsize_);
! unsigned int len;
runmutex_.enterMutex();
while(!stoprunning_) {
runmutex_.leaveMutex();
! if(socket_->isPending(ost::Socket::pendingInput,1000)) {
! len=socket_->receive(buffer,packetsize_);
! Update(buffer,len);
! }
! else {
if(controlsocket_ &&
! controlsocket_->isPending(ost::Socket::pendingInput,100)) {
! char instr[100];
! *controlsocket_ >> instr;
! runmutex_.enterMutex();
! break;
}
}
--- 30,67 ----
const ALuint buffer1,ALuint buffer2,
ALenum format,unsigned int frequency,
! unsigned int buffersize)
: StreamUpdater(buffer1,buffer2,format,frequency), socket_(socket)
! , controlsocket_(controlsocket), buffersize_(buffersize) {
}
void NetUpdater::run() {
! char *buffer=new char[buffersize_];
! unsigned int len=0,received=0;
runmutex_.enterMutex();
while(!stoprunning_) {
runmutex_.leaveMutex();
! // TODO: Make the timeout dependant on how long it would take to play
! // one buffer. If it takes too long, just fill up with zeros and Update.
! if(socket_->isPending(ost::Socket::pendingInput,100)) {
! len=socket_->receive(&(buffer[received]),buffersize_-received);
! received+=len;
! if(received>=buffersize_) {
! Update(buffer,received);
! received=0;
! }
! } else {
! // Timeout; fill the buffer with zeros (silence) and Update
! memset(&(buffer[received]),0,buffersize_-received);
! Update(buffer,buffersize_);
! received=0;
!
! // Take care of messages on the control socket (if it exists)
if(controlsocket_ &&
! controlsocket_->isPending(ost::Socket::pendingInput,100)) {
! char instr[100];
! *controlsocket_ >> instr;
! runmutex_.enterMutex();
! break;
}
}
***************
*** 59,63 ****
runmutex_.leaveMutex();
! free(buffer);
}
--- 70,74 ----
runmutex_.leaveMutex();
! delete []buffer;
}
|
|
From: <tom...@us...> - 2003-03-07 20:28:12
|
Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32582
Modified Files:
sample.cpp
Log Message:
Added a couple of utility functions (they might be moved to another file later)
Index: sample.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/sample.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sample.cpp 28 Feb 2003 08:36:23 -0000 1.5
--- sample.cpp 7 Mar 2003 20:28:06 -0000 1.6
***************
*** 64,66 ****
--- 64,101 ----
}
+ // A couple of utility functions. Might move them to their own file later...
+ unsigned int SampleSize(SampleFormat format) {
+ switch(format) {
+ case(Mono8):
+ return 1;
+ break;
+ case(Stereo8):
+ case(Mono16):
+ return 2;
+ break;
+ case(Stereo16):
+ return 4;
+ break;
+ default:
+ return 0;
+ }
+ }
+
+ unsigned int SampleSize(ALenum format) {
+ switch(format) {
+ case(AL_FORMAT_MONO8):
+ return 1;
+ break;
+ case(AL_FORMAT_STEREO8):
+ case(AL_FORMAT_MONO16):
+ return 2;
+ break;
+ case(AL_FORMAT_STEREO16):
+ return 4;
+ break;
+ default:
+ return 0;
+ }
+ }
+
}
|
|
From: <tom...@us...> - 2003-03-07 20:26:29
|
Update of /cvsroot/alpp/openalpp/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv31680
Modified Files:
testfstream.cpp testsend.cpp teststream.cpp
Log Message:
Changed so that buffer sizes are given in number of samples. Also added a few comments
Index: testfstream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/testfstream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testfstream.cpp 16 Feb 2003 23:01:48 -0000 1.2
--- testfstream.cpp 7 Mar 2003 20:26:24 -0000 1.3
***************
*** 41,45 ****
try {
! FileStream stream(argv[1],131072);
Source source(stream);
--- 41,45 ----
try {
! FileStream stream(argv[1]);
Source source(stream);
Index: testsend.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/testsend.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** testsend.cpp 18 Oct 2002 07:50:15 -0000 1.7
--- testsend.cpp 7 Mar 2003 20:26:24 -0000 1.8
***************
*** 22,27 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*
! * Example where a soundfile is loaded using alutLoadWav and streamed over a UDP socket
! * to a receiver that will read the datastream and play it.
*/
--- 22,40 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*
! * Example where a soundfile is loaded using alutLoadWav and streamed over a
! * UDP socket to a receiver that will read the datastream and play it.
! *
! * Note about selecting rate, format and sending rate:
! * Rate is given in samples per second, and format gives the size of one
! * sample. This means that, for example:
! * If the format is Mono16, we have one channel with 16 bit per channel, i.e.
! * 16 bit or 2 bytes per sample.
! * Say we have a frequency of 44100 samples per second. 2 byte samples will
! * mean that we need to stream 88200 bytes per second.
! * If we can send (and receive) ten packets per second, each packet should be
! * at least 8820 bytes.
! * If we instead had a frequency of 11025, then it would be enough with 2205
! * bytes per packet.
! * Of course it's a good idea to add a few hundred bytes to those numbers ;)
*/
***************
*** 41,45 ****
ALenum format;
ALboolean success;
! unsigned int packetsize=10000; // Default packet size = 10000 bytes
const char defaultfile[]="bee.wav";
const char *filename;
--- 54,63 ----
ALenum format;
ALboolean success;
! // Default packet size (in bytes)
! // Note that this doesn't necessarily have to have anything to do with the
! // buffer size of the receiver. Just set it to something appropriate
! // (depending on the connection), and the receiver will take care of the
! // playing the sound correctly...
! unsigned int packetsize=10000;
const char defaultfile[]="bee.wav";
const char *filename;
***************
*** 65,73 ****
int totalsent=0;
! while(totalsent<size) { // Send data in packets with a 100 ms delay between packets
if((totalsent+packetsize)>size)
packetsize=size-totalsent;
totalsent+=socket.send((char *)data+totalsent,packetsize);
! ost::Thread::sleep(100);
}
--- 83,92 ----
int totalsent=0;
! while(totalsent<size) {
! // Send data in packets with a 60 ms delay between packets
if((totalsent+packetsize)>size)
packetsize=size-totalsent;
totalsent+=socket.send((char *)data+totalsent,packetsize);
! ost::Thread::sleep(60);
}
Index: teststream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/teststream.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** teststream.cpp 21 Feb 2003 14:48:24 -0000 1.8
--- teststream.cpp 7 Mar 2003 20:26:24 -0000 1.9
***************
*** 33,39 ****
int main(int argc,char **argv) {
! unsigned int packetsize=10000;
if(argc>1)
! packetsize=atoi(argv[1]);
try {
--- 33,40 ----
int main(int argc,char **argv) {
! // Buffersize in #samples. <-- This has changed from earlier releases!
! unsigned int buffersize=4096;
if(argc>1)
! buffersize=atoi(argv[1]);
try {
***************
*** 42,46 ****
// Create a soundstream that will read its data from the socket
! NetStream stream(&socket,Mono16,44100,packetsize);
// Create a soundsource that uses the net-streamed soundstream.
--- 43,49 ----
// Create a soundstream that will read its data from the socket
! // Unless you want to send lots of data, it's a good idea to go for a
! // low rate and/or small sample format.
! NetStream stream(&socket,Mono16,44100,buffersize);
// Create a soundsource that uses the net-streamed soundstream.
|
|
From: <vr-...@us...> - 2003-02-28 08:36:56
|
Update of /cvsroot/alpp/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv21511
Modified Files:
Makefile.in configure
Log Message:
Moved over from old strstream to sstream according to latest C++ standard.
Also commented away unused variables to get rid of compiler warnings.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/alpp/openalpp/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in 17 Dec 2002 16:42:51 -0000 1.5
--- Makefile.in 28 Feb 2003 08:36:21 -0000 1.6
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,16 ****
# PARTICULAR PURPOSE.
- @SET_MAKE@
SHELL = @SHELL@
--- 11,14 ----
***************
*** 34,40 ****
--- 32,42 ----
includedir = @includedir@
oldincludedir = /usr/include
+
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = .
***************
*** 45,53 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 47,55 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,64 ****
host_alias = @host_alias@
host_triplet = @host@
- AMTAR = @AMTAR@
AS = @AS@
- AWK = @AWK@
CC = @CC@
CCGNUCFLAGS = @CCGNUCFLAGS@
--- 60,64 ----
***************
*** 66,76 ****
CXX = @CXX@
CXXCPP = @CXXCPP@
- DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
--- 66,75 ----
CXX = @CXX@
CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
+ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 79,85 ****
STRIP = @STRIP@
VERSION = @VERSION@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
SUBDIRS = src include tests
--- 78,81 ----
***************
*** 89,156 ****
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = openalpp.pc
- subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
! CONFIG_CLEAN_FILES = openalpp.pc
! DIST_SOURCES =
! DATA = $(pkgconfig_DATA)
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \
- config/README config/config.guess config/config.sub \
- config/depcomp config/install-sh config/ltmain.sh \
- config/missing config/mkinstalldirs configure configure.in \
- openalpp.pc.in
- DIST_SUBDIRS = $(SUBDIRS)
- all: all-recursive
! .SUFFIXES:
! mostlyclean-libtool:
! -rm -f *.lo
! clean-libtool:
! -rm -rf .libs _libs
! distclean-libtool:
! -rm -f libtool
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --foreign Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && \
! CONFIG_HEADERS= CONFIG_LINKS= \
! CONFIG_FILES=$@ $(SHELL) ./config.status
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-
- $(ACLOCAL_M4): configure.in
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
openalpp.pc: $(top_builddir)/config.status openalpp.pc.in
! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
! uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
@list='$(pkgconfig_DATA)'; for p in $$list; do \
! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! f="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \
! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \
done
uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
! @list='$(pkgconfig_DATA)'; for p in $$list; do \
! f="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \
! rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \
done
--- 85,137 ----
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = openalpp.pc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
! CONFIG_CLEAN_FILES = openalpp.pc
! DATA = $(pkgconfig_DATA)
+ DIST_COMMON = COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \
+ configure configure.in openalpp.pc.in
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
! GZIP_ENV = --best
! all: all-redirect
! .SUFFIXES:
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! $(ACLOCAL_M4): configure.in
! cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
openalpp.pc: $(top_builddir)/config.status openalpp.pc.in
! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
@list='$(pkgconfig_DATA)'; for p in $$list; do \
! if test -f $(srcdir)/$$p; then \
! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
! else if test -f $$p; then \
! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
! $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
! fi; fi; \
done
uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
! list='$(pkgconfig_DATA)'; for p in $$list; do \
! rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
done
***************
*** 161,165 ****
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
--- 142,151 ----
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
***************
*** 184,197 ****
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! case "$@" in \
! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! *) list='$(SUBDIRS)' ;; \
! esac; \
! rev=''; for subdir in $$list; do \
! if test "$$subdir" = "."; then :; else \
! rev="$$subdir $$rev"; \
! fi; \
done; \
! rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
--- 170,178 ----
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" != "." || dot_seen=yes; \
done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
***************
*** 212,275 ****
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- top_distdir = .
- # Avoid unsightly `./'.
distdir = $(PACKAGE)-$(VERSION)
! GZIP_ENV = --best
!
distdir: $(DISTFILES)
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
! $(mkinstalldirs) $(distdir)/. $(distdir)/config
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
--- 193,279 ----
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
! mostlyclean-tags:
!
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
distdir: $(DISTFILES)
! -rm -rf $(distdir)
mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
***************
*** 279,350 ****
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" \
! distdir=../$(distdir)/$$subdir \
! distdir) \
|| exit 1; \
fi; \
done
! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
!
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! chmod a-w $(distdir)
! dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
! && cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || (echo "Error: files left after uninstall" 1>&2; \
! exit 1) ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist \
! && $(MAKE) $(AM_MAKEFLAGS) distclean \
! && rm -f $(distdir).tar.gz \
! && (test `find . -type f -print | wc -l` -eq 0 \
! || (echo "Error: files left after distclean" 1>&2; \
! exit 1) )
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
check-am: all-am
check: check-recursive
! all-am: Makefile $(DATA)
! installdirs: installdirs-recursive
! installdirs-am:
! $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
!
! install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
- uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
!
! installcheck: installcheck-recursive
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
--- 283,319 ----
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
check-am: all-am
check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! install-exec-am:
install-exec: install-exec-recursive
+
+ install-data-am: install-pkgconfigDATA
install-data: install-data-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-recursive
! uninstall-am: uninstall-pkgconfigDATA
! uninstall: uninstall-recursive
! all-am: Makefile $(DATA)
! all-redirect: all-recursive
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs: installdirs-recursive
! installdirs-am:
! $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
!
!
mostlyclean-generic:
***************
*** 352,418 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
!
! clean-am: clean-generic clean-libtool mostlyclean-am
!
! dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
! distclean: distclean-recursive
! -rm -f config.status config.cache config.log
! distclean-am: clean-am distclean-generic distclean-libtool \
! distclean-tags
!
! dvi: dvi-recursive
!
! dvi-am:
!
! info: info-recursive
! info-am:
! install-data-am: install-pkgconfigDATA
! install-exec-am:
! install-info: install-info-recursive
! install-man:
! installcheck-am:
maintainer-clean: maintainer-clean-recursive
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-recursive
!
! mostlyclean-am: mostlyclean-generic mostlyclean-libtool
!
! uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
!
! uninstall-info: uninstall-info-recursive
!
! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
! clean-generic clean-libtool clean-recursive dist dist-all \
! distcheck distclean distclean-generic distclean-libtool \
! distclean-recursive distclean-tags distdir dvi dvi-am \
! dvi-recursive info info-am info-recursive install install-am \
! install-data install-data-am install-data-recursive \
! install-exec install-exec-am install-exec-recursive \
! install-info install-info-am install-info-recursive install-man \
! install-pkgconfigDATA install-recursive install-strip \
! installcheck installcheck-am installdirs installdirs-am \
! installdirs-recursive maintainer-clean maintainer-clean-generic \
! maintainer-clean-recursive mostlyclean mostlyclean-generic \
! mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
! uninstall uninstall-am uninstall-info-am \
! uninstall-info-recursive uninstall-pkgconfigDATA \
! uninstall-recursive
--- 321,362 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-tags mostlyclean-generic
! mostlyclean: mostlyclean-recursive
! clean-am: clean-tags clean-generic mostlyclean-am
! clean: clean-recursive
! distclean-am: distclean-tags distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-recursive
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
+ -rm -f config.status
! .PHONY: uninstall-pkgconfigDATA install-pkgconfigDATA \
! install-data-recursive uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs-am \
! installdirs mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
***************
*** 424,427 ****
--- 368,372 ----
ALL-install:
cd $(top_builddir); make -j4 install
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: configure
===================================================================
RCS file: /cvsroot/alpp/openalpp/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure 17 Dec 2002 16:42:51 -0000 1.4
--- configure 28 Feb 2003 08:36:21 -0000 1.5
***************
*** 13,19 ****
# Any additions from configure.in:
ac_help="$ac_help
- --disable-dependency-tracking Speeds up one-time builds
- --enable-dependency-tracking Do not reject slow dependency extractors"
- ac_help="$ac_help
--enable-shared[=PKGS] build shared libraries [default=yes]"
ac_help="$ac_help
--- 13,16 ----
***************
*** 738,745 ****
[...2259 lines suppressed...]
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
- $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-
exit 0
--- 6204,6210 ----
|
|
From: <vr-...@us...> - 2003-02-28 08:36:28
|
Update of /cvsroot/alpp/openalpp/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv21511/tests
Modified Files:
Makefile.in testmic.cpp
Log Message:
Moved over from old strstream to sstream according to latest C++ standard.
Also commented away unused variables to get rid of compiler warnings.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in 21 Feb 2003 14:48:24 -0000 1.6
--- Makefile.in 28 Feb 2003 08:36:23 -0000 1.7
***************
*** 1,3 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--- 1,3 ----
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
***************
*** 81,98 ****
INCLUDES = -I$(top_builddir)/include
! LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs)
! bin_PROGRAMS = teststream testsend $(portaudiotests) simple
! teststream_SOURCES = teststream.cpp
! testsend_SOURCES = testsend.cpp
! testmic_SOURCES = testmic.cpp
! simple_SOURCES = simple.cpp
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_CLEAN_FILES =
! bin_PROGRAMS = teststream$(EXEEXT) testsend$(EXEEXT) simple$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
--- 81,108 ----
INCLUDES = -I$(top_builddir)/include
! @WITH_CCGNU_TRUE@ccgnulibs = @CCGNULIBS@
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@portaudiolibs = -lportaudio
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@ogglibs = -lvorbisfile -lvorbis -logg
! @WITH_CCGNU_TRUE@LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs) $(ogglibs)
! @WITH_CCGNU_TRUE@bin_PROGRAMS = teststream testsend testfstream testmic simple moving
! @WITH_CCGNU_TRUE@teststream_SOURCES = teststream.cpp
! @WITH_CCGNU_TRUE@testsend_SOURCES = testsend.cpp
! @WITH_CCGNU_TRUE@testmic_SOURCES = testmic.cpp
!
! @WITH_CCGNU_TRUE@simple_SOURCES = simple.cpp
!
! @WITH_CCGNU_TRUE@moving_SOURCES = moving.cpp
!
! @WITH_CCGNU_TRUE@testfstream_SOURCES = testfstream.cpp
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_CLEAN_FILES =
! @WITH_CCGNU_TRUE@bin_PROGRAMS = teststream$(EXEEXT) testsend$(EXEEXT) \
! @WITH_CCGNU_TRUE@testfstream$(EXEEXT) testmic$(EXEEXT) simple$(EXEEXT) \
! @WITH_CCGNU_TRUE@moving$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
***************
*** 102,117 ****
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! teststream_OBJECTS = teststream.$(OBJEXT)
teststream_LDADD = $(LDADD)
! teststream_DEPENDENCIES = ../src/libopenalpp.la
teststream_LDFLAGS =
! testsend_OBJECTS = testsend.$(OBJEXT)
testsend_LDADD = $(LDADD)
! testsend_DEPENDENCIES = ../src/libopenalpp.la
testsend_LDFLAGS =
! simple_OBJECTS = simple.$(OBJEXT)
simple_LDADD = $(LDADD)
! simple_DEPENDENCIES = ../src/libopenalpp.la
simple_LDFLAGS =
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 112,187 ----
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! @WITH_CCGNU_TRUE@teststream_OBJECTS = teststream.$(OBJEXT)
teststream_LDADD = $(LDADD)
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@teststream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@teststream_DEPENDENCIES = ../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@teststream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la
teststream_LDFLAGS =
! @WITH_CCGNU_TRUE@testsend_OBJECTS = testsend.$(OBJEXT)
testsend_LDADD = $(LDADD)
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testsend_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@testsend_DEPENDENCIES = ../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testsend_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la
testsend_LDFLAGS =
! @WITH_CCGNU_TRUE@testfstream_OBJECTS = testfstream.$(OBJEXT)
! testfstream_LDADD = $(LDADD)
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testfstream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@testfstream_DEPENDENCIES = ../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testfstream_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la
! testfstream_LDFLAGS =
! @WITH_CCGNU_TRUE@testmic_OBJECTS = testmic.$(OBJEXT)
! testmic_LDADD = $(LDADD)
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testmic_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@testmic_DEPENDENCIES = ../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testmic_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la
! testmic_LDFLAGS =
! @WITH_CCGNU_TRUE@simple_OBJECTS = simple.$(OBJEXT)
simple_LDADD = $(LDADD)
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@simple_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@simple_DEPENDENCIES = ../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@simple_DEPENDENCIES = \
! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la
simple_LDFLAGS =
+ @WITH_CCGNU_TRUE@moving_OBJECTS = moving.$(OBJEXT)
+ moving_LDADD = $(LDADD)
+ @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = \
+ @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la
+ @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@moving_DEPENDENCIES = \
+ @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la
+ @WITH_CCGNU_TRUE@moving_DEPENDENCIES = ../src/libopenalpp.la
+ @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = \
+ @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la
+ @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@moving_DEPENDENCIES = \
+ @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la
+ moving_LDFLAGS =
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 126,132 ****
TAR = tar
GZIP_ENV = --best
! DEP_FILES = .deps/simple.P .deps/testsend.P .deps/teststream.P
! SOURCES = $(teststream_SOURCES) $(testsend_SOURCES) $(simple_SOURCES)
! OBJECTS = $(teststream_OBJECTS) $(testsend_OBJECTS) $(simple_OBJECTS)
all: all-redirect
--- 196,203 ----
TAR = tar
GZIP_ENV = --best
! DEP_FILES = .deps/moving.P .deps/simple.P .deps/testfstream.P \
! .deps/testmic.P .deps/testsend.P .deps/teststream.P
! SOURCES = $(teststream_SOURCES) $(testsend_SOURCES) $(testfstream_SOURCES) $(testmic_SOURCES) $(simple_SOURCES) $(moving_SOURCES)
! OBJECTS = $(teststream_OBJECTS) $(testsend_OBJECTS) $(testfstream_OBJECTS) $(testmic_OBJECTS) $(simple_OBJECTS) $(moving_OBJECTS)
all: all-redirect
***************
*** 212,218 ****
--- 283,301 ----
$(CXXLINK) $(testsend_LDFLAGS) $(testsend_OBJECTS) $(testsend_LDADD) $(LIBS)
+ testfstream$(EXEEXT): $(testfstream_OBJECTS) $(testfstream_DEPENDENCIES)
+ @rm -f testfstream$(EXEEXT)
+ $(CXXLINK) $(testfstream_LDFLAGS) $(testfstream_OBJECTS) $(testfstream_LDADD) $(LIBS)
+
+ testmic$(EXEEXT): $(testmic_OBJECTS) $(testmic_DEPENDENCIES)
+ @rm -f testmic$(EXEEXT)
+ $(CXXLINK) $(testmic_LDFLAGS) $(testmic_OBJECTS) $(testmic_LDADD) $(LIBS)
+
simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES)
@rm -f simple$(EXEEXT)
$(CXXLINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS)
+
+ moving$(EXEEXT): $(moving_OBJECTS) $(moving_DEPENDENCIES)
+ @rm -f moving$(EXEEXT)
+ $(CXXLINK) $(moving_LDFLAGS) $(moving_OBJECTS) $(moving_LDADD) $(LIBS)
.cpp.o:
$(CXXCOMPILE) -c $<
***************
*** 240,244 ****
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
--- 323,327 ----
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
mostlyclean-tags:
***************
*** 399,408 ****
mostlyclean distclean maintainer-clean
-
- @WITH_CCGNU_TRUE@ ccgnulibs = @CCGNULIBS@
-
- @WITH_PORTAUDIO_TRUE@ portaudiolibs = -lportaudio
-
- @WITH_PORTAUDIO_TRUE@ portaudiotests = testmic
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 482,485 ----
Index: testmic.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/testmic.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** testmic.cpp 21 Feb 2003 14:48:24 -0000 1.9
--- testmic.cpp 28 Feb 2003 08:36:24 -0000 1.10
***************
*** 45,55 ****
float limits[2] = {0.5,-0.5};
! float delay=10;
! float time=0,angle=0;
source.SetPosition(limits[0],0.0,0.0);
source.Play();
! const int no_laps=5;
std::cerr << "Moving sound 5 times..." << std::endl;
--- 45,55 ----
float limits[2] = {0.5,-0.5};
! //float delay=10;
! //float time=0,angle=0;
source.SetPosition(limits[0],0.0,0.0);
source.Play();
! //const int no_laps=5;
std::cerr << "Moving sound 5 times..." << std::endl;
|
|
From: <vr-...@us...> - 2003-02-28 08:36:27
|
Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21511/src
Modified Files:
Makefile.in audioconvert.cpp nofilestream.cpp
noinputdevice.cpp sample.cpp
Log Message:
Moved over from old strstream to sstream according to latest C++ standard.
Also commented away unused variables to get rid of compiler warnings.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in 21 Feb 2003 14:47:15 -0000 1.5
--- Makefile.in 28 Feb 2003 08:36:22 -0000 1.6
***************
*** 1,3 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--- 1,3 ----
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
***************
*** 83,90 ****
basicfiles = audioenvironment.cpp listener.cpp audiobase.cpp sourcebase.cpp source.cpp sample.cpp sounddata.cpp audioconvert.cpp error.cpp groupsource.cpp
! lib_LTLIBRARIES = libopenalpp.la
! libopenalpp_la_SOURCES = $(basicfiles) $(streamfiles) $(devicefiles)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_CLEAN_FILES =
--- 83,96 ----
basicfiles = audioenvironment.cpp listener.cpp audiobase.cpp sourcebase.cpp source.cpp sample.cpp sounddata.cpp audioconvert.cpp error.cpp groupsource.cpp
+ @WITH_CCGNU_TRUE@streamfiles = netstream.cpp streamupdater.cpp netupdater.cpp stream.cpp
+ @WITH_CCGNU_FALSE@streamfiles = nostreaming.cpp noinputdevice.cpp nofilestream.cpp
+ @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@oggfiles = filestream.cpp filestreamupdater.cpp
+ @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@oggfiles = nofilestream.cpp
+ @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@devicefiles = deviceupdater.cpp inputdevice.cpp
+ @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@devicefiles = noinputdevice.cpp
! libopenalpp_la_SOURCES = $(basicfiles) $(streamfiles) $(devicefiles) $(oggfiles)
! lib_LTLIBRARIES = libopenalpp.la
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_CLEAN_FILES =
***************
*** 98,104 ****
libopenalpp_la_LDFLAGS =
libopenalpp_la_LIBADD =
! libopenalpp_la_OBJECTS = audioenvironment.lo listener.lo audiobase.lo \
! sourcebase.lo source.lo sample.lo sounddata.lo audioconvert.lo error.lo \
! groupsource.lo
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 104,235 ----
libopenalpp_la_LDFLAGS =
libopenalpp_la_LIBADD =
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@listener.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audiobase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@source.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sample.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sounddata.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@error.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@groupsource.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netstream.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@streamupdater.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netupdater.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@stream.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@nofilestream.lo
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@listener.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audiobase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@source.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sample.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sounddata.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@error.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@groupsource.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nostreaming.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nofilestream.lo
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@listener.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audiobase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@source.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sample.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sounddata.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@error.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@groupsource.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nostreaming.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nofilestream.lo
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@listener.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audiobase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@source.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sample.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sounddata.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@error.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@groupsource.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netstream.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@streamupdater.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netupdater.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@stream.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestream.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestreamupdater.lo
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@listener.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audiobase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@source.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sample.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sounddata.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@error.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@groupsource.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netstream.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@streamupdater.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netupdater.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@stream.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@deviceupdater.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@inputdevice.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@nofilestream.lo
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@listener.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audiobase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@source.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sample.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sounddata.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@error.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@groupsource.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netstream.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@streamupdater.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netupdater.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@stream.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@deviceupdater.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@inputdevice.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestream.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestreamupdater.lo
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@listener.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audiobase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@source.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sample.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sounddata.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@error.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@groupsource.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nostreaming.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \
! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nofilestream.lo
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@listener.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audiobase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@source.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sample.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sounddata.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@error.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@groupsource.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nostreaming.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \
! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nofilestream.lo
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 114,120 ****
GZIP_ENV = --best
DEP_FILES = .deps/audiobase.P .deps/audioconvert.P \
! .deps/audioenvironment.P .deps/error.P .deps/groupsource.P \
! .deps/listener.P .deps/sample.P .deps/sounddata.P .deps/source.P \
! .deps/sourcebase.P
SOURCES = $(libopenalpp_la_SOURCES)
OBJECTS = $(libopenalpp_la_OBJECTS)
--- 245,254 ----
GZIP_ENV = --best
DEP_FILES = .deps/audiobase.P .deps/audioconvert.P \
! .deps/audioenvironment.P .deps/deviceupdater.P .deps/error.P \
! .deps/filestream.P .deps/filestreamupdater.P .deps/groupsource.P \
! .deps/inputdevice.P .deps/listener.P .deps/netstream.P \
! .deps/netupdater.P .deps/nofilestream.P .deps/noinputdevice.P \
! .deps/nostreaming.P .deps/sample.P .deps/sounddata.P .deps/source.P \
! .deps/sourcebase.P .deps/stream.P .deps/streamupdater.P
SOURCES = $(libopenalpp_la_SOURCES)
OBJECTS = $(libopenalpp_la_OBJECTS)
***************
*** 221,225 ****
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
--- 355,359 ----
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
mostlyclean-tags:
***************
*** 380,392 ****
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
- @WITH_CCGNU_TRUE@ streamfiles = \
- @WITH_CCGNU_TRUE@ netstream.cpp \
- @WITH_CCGNU_TRUE@ streamupdater.cpp \
- @WITH_CCGNU_TRUE@ netupdater.cpp \
- @WITH_CCGNU_TRUE@ stream.cpp
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ devicefiles = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ deviceupdater.cpp \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ inputdevice.cpp
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 514,517 ----
Index: audioconvert.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/audioconvert.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** audioconvert.cpp 18 Oct 2002 07:50:13 -0000 1.3
--- audioconvert.cpp 28 Feb 2003 08:36:23 -0000 1.4
***************
*** 30,34 ****
#include <iostream>
! #include <strstream>
/*
--- 30,34 ----
#include <iostream>
! #include <sstream>
/*
***************
*** 129,134 ****
}
! unsigned int insize=size;
! unsigned short inbits=Bits(format),inchannels=Channels(format);
if(acBuildAudioCVT(&s16le,
--- 129,134 ----
}
! //unsigned int insize=size;
! //unsigned short inbits=Bits(format),inchannels=Channels(format);
if(acBuildAudioCVT(&s16le,
***************
*** 924,930 ****
if ( *indata++ != 0 ) {
/* Uh oh, corrupt data? Buggy code? */
! std::strstream str;
str << __FILE__ << ": " << __LINE__ << ": " << "Reserved byte in buffer should be 0" << std::ends;
! throw FatalError(str.str());
}
--- 924,930 ----
if ( *indata++ != 0 ) {
/* Uh oh, corrupt data? Buggy code? */
! std::ostringstream str;
str << __FILE__ << ": " << __LINE__ << ": " << "Reserved byte in buffer should be 0" << std::ends;
! throw FatalError(str.str().c_str());
}
Index: nofilestream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/nofilestream.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nofilestream.cpp 16 Feb 2003 22:36:17 -0000 1.1
--- nofilestream.cpp 28 Feb 2003 08:36:23 -0000 1.2
***************
*** 27,31 ****
namespace openalpp {
! FileStream::FileStream(const char *filename,const int buffersize)
throw (NameError,InitError,FileError) : Stream() {
throw InitError("No support for streaming from files compiled in.");
--- 27,31 ----
namespace openalpp {
! FileStream::FileStream(const char */*filename*/,const int /*buffersize*/)
throw (NameError,InitError,FileError) : Stream() {
throw InitError("No support for streaming from files compiled in.");
***************
*** 39,43 ****
}
! FileStream &FileStream::operator=(const FileStream &stream) {
}
--- 39,43 ----
}
! FileStream &FileStream::operator=(const FileStream &/*stream*/) {
}
Index: noinputdevice.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/noinputdevice.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** noinputdevice.cpp 21 Feb 2003 12:12:57 -0000 1.2
--- noinputdevice.cpp 28 Feb 2003 08:36:23 -0000 1.3
***************
*** 38,43 ****
}
! InputDevice::InputDevice(int device,unsigned int samplerate,unsigned int buffersize,
! SampleFormat format) {
Init();
}
--- 38,43 ----
}
! InputDevice::InputDevice(int /*device*/, unsigned int /*samplerate*/, unsigned int /*buffersize*/,
! SampleFormat /*format*/) {
Init();
}
***************
*** 47,51 ****
}
! InputDevice &InputDevice::operator=(const InputDevice &input) {
}
--- 47,52 ----
}
! InputDevice &InputDevice::operator=(const InputDevice &/*input*/) {
! return *this;
}
Index: sample.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/sample.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sample.cpp 18 Oct 2002 07:50:14 -0000 1.4
--- sample.cpp 28 Feb 2003 08:36:23 -0000 1.5
***************
*** 24,28 ****
#include "openalpp/sample.h"
! #include <strstream>
namespace openalpp {
--- 24,28 ----
#include "openalpp/sample.h"
! #include <sstream>
namespace openalpp {
***************
*** 42,48 ****
free(data);
} else {
! std::strstream str;
str << "Unable to load file: " << filename << std::ends;
! throw FileError(str.str());
}
}
--- 42,48 ----
free(data);
} else {
! std::ostringstream str;
str << "Unable to load file: " << filename << std::ends;
! throw FileError(str.str().c_str());
}
}
|
|
From: <tom...@us...> - 2003-02-24 13:04:49
|
Update of /cvsroot/alpp/openalpp/include/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv6896
Modified Files:
Makefile.am
Log Message:
Added filestream and filestreamupdater
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 13 Dec 2002 13:03:42 -0000 1.1
--- Makefile.am 24 Feb 2003 13:04:45 -0000 1.2
***************
*** 19,21 ****
--- 19,23 ----
stream.h \
streamupdater.h \
+ filestream.h \
+ filestreamupdater.h \
windowsstuff.h
|
|
From: <tom...@us...> - 2003-02-21 14:48:28
|
Update of /cvsroot/alpp/openalpp/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv16527
Modified Files:
Makefile.am Makefile.in moving.cpp simple.cpp testmic.cpp
teststream.cpp
Log Message:
Fixed erroneous commits
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am 19 Feb 2003 18:35:14 -0000 1.4
--- Makefile.am 21 Feb 2003 14:48:24 -0000 1.5
***************
*** 3,20 ****
if WITH_CCGNU
! ccgnulibs = @CCGNULIBS@
! endif
!
if WITH_PORTAUDIO
! portaudiolibs = -lportaudio
endif
- LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs)
! if WITH_PORTAUDIO
! portaudiotests = testmic
! endif
! bin_PROGRAMS = teststream testsend $(portaudiotests) simple
teststream_SOURCES = teststream.cpp
--- 3,18 ----
if WITH_CCGNU
! ccgnulibs = @CCGNULIBS@
if WITH_PORTAUDIO
! portaudiolibs = -lportaudio
! endif
! if WITH_OGGVORBIS
! ogglibs = -lvorbisfile -lvorbis -logg
endif
! LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs) $(ogglibs)
! bin_PROGRAMS = teststream testsend testfstream testmic simple moving
teststream_SOURCES = teststream.cpp
***************
*** 25,26 ****
--- 23,30 ----
simple_SOURCES = simple.cpp
+
+ moving_SOURCES = moving.cpp
+
+ testfstream_SOURCES = testfstream.cpp
+
+ endif
Index: Makefile.in
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in 18 Dec 2002 10:34:13 -0000 1.5
--- Makefile.in 21 Feb 2003 14:48:24 -0000 1.6
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,16 ****
# PARTICULAR PURPOSE.
- @SET_MAKE@
SHELL = @SHELL@
--- 11,14 ----
***************
*** 34,40 ****
--- 32,42 ----
includedir = @includedir@
oldincludedir = /usr/include
+
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = ..
***************
*** 45,53 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 47,55 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,64 ****
host_alias = @host_alias@
host_triplet = @host@
- AMTAR = @AMTAR@
AS = @AS@
- AWK = @AWK@
CC = @CC@
CCGNUCFLAGS = @CCGNUCFLAGS@
--- 60,64 ----
***************
*** 66,76 ****
CXX = @CXX@
CXXCPP = @CXXCPP@
- DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
--- 66,75 ----
CXX = @CXX@
CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
+ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 79,96 ****
STRIP = @STRIP@
VERSION = @VERSION@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
INCLUDES = -I$(top_builddir)/include
- @WITH_CCGNU_TRUE@ccgnulibs = @CCGNULIBS@
-
- @WITH_PORTAUDIO_TRUE@portaudiolibs = -lportaudio
-
LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs)
- @WITH_PORTAUDIO_TRUE@portaudiotests = testmic
-
bin_PROGRAMS = teststream testsend $(portaudiotests) simple
--- 78,86 ----
***************
*** 102,217 ****
simple_SOURCES = simple.cpp
- subdir = tests
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
! CONFIG_CLEAN_FILES =
! @WITH_PORTAUDIO_TRUE@bin_PROGRAMS = teststream$(EXEEXT) \
! @WITH_PORTAUDIO_TRUE@ testsend$(EXEEXT) testmic$(EXEEXT) \
! @WITH_PORTAUDIO_TRUE@ simple$(EXEEXT)
! @WITH_PORTAUDIO_FALSE@bin_PROGRAMS = teststream$(EXEEXT) \
! @WITH_PORTAUDIO_FALSE@ testsend$(EXEEXT) simple$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
- am_simple_OBJECTS = simple.$(OBJEXT)
- simple_OBJECTS = $(am_simple_OBJECTS)
- simple_LDADD = $(LDADD)
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- simple_LDFLAGS =
- am_testmic_OBJECTS = testmic.$(OBJEXT)
- testmic_OBJECTS = $(am_testmic_OBJECTS)
- testmic_LDADD = $(LDADD)
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- testmic_LDFLAGS =
- am_testsend_OBJECTS = testsend.$(OBJEXT)
- testsend_OBJECTS = $(am_testsend_OBJECTS)
- testsend_LDADD = $(LDADD)
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- testsend_LDFLAGS =
- am_teststream_OBJECTS = teststream.$(OBJEXT)
- teststream_OBJECTS = $(am_teststream_OBJECTS)
- teststream_LDADD = $(LDADD)
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \
- @WITH_CCGNU_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \
- @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la
- teststream_LDFLAGS =
! DEFS = @DEFS@
! DEFAULT_INCLUDES = -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! depcomp = $(SHELL) $(top_srcdir)/config/depcomp
! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/simple.Po $(DEPDIR)/testmic.Po \
! @AMDEP_TRUE@ $(DEPDIR)/testsend.Po $(DEPDIR)/teststream.Po
! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
! $(AM_CXXFLAGS) $(CXXFLAGS)
! CXXLD = $(CXX)
! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
! $(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(simple_SOURCES) $(testmic_SOURCES) $(testsend_SOURCES) \
! $(teststream_SOURCES)
! DIST_COMMON = README Makefile.am Makefile.in
! SOURCES = $(simple_SOURCES) $(testmic_SOURCES) $(testsend_SOURCES) $(teststream_SOURCES)
- all: all-am
.SUFFIXES:
! .SUFFIXES: .cpp .lo .o .obj
! mostlyclean-libtool:
! -rm -f *.lo
- clean-libtool:
- -rm -rf .libs _libs
! distclean-libtool:
! -rm -f libtool
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --foreign tests/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && \
! CONFIG_HEADERS= CONFIG_LINKS= \
! CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! || test -f $$p1 \
! ; then \
! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
--- 92,160 ----
simple_SOURCES = simple.cpp
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
! CONFIG_CLEAN_FILES =
! bin_PROGRAMS = teststream$(EXEEXT) testsend$(EXEEXT) simple$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
! DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! teststream_OBJECTS = teststream.$(OBJEXT)
! teststream_LDADD = $(LDADD)
! teststream_DEPENDENCIES = ../src/libopenalpp.la
! teststream_LDFLAGS =
! testsend_OBJECTS = testsend.$(OBJEXT)
! testsend_LDADD = $(LDADD)
! testsend_DEPENDENCIES = ../src/libopenalpp.la
! testsend_LDFLAGS =
! simple_OBJECTS = simple.$(OBJEXT)
! simple_LDADD = $(LDADD)
! simple_DEPENDENCIES = ../src/libopenalpp.la
! simple_LDFLAGS =
CXXFLAGS = @CXXFLAGS@
! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! CXXLD = $(CXX)
! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = README Makefile.am Makefile.in
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+ TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES = .deps/simple.P .deps/testsend.P .deps/teststream.P
+ SOURCES = $(teststream_SOURCES) $(testsend_SOURCES) $(simple_SOURCES)
+ OBJECTS = $(teststream_OBJECTS) $(testsend_OBJECTS) $(simple_OBJECTS)
+
+ all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .cpp .lo .o .obj .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
! mostlyclean-binPROGRAMS:
!
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
!
! distclean-binPROGRAMS:
!
! maintainer-clean-binPROGRAMS:
!
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
***************
*** 219,350 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES)
! @rm -f simple$(EXEEXT)
! $(CXXLINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS)
! testmic$(EXEEXT): $(testmic_OBJECTS) $(testmic_DEPENDENCIES)
! @rm -f testmic$(EXEEXT)
! $(CXXLINK) $(testmic_LDFLAGS) $(testmic_OBJECTS) $(testmic_LDADD) $(LIBS)
! testsend$(EXEEXT): $(testsend_OBJECTS) $(testsend_DEPENDENCIES)
! @rm -f testsend$(EXEEXT)
! $(CXXLINK) $(testsend_LDFLAGS) $(testsend_OBJECTS) $(testsend_LDADD) $(LIBS)
! teststream$(EXEEXT): $(teststream_OBJECTS) $(teststream_DEPENDENCIES)
! @rm -f teststream$(EXEEXT)
! $(CXXLINK) $(teststream_LDFLAGS) $(teststream_OBJECTS) $(teststream_LDADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/simple.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testmic.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testsend.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/teststream.Po@am__quote@
! distclean-depend:
! -rm -rf $(DEPDIR)
! .cpp.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
! .cpp.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
.cpp.lo:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
! CXXDEPMODE = @CXXDEPMODE@
! uninstall-info-am:
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
- check-am: all-am
- check: check-am
- all-am: Makefile $(PROGRAMS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
! install: install-am
install-exec: install-exec-am
install-data: install-data-am
- uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
!
! installcheck: installcheck-am
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
--- 162,352 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! # FIXME: We should only use cygpath when building on Windows,
! # and only if it is available.
! .c.obj:
! $(COMPILE) -c `cygpath -w $<`
!
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
! -rm -f *.$(OBJEXT)
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
! .s.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
! .S.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
! mostlyclean-libtool:
! -rm -f *.lo
!
! clean-libtool:
! -rm -rf .libs _libs
!
! distclean-libtool:
+ maintainer-clean-libtool:
+
+ teststream$(EXEEXT): $(teststream_OBJECTS) $(teststream_DEPENDENCIES)
+ @rm -f teststream$(EXEEXT)
+ $(CXXLINK) $(teststream_LDFLAGS) $(teststream_OBJECTS) $(teststream_LDADD) $(LIBS)
+
+ testsend$(EXEEXT): $(testsend_OBJECTS) $(testsend_DEPENDENCIES)
+ @rm -f testsend$(EXEEXT)
+ $(CXXLINK) $(testsend_LDFLAGS) $(testsend_OBJECTS) $(testsend_LDADD) $(LIBS)
+
+ simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES)
+ @rm -f simple$(EXEEXT)
+ $(CXXLINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS)
+ .cpp.o:
+ $(CXXCOMPILE) -c $<
+ .cpp.obj:
+ $(CXXCOMPILE) -c `cygpath -w $<`
.cpp.lo:
! $(LTCXXCOMPILE) -c $<
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
! mostlyclean-tags:
!
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
!
! subdir = tests
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign tests/Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
! -include $(DEP_FILES)
!
! mostlyclean-depend:
!
! clean-depend:
!
! distclean-depend:
! -rm -rf .deps
!
! maintainer-clean-depend:
!
! %.o: %.c
! @echo '$(COMPILE) -c $<'; \
! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
!
! %.lo: %.c
! @echo '$(LTCOMPILE) -c $<'; \
! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
!
! %.o: %.cpp
! @echo '$(CXXCOMPILE) -c $<'; \
! $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
!
! %.lo: %.cpp
! @echo '$(LTCXXCOMPILE) -c $<'; \
! $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
! info-am:
! info: info-am
! dvi-am:
! dvi: dvi-am
! check-am: all-am
! check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binPROGRAMS
install-exec: install-exec-am
+
+ install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-am
! uninstall-am: uninstall-binPROGRAMS
! uninstall: uninstall-am
! all-am: Makefile $(PROGRAMS)
! all-redirect: all-am
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
!
!
mostlyclean-generic:
***************
*** 352,409 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
!
! clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
!
! distclean: distclean-am
!
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-libtool distclean-tags
!
! dvi: dvi-am
!
! dvi-am:
!
! info: info-am
! info-am:
! install-data-am:
! install-exec-am: install-binPROGRAMS
! install-info: install-info-am
! install-man:
! installcheck-am:
maintainer-clean: maintainer-clean-am
! maintainer-clean-am: distclean-am maintainer-clean-generic
- mostlyclean: mostlyclean-am
! mostlyclean-am: mostlyclean-compile mostlyclean-generic \
! mostlyclean-libtool
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am
! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
! clean-generic clean-libtool distclean distclean-compile \
! distclean-depend distclean-generic distclean-libtool \
! distclean-tags distdir dvi dvi-am info info-am install \
! install-am install-binPROGRAMS install-data install-data-am \
! install-exec install-exec-am install-info install-info-am \
! install-man install-strip installcheck installcheck-am \
! installdirs maintainer-clean maintainer-clean-generic \
! mostlyclean mostlyclean-compile mostlyclean-generic \
! mostlyclean-libtool tags uninstall uninstall-am \
! uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 354,408 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
! mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \
! clean-depend clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \
! distclean-tags distclean-depend distclean-generic \
! clean-am
! -rm -f libtool
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-binPROGRAMS \
! maintainer-clean-compile maintainer-clean-libtool \
! maintainer-clean-tags maintainer-clean-depend \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile mostlyclean-libtool distclean-libtool \
! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir \
! mostlyclean-depend distclean-depend clean-depend \
! maintainer-clean-depend info-am info dvi-am dvi check check-am \
! installcheck-am installcheck install-exec-am install-exec \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
! @WITH_CCGNU_TRUE@ ccgnulibs = @CCGNULIBS@
! @WITH_PORTAUDIO_TRUE@ portaudiolibs = -lportaudio
! @WITH_PORTAUDIO_TRUE@ portaudiotests = testmic
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: moving.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/moving.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** moving.cpp 19 Feb 2003 18:35:14 -0000 1.8
--- moving.cpp 21 Feb 2003 14:48:24 -0000 1.9
***************
*** 26,37 ****
* Plays a file bee.wav and moves it left right.
*/
- #include <openalpp/alpp.h>
#include <cc++/thread.h>
#include <iostream>
using namespace openalpp;
- using namespace std;
- using namespace ost;
-
#ifndef M_PI
--- 26,34 ----
* Plays a file bee.wav and moves it left right.
*/
#include <cc++/thread.h>
+ #include <openalpp/alpp.h>
#include <iostream>
using namespace openalpp;
#ifndef M_PI
***************
*** 42,50 ****
int main() {
try {
! Source beesound("c:\\temp\\mono.wav");
beesound.SetGain(1);
beesound.SetLooping();
! float limits[2] = {0.5,-0.5};
float delay=10;
float time=0,angle=0;
--- 39,47 ----
int main() {
try {
! Source beesound("bee.wav");
beesound.SetGain(1);
beesound.SetLooping();
! float limits[2] = {5,-15};
float delay=10;
float time=0,angle=0;
***************
*** 55,62 ****
const int no_laps=5;
! std::cerr << "Moving sound 5 times..." << std::endl;
// Do a cheat time loop.
! while(angle<(M_PI*no_laps)) {
ost::Thread::sleep(delay); // Wait for delay milliseconds
--- 52,59 ----
const int no_laps=5;
! std::cerr << "Moving sound 5 laps..." << std::endl;
// Do a cheat time loop.
! while(angle<(M_PI*2.0*no_laps)) {
ost::Thread::sleep(delay); // Wait for delay milliseconds
***************
*** 68,75 ****
}
} catch(Error e) {
! cerr << e << "\n";
return -1;
}
return 0;
}
!
\ No newline at end of file
--- 65,72 ----
}
} catch(Error e) {
! std::cerr << e << "\n";
return -1;
}
return 0;
}
!
Index: simple.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** simple.cpp 19 Feb 2003 18:35:14 -0000 1.7
--- simple.cpp 21 Feb 2003 14:48:24 -0000 1.8
***************
*** 25,35 ****
* Plays a file bee.wav in the background.
*/
- #include <openalpp/alpp.h>
#include <cc++/thread.h>
#include <iostream>
using namespace openalpp;
- using namespace std;
- using namespace ost;
int main() {
--- 25,33 ----
* Plays a file bee.wav in the background.
*/
#include <cc++/thread.h>
+ #include <openalpp/alpp.h>
#include <iostream>
using namespace openalpp;
int main() {
***************
*** 45,49 ****
ost::Thread::sleep(3000); // Sleep for a while
} catch(Error e) {
! cerr << e << "\n";
return -1;
}
--- 43,47 ----
ost::Thread::sleep(3000); // Sleep for a while
} catch(Error e) {
! std::cerr << e << "\n";
return -1;
}
Index: testmic.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/testmic.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** testmic.cpp 19 Feb 2003 18:35:15 -0000 1.8
--- testmic.cpp 21 Feb 2003 14:48:24 -0000 1.9
***************
*** 24,46 ****
* Example where sound is streamed from a microphone.
*/
#include "openalpp/alpp.h"
-
#include <iostream>
-
-
using namespace openalpp;
- using namespace ost;
-
- using namespace std;
-
-
-
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-
int main() {
try {
--- 24,37 ----
* Example where sound is streamed from a microphone.
*/
+ #include <cc++/thread.h>
#include "openalpp/alpp.h"
#include <iostream>
using namespace openalpp;
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
int main() {
try {
***************
*** 85,89 ****
#endif
} catch(Error e) {
! cerr << e << "\n";
return -1;
}
--- 76,80 ----
#endif
} catch(Error e) {
! std::cerr << e << "\n";
return -1;
}
Index: teststream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/teststream.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** teststream.cpp 19 Feb 2003 18:35:15 -0000 1.7
--- teststream.cpp 21 Feb 2003 14:48:24 -0000 1.8
***************
*** 31,36 ****
using namespace openalpp;
- using namespace ost;
- using namespace std;
int main(int argc,char **argv) {
--- 31,34 ----
***************
*** 41,45 ****
try {
// Create a socket and listen for streamed data
! UDPSocket socket(InetAddress("127.0.0.1"),33333);
// Create a soundstream that will read its data from the socket
--- 39,43 ----
try {
// Create a socket and listen for streamed data
! ost::UDPSocket socket(ost::InetAddress("127.0.0.1"),33333);
// Create a soundstream that will read its data from the socket
***************
*** 51,61 ****
source.SetAmbient();
source.Play();
! cerr << "Press return to continue\n";
! cin.get();
source.Stop();
} catch(openalpp::Error e) {
! cerr << e << "\n";
} catch(...) {
! cerr << "Unknown error!\n";
}
return 0;
--- 49,59 ----
source.SetAmbient();
source.Play();
! std::cout << "Press return to continue\n";
! std::cin.get();
source.Stop();
} catch(openalpp::Error e) {
! std::cerr << e << "\n";
} catch(...) {
! std::cerr << "Unknown error!\n";
}
return 0;
|
Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16083
Modified Files:
Makefile.am Makefile.in audiobase.cpp audioenvironment.cpp
inputdevice.cpp netstream.cpp stream.cpp streamupdater.cpp
Log Message:
Fixed erroneous commits
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am 19 Feb 2003 18:35:11 -0000 1.4
--- Makefile.am 21 Feb 2003 14:47:15 -0000 1.5
***************
*** 13,32 ****
error.cpp \
groupsource.cpp
-
if WITH_CCGNU
! streamfiles = \
netstream.cpp \
streamupdater.cpp \
netupdater.cpp \
stream.cpp
if WITH_PORTAUDIO
! devicefiles = \
! deviceupdater.cpp \
! inputdevice.cpp
endif
endif
lib_LTLIBRARIES = libopenalpp.la
- libopenalpp_la_SOURCES = $(basicfiles) $(streamfiles) $(devicefiles)
--- 13,44 ----
error.cpp \
groupsource.cpp
if WITH_CCGNU
! streamfiles = \
netstream.cpp \
streamupdater.cpp \
netupdater.cpp \
stream.cpp
+ if WITH_OGGVORBIS
+ oggfiles = \
+ filestream.cpp \
+ filestreamupdater.cpp
+ else
+ oggfiles = nofilestream.cpp
+ endif
if WITH_PORTAUDIO
! devicefiles = \
! deviceupdater.cpp \
! inputdevice.cpp
! else
! devicefiles = noinputdevice.cpp
endif
+ else
+ streamfiles=nostreaming.cpp noinputdevice.cpp nofilestream.cpp
endif
+ libopenalpp_la_SOURCES = $(basicfiles) $(streamfiles) $(devicefiles) $(oggfiles)
+
+
lib_LTLIBRARIES = libopenalpp.la
Index: Makefile.in
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in 17 Dec 2002 16:42:53 -0000 1.4
--- Makefile.in 21 Feb 2003 14:47:15 -0000 1.5
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,16 ****
# PARTICULAR PURPOSE.
- @SET_MAKE@
SHELL = @SHELL@
--- 11,14 ----
***************
*** 34,40 ****
--- 32,42 ----
includedir = @includedir@
oldincludedir = /usr/include
+
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = ..
***************
*** 45,53 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 47,55 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,64 ****
host_alias = @host_alias@
host_triplet = @host@
- AMTAR = @AMTAR@
AS = @AS@
- AWK = @AWK@
CC = @CC@
CCGNUCFLAGS = @CCGNUCFLAGS@
--- 60,64 ----
***************
*** 66,76 ****
CXX = @CXX@
CXXCPP = @CXXCPP@
- DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
--- 66,75 ----
CXX = @CXX@
CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
+ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 79,106 ****
STRIP = @STRIP@
VERSION = @VERSION@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
INCLUDES = -I$(top_builddir)/include
! basicfiles = \
! audioenvironment.cpp \
! listener.cpp \
! audiobase.cpp \
! sourcebase.cpp \
! source.cpp \
! sample.cpp \
! sounddata.cpp \
! audioconvert.cpp \
! error.cpp \
! groupsource.cpp
!
!
! @WITH_CCGNU_TRUE@streamfiles = \
! @WITH_CCGNU_TRUE@ netstream.cpp \
! @WITH_CCGNU_TRUE@ streamupdater.cpp \
! @WITH_CCGNU_TRUE@ netupdater.cpp \
! @WITH_CCGNU_TRUE@ stream.cpp
--- 78,85 ----
STRIP = @STRIP@
VERSION = @VERSION@
INCLUDES = -I$(top_builddir)/include
! basicfiles = audioenvironment.cpp listener.cpp audiobase.cpp sourcebase.cpp source.cpp sample.cpp sounddata.cpp audioconvert.cpp error.cpp groupsource.cpp
***************
*** 108,177 ****
libopenalpp_la_SOURCES = $(basicfiles) $(streamfiles) $(devicefiles)
- subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
! CONFIG_CLEAN_FILES =
! LTLIBRARIES = $(lib_LTLIBRARIES)
- libopenalpp_la_LDFLAGS =
- libopenalpp_la_LIBADD =
- @WITH_CCGNU_TRUE@am_libopenalpp_la_OBJECTS = audioenvironment.lo \
- @WITH_CCGNU_TRUE@ listener.lo audiobase.lo sourcebase.lo \
- @WITH_CCGNU_TRUE@ source.lo sample.lo sounddata.lo \
- @WITH_CCGNU_TRUE@ audioconvert.lo error.lo groupsource.lo \
- @WITH_CCGNU_TRUE@ netstream.lo streamupdater.lo netupdater.lo \
- @WITH_CCGNU_TRUE@ stream.lo
- @WITH_CCGNU_FALSE@am_libopenalpp_la_OBJECTS = audioenvironment.lo \
- @WITH_CCGNU_FALSE@ listener.lo audiobase.lo sourcebase.lo \
- @WITH_CCGNU_FALSE@ source.lo sample.lo sounddata.lo \
- @WITH_CCGNU_FALSE@ audioconvert.lo error.lo groupsource.lo
- libopenalpp_la_OBJECTS = $(am_libopenalpp_la_OBJECTS)
! DEFS = @DEFS@
! DEFAULT_INCLUDES = -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! depcomp = $(SHELL) $(top_srcdir)/config/depcomp
! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/audiobase.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/audioconvert.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/audioenvironment.Plo $(DEPDIR)/error.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/groupsource.Plo $(DEPDIR)/listener.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/netstream.Plo $(DEPDIR)/netupdater.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/sample.Plo $(DEPDIR)/sounddata.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/source.Plo $(DEPDIR)/sourcebase.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/stream.Plo $(DEPDIR)/streamupdater.Plo
! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
! $(AM_CXXFLAGS) $(CXXFLAGS)
! CXXLD = $(CXX)
! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
! $(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(libopenalpp_la_SOURCES)
! DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libopenalpp_la_SOURCES)
- all: all-am
.SUFFIXES:
! .SUFFIXES: .cpp .lo .o .obj
! mostlyclean-libtool:
! -rm -f *.lo
- clean-libtool:
- -rm -rf .libs _libs
! distclean-libtool:
! -rm -f libtool
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --foreign src/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && \
! CONFIG_HEADERS= CONFIG_LINKS= \
! CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- 87,143 ----
libopenalpp_la_SOURCES = $(basicfiles) $(streamfiles) $(devicefiles)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
! CONFIG_CLEAN_FILES =
! LTLIBRARIES = $(lib_LTLIBRARIES)
! DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! libopenalpp_la_LDFLAGS =
! libopenalpp_la_LIBADD =
! libopenalpp_la_OBJECTS = audioenvironment.lo listener.lo audiobase.lo \
! sourcebase.lo source.lo sample.lo sounddata.lo audioconvert.lo error.lo \
! groupsource.lo
CXXFLAGS = @CXXFLAGS@
! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! CXXLD = $(CXX)
! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+ TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES = .deps/audiobase.P .deps/audioconvert.P \
+ .deps/audioenvironment.P .deps/error.P .deps/groupsource.P \
+ .deps/listener.P .deps/sample.P .deps/sounddata.P .deps/source.P \
+ .deps/sourcebase.P
+ SOURCES = $(libopenalpp_la_SOURCES)
+ OBJECTS = $(libopenalpp_la_OBJECTS)
+
+ all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .cpp .lo .o .obj .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
! mostlyclean-libLTLIBRARIES:
!
! clean-libLTLIBRARIES:
! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
!
! distclean-libLTLIBRARIES:
!
! maintainer-clean-libLTLIBRARIES:
!
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
***************
*** 179,184 ****
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
--- 145,150 ----
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
***************
*** 186,380 ****
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
! clean-libLTLIBRARIES:
! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
! libopenalpp.la: $(libopenalpp_la_OBJECTS) $(libopenalpp_la_DEPENDENCIES)
! $(CXXLINK) -rpath $(libdir) $(libopenalpp_la_LDFLAGS) $(libopenalpp_la_OBJECTS) $(libopenalpp_la_LIBADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audiobase.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audioconvert.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audioenvironment.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupsource.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/listener.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netstream.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netupdater.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sample.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sounddata.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/source.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sourcebase.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stream.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/streamupdater.Plo@am__quote@
! distclean-depend:
! -rm -rf $(DEPDIR)
! .cpp.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
! .cpp.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
.cpp.lo:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
! CXXDEPMODE = @CXXDEPMODE@
! uninstall-info-am:
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(libdir)
!
! install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
! uninstall: uninstall-am
! install-am: all-am
! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! installcheck: installcheck-am
! install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
! mostlyclean-generic:
! clean-generic:
! distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
! maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
! mostlyclean-am
! distclean: distclean-am
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-libtool distclean-tags
dvi: dvi-am
! dvi-am:
! info: info-am
- info-am:
! install-data-am:
! install-exec-am: install-libLTLIBRARIES
! install-info: install-info-am
! install-man:
! installcheck-am:
! maintainer-clean: maintainer-clean-am
! maintainer-clean-am: distclean-am maintainer-clean-generic
! mostlyclean: mostlyclean-am
! mostlyclean-am: mostlyclean-compile mostlyclean-generic \
! mostlyclean-libtool
! uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
! .PHONY: GTAGS all all-am check check-am clean clean-generic \
! clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
! distclean-depend distclean-generic distclean-libtool \
! distclean-tags distdir dvi dvi-am info info-am install \
! install-am install-data install-data-am install-exec \
! install-exec-am install-info install-info-am \
! install-libLTLIBRARIES install-man install-strip installcheck \
! installcheck-am installdirs maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-compile \
! mostlyclean-generic mostlyclean-libtool tags uninstall \
! uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
@WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ devicefiles = \
@WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ deviceupdater.cpp \
@WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ inputdevice.cpp
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- 152,393 ----
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
! # FIXME: We should only use cygpath when building on Windows,
! # and only if it is available.
! .c.obj:
! $(COMPILE) -c `cygpath -w $<`
!
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
! -rm -f *.$(OBJEXT)
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
! .s.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
! .S.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
! mostlyclean-libtool:
! -rm -f *.lo
!
! clean-libtool:
! -rm -rf .libs _libs
!
! distclean-libtool:
+ maintainer-clean-libtool:
+
+ libopenalpp.la: $(libopenalpp_la_OBJECTS) $(libopenalpp_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libopenalpp_la_LDFLAGS) $(libopenalpp_la_OBJECTS) $(libopenalpp_la_LIBADD) $(LIBS)
+ .cpp.o:
+ $(CXXCOMPILE) -c $<
+ .cpp.obj:
+ $(CXXCOMPILE) -c `cygpath -w $<`
.cpp.lo:
! $(LTCXXCOMPILE) -c $<
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
! mostlyclean-tags:
!
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
!
! subdir = src
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
! -include $(DEP_FILES)
! mostlyclean-depend:
! clean-depend:
! distclean-depend:
! -rm -rf .deps
! maintainer-clean-depend:
! %.o: %.c
! @echo '$(COMPILE) -c $<'; \
! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
! %.lo: %.c
! @echo '$(LTCOMPILE) -c $<'; \
! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
! %.o: %.cpp
! @echo '$(CXXCOMPILE) -c $<'; \
! $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
+ %.lo: %.cpp
+ @echo '$(LTCXXCOMPILE) -c $<'; \
+ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
dvi: dvi-am
+ check-am: all-am
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+ install-exec-am: install-libLTLIBRARIES
+ install-exec: install-exec-am
! install-data-am:
! install-data: install-data-am
! install-am: all-am
! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-am
! uninstall-am: uninstall-libLTLIBRARIES
! uninstall: uninstall-am
! all-am: Makefile $(LTLIBRARIES)
! all-redirect: all-am
! install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(libdir)
! mostlyclean-generic:
! clean-generic:
! distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
! maintainer-clean-generic:
! mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
! mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
! clean-depend clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-libLTLIBRARIES distclean-compile \
! distclean-libtool distclean-tags distclean-depend \
! distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
! maintainer-clean-compile maintainer-clean-libtool \
! maintainer-clean-tags maintainer-clean-depend \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
! maintainer-clean: maintainer-clean-am
+ .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+ clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+ uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+ distclean-compile clean-compile maintainer-clean-compile \
+ mostlyclean-libtool distclean-libtool clean-libtool \
+ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+ clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+ distclean-depend clean-depend maintainer-clean-depend info-am info \
+ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+ install-exec install-data-am install-data install-am install \
+ uninstall-am uninstall all-redirect all-am all installdirs \
+ mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+ @WITH_CCGNU_TRUE@ streamfiles = \
+ @WITH_CCGNU_TRUE@ netstream.cpp \
+ @WITH_CCGNU_TRUE@ streamupdater.cpp \
+ @WITH_CCGNU_TRUE@ netupdater.cpp \
+ @WITH_CCGNU_TRUE@ stream.cpp
@WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ devicefiles = \
@WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ deviceupdater.cpp \
@WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ inputdevice.cpp
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: audiobase.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/audiobase.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** audiobase.cpp 19 Feb 2003 18:35:11 -0000 1.10
--- audiobase.cpp 21 Feb 2003 14:47:15 -0000 1.11
***************
*** 39,43 ****
#else
! device_=alcOpenDevice((/*const */ALubyte *)"'((direction \"write\"))");
#endif
if(!device_)
--- 39,43 ----
#else
! device_=alcOpenDevice((/*const */ALubyte *)"'((direction \"write\")) '((devices '(alsa sdl native null)))");
#endif
if(!device_)
Index: audioenvironment.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/audioenvironment.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** audioenvironment.cpp 19 Feb 2003 18:35:12 -0000 1.5
--- audioenvironment.cpp 21 Feb 2003 14:47:15 -0000 1.6
***************
*** 99,103 ****
float AudioEnvironment::GetGain() throw (FatalError) {
ALfloat gain;
! alGetListenerfv(AL_GAIN,&gain);
if(alGetError()!=AL_FALSE) // This isn't strictly necessary...
throw FatalError("Unknown error in AudioEnvironment::GetGain()");
--- 99,103 ----
float AudioEnvironment::GetGain() throw (FatalError) {
ALfloat gain;
! alGetListenerf(AL_GAIN,&gain);
if(alGetError()!=AL_FALSE) // This isn't strictly necessary...
throw FatalError("Unknown error in AudioEnvironment::GetGain()");
Index: inputdevice.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/inputdevice.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** inputdevice.cpp 19 Feb 2003 18:35:12 -0000 1.6
--- inputdevice.cpp 21 Feb 2003 14:47:15 -0000 1.7
***************
*** 23,27 ****
--- 23,29 ----
*/
+ #include "openalpp/deviceupdater.h"
#include "openalpp/inputdevice.h"
+ #include <portaudio.h>
namespace openalpp {
***************
*** 34,38 ****
PaError err=Pa_Initialize();
if(err!=paNoError)
! throw InitError("Error initializing PortAudio");
}
nobjects_++;
--- 36,40 ----
PaError err=Pa_Initialize();
if(err!=paNoError)
! throw InitError("Error initializing input device");
}
nobjects_++;
Index: netstream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/netstream.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** netstream.cpp 19 Feb 2003 18:35:13 -0000 1.5
--- netstream.cpp 21 Feb 2003 14:47:15 -0000 1.6
***************
*** 23,26 ****
--- 23,27 ----
*/
+ #include "openalpp/netupdater.h"
#include "openalpp/netstream.h"
Index: stream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/stream.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** stream.cpp 19 Feb 2003 18:35:13 -0000 1.6
--- stream.cpp 21 Feb 2003 14:47:15 -0000 1.7
***************
*** 23,26 ****
--- 23,27 ----
*/
+ #include "openalpp/streamupdater.h"
#include "openalpp/stream.h"
***************
*** 49,54 ****
Stream::~Stream() {
! buffer2_->DeReference();
! updater_->DeReference();
}
--- 50,57 ----
Stream::~Stream() {
! if(buffer2_)
! buffer2_->DeReference();
! if(updater_)
! updater_->DeReference();
}
Index: streamupdater.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/streamupdater.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** streamupdater.cpp 19 Feb 2003 18:35:14 -0000 1.10
--- streamupdater.cpp 21 Feb 2003 14:47:15 -0000 1.11
***************
*** 23,26 ****
--- 23,29 ----
*/
+ // TODO: Need to update this so that frequency and format can be changed after
+ // the class has been instantiated (the ogg vorbis format allows this)
+
#include "openalpp/streamupdater.h"
***************
*** 41,44 ****
--- 44,48 ----
void StreamUpdater::AddSource(ALuint sourcename) {
+ alSourceStop(sourcename);
ENTER_CRITICAL;
newsources_.push_back(sourcename);
***************
*** 51,57 ****
ENTER_CRITICAL;
removesources_.push_back(sourcename);
- alSourceStop(sourcename);
- alSourceUnqueueBuffers(sourcename,2,buffers_);
- alGetError();
LEAVE_CRITICAL;
}
--- 55,58 ----
***************
*** 61,73 ****
return false;
! ALint processed,nprocessed,state,nstate;
ALuint albuffer;
ENTER_CRITICAL;
! while(sources_.size() && removesources_.size()>0) {
for(unsigned int i=0;i<sources_.size();i++)
! if(removesources_.back()==sources_[i] && (i+1)<sources_.size()) {
! sources_[i]=sources_[i+1];
break;
}
--- 62,82 ----
return false;
! ALint processed,state;
ALuint albuffer;
ENTER_CRITICAL;
! while(sources_.size() && removesources_.size()) {
for(unsigned int i=0;i<sources_.size();i++)
! if(removesources_.back()==sources_[i]) {
! alSourceStop(removesources_.back());
! ALuint dump[2];
! ALint nqueued;
! alGetSourceiv(removesources_.back(),AL_BUFFERS_QUEUED,&nqueued);
! if(nqueued)
! alSourceUnqueueBuffers(removesources_.back(),nqueued,dump);
! alGetError();
! while((i+1)<sources_.size())
! sources_[i]=sources_[i+1];
break;
}
***************
*** 78,85 ****
while(newsources_.size() || !sources_.size()) // Add any new sources
if(newsources_.size()) {
! sources_.push_back(newsources_.back());
! alSourceQueueBuffers(newsources_.back(),2,buffers_);
! alSourceStop(newsources_.back());
! newsources_.pop_back();
} else {
LEAVE_CRITICAL;
--- 87,95 ----
while(newsources_.size() || !sources_.size()) // Add any new sources
if(newsources_.size()) {
! while(newsources_.size()) {
! sources_.push_back(newsources_.back());
! alSourceStop(newsources_.back());
! newsources_.pop_back();
! }
} else {
LEAVE_CRITICAL;
***************
*** 92,103 ****
state=AL_PLAYING;
for(unsigned int i=0;i<sources_.size();i++) {
! alGetSourceiv(sources_[i],AL_SOURCE_STATE,&nstate);
! state&=nstate;
}
if(state!=AL_PLAYING) {
for(unsigned int i=0;i<sources_.size();i++) {
alSourceStop(sources_[i]);
! alSourceUnqueueBuffers(sources_[i],2,buffers_);
}
alBufferData(buffers_[0],format_,buffer,length/2,frequency_);
--- 102,121 ----
state=AL_PLAYING;
for(unsigned int i=0;i<sources_.size();i++) {
! alGetSourceiv(sources_[i],AL_SOURCE_STATE,&state);
! if(state!=AL_PLAYING)
! break;
}
if(state!=AL_PLAYING) {
+ ALuint dump[2];
for(unsigned int i=0;i<sources_.size();i++) {
+ // Yeah, this sucks, but how else could the sources be kept
+ // synchronized (they have to be unless we start using different
+ // buffers for each source)...
alSourceStop(sources_[i]);
! ALint nqueued;
! alGetSourceiv(sources_[i],AL_BUFFERS_QUEUED,&nqueued);
! if(nqueued)
! alSourceUnqueueBuffers(sources_[i],nqueued,dump);
}
alBufferData(buffers_[0],format_,buffer,length/2,frequency_);
***************
*** 109,117 ****
// alSourcePlayv((ALuint *)&sources_[0]..)...;
}
} else {
processed=1;
for(unsigned int i=0;i<sources_.size();i++) {
! alGetSourceiv(sources_[i],AL_BUFFERS_PROCESSED,&nprocessed);
! processed=processed && nprocessed;
if(!processed)
break;
--- 127,135 ----
// alSourcePlayv((ALuint *)&sources_[0]..)...;
}
+ processed=1;
} else {
processed=1;
for(unsigned int i=0;i<sources_.size();i++) {
! alGetSourceiv(sources_[i],AL_BUFFERS_PROCESSED,&processed);
if(!processed)
break;
***************
*** 125,158 ****
} else {
LEAVE_CRITICAL;
! ost::Thread::yield(); //ost::ccxx_sleep(50);
ENTER_CRITICAL;
! if(removesources_.size()) { // Not sure if this is necessary, but just in case...
LEAVE_CRITICAL;
return Update(buffer,length);
}
! }
! }
! }
! /*
! processed=0;
! while(!processed) {
! alGetSourceiv(sources_[0],AL_SOURCE_STATE,&state);
! if(state!=AL_PLAYING) {
! alBufferData(buffers_[0],format_,buffer,length/2,frequency_);
! alBufferData(buffers_[1],format_,
! (char *)buffer+length/2,length/2,frequency_);
! alSourceQueueBuffers(sources_[0],2,buffers_);
! alSourcePlay(sources_[0]);
! break;
! }
! alGetSourceiv(sources_[0],AL_BUFFERS_PROCESSED,&processed);
! if(processed) {
! alSourceUnqueueBuffers(sources_[0],1,&albuffer);
! alBufferData(albuffer,format_,buffer,length,frequency_);
! alSourceQueueBuffers(sources_[0],1,&albuffer);
! } else
! Sleep(50);
! }
! */
LEAVE_CRITICAL;
bool ret;
--- 143,157 ----
} else {
LEAVE_CRITICAL;
! yield();
ENTER_CRITICAL;
! // Not sure if this is necessary, but just in case...
! if(removesources_.size()) {
LEAVE_CRITICAL;
return Update(buffer,length);
}
! } // if(processed) else
! } // if(state!=AL_PLAYING) else
! } // while(!processed)
!
LEAVE_CRITICAL;
bool ret;
|
|
From: <tom...@us...> - 2003-02-21 14:37:15
|
Update of /cvsroot/alpp/openalpp/include/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv10930
Modified Files:
alpp.h audiobase.h inputdevice.h netstream.h stream.h
streamupdater.h
Log Message:
Fixed erroneous commits
Index: alpp.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/alpp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** alpp.h 19 Feb 2003 18:35:08 -0000 1.5
--- alpp.h 21 Feb 2003 14:37:10 -0000 1.6
***************
*** 37,44 ****
#include "openalpp/groupsource.h"
#include "openalpp/sample.h"
- #include "openalpp/netstream.h"
- #ifdef _WIN32
#include "openalpp/inputdevice.h"
! #endif
#endif
--- 37,43 ----
#include "openalpp/groupsource.h"
#include "openalpp/sample.h"
#include "openalpp/inputdevice.h"
! #include "openalpp/netstream.h"
! #include "openalpp/filestream.h"
#endif
Index: audiobase.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/audiobase.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** audiobase.h 19 Feb 2003 18:35:08 -0000 1.3
--- audiobase.h 21 Feb 2003 14:37:10 -0000 1.4
***************
*** 57,60 ****
--- 57,65 ----
namespace openalpp {
+ /**
+ * Format for sound data. Mono/Stereo, 8 or 16 bits.
+ */
+ typedef enum SampleFormat {Mono8,Stereo8,Mono16,Stereo16};
+
/**
* Base class for enviroment, listener and source classes.
Index: inputdevice.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/inputdevice.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** inputdevice.h 19 Feb 2003 18:35:09 -0000 1.3
--- inputdevice.h 21 Feb 2003 14:37:10 -0000 1.4
***************
*** 26,32 ****
#define INPUTDEVICE_H_INCLUDED_C41987DC
- #include "openalpp/deviceupdater.h"
#include "openalpp/stream.h"
- #include <portaudio.h>
namespace openalpp {
--- 26,30 ----
Index: netstream.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** netstream.h 19 Feb 2003 18:35:10 -0000 1.3
--- netstream.h 21 Feb 2003 14:37:10 -0000 1.4
***************
*** 26,31 ****
#define NETSTREAM_H_INCLUDED_C419F72E
- #include "openalpp/netupdater.h"
#include "openalpp/stream.h"
namespace openalpp {
--- 26,35 ----
#define NETSTREAM_H_INCLUDED_C419F72E
#include "openalpp/stream.h"
+
+ namespace ost {
+ class UDPSocket;
+ class TCPStream;
+ }
namespace openalpp {
Index: stream.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/stream.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stream.h 19 Feb 2003 18:35:10 -0000 1.3
--- stream.h 21 Feb 2003 14:37:10 -0000 1.4
***************
*** 25,32 ****
#ifndef STREAM_H_INCLUDED_C41983DF
#define STREAM_H_INCLUDED_C41983DF
! #include "openalpp/streamupdater.h"
#include "openalpp/sounddata.h"
namespace openalpp {
/**
--- 25,34 ----
#ifndef STREAM_H_INCLUDED_C41983DF
#define STREAM_H_INCLUDED_C41983DF
!
#include "openalpp/sounddata.h"
namespace openalpp {
+
+ class StreamUpdater;
/**
Index: streamupdater.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/streamupdater.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** streamupdater.h 19 Feb 2003 18:35:11 -0000 1.3
--- streamupdater.h 21 Feb 2003 14:37:10 -0000 1.4
***************
*** 31,43 ****
#include <AL/al.h>
}
#include "openalpp/error.h"
#include "openalpp/windowsstuff.h"
namespace openalpp {
-
- /**
- * Format for sound data. Mono/Stereo, 8 or 16 bits.
- */
- typedef enum SampleFormat {Mono8,Stereo8,Mono16,Stereo16};
/**
--- 31,39 ----
#include <AL/al.h>
}
+ #include "openalpp/audiobase.h"
#include "openalpp/error.h"
#include "openalpp/windowsstuff.h"
namespace openalpp {
/**
|
|
From: <tom...@us...> - 2003-02-21 14:22:28
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv3961 Modified Files: configure.in Log Message: Fixed erroneous commit Index: configure.in =================================================================== RCS file: /cvsroot/alpp/openalpp/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.in 19 Feb 2003 18:35:05 -0000 1.7 --- configure.in 21 Feb 2003 14:22:21 -0000 1.8 *************** *** 85,88 **** --- 85,91 ---- AM_CONDITIONAL(WITH_PORTAUDIO, test "$WITH_PORTAUDIO" = "yes") + # Ogg Vorbis + AC_CHECK_LIB(ogg,main,WITH_OGGVORBIS="yes") + AM_CONDITIONAL(WITH_OGGVORBIS, test "$WITH_OGGVORBIS" = "yes") dnl Checks for header files. |
