From 147f2d29a85cb1af80459546d95857e1ce3344f3 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@herge.(none)>
Date: Wed, 8 May 2013 10:06:00 +0100
Subject: fixed output hang

---
 rotord/libavaudioloader.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'rotord/libavaudioloader.cpp')

diff --git a/rotord/libavaudioloader.cpp b/rotord/libavaudioloader.cpp
index ef84560..a894727 100644
--- a/rotord/libavaudioloader.cpp
+++ b/rotord/libavaudioloader.cpp
@@ -150,7 +150,7 @@ bool libav::Audioloader::setup(const std::string &filename){
 
 uint16_t* libav::Audioloader::get_samples(int num){ //presumes 16bpc here
 	//std::cerr << "request "<<num<<" samples: "<<(ready?"ready":"not ready")<<std::endl;
-	if(!ready) return nullptr;
+	//if(!ready) return nullptr;
 	//shuffle down samples
 
 	if (sample_start>0){
@@ -177,9 +177,7 @@ uint16_t* libav::Audioloader::get_samples(int num){ //presumes 16bpc here
 			for (int i=0;i<frame->nb_samples;i++) {
 				for (int j=0;j<channels;j++) {
 					buffer[((sample_end+i)*frame->channels)+j]= ((uint16_t*) frame->buf[j]->data)[i];
-					//temporarily disabled audio as its is SIGSEV with audio from delorentos
-
-
+					
 					//buffer[(j*frame->channels)+(sample_end+i)]= ((uint16_t*) frame->buf[j]->data)[i]; ??planar?? nope
 				}
 			}
@@ -191,7 +189,7 @@ uint16_t* libav::Audioloader::get_samples(int num){ //presumes 16bpc here
 					buffer[(channels*i)+j]=0;
 				}
 			}
-
+			sample_end=num;
 		}
 		//std::cerr<<"filling buffer to "<<((sample_end+frame->nb_samples)*frame->channels)<<std::endl;
 
-- 
cgit v1.2.3