chore: 0.7.2

fix(custom): ignore selected_player if not defined. Fixes #419

include/bar.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <glibmm/refptr.h>
+#include <gtkmm/box.h>
 #include <gtkmm/cssprovider.h>
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
-#include <gtkmm/box.h>
 #include <json/json.h>
 #include "AModule.hpp"
 #include "idle-inhibit-unstable-v1-client-protocol.h"
@@ -15,10 +15,10 @@ namespace waybar {
 
 class Factory;
 struct waybar_output {
-  struct wl_output *     output;
+  struct wl_output *     output = nullptr;
   std::string            name;
   uint32_t               wl_name;
-  struct zxdg_output_v1 *xdg_output;
+  struct zxdg_output_v1 *xdg_output = nullptr;
 };
 
 class Bar {

meson.build

@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.7.1',
+    version: '0.7.2',
     license: 'MIT',
     default_options : [
         'cpp_std=c++17',

resources/config

@@ -140,5 +140,6 @@
         },
         "escape": true,
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     }
 }

resources/custom_modules/mediaplayer.py

@@ -45,7 +45,7 @@ def on_metadata(player, metadata, manager):
 
 
 def on_player_appeared(manager, player, selected_player=None):
-    if player is not None and player.name == selected_player:
+    if player is not None and (selected_player is None or player.name == selected_player):
         init_player(manager, player)
     else:
         logger.debug("New player appeared, but it's not the selected player, skipping")

src/client.cpp

@@ -65,8 +65,14 @@ void waybar::Client::handleGlobalRemove(void *   data, struct wl_registry * /*re
                          client->outputs_.end(),
                          [&name](const auto &output) { return output->wl_name == name; });
   if (it != client->outputs_.end()) {
-    zxdg_output_v1_destroy((*it)->xdg_output);
-    wl_output_destroy((*it)->output);
+    if ((*it)->xdg_output != nullptr) {
+      zxdg_output_v1_destroy((*it)->xdg_output);
+      (*it)->xdg_output = nullptr;
+    }
+    if ((*it)->output != nullptr) {
+      wl_output_destroy((*it)->output);
+      (*it)->output = nullptr;
+    }
     client->outputs_.erase(it);
   }
 }
@@ -151,8 +157,14 @@ void waybar::Client::handleName(void *      data, struct zxdg_output_v1 * /*xdg_
     output->name = name;
     auto configs = client->getOutputConfigs(output);
     if (configs.empty()) {
-      wl_output_destroy(output->output);
-      zxdg_output_v1_destroy(output->xdg_output);
+      if (output->output != nullptr) {
+        wl_output_destroy(output->output);
+        output->output = nullptr;
+      }
+      if (output->xdg_output != nullptr) {
+        zxdg_output_v1_destroy(output->xdg_output);
+        output->xdg_output = nullptr;
+      }
     } else {
       wl_display_roundtrip(client->wl_display);
       for (const auto &config : configs) {

src/modules/sni/tray.cpp

@@ -10,7 +10,7 @@ Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config)
       host_(nb_hosts_, config, std::bind(&Tray::onAdd, this, std::placeholders::_1),
             std::bind(&Tray::onRemove, this, std::placeholders::_1)) {
   spdlog::warn(
-      "For a functionnal tray you must have libappindicator-* installed and export "
+      "For a functional tray you must have libappindicator-* installed and export "
       "XDG_CURRENT_DESKTOP=Unity");
   box_.set_name("tray");
   event_box_.add(box_);