- Fix: settings window not auto focussing on mac os

- Optimized the windows backend
- Updated dependencies

.clang-format

@@ -8,3 +8,4 @@ IndentCaseLabels: false
 AccessModifierOffset: -4
 ColumnLimit: 120
 NamespaceIndentation: All
+SortIncludes: false

src/backends/windows.cpp

@@ -21,11 +21,19 @@ using namespace winrt;
 using namespace Windows::Media::Control;
 using namespace Windows::Storage::Streams;
 #define EM_DASH "\xE2\x80\x94"
-// codecvt is deprecated, but there is no good portable way to do this, I could technically use the winapi as this is
+
-// the windows backend tho
+std::string toStdString(winrt::hstring& in) {
-std::string toStdString(winrt::hstring in) {
+    const wchar_t* wideStr = in.c_str();
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
+    int wideStrLen = static_cast<int>(in.size());
-    return converter.to_bytes(in.c_str());
+    int bufferSize = WideCharToMultiByte(CP_UTF8, 0, wideStr, wideStrLen, nullptr, 0, nullptr, nullptr);
+    if (bufferSize <= 0)
+        return "";
+
+    std::string result(bufferSize, 0);
+
+    WideCharToMultiByte(CP_UTF8, 0, wideStr, wideStrLen, result.data(), bufferSize, nullptr, nullptr);
+
+    return result;
 }
 
 std::string getAppModelIdOfProcess(HANDLE hProc) {
@@ -43,7 +51,8 @@ std::string getAppModelIdOfProcess(HANDLE hProc) {
         free(fullName);
         return "";
     }
-    std::string name = toStdString(fullName);
+    winrt::hstring wideName = fullName;
+    std::string name = toStdString(wideName);
     free(fullName);
     return name;
 }
@@ -131,7 +140,7 @@ bool backend::toggleAutostart(bool enabled) {
 }
 
 std::shared_ptr<MediaInfo> backend::getMediaInformation() {
-    auto sessionManager = GlobalSystemMediaTransportControlsSessionManager::RequestAsync().get();
+    static auto sessionManager = GlobalSystemMediaTransportControlsSessionManager::RequestAsync().get();
     auto currentSession = sessionManager.GetCurrentSession();
     if (!currentSession)
         return nullptr;
@@ -186,7 +195,8 @@ std::shared_ptr<MediaInfo> backend::getMediaInformation() {
 
     return std::make_shared<MediaInfo>(
         playbackInfo.PlaybackStatus() == GlobalSystemMediaTransportControlsSessionPlaybackStatus::Paused,
-        toStdString(mediaProperties.Title()), artist, albumName, modelId, thumbnailData, endTime, elapsedTime);
+        toStdString(mediaProperties.Title()), std::move(artist), std::move(albumName), std::move(modelId),
+        std::move(thumbnailData), endTime, elapsedTime);
 }
 
 bool backend::init() {

src/main.cpp

@@ -147,7 +147,10 @@ class PlayerLinkIcon : public wxTaskBarIcon {
 public:
     PlayerLinkIcon(wxFrame* s) : settingsFrame(s) {}
 
-    void OnMenuOpen(wxCommandEvent& evt) { settingsFrame->Show(true); }
+    void OnMenuOpen(wxCommandEvent& evt) {
+        settingsFrame->Show(true);
+        settingsFrame->Raise();
+    }
 
     void OnMenuExit(wxCommandEvent& evt) { settingsFrame->Close(true); }
 
@@ -248,7 +251,7 @@ public:
         auto settings = utils::getSettings();
 
         for (auto app : settings.apps) {
-            auto checkbox = new wxCheckBox(this, wxID_ANY, _(app.appName), wxDefaultPosition, wxDefaultSize, 0);
+            auto checkbox = new wxCheckBox(this, wxID_ANY, app.appName, wxDefaultPosition, wxDefaultSize, 0);
             checkbox->SetValue(app.enabled);
             checkbox->SetClientData(new utils::App(app));
             checkbox->Bind(wxEVT_CHECKBOX, [checkbox](wxCommandEvent& event) {

vendor/wxWidgets

@@ -1 +1 @@
-Subproject commit 12b09a5e5ea76a1a0c27b769e821b37d803a4cb7
+Subproject commit 138937b7775c117b57f55374a0c507a35a1102f6