From bca0d259b781f2bf95846d2e7e93563be132ff2e Mon Sep 17 00:00:00 2001
From: Bruno Morais <brunosmmm@gmail.com>
Date: Fri, 6 Sep 2019 16:05:56 -0400
Subject: [PATCH] cleanup ugly initialization trick

---
 src/plugins/mpris/mpris.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/plugins/mpris/mpris.cpp b/src/plugins/mpris/mpris.cpp
index 46ba9db98..57c0372ab 100644
--- a/src/plugins/mpris/mpris.cpp
+++ b/src/plugins/mpris/mpris.cpp
@@ -2,6 +2,7 @@
 #include "mpris.h"
 #include "dbus.h"
 #include <map>
+#include <vector>
 #include <chrono>
 #include <functional>
 
@@ -12,12 +13,7 @@ extern "C" {
 thread_local char localBuffer[4096];
 static MPRISRemote remote;
 
-struct sd_null_term_str {
-  const char* string;
-  const char* terminator;
-};
-
-static const std::map<MPRISProperty, struct sd_null_term_str> MPRISPropertyNames =
+static const std::map<MPRISProperty, std::vector<const char*>> MPRISPropertyNames =
   {{MPRISProperty::Volume, {"Volume", NULL}},
    {MPRISProperty::PlaybackStatus, {"PlaybackStatus", NULL}},
    {MPRISProperty::LoopStatus, {"LoopStatus", NULL}},