Changeset 6320 for code/branches/presentation2/src/orxonox/sound

Timestamp:

Dec 11, 2009, 2:05:00 AM (15 years ago)

Author:

scheusso

Message:

various fixes for client: NHC, sound, callback handling of Vector4 & Quaternion

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (5 diffs)
• BaseSound.cc (modified) (1 diff)
• BaseSound.h (modified) (2 diffs)
• WorldSound.cc (modified) (1 diff)

code/branches/presentation2/src/orxonox/sound/AmbientSound.cc

@@ -58 +58 @@
     {
         registerVariable(volume_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::volumeChanged));
-//         registerVariable(source_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::sourceChanged));
         registerVariable(ambientSource_, ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::ambientSourceChanged));
         registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::loopingChanged));
         registerVariable(pitch_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::pitchChanged));
-        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient);
+        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::stateChanged));
     }
 
@@ -84 +83 @@
             SoundManager::getInstance().registerAmbientSound(this);
         }
+        else
+            BaseSound::play();
     }
 
@@ -97 +98 @@
             SoundManager::getInstance().unregisterAmbientSound(this);
         }
+        else
+            BaseSound::stop();
     }
 
@@ -110 +113 @@
             SoundManager::getInstance().pauseAmbientSound(this);
         }
+        else
+            BaseSound::pause();
     }
     
@@ -136 +141 @@
     }
 
-    void AmbientSound::changedActivity() 
+    void AmbientSound::changedActivity()
     {
         SUPER(AmbientSound, changedActivity);

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -221 +221 @@
             alSourcePause(this->audioSource_);
     }
+    
+    void BaseSound::stateChanged()
+    {
+        CCOUT(0) << "changed state to " << this->state_ << endl;
+        switch( this->state_ )
+        {
+            case Playing:
+                this->play();
+                break;
+            case Paused:
+                this->pause();
+                break;
+            case Stopped:
+            default:
+                this->stop();
+                break;
+        }
+    }
 }

code/branches/presentation2/src/orxonox/sound/BaseSound.h

@@ -59 +59 @@
         virtual void pause();
 
-        bool isPlaying() { return this->state_ == Playing; }
-        bool isPaused()  { return this->state_ == Paused; }
-        bool isStopped() { return this->state_ == Stopped; }
+        bool isPlaying() const { return this->state_ == Playing; }
+        bool isPaused()  const { return this->state_ == Paused; }
+        bool isStopped() const { return this->state_ == Stopped; }
 
         void setPlaying(bool val)
@@ -84 +84 @@
         void setPitch(float pitch);
         inline void pitchChanged(){ this->setPitch(this->pitch_); }
+        
+        void stateChanged();
 
         //ALuint getALAudioSource(void);

code/branches/presentation2/src/orxonox/sound/WorldSound.cc

@@ -60 +60 @@
         registerVariable(source_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::sourceChanged));
         registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::loopingChanged));
-        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient);
+        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::stateChanged));
         registerVariable(pitch_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::pitchChanged));
     }