aboutsummaryrefslogtreecommitdiff
path: root/tests/integration/indicator-sound-test-base.h
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2016-02-10 13:22:06 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2016-02-10 13:22:06 +0000
commitcd1eb8bd1cb657a787d3d6fb8b2db26669581c72 (patch)
tree8ab41e0d437047d35464a3c464c33cf037c35438 /tests/integration/indicator-sound-test-base.h
parent3df5a15f0c7924214c1ae5fbaa5eca32b5c2cd54 (diff)
parentf1bdb863aea00a03acf9501432e2baa70dd9ee8b (diff)
downloadayatana-indicator-sound-cd1eb8bd1cb657a787d3d6fb8b2db26669581c72.tar.gz
ayatana-indicator-sound-cd1eb8bd1cb657a787d3d6fb8b2db26669581c72.tar.bz2
ayatana-indicator-sound-cd1eb8bd1cb657a787d3d6fb8b2db26669581c72.zip
This branch modifies the sound indicator on the desktop to only show the playback controls for those players that are active or (if any is running) the last one being active. Fixes: #1213907
Approved by: Charles Kerr, PS Jenkins bot
Diffstat (limited to 'tests/integration/indicator-sound-test-base.h')
-rw-r--r--tests/integration/indicator-sound-test-base.h9
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_;