music & sound working, starting at wrong point

Author: flipcoder

Qor/Audio.cpp

@@ -62,6 +62,8 @@ Audio::Source :: Source(
     flags(_flags)
 {
     auto l = Audio::lock();
+    source = std::make_shared<coal::Source>();
+    s_pSpace->add(source);
     //alGenSources(1, &id);
     //if(flags & F_AUTOPLAY){
     //    play();
@@ -397,6 +399,8 @@ Audio::Stream :: Stream(std::string fn):
 {
     source = std::make_shared<coal::Source>();
     m_pStream = std::make_shared<coal::Stream>(fn);
+    source->add(m_pStream);
+    s_pSpace->add(source);
 }
 
 //void Audio::Stream :: init(std::string fn)

Qor/Audio.h

@@ -207,6 +207,8 @@ class Audio
     //K_S_GET_SET(float, max_distance, m_MaxDist);
     //K_S_GET_SET(float, reference_distance, m_ReferenceDist);
 
+    static coal::Space* space() { return s_pSpace.get(); }
+
 private:
     //ALCdevice* m_pDevice = nullptr;
     //ALCcontext* m_pContext = nullptr;

Qor/BasicState.cpp

@@ -18,7 +18,9 @@ BasicState :: BasicState(Qor* engine):
     m_pRoot(make_shared<Node>()),
     m_pRTTRoot(make_shared<Node>()),
     m_pPipeline(engine->pipeline()),
-    m_pResources(engine->resources())
+    m_pResources(engine->resources()),
+    m_pMusic(engine->make<Sound>("loading.ogg")),
+    m_pSound(engine->make<Sound>("test.wav"))
 {}
 
 void BasicState :: preload()
@@ -27,6 +29,8 @@ void BasicState :: preload()
     m_pRoot->add(m_pCamera->as_node());
     m_pRTTCamera = make_shared<Camera>(m_pQor->resources(), m_pQor->window());
     m_pRTTRoot->add(m_pRTTCamera->as_node());
+    m_pRoot->add(m_pMusic);
+    m_pRoot->add(m_pSound);
 }
 
 BasicState :: ~BasicState()
@@ -61,6 +65,9 @@ void BasicState :: enter()
         }, std::make_shared<MeshMaterial>(m_pRenderBuffer->texture())
     );
     m_pRoot->add(mesh);
+
+    m_pMusic->play();
+    m_pSound->play();
 }
 
 void BasicState :: logic(Freq::Time t)

Qor/BasicState.h

@@ -13,6 +13,7 @@
 #include "Text.h"
 #include "Menu.h"
 #include "RenderBuffer.h"
+#include "Sound.h"
 
 class Qor;
 
@@ -50,6 +51,9 @@ class BasicState:
         //unsigned m_DetailShader = ~0u;
 
         //unsigned m_Shader = ~0u;
+
+        std::shared_ptr<Sound> m_pMusic;
+        std::shared_ptr<Sound> m_pSound;
 };
 
 #endif

Qor/Qor.cpp

@@ -199,6 +199,7 @@ void Qor :: logic()
     //t = m_pTimer->tick();
     ++m_FramesLastSecond;
 
+    m_pAudio->update();
     m_pInput->logic(t);
     if(m_pInput->quit_flag())
     {