Zwischenstand

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@968 b431acfa-c32f-4a4a-93f1-934dc6c82436

radio/processor/src/Buffer.hpp

@@ -58,9 +58,10 @@ class Buffer : public IBuffer
 
 	T* data_w();
 	T* data_r();
+
 	size_t write(const T* pData, size_t len);
-	size_t read(T* pData, size_t len);
-	Result readAt(size_t offset, T &x);
+	size_t read(T* pData, size_t len, bool do_consume=true);
+	T readAt(size_t offset);
 	Result consume(size_t len);
 	Result produce(size_t len);
 	void print(const char *prefix);

radio/processor/src/Buffer.tcc

@@ -108,7 +108,7 @@ size_t Buffer<T>::write(const T *pData, size_t len)
 }
 
 template<typename T>
-size_t Buffer<T>::read(T* pData, size_t len)
+size_t Buffer<T>::read(T* pData, size_t len, bool do_consume)
 {
 	len = std::min(m_len, len);
 	size_t numRead = 0;
@@ -120,27 +120,26 @@ size_t Buffer<T>::read(T* pData, size_t len)
 		memcpy(pData, data_r(), actual_len*sizeof(T));
 		len -= actual_len;
 		pData += actual_len;
-		consume(actual_len);
+		if (do_consume)
+		{
+			consume(actual_len);
+		}
 	}
 	return numRead;
 
 }
 
 template<typename T>
-typename Buffer<T>::Result Buffer<T>::readAt(size_t offset, T &x)
+T Buffer<T>::readAt(size_t offset)
 {
-	if (m_len == 0)
+	if (m_len < offset)
 	{
-		RETURN_OR_EXCEPT(Result::Err_InvalidSize);
+		throw Buffer::Exception(Result::Err_InvalidSize);
 	}
-	size_t n = (m_ri+offset) % m_capacity;
-	x = data_r()[n];
-	if (offset)
-	{
-		consume(1);
-	}
-
-	return Result::Ok;
+	size_t i = (m_ri + offset) % m_capacity;
+	T result = bufferActive()[i];
+	consume(1);
+	return result;
 }
 
 template<typename T>