diff options
| author | 2018-07-02 10:13:26 -0600 | |
|---|---|---|
| committer | 2018-07-02 21:45:47 -0400 | |
| commit | 638956aa81de255bf4bbd4e69a717eabf4ceadb9 (patch) | |
| tree | 5783dda790575e047fa757d8c56e11f3fffe7646 /src/core/loader/loader.cpp | |
| parent | Merge pull request #608 from Subv/depth (diff) | |
| download | yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.gz yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.xz yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.zip | |
Rename logging macro back to LOG_*
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 20cc0bac0..8831d8e83 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -43,7 +43,7 @@ FileType IdentifyFile(FileUtil::IOFile& file, const std::string& filepath) { | |||
| 43 | FileType IdentifyFile(const std::string& file_name) { | 43 | FileType IdentifyFile(const std::string& file_name) { |
| 44 | FileUtil::IOFile file(file_name, "rb"); | 44 | FileUtil::IOFile file(file_name, "rb"); |
| 45 | if (!file.IsOpen()) { | 45 | if (!file.IsOpen()) { |
| 46 | NGLOG_ERROR(Loader, "Failed to load file {}", file_name); | 46 | LOG_ERROR(Loader, "Failed to load file {}", file_name); |
| 47 | return FileType::Unknown; | 47 | return FileType::Unknown; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| @@ -126,7 +126,7 @@ static std::unique_ptr<AppLoader> GetFileLoader(FileUtil::IOFile&& file, FileTyp | |||
| 126 | std::unique_ptr<AppLoader> GetLoader(const std::string& filename) { | 126 | std::unique_ptr<AppLoader> GetLoader(const std::string& filename) { |
| 127 | FileUtil::IOFile file(filename, "rb"); | 127 | FileUtil::IOFile file(filename, "rb"); |
| 128 | if (!file.IsOpen()) { | 128 | if (!file.IsOpen()) { |
| 129 | NGLOG_ERROR(Loader, "Failed to load file {}", filename); | 129 | LOG_ERROR(Loader, "Failed to load file {}", filename); |
| 130 | return nullptr; | 130 | return nullptr; |
| 131 | } | 131 | } |
| 132 | 132 | ||
| @@ -137,12 +137,12 @@ std::unique_ptr<AppLoader> GetLoader(const std::string& filename) { | |||
| 137 | FileType filename_type = GuessFromExtension(filename_extension); | 137 | FileType filename_type = GuessFromExtension(filename_extension); |
| 138 | 138 | ||
| 139 | if (type != filename_type) { | 139 | if (type != filename_type) { |
| 140 | NGLOG_WARNING(Loader, "File {} has a different type than its extension.", filename); | 140 | LOG_WARNING(Loader, "File {} has a different type than its extension.", filename); |
| 141 | if (FileType::Unknown == type) | 141 | if (FileType::Unknown == type) |
| 142 | type = filename_type; | 142 | type = filename_type; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | NGLOG_DEBUG(Loader, "Loading file {} as {}...", filename, GetFileTypeString(type)); | 145 | LOG_DEBUG(Loader, "Loading file {} as {}...", filename, GetFileTypeString(type)); |
| 146 | 146 | ||
| 147 | return GetFileLoader(std::move(file), type, filename_filename, filename); | 147 | return GetFileLoader(std::move(file), type, filename_filename, filename); |
| 148 | } | 148 | } |