History

Adjust reporting of availability to metaverse.

Howard Stearns committed 9 years ago

Commit 3a7edeb1 parent b8f557c4 files · +24 −25Browse files

Showing the changes to interface/src/scripting/GlobalServicesScriptingInterface.cpp (1 of 4 files). Show all

Unified · Split

interface/src/scripting/GlobalServicesScriptingInterface.cpp+2−20
@@ -53,31 +53,13 @@ void GlobalServicesScriptingInterface::loggedOut() { · 52 unmodified lines
53 emit GlobalServicesScriptingInterface::disconnected(QString("logout"));53 emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
54}54}
55 55
56
57QString GlobalServicesScriptingInterface::findableByString(Discoverability::Mode discoverabilityMode) const {
58 if (discoverabilityMode == Discoverability::None) {
59 return "none";
60 } else if (discoverabilityMode == Discoverability::Friends) {
61 return "friends";
62 } else if (discoverabilityMode == Discoverability::Connections) {
63 return "connections";
64 } else if (discoverabilityMode == Discoverability::All) {
65 return "all";
66 } else {
67 qDebug() << "GlobalServices findableByString called with an unrecognized value.";
68 return "";
69 }
70}
71
72
73QString GlobalServicesScriptingInterface::getFindableBy() const {56QString GlobalServicesScriptingInterface::getFindableBy() const {
74 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();57 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
75 return findableByString(discoverabilityManager->getDiscoverabilityMode());58 return DiscoverabilityManager::findableByString(discoverabilityManager->getDiscoverabilityMode());
76}59}
77 60
78void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {61void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {
79 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();62 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
80
81 if (discoverabilityMode.toLower() == "none") {63 if (discoverabilityMode.toLower() == "none") {
82 discoverabilityManager->setDiscoverabilityMode(Discoverability::None);64 discoverabilityManager->setDiscoverabilityMode(Discoverability::None);
83 } else if (discoverabilityMode.toLower() == "friends") {65 } else if (discoverabilityMode.toLower() == "friends") {
@@ -92,7 +74,7 @@ void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabil · 8 unmodified lines
92}74}
93 75
94void GlobalServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) {76void GlobalServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) {
95 emit findableByChanged(findableByString(discoverabilityMode));77 emit findableByChanged(DiscoverabilityManager::findableByString(discoverabilityMode));
96}78}
97 79
98DownloadInfoResult::DownloadInfoResult() :80DownloadInfoResult::DownloadInfoResult() :