|
From: Yoda-JM <yo...@us...> - 2010-08-15 14:51:31
|
Module: performous Branch: joinmenu Commit: 04c09a279de7be78393b151a1b20b7ed7588453b Author: Lasse Karkkainen <tro...@tr...> Date: Sat Feb 27 04:49:54 2010 +0200 Fifth generation audio rewrite: - Removed most libda functionality - Ripped away a lot of things to make Performous compile again - Using PortAudio directly within audio.cc - audio.cc/audio.hh completely redesigned (now with pImpl) - Supports multiple tracks and simple crossfading - Many other things missing - Audio device configuration not implemented, a lot of hardcoded stuff - Displays "no playback devices found" always. (still a long way to go) --- cmake/Modules/FindPortAudio.cmake | 35 ++ cmake/Modules/FindPortaudio.cmake | 35 -- game/CMakeLists.txt | 12 +- game/audio.cc | 227 ++++---- game/audio.hh | 91 +--- game/ffmpeg.hh | 17 +- game/main.cc | 90 +--- game/record.hh | 45 -- game/screen_intro.cc | 4 +- game/screen_intro.hh | 4 +- game/screen_practice.cc | 10 +- game/screen_practice.hh | 5 +- game/screen_sing.cc | 3 +- game/screen_sing.hh | 6 +- libs/CMakeLists.txt | 1 - libs/libda/CMakeLists.txt | 71 --- libs/libda/cmake/CMakeLists.txt | 11 - libs/libda/cmake/LibDAConfig.cmake.in | 10 - libs/libda/cmake/LibDAConfigVersion.cmake.in | 13 - libs/libda/cmake/Modules/FindALSA.cmake | 34 -- libs/libda/cmake/Modules/FindAVCodec.cmake | 48 -- libs/libda/cmake/Modules/FindAVFormat.cmake | 46 -- libs/libda/cmake/Modules/FindAVUtil.cmake | 44 -- libs/libda/cmake/Modules/FindAtk.cmake | 34 -- libs/libda/cmake/Modules/FindAtkmm.cmake | 35 -- libs/libda/cmake/Modules/FindBoost.cmake | 413 -------------- libs/libda/cmake/Modules/FindCairo.cmake | 34 -- libs/libda/cmake/Modules/FindCairomm.cmake | 34 -- libs/libda/cmake/Modules/FindClanLib.cmake | 48 -- libs/libda/cmake/Modules/FindDL.cmake | 23 - libs/libda/cmake/Modules/FindFAAC.cmake | 24 - libs/libda/cmake/Modules/FindFreetype.cmake | 31 - libs/libda/cmake/Modules/FindGDK-PixBuf.cmake | 32 -- libs/libda/cmake/Modules/FindGDK.cmake | 43 -- libs/libda/cmake/Modules/FindGDKmm.cmake | 44 -- libs/libda/cmake/Modules/FindGIO.cmake | 27 - libs/libda/cmake/Modules/FindGIOmm.cmake | 35 -- libs/libda/cmake/Modules/FindGLEW.cmake | 29 - libs/libda/cmake/Modules/FindGLFW.cmake | 38 -- libs/libda/cmake/Modules/FindGObject.cmake | 31 - libs/libda/cmake/Modules/FindGStreamer.cmake | 33 -- libs/libda/cmake/Modules/FindGTK.cmake | 38 -- libs/libda/cmake/Modules/FindGTKmm.cmake | 46 -- libs/libda/cmake/Modules/FindGlib.cmake | 39 -- libs/libda/cmake/Modules/FindGlibmm.cmake | 42 -- libs/libda/cmake/Modules/FindJack.cmake | 28 - libs/libda/cmake/Modules/FindJpeg.cmake | 28 - libs/libda/cmake/Modules/FindLibPulse.cmake | 28 - libs/libda/cmake/Modules/FindLibPulseSimple.cmake | 28 - libs/libda/cmake/Modules/FindLibRSVG.cmake | 35 -- libs/libda/cmake/Modules/FindLibXML++.cmake | 42 -- libs/libda/cmake/Modules/FindLibXML2.cmake | 29 - libs/libda/cmake/Modules/FindMagick++.cmake | 33 -- libs/libda/cmake/Modules/FindMagick.cmake | 38 -- libs/libda/cmake/Modules/FindOpenGL.cmake | 35 -- libs/libda/cmake/Modules/FindPThread.cmake | 21 - libs/libda/cmake/Modules/FindPango.cmake | 36 -- libs/libda/cmake/Modules/FindPangoCairo.cmake | 35 -- libs/libda/cmake/Modules/FindPangomm.cmake | 36 -- libs/libda/cmake/Modules/FindPng.cmake | 28 - libs/libda/cmake/Modules/FindPortMidi.cmake | 21 - libs/libda/cmake/Modules/FindPortaudio.cmake | 35 -- libs/libda/cmake/Modules/FindProjectM.cmake | 30 - libs/libda/cmake/Modules/FindSDL.cmake | 59 -- libs/libda/cmake/Modules/FindSDL_mixer.cmake | 32 -- libs/libda/cmake/Modules/FindSWScale.cmake | 46 -- libs/libda/cmake/Modules/FindSigC++.cmake | 38 -- libs/libda/cmake/Modules/FindTiff.cmake | 28 - libs/libda/cmake/Modules/FindZ.cmake | 28 - libs/libda/cmake/Modules/LibFindMacros.cmake | 76 --- libs/libda/cmake/config.h.in | 11 - libs/libda/cmake/libda-packaging.cmake | 61 -- libs/libda/examples/CMakeLists.txt | 7 - libs/libda/examples/capture.cpp | 71 --- libs/libda/include/libda/audio.hpp | 171 ------ libs/libda/include/libda/audio_dev.hpp | 35 -- .../portaudio.hh => include/libda/portaudio.hpp} | 30 +- libs/libda/plugins/CMakeLists.txt | 170 ------ libs/libda/plugins/alsa/alsa.hpp | 581 -------------------- libs/libda/plugins/audio_dev_alsa.cpp | 260 --------- libs/libda/plugins/audio_dev_gst.cpp | 94 ---- libs/libda/plugins/audio_dev_jack.cpp | 134 ----- libs/libda/plugins/audio_dev_pa18.cpp | 90 --- libs/libda/plugins/audio_dev_pa19.cpp | 78 --- libs/libda/plugins/audio_dev_pulse.cpp | 122 ---- libs/libda/plugins/audio_dev_tone.cpp | 109 ---- libs/libda/src/CMakeLists.txt | 31 - libs/libda/src/audio.cpp | 103 ---- 88 files changed, 222 insertions(+), 4824 deletions(-) |