Merge branch 'stable-1.1'

This commit is contained in:
Vesa
2015-01-04 17:33:20 +02:00

View File

@@ -253,10 +253,13 @@ ProjectRenderer* ExportProjectDialog::prepRender()
static_cast<Mixer::qualitySettings::Interpolation>(interpolationCB->currentIndex()),
static_cast<Mixer::qualitySettings::Oversampling>(oversamplingCB->currentIndex()) );
const int samplerates[5] = { 44100, 48000, 88200, 96000, 192000 };
const int bitrates[6] = { 64, 128, 160, 192, 256, 320 };
ProjectRenderer::OutputSettings os = ProjectRenderer::OutputSettings(
samplerateCB->currentText().section(" ", 0, 0).toUInt(),
samplerates[ samplerateCB->currentIndex() ],
false,
bitrateCB->currentText().section(" ", 0, 0).toUInt(),
bitrates[ bitrateCB->currentIndex() ],
static_cast<ProjectRenderer::Depths>( depthCB->currentIndex() ) );
Engine::getSong()->setExportLoop( exportLoopCB->isChecked() );