Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Logging API change (refactor) (#19324)

Browse Source 
* Rename LogType to Log

* Explicitly use the Log:: enum when logging. Allows for autocomplete when editing.

* Mac/ARM64 buildfix

* Do the same with the hle result log macros

* Rename the log names to mixed case while at it.

* iOS buildfix

* Qt buildfix attempt, ARM32 buildfix
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2024-07-14 14:42:59 +02:00
1 parent ae3ff686f0
commit e01ca5b057
393 files changed
+6198 -6193
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/BackgroundAudio.cpp
+10 -10
View File
@@ -73,7 +73,7 @@ bool WavData::Read(RIFFReader &file_) {
codec = 0;
break;
default:
ERROR_LOG(SCEAUDIO, "Unexpected wave format %04x", format);
ERROR_LOG(Log::sceAudio, "Unexpected wave format %04x", format);
return false;
}
@@ -95,9 +95,9 @@ bool WavData::Read(RIFFReader &file_) {
}
}
file_.Ascend();
// INFO_LOG(AUDIO, "got fmt data: %i", samplesPerSec);
// INFO_LOG(Log::AUDIO, "got fmt data: %i", samplesPerSec);
} else {
ERROR_LOG(AUDIO, "Error - no format chunk in wav");
ERROR_LOG(Log::Audio, "Error - no format chunk in wav");
file_.Ascend();
return false;
}
@@ -156,20 +156,20 @@ bool WavData::Read(RIFFReader &file_) {
if (num_channels == 1 || num_channels == 2) {
file_.ReadData(raw_data, numBytes);
} else {
ERROR_LOG(AUDIO, "Error - bad blockalign or channels");
ERROR_LOG(Log::Audio, "Error - bad blockalign or channels");
free(raw_data);
raw_data = nullptr;
return false;
}
file_.Ascend();
} else {
ERROR_LOG(AUDIO, "Error - no data chunk in wav");
ERROR_LOG(Log::Audio, "Error - no data chunk in wav");
file_.Ascend();
return false;
}
file_.Ascend();
} else {
ERROR_LOG(AUDIO, "Could not descend into RIFF file.");
ERROR_LOG(Log::Audio, "Could not descend into RIFF file.");
return false;
}
sample_rate = samplesPerSec;
@@ -200,7 +200,7 @@ public:
blockSize = wave_.raw_bytes_per_frame;
}
decoder_ = CreateAudioDecoder((PSPAudioType)wave_.codec, wave_.sample_rate, wave_.num_channels, blockSize, extraData, extraDataSize);
INFO_LOG(AUDIO, "read ATRAC, frames: %d, rate %d", wave_.numFrames, wave_.sample_rate);
INFO_LOG(Log::Audio, "read ATRAC, frames: %d, rate %d", wave_.numFrames, wave_.sample_rate);
}
~AT3PlusReader() {
@@ -395,7 +395,7 @@ Sample *Sample::Load(const std::string &path) {
size_t data_size = 0;
uint8_t *data = g_VFS.ReadFile(path.c_str(), &data_size);
if (!data || data_size > 100000000) {
WARN_LOG(AUDIO, "Failed to load sample '%s'", path.c_str());
WARN_LOG(Log::Audio, "Failed to load sample '%s'", path.c_str());
return nullptr;
}
@@ -412,7 +412,7 @@ Sample *Sample::Load(const std::string &path) {
delete[] data;
if (!wave.IsSimpleWAV()) {
ERROR_LOG(AUDIO, "Wave format not supported for mixer playback. Must be 8-bit or 16-bit raw mono or stereo. '%s'", path.c_str());
ERROR_LOG(Log::Audio, "Wave format not supported for mixer playback. Must be 8-bit or 16-bit raw mono or stereo. '%s'", path.c_str());
return nullptr;
}
@@ -548,7 +548,7 @@ void SoundEffectMixer::LoadDefaultSample(UI::UISound sound) {
}
Sample *sample = Sample::Load(filename);
if (!sample) {
ERROR_LOG(SYSTEM, "Failed to load the default sample for UI sound %d", (int)sound);
ERROR_LOG(Log::System, "Failed to load the default sample for UI sound %d", (int)sound);
}
std::lock_guard<std::mutex> guard(mutex_);
samples_[(size_t)sound] = std::unique_ptr<Sample>(sample);