[Alpp-cvs] openalpp/tests Makefile.in,1.6,1.7 testmic.cpp,1.9,1.10

[<vr-...@us...>]

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;