Merge pull request #6499 from AndrewMeadows/fewer-warnings

Remove warning about unused AudioConstants::AUDIO_FRAME_NAME

assignment-client/src/Agent.cpp

@@ -67,7 +67,7 @@ Agent::Agent(NLPacket& packet) :
     DependencyManager::set<RecordingScriptingInterface>();
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    
+
     packetReceiver.registerListenerForTypes(
         { PacketType::MixedAudio, PacketType::SilentAudioFrame },
         this, "handleAudioPacket");
@@ -86,7 +86,7 @@ void Agent::handleOctreePacket(QSharedPointer<NLPacket> packet, SharedNodePointe
         if (packet->getPayloadSize() > statsMessageLength) {
             // pull out the piggybacked packet and create a new QSharedPointer<NLPacket> for it
             int piggyBackedSizeWithHeader = packet->getPayloadSize() - statsMessageLength;
-            
+
             auto buffer = std::unique_ptr<char[]>(new char[piggyBackedSizeWithHeader]);
             memcpy(buffer.get(), packet->getPayload() + statsMessageLength, piggyBackedSizeWithHeader);
 
@@ -126,11 +126,11 @@ void Agent::handleAudioPacket(QSharedPointer<NLPacket> packet) {
 const QString AGENT_LOGGING_NAME = "agent";
 
 void Agent::run() {
-    
+
     // make sure we request our script once the agent connects to the domain
     auto nodeList = DependencyManager::get<NodeList>();
     connect(&nodeList->getDomainHandler(), &DomainHandler::connectedToDomain, this, &Agent::requestScript);
-    
+
     ThreadedAssignment::commonInit(AGENT_LOGGING_NAME, NodeType::Agent);
 
     // Setup MessagesClient
@@ -140,7 +140,7 @@ void Agent::run() {
     messagesClient->moveToThread(messagesThread);
     connect(messagesThread, &QThread::started, messagesClient.data(), &MessagesClient::init);
     messagesThread->start();
-    
+
     nodeList->addSetOfNodeTypesToNodeInterestSet({
         NodeType::AudioMixer, NodeType::AvatarMixer, NodeType::EntityServer, NodeType::MessagesMixer, NodeType::AssetServer
     });
@@ -149,7 +149,7 @@ void Agent::run() {
 void Agent::requestScript() {
     auto nodeList = DependencyManager::get<NodeList>();
     disconnect(&nodeList->getDomainHandler(), &DomainHandler::connectedToDomain, this, &Agent::requestScript);
-    
+
     // figure out the URL for the script for this agent assignment
     QUrl scriptURL;
     if (_payload.isEmpty())  {
@@ -160,24 +160,24 @@ void Agent::requestScript() {
     } else {
         scriptURL = QUrl(_payload);
     }
-    
+
     // setup a network access manager and
     QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
-    
+
     QNetworkDiskCache* cache = new QNetworkDiskCache();
     QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
     cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "agentCache");
     networkAccessManager.setCache(cache);
-    
+
     QNetworkRequest networkRequest = QNetworkRequest(scriptURL);
     networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
-    
+
     // setup a timeout for script request
     static const int SCRIPT_TIMEOUT_MS = 10000;
     _scriptRequestTimeout = new QTimer(this);
     connect(_scriptRequestTimeout, &QTimer::timeout, this, &Agent::scriptRequestFinished);
     _scriptRequestTimeout->start(SCRIPT_TIMEOUT_MS);
-    
+
     qDebug() << "Downloading script at" << scriptURL.toString();
     QNetworkReply* reply = networkAccessManager.get(networkRequest);
     connect(reply, &QNetworkReply::finished, this, &Agent::scriptRequestFinished);
@@ -187,11 +187,11 @@ void Agent::scriptRequestFinished() {
     auto reply = qobject_cast<QNetworkReply*>(sender());
 
     _scriptRequestTimeout->stop();
-    
+
     if (reply && reply->error() == QNetworkReply::NoError) {
         _scriptContents = reply->readAll();
         qDebug() << "Downloaded script:" << _scriptContents;
-        
+
         // we could just call executeScript directly - we use a QueuedConnection to allow scriptRequestFinished
         // to return before calling executeScript
         QMetaObject::invokeMethod(this, "executeScript", Qt::QueuedConnection);
@@ -202,38 +202,38 @@ void Agent::scriptRequestFinished() {
         } else {
             qDebug() << "Failed to download script - request timed out. Bailing on assignment.";
         }
-        
+
         setFinished(true);
     }
-    
+
     reply->deleteLater();
 }
 
 void Agent::executeScript() {
     _scriptEngine = std::unique_ptr<ScriptEngine>(new ScriptEngine(_scriptContents, _payload));
     _scriptEngine->setParent(this); // be the parent of the script engine so it gets moved when we do
-    
+
     // setup an Avatar for the script to use
     auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
     connect(_scriptEngine.get(), SIGNAL(update(float)), scriptedAvatar.data(), SLOT(update(float)), Qt::ConnectionType::QueuedConnection);
     scriptedAvatar->setForceFaceTrackerConnected(true);
-    
+
     // call model URL setters with empty URLs so our avatar, if user, will have the default models
     scriptedAvatar->setFaceModelURL(QUrl());
     scriptedAvatar->setSkeletonModelURL(QUrl());
     // give this AvatarData object to the script engine
     _scriptEngine->registerGlobalObject("Avatar", scriptedAvatar.data());
-    
+
-    
+
     using namespace recording;
     static const FrameType AVATAR_FRAME_TYPE = Frame::registerFrameType(AvatarData::FRAME_NAME);
     // FIXME how to deal with driving multiple avatars locally?
     Frame::registerFrameHandler(AVATAR_FRAME_TYPE, [this, scriptedAvatar](Frame::ConstPointer frame) {
         AvatarData::fromFrame(frame->data, *scriptedAvatar);
     });
-    
+
     using namespace recording;
-    static const FrameType AUDIO_FRAME_TYPE = Frame::registerFrameType(AudioConstants::AUDIO_FRAME_NAME);
+    static const FrameType AUDIO_FRAME_TYPE = Frame::registerFrameType(AudioConstants::getAudioFrameName());
     Frame::registerFrameHandler(AUDIO_FRAME_TYPE, [this, &scriptedAvatar](Frame::ConstPointer frame) {
         const QByteArray& audio = frame->data;
         static quint16 audioSequenceNumber{ 0 };
@@ -242,49 +242,49 @@ void Agent::executeScript() {
         audioTransform.setRotation(scriptedAvatar->getOrientation());
         AbstractAudioInterface::emitAudioPacket(audio.data(), audio.size(), audioSequenceNumber, audioTransform, PacketType::MicrophoneAudioNoEcho);
     });
-    
+
     auto avatarHashMap = DependencyManager::set<AvatarHashMap>();
     _scriptEngine->registerGlobalObject("AvatarList", avatarHashMap.data());
-    
+
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerListener(PacketType::BulkAvatarData, avatarHashMap.data(), "processAvatarDataPacket");
     packetReceiver.registerListener(PacketType::KillAvatar, avatarHashMap.data(), "processKillAvatar");
     packetReceiver.registerListener(PacketType::AvatarIdentity, avatarHashMap.data(), "processAvatarIdentityPacket");
     packetReceiver.registerListener(PacketType::AvatarBillboard, avatarHashMap.data(), "processAvatarBillboardPacket");
-    
+
     // register ourselves to the script engine
     _scriptEngine->registerGlobalObject("Agent", this);
-    
+
     // FIXME -we shouldn't be calling this directly, it's normally called by run(), not sure why
     // viewers would need this called.
     //_scriptEngine->init(); // must be done before we set up the viewers
-    
+
     _scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data());
-    
+
     QScriptValue webSocketServerConstructorValue = _scriptEngine->newFunction(WebSocketServerClass::constructor);
     _scriptEngine->globalObject().setProperty("WebSocketServer", webSocketServerConstructorValue);
-    
+
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    
+
     _scriptEngine->registerGlobalObject("EntityViewer", &_entityViewer);
-    
+
     // we need to make sure that init has been called for our EntityScriptingInterface
     // so that it actually has a jurisdiction listener when we ask it for it next
     entityScriptingInterface->init();
     _entityViewer.setJurisdictionListener(entityScriptingInterface->getJurisdictionListener());
-    
+
     _entityViewer.init();
-    
+
     entityScriptingInterface->setEntityTree(_entityViewer.getTree());
-    
+
     // wire up our additional agent related processing to the update signal
     QObject::connect(_scriptEngine.get(), &ScriptEngine::update, this, &Agent::processAgentAvatarAndAudio);
-    
+
     _scriptEngine->run();
-    
+
     Frame::clearFrameHandler(AUDIO_FRAME_TYPE);
     Frame::clearFrameHandler(AVATAR_FRAME_TYPE);
-    
+
     setFinished(true);
 }
 
@@ -317,7 +317,7 @@ void Agent::setIsAvatar(bool isAvatar) {
             delete _avatarIdentityTimer;
             _avatarIdentityTimer = nullptr;
         }
-        
+
         if (_avatarBillboardTimer) {
             _avatarBillboardTimer->stop();
             delete _avatarBillboardTimer;

assignment-client/src/Agent.h

@@ -31,7 +31,7 @@
 
 class Agent : public ThreadedAssignment {
     Q_OBJECT
-    
+
     Q_PROPERTY(bool isAvatar READ isAvatar WRITE setIsAvatar)
     Q_PROPERTY(bool isPlayingAvatarSound READ isPlayingAvatarSound)
     Q_PROPERTY(bool isListeningToAudioStream READ isListeningToAudioStream WRITE setIsListeningToAudioStream)
@@ -40,7 +40,7 @@ class Agent : public ThreadedAssignment {
 
 public:
     Agent(NLPacket& packet);
-    
+
     void setIsAvatar(bool isAvatar);
     bool isAvatar() const { return _isAvatar; }
 
@@ -53,7 +53,7 @@ public:
     QUuid getSessionUUID() const;
 
     virtual void aboutToFinish();
-    
+
 public slots:
     void run();
     void playAvatarSound(Sound* avatarSound) { setAvatarSound(avatarSound); }
@@ -62,7 +62,7 @@ private slots:
     void requestScript();
     void scriptRequestFinished();
     void executeScript();
-    
+
     void handleAudioPacket(QSharedPointer<NLPacket> packet);
     void handleOctreePacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
     void handleJurisdictionPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
@@ -72,7 +72,7 @@ private:
     std::unique_ptr<ScriptEngine> _scriptEngine;
     EntityEditPacketSender _entityEditSender;
     EntityTreeHeadlessViewer _entityViewer;
-    
+
     MixedAudioStream _receivedAudioStream;
     float _lastReceivedAudioLoudness;
 

interface/src/Application.cpp

@@ -454,14 +454,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     audioIO->setOrientationGetter([this]{ return getMyAvatar()->getOrientationForAudio(); });
 
     audioIO->moveToThread(audioThread);
-    recording::Frame::registerFrameHandler(AudioConstants::AUDIO_FRAME_NAME, [=](recording::Frame::ConstPointer frame) {
+    recording::Frame::registerFrameHandler(AudioConstants::getAudioFrameName(), [=](recording::Frame::ConstPointer frame) {
         audioIO->handleRecordedAudioInput(frame->data);
     });
 
     connect(audioIO.data(), &AudioClient::inputReceived, [](const QByteArray& audio){
         static auto recorder = DependencyManager::get<recording::Recorder>();
         if (recorder->isRecording()) {
-            static const recording::FrameType AUDIO_FRAME_TYPE = recording::Frame::registerFrameType(AudioConstants::AUDIO_FRAME_NAME);
+            static const recording::FrameType AUDIO_FRAME_TYPE = recording::Frame::registerFrameType(AudioConstants::getAudioFrameName());
             recorder->recordFrame(AUDIO_FRAME_TYPE, audio);
         }
     });

libraries/audio/src/AudioConstants.h

@@ -18,10 +18,10 @@
 
 namespace AudioConstants {
     const int SAMPLE_RATE = 24000;
-    
+
     typedef int16_t AudioSample;
 
-    static const char* AUDIO_FRAME_NAME = "com.highfidelity.recording.Audio";
+    inline const char* getAudioFrameName() { return "com.highfidelity.recording.Audio"; }
 
     const int NETWORK_FRAME_BYTES_STEREO = 1024;
     const int NETWORK_FRAME_SAMPLES_STEREO = NETWORK_FRAME_BYTES_STEREO / sizeof(AudioSample);