From b714f54cd43ded50cd87491f19b0dcb880cb7476 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 3 Mar 2023 17:32:00 +0000
Subject: [PATCH] dbus: reshuffle HAVE_DBUS handling

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
 src/dbus_info.h        |  3 +++
 src/gl/gl_hud.cpp      |  4 ----
 src/overlay.cpp        | 14 ++++++--------
 src/overlay.h          |  3 ---
 src/overlay_params.cpp |  2 --
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/dbus_info.h b/src/dbus_info.h
index 35ebe5e9..43411d0b 100644
--- a/src/dbus_info.h
+++ b/src/dbus_info.h
@@ -2,6 +2,8 @@
 #ifndef MANGOHUD_DBUS_INFO_H
 #define MANGOHUD_DBUS_INFO_H
 
+#ifdef HAVE_DBUS
+
 #include <array>
 #include <functional>
 #include <map>
@@ -142,4 +144,5 @@ extern dbus_manager dbus_mgr;
 }  // namespace dbusmgr
 bool get_media_player_metadata(dbusmgr::dbus_manager& dbus, const std::string& name, metadata& meta);
 
+#endif // HAVE_DBUS
 #endif //MANGOHUD_DBUS_INFO_H
diff --git a/src/gl/gl_hud.cpp b/src/gl/gl_hud.cpp
index cba50d84..fdcd021d 100644
--- a/src/gl/gl_hud.cpp
+++ b/src/gl/gl_hud.cpp
@@ -13,10 +13,6 @@
 #include "notify.h"
 #include "blacklist.h"
 
-#ifdef HAVE_DBUS
-#include "dbus_info.h"
-#endif
-
 #include <glad/glad.h>
 
 
diff --git a/src/overlay.cpp b/src/overlay.cpp
index 3e502269..4571b84d 100644
--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -33,10 +33,6 @@
 namespace fs = ghc::filesystem;
 using namespace std;
 
-#ifdef HAVE_DBUS
-float g_overflow = 50.f /* 3333ms * 0.5 / 16.6667 / 2 (to edge and back) */;
-#endif
-
 string gpuString,wineVersion,wineProcess;
 uint32_t deviceID;
 bool gui_open = false;
@@ -413,6 +409,8 @@ float get_ticker_limited_pos(float pos, float tw, float& left_limit, float& righ
 #ifdef HAVE_DBUS
 void render_mpris_metadata(const struct overlay_params& params, mutexed_metadata& meta, uint64_t frame_timing)
 {
+   static const float overflow = 50.f /* 3333ms * 0.5 / 16.6667 / 2 (to edge and back) */;
+
    if (meta.meta.valid) {
       auto color = ImGui::ColorConvertU32ToFloat4(params.media_player_color);
       ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8,0));
@@ -446,12 +444,12 @@ void render_mpris_metadata(const struct overlay_params& params, mutexed_metadata
       float new_pos, left_limit = 0, right_limit = 0;
       get_ticker_limited_pos(meta.ticker.pos, meta.ticker.longest, left_limit, right_limit);
 
-      if (meta.ticker.pos < left_limit - g_overflow * .5f) {
+      if (meta.ticker.pos < left_limit - overflow * .5f) {
          meta.ticker.dir = -1;
-         meta.ticker.pos = (left_limit - g_overflow * .5f) + 1.f /* random */;
-      } else if (meta.ticker.pos > right_limit + g_overflow) {
+         meta.ticker.pos = (left_limit - overflow * .5f) + 1.f /* random */;
+      } else if (meta.ticker.pos > right_limit + overflow) {
          meta.ticker.dir = 1;
-         meta.ticker.pos = (right_limit + g_overflow) - 1.f /* random */;
+         meta.ticker.pos = (right_limit + overflow) - 1.f /* random */;
       }
 
       meta.ticker.pos -= .5f * (frame_timing / 16666666.7f /* ns */) * meta.ticker.dir;
diff --git a/src/overlay.h b/src/overlay.h
index 54782eae..1b1c9bfa 100644
--- a/src/overlay.h
+++ b/src/overlay.h
@@ -11,10 +11,7 @@
 #include "hud_elements.h"
 #include "engine_types.h"
 
-#ifdef HAVE_DBUS
 #include "dbus_info.h"
-extern float g_overflow;
-#endif
 #include "logging.h"
 
 struct frame_stat {
diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp
index ea112a42..01cdd69a 100644
--- a/src/overlay_params.cpp
+++ b/src/overlay_params.cpp
@@ -32,9 +32,7 @@
 #include "loaders/loader_x11.h"
 #endif
 
-#ifdef HAVE_DBUS
 #include "dbus_info.h"
-#endif
 
 #include "app/mangoapp.h"