Fixes

dolphin-emu · Dec 14, 2024 · 9078674 · 9078674
1 parent 9898ab4
commit 9078674
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 39 deletions.
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h
@@ -81,14 +81,12 @@ enum class LogLevel : int
   LDEBUG = 5,    // Detailed debugging - might make things slow.
 };
 
-constexpr auto MAX_LOGLEVEL = Common::Log::LogLevel::LDEBUG;
-/*
 #if defined(_DEBUG) || defined(DEBUGFAST)
 constexpr auto MAX_LOGLEVEL = Common::Log::LogLevel::LDEBUG;
 #else
 constexpr auto MAX_LOGLEVEL = Common::Log::LogLevel::LINFO;
 #endif  // logging
-*/
+
 static const char LOG_LEVEL_TO_CHAR[7] = "-NEWID";
 
 void GenericLogFmtImpl(LogLevel level, LogType type, const char* file, int line,

diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
@@ -31,7 +31,7 @@ const Config::Info<bool> LOGGER_WRITE_TO_CONSOLE{
 const Config::Info<bool> LOGGER_WRITE_TO_WINDOW{
     {Config::System::Logger, "Options", "WriteToWindow"}, true};
 const Config::Info<LogLevel> LOGGER_VERBOSITY{{Config::System::Logger, "Options", "Verbosity"},
-                                              LogLevel::LDEBUG};
+                                              LogLevel::LNOTICE};
 
 class FileLogListener : public LogListener
 {
@@ -165,7 +165,7 @@ LogManager::LogManager()
   for (auto& container : m_log)
   {
     container.m_enable = Config::Get(
-        Config::Info<bool>{{Config::System::Logger, "Logs", container.m_short_name}, true});
+        Config::Info<bool>{{Config::System::Logger, "Logs", container.m_short_name}, false});
   }
 
   m_path_cutoff_point = DeterminePathCutOffPoint();
@@ -191,7 +191,7 @@ void LogManager::SaveSettings()
 
   for (const auto& container : m_log)
   {
-    const Config::Info<bool> info{{Config::System::Logger, "Logs", container.m_short_name}, true};
+    const Config::Info<bool> info{{Config::System::Logger, "Logs", container.m_short_name}, false};
     Config::SetBaseOrCurrent(info, container.m_enable);
   }
 

diff --git a/Source/Core/DolphinNoGUI/PlatformDRM.cpp b/Source/Core/DolphinNoGUI/PlatformDRM.cpp
@@ -23,45 +23,12 @@ namespace
 class PlatformDRM : public Platform
 {
 public:
-  ~PlatformDRM() override;
-
-  bool Init() override;
   void SetTitle(const std::string& string) override;
   void MainLoop() override;
 
   WindowSystemInfo GetWindowSystemInfo() const override;
-
-private:
-  bool OpenFramebuffer();
-
-  int m_fb_fd = -1;
 };
 
-PlatformDRM::~PlatformDRM()
-{
-  if (m_fb_fd >= 0)
-    close(m_fb_fd);
-}
-
-bool PlatformDRM::Init()
-{
-  if (!OpenFramebuffer())
-    return false;
-
-  return true;
-}
-
-bool PlatformDRM::OpenFramebuffer()
-{
-  m_fb_fd = open("/dev/fb0", O_RDWR);
-  if (m_fb_fd < 0)
-  {
-    std::fprintf(stderr, "open(/dev/fb0) failed\n");
-    return false;
-  }
-
-  return true;
-}
 
 void PlatformDRM::SetTitle(const std::string& string)
 {