From d8d60bc83824359c6e22b9114fc0a6bde45b8eca Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Wed, 23 Dec 2015 12:08:16 +0100 Subject: Reverted to release 507 --- tests/integration/utils/dbus-pulse-volume.cpp | 232 -------------------------- tests/integration/utils/dbus-pulse-volume.h | 57 ------- tests/integration/utils/get-volume.cpp | 33 ---- tests/integration/utils/set-volume.cpp | 36 ---- 4 files changed, 358 deletions(-) delete mode 100644 tests/integration/utils/dbus-pulse-volume.cpp delete mode 100644 tests/integration/utils/dbus-pulse-volume.h delete mode 100644 tests/integration/utils/get-volume.cpp delete mode 100644 tests/integration/utils/set-volume.cpp (limited to 'tests/integration/utils') diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp deleted file mode 100644 index c8b6ae6..0000000 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Author: Xavi Garcia - */ - -#include "dbus-pulse-volume.h" - -#include "dbus_properties_interface.h" -#include "dbus_accounts_interface.h" -#include "dbus_accountssound_interface.h" -#include "stream_restore_interface.h" - -#include - -#include - -unsigned int volumeDoubleToUint(double volume) -{ - double tmp = (double)(PA_VOLUME_NORM - PA_VOLUME_MUTED) * volume; - return (unsigned int)tmp + PA_VOLUME_MUTED; -} - -double volumeUIntToDoulbe(uint volume) -{ - double tmp = (double)(volume - PA_VOLUME_MUTED); - return tmp / (double)(PA_VOLUME_NORM - PA_VOLUME_MUTED); -} - -DBusPulseVolume::DBusPulseVolume() : - QObject() -{ - std::unique_ptr basicConnectionInterface(new DBusPropertiesInterface("org.PulseAudio1", - "/org/pulseaudio/server_lookup1", - QDBusConnection::sessionBus(), 0)); - - QDBusReply connection_string = basicConnectionInterface->call(QLatin1String("Get"), - QLatin1String("org.PulseAudio.ServerLookup1"), - QLatin1String("Address")); - - if (!connection_string.isValid()) - { - qWarning() << "DBusPulseVolume::DBusPulseVolume(): D-Bus error: " << connection_string.error().message(); - } - - connection_.reset(new QDBusConnection(QDBusConnection::connectToPeer(connection_string.value().toString(), "set-volume"))); - - if (connection_->isConnected()) - { - interface_paths_.reset(new StreamRestoreInterface("org.PulseAudio.Ext.StreamRestore1", - "/org/pulseaudio/stream_restore1", - *(connection_.get()), 0)); - if (interface_paths_) - { - // get the role paths - fillRolePath("multimedia"); - fillRolePath("alert"); - fillRolePath("alarm"); - fillRolePath("phone"); - } - - initializeAccountsInterface(); - } - else - { - qWarning() << "DBusPulseVolume::DBusPulseVolume(): Error connecting: " << connection_->lastError().message(); - } -} - -DBusPulseVolume::~DBusPulseVolume() -{ -} - -QString DBusPulseVolume::fillRolePath(QString const &role) -{ - QString role_complete_name = QString("sink-input-by-media-role:") + role; - // get the role paths - QDBusReply objectPath = interface_paths_->call(QLatin1String("GetEntryByName"), role_complete_name); - if (!objectPath.isValid()) - { - qWarning() << "SetVolume::fillRolePath(): D-Bus error: " << objectPath.error().message(); - return ""; - } - - auto role_info = std::make_shared(); - role_info->interface_.reset(new DBusPropertiesInterface("org.PulseAudio.Ext.StreamRestore1.RestoreEntry", - objectPath.value().path(), - *(connection_.get()), 0)); - if (!role_info->interface_) - { - qWarning() << "SetVolume::fillRolePath() - Error obtaining properties interface"; - return ""; - } - role_info->path_ = objectPath.value().path(); - roles_map_[role] = role_info; - return role_info->path_; -} - -bool DBusPulseVolume::setVolume(QString const & role, double volume) -{ - if (!interface_paths_) - { - qWarning() << "SetVolume::setVolume(): error: Volume interfaces are not initialized"; - return false; - } - - RolesMap::const_iterator iter = roles_map_.find(role); - if (iter != roles_map_.end()) - { - QVariant var; - PulseaudioVolumeArray t; - PulseaudioVolume vv(0, volumeDoubleToUint(volume)); - t.addItem(vv); - var.setValue(t); - QDBusVariant dbusVar(var); - QDBusReply set_vol = (*iter).second->interface_->call(QLatin1String("Set"), - QVariant::fromValue(QString("org.PulseAudio.Ext.StreamRestore1.RestoreEntry")), - QVariant::fromValue(QString("Volume")), - QVariant::fromValue(dbusVar)); - - if (!set_vol.isValid()) - { - qWarning() << "SetVolume::setVolume(): D-Bus error: " << set_vol.error().message(); - return false; - } - - if (accounts_interface_) - { - QDBusVariant dbusVar(QVariant::fromValue(volume)); - QDBusReply set_vol = accounts_interface_->call(QLatin1String("Set"), - QVariant::fromValue(QString("com.ubuntu.AccountsService.Sound")), - QVariant::fromValue(QString("Volume")), - QVariant::fromValue(dbusVar)); - if (!set_vol.isValid()) - { - qWarning() << "SetVolume::setVolume(): D-Bus error: " << set_vol.error().message(); - return false; - } - } - } - else - { - qWarning() << "SetVolume::setVolume(): role " << role << " was not found."; - return false; - } - return true; -} - -double DBusPulseVolume::getVolume(QString const & role) -{ - if (interface_paths_) - { - RolesMap::const_iterator iter = roles_map_.find(role); - if (iter != roles_map_.end()) - { - QDBusReply prev_vol = (*iter).second->interface_->call(QLatin1String("Get"), - QLatin1String("org.PulseAudio.Ext.StreamRestore1.RestoreEntry"), - QLatin1String("Volume")); - - if (!prev_vol.isValid()) - { - qWarning() << "SetVolume::setVolume(): D-Bus error: " << prev_vol.error().message(); - } - QDBusArgument arg = prev_vol.value().value(); - PulseaudioVolumeArray element; - arg >> element; - return volumeUIntToDoulbe(element.getItem(0).getVolume()); - } - } - return -1.0; -} - -void DBusPulseVolume::initializeAccountsInterface() -{ - auto username = qgetenv("USER"); - if (username != "") - { - qDebug() << "Setting Accounts interface for user: " << username; - std::unique_ptr setInterface(new AccountsInterface("org.freedesktop.Accounts", - "/org/freedesktop/Accounts", - QDBusConnection::systemBus(), 0)); - - QDBusReply userResp = setInterface->call(QLatin1String("FindUserByName"), - QLatin1String(username)); - - if (!userResp.isValid()) - { - qWarning() << "SetVolume::initializeAccountsInterface(): D-Bus error: " << userResp.error().message(); - } - auto userPath = userResp.value().path(); - if (userPath != "") - { - std::unique_ptr soundInterface(new AccountsSoundInterface("org.freedesktop.Accounts", - userPath, - QDBusConnection::systemBus(), 0)); - - accounts_interface_.reset(new DBusPropertiesInterface("org.freedesktop.Accounts", - userPath, - soundInterface->connection(), 0)); - if (!accounts_interface_->isValid()) - { - qWarning() << "SetVolume::initializeAccountsInterface(): D-Bus error: " << accounts_interface_->lastError().message(); - } - signal_spy_volume_changed_.reset(new QSignalSpy(accounts_interface_.get(),&DBusPropertiesInterface::PropertiesChanged)); - } - } -} - -bool DBusPulseVolume::waitForVolumeChangedInAccountsService() -{ - if (signal_spy_volume_changed_) - { - return signal_spy_volume_changed_->wait(); - } - else - { - qWarning() << "DBusPulseVolume::waitForVolumeChangedInAccountsService(): signal was not instantiated"; - } - return false; -} diff --git a/tests/integration/utils/dbus-pulse-volume.h b/tests/integration/utils/dbus-pulse-volume.h deleted file mode 100644 index 2d55e89..0000000 --- a/tests/integration/utils/dbus-pulse-volume.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Author: Xavi Garcia - */ -#pragma once - -#include -#include - -#include -#include - -class StreamRestoreInterface; -class DBusPropertiesInterface; -class AccountsInterface; -class AccountsSoundInterface; -class QSignalSpy; - -struct RoleInformation -{ - std::unique_ptr interface_; - QString path_; -}; - -class DBusPulseVolume : public QObject -{ -public: - DBusPulseVolume(); - ~DBusPulseVolume(); - - bool setVolume(QString const & role, double volume); - double getVolume(QString const & role); - bool waitForVolumeChangedInAccountsService(); - -protected: - QString fillRolePath(QString const &role); - void initializeAccountsInterface(); - std::unique_ptr connection_; - std::unique_ptr interface_paths_; - typedef std::map> RolesMap; - RolesMap roles_map_; - std::unique_ptr accounts_interface_; - std::unique_ptr signal_spy_volume_changed_; -}; diff --git a/tests/integration/utils/get-volume.cpp b/tests/integration/utils/get-volume.cpp deleted file mode 100644 index 309da36..0000000 --- a/tests/integration/utils/get-volume.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Author: Xavi Garcia - */ - -#include "dbus-types.h" - -#include -#include "dbus-pulse-volume.h" - -int main(int argc, char **argv) -{ - DBusTypes::registerMetaTypes(); - if (argc == 2) - { - DBusPulseVolume volume; - volume.getVolume(argv[1]); - } - return 0; -} diff --git a/tests/integration/utils/set-volume.cpp b/tests/integration/utils/set-volume.cpp deleted file mode 100644 index d29e5ef..0000000 --- a/tests/integration/utils/set-volume.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Author: Xavi Garcia - */ - -#include "dbus-types.h" - -#include -#include "dbus-pulse-volume.h" - -int main(int argc, char **argv) -{ - DBusTypes::registerMetaTypes(); - if (argc == 3) - { - DBusPulseVolume volume; - if(!volume.setVolume(argv[1], std::stod(argv[2]))) - { - return 1; - } - } - return 0; -} -- cgit v1.2.3