ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/6.0' of https://github.com/stella-emu/stella into release/6.0

This commit is contained in:
thrust26 2018-09-06 15:39:25 +02:00
parent 503d861c2e 3df644ecff
commit 228f57b108
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/SoundSDL2.cxx
View File

@ -249,8 +249,10 @@ string SoundSDL2::about() const
}
buf << " Sample rate: " << uInt32(myHardwareSpec.freq) << endl
<< " Frag size: " << uInt32(myHardwareSpec.samples) << endl
<< " Buffer size: " << myAudioSettings.bufferSize() << endl
<< " Head room: " << myAudioSettings.headroom() << endl
<< " Head room: " << std::fixed << std::setprecision(1)
<< (0.5 * myAudioSettings.headroom()) << " frames" << endl
<< " Buffer size: " << std::fixed << std::setprecision(1)
<< (0.5 * myAudioSettings.bufferSize()) << " frames" << endl
<< " Resampling: ";
switch (myAudioSettings.resamplingQuality()) {
case AudioSettings::ResamplingQuality::nearestNeightbour:

3
src/gui/AudioDialog.cxx
View File

@ -219,8 +219,7 @@ void AudioDialog::saveConfig()
audioSettings.setPreset(preset);
if (preset == AudioSettings::Preset::custom) {
// Fragsize
// Fragsize
audioSettings.setFragmentSize(myFragsizePopup->getSelectedTag().toInt());
audioSettings.setSampleRate(myFreqPopup->getSelectedTag().toInt());
audioSettings.setHeadroom(myHeadroomSlider->getValue());