fixed conflict

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h
index d9d3289..969fd69 100644
--- a/tests/integration/indicator-sound-test-base.h
+++ b/tests/integration/indicator-sound-test-base.h
@@ -81,6 +81,8 @@ protected:
     bool runProcess(QProcess&);
 
     bool startTestMprisPlayer(QString const& playerName);
+    bool stopTestMprisPlayer(QString const& playerName);
+    int findRunningTestMprisPlayer(QString const& playerName);
 
     bool setTestMprisPlayerProperty(QString const &testPlayer, QString const &property, bool value);
 
@@ -156,6 +158,13 @@ protected:
 
     QProcess testPlayer1;
 
+    struct TestPlayer
+    {
+        std::shared_ptr<QProcess> process;
+        QString name;
+    };
+    QVector<TestPlayer> testPlayers;
+
     std::unique_ptr<MenusInterface> menu_interface_;
 
     std::unique_ptr<DBusPropertiesInterface> accounts_interface_;