Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3985 from BreadFish64/fix-warnings

Browse source 
core: clean up warnings
This commit is contained in:
James Rowe 2018-08-02 11:14:57 -06:00 • committed by GitHub
commit c35a251d86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 83 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/audio_core/dsp_interface.cpp
View file

@ -45,7 +45,7 @@ void DspInterface::OutputFrame(StereoFrame16& frame) {
return;
// Implementation of the hardware volume slider with a dynamic range of 60 dB
float volume_scale_factor = std::exp(6.90775 * Settings::values.volume) * 0.001;
double volume_scale_factor = std::exp(6.90775 * Settings::values.volume) * 0.001;
for (size_t i = 0; i < frame.size(); i++) {
frame[i][0] = static_cast<s16>(frame[i][0] * volume_scale_factor);
frame[i][1] = static_cast<s16>(frame[i][1] * volume_scale_factor);

6
src/audio_core/hle/hle.cpp
View file

@ -47,7 +47,7 @@ private:
StereoFrame16 GenerateCurrentFrame();
bool Tick();
void AudioTickCallback(int cycles_late);
void AudioTickCallback(s64 cycles_late);
DspState dsp_state = DspState::Off;
std::array<std::vector<u8>, num_dsp_pipe> pipe_data;
@ -72,7 +72,7 @@ DspHle::Impl::Impl(DspHle& parent_) : parent(parent_) {
dsp_memory.raw_memory.fill(0);
tick_event =
CoreTiming::RegisterEvent("AudioCore::DspHle::tick_event", [this](u64, int cycles_late) {
CoreTiming::RegisterEvent("AudioCore::DspHle::tick_event", [this](u64, s64 cycles_late) {
this->AudioTickCallback(cycles_late);
});
CoreTiming::ScheduleEvent(audio_frame_ticks, tick_event);
@ -316,7 +316,7 @@ bool DspHle::Impl::Tick() {
return true;
}
void DspHle::Impl::AudioTickCallback(int cycles_late) {
void DspHle::Impl::AudioTickCallback(s64 cycles_late) {
if (Tick()) {
// TODO(merry): Signal all the other interrupts as appropriate.
if (auto service = dsp_dsp.lock()) {