Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 22:49:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a volume setter to the AudioInjector

Browse source
This commit is contained in:
Stephen Birarda 2013-12-19 15:28:10 -08:00
parent 3f4b4178ff
commit 534010347b
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/audio/src/AudioInjector.cpp
View file

@ -107,7 +107,7 @@ void AudioInjector::injectAudio(AbstractAudioInterface* localAudioInterface) {
currentPacketPosition += sizeof(radius); currentPacketPosition += sizeof(radius);
// pack 255 for attenuation byte // pack 255 for attenuation byte
uchar volume = 255; uchar volume = MAX_INJECTOR_VOLUME * _volume;
memcpy(currentPacketPosition, &volume, sizeof(volume)); memcpy(currentPacketPosition, &volume, sizeof(volume));
currentPacketPosition += sizeof(volume); currentPacketPosition += sizeof(volume);

4
libraries/audio/src/AudioInjector.h
View file

@ -19,6 +19,8 @@
class AbstractAudioInterface; class AbstractAudioInterface;
class QNetworkReply; class QNetworkReply;
const uchar MAX_INJECTOR_VOLUME = 0xFF;
class AudioInjector : public QObject { class AudioInjector : public QObject {
Q_OBJECT Q_OBJECT
public: public:
@ -28,6 +30,7 @@ public:
void setPosition(const glm::vec3& position) { _position = position; } void setPosition(const glm::vec3& position) { _position = position; }
void setOrientation(const glm::quat& orientation) { _orientation = orientation; } void setOrientation(const glm::quat& orientation) { _orientation = orientation; }
void setVolume(float volume) { _volume = std::max(fabsf(volume), 1.0f); }
public slots: public slots:
void injectViaThread(AbstractAudioInterface* localAudioInterface = NULL); void injectViaThread(AbstractAudioInterface* localAudioInterface = NULL);
@ -38,6 +41,7 @@ private:
QUrl _sourceURL; QUrl _sourceURL;
glm::vec3 _position; glm::vec3 _position;
glm::quat _orientation; glm::quat _orientation;
float _volume;
private slots: private slots:
void startDownload(); void startDownload();