summaryrefslogtreecommitdiff
path: root/rotord/libavaudioloader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rotord/libavaudioloader.cpp')
-rw-r--r--rotord/libavaudioloader.cpp8
1 files changed, 3 insertions, 5 deletions
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;