chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

OpenMPT: Change decode call slightly

Browse source
This commit is contained in:
Christopher Snowhill 2021-12-28 15:38:57 -08:00
parent 73a356ad1d
commit 27dbd609c9
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Plugins/OpenMPT/OpenMPT/OMPTDecoder.h
View file

@ -16,8 +16,6 @@
@interface OMPTDecoder : NSObject <CogDecoder> { @interface OMPTDecoder : NSObject <CogDecoder> {
openmpt::module *mod; openmpt::module *mod;
std::vector<float> left;
std::vector<float> right;
id<CogSource> source; id<CogSource> source;
long length; long length;

10
Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm
View file

@ -82,9 +82,6 @@ static void g_push_archive_extensions(std::vector<std::string> & list)
mod->set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, interp ); mod->set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, interp );
mod->set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, -1 ); mod->set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, -1 );
mod->ctl_set_boolean("render.resampler.emulate_amiga", true); mod->ctl_set_boolean("render.resampler.emulate_amiga", true);
left.resize( 1024 );
right.resize( 1024 );
} catch (std::exception & /*e*/) { } catch (std::exception & /*e*/) {
return NO; return NO;
} }
@ -119,15 +116,10 @@ static void g_push_archive_extensions(std::vector<std::string> & list)
if ( framesToRender > frames ) if ( framesToRender > frames )
framesToRender = frames; framesToRender = frames;
std::size_t count = mod->read(44100, framesToRender, left.data(), right.data()); std::size_t count = mod->read_interleaved_stereo(44100, framesToRender, ((float *)buf) + total * 2);
if ( count == 0 ) if ( count == 0 )
break; break;
for ( std::size_t frame = 0; frame < count; frame++ ) {
((float *)buf)[(total + frame) * 2 + 0] = left[frame];
((float *)buf)[(total + frame) * 2 + 1] = right[frame];
}
total += count; total += count;
if ( count < framesToRender ) if ( count < framesToRender )