[Performous-commit] Lasse Karkkainen : Fix fadeout with multiple streams.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 0dce4c7ba53fedae1e6e63b239ba950f9493ed5c

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Jul 23 23:04:41 2009 +0300

Fix fadeout with multiple streams.

---

 libs/libda/include/libda/mixer.hpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/libda/include/libda/mixer.hpp b/libs/libda/include/libda/mixer.hpp
index 9e0e3ed..ce2cafc 100644
--- a/libs/libda/include/libda/mixer.hpp
+++ b/libs/libda/include/libda/mixer.hpp
@@ -92,7 +92,7 @@ namespace da {
 
 	class fadeout: boost::noncopyable {
 	  public:
-		fadeout(callback_t stream, double time = 1.0): m_stream(stream), m_pos(), m_time(time) { std::cerr << "fadeout" << std::endl; }
+		fadeout(callback_t stream, double time = 1.0): m_stream(stream), m_pos(), m_time(time) {}
 		bool operator()(pcm_data& data) {
 			bool ret = m_stream(data);
 			size_t end = m_time * data.rate;
@@ -151,7 +151,7 @@ namespace da {
 			if (m_chain.streams.size() == 1) return;
 			std::auto_ptr<chain> ch(new chain());
 			ch->streams = chain::streams_t(m_chain.streams.begin() + 1, m_chain.streams.end());
-			m_chain.streams.erase(m_chain.streams.begin() + 1);
+			m_chain.streams.erase(m_chain.streams.begin() + 1, m_chain.streams.end());
 			m_chain.add(shared_ref(new fadeout(shared_ref(ch.release()), time)));
 		}
 		settings get_settings() { return m_settings; }