Showing the changes to interface/src/scripting/ScreenshareScriptingInterface.cpp (1 of 141 files). Show all
Unified · Split
| @@ -24,6 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | |
| 25 | 25 | #include "EntityScriptingInterface.h" |
| 26 | 26 | #include "ScreenshareScriptingInterface.h" |
| 27 | +#include "ExternalResource.h" | |
| 27 | 28 | |
| 28 | 29 | static const int SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS = 300; |
| 29 | 30 | ScreenshareScriptingInterface::ScreenshareScriptingInterface() { |
| @@ -109,7 +110,7 @@ void ScreenshareScriptingInterface::requestScreenshareInfo() { · 79 unmodified lines | ||
| 109 | 110 | // See `DomainServer::screensharePresence()` for more info about that. |
| 110 | 111 | |
| 111 | 112 | QString currentDomainID = uuidStringWithoutCurlyBraces(addressManager->getDomainID()); |
| 112 | − QString requestURLPath = "api/v1/domains/%1/screenshare"; | |
| 113 | + QString requestURLPath = "/api/v1/domains/%1/screenshare"; | |
| 113 | 114 | JSONCallbackParameters callbackParams; |
| 114 | 115 | callbackParams.callbackReceiver = this; |
| 115 | 116 | callbackParams.jsonCallbackMethod = "handleSuccessfulScreenshareInfoGet"; |
| @@ -129,8 +130,8 @@ static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30; · 13 unmodified lines | ||
| 129 | 130 | // The `z` value here is dynamic. |
| 130 | 131 | static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0f); |
| 131 | 132 | static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f); |
| 132 | −static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = | |
| 133 | − NetworkingConstants::CONTENT_CDN_URL + "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html"; | |
| 133 | +static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, | |
| 134 | + "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html"); | |
| 134 | 135 | static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local"; |
| 135 | 136 | void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID, |
| 136 | 137 | const QUuid& smartboardEntityID, |