octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 14b0435df2 aa4b71d0ce
commit c35a251d86
36 changed files with 83 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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()) {