we're so back

DarkRTA · Jun 8, 2024 · 9baa5b3 · 9baa5b3
1 parent c6e5922
commit 9baa5b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/system/meta/StreamPlayer.cpp b/src/system/meta/StreamPlayer.cpp
@@ -21,7 +21,7 @@ void StreamPlayer::Delete(){
     delete mStream;
     mStream = 0;
     if(mSongBuf && mSongBuf){
-        delete mSongBuf;
+        _MemFree(mSongBuf);
         mSongBuf = 0;
     }
 }
@@ -63,7 +63,7 @@ void StreamPlayer::Init(){
     }
     else mStream->SetPan(0, 0.0f);
     if(mLoop){
-        mStream->SetJump(kStreamEndMs, 0.0f, 0);
+        mStream->SetJump(Stream::kStreamEndMs, 0.0f, 0);
     }
 }
 

diff --git a/src/system/meta/StreamPlayer.h b/src/system/meta/StreamPlayer.h
@@ -1,8 +1,8 @@
 #ifndef META_STREAMPLAYER_H
 #define META_STREAMPLAYER_H
 #include "obj/Object.h"
-
-class Stream;
+#include "synth/Stream.h"
+#include "utl/MemMgr.h"
 
 class StreamPlayer : public Hmx::Object {
 public:
@@ -17,8 +17,8 @@ class StreamPlayer : public Hmx::Object {
     void StopPlaying();
     void SetMasterVolume(float);
 
-    static float kStreamEndMs;
-    static int kStreamEndSamples;
+    // static float kStreamEndMs;
+    // static int kStreamEndSamples;
 
     float mMasterVol;
     float mStreamVol;
@@ -27,9 +27,10 @@ class StreamPlayer : public Hmx::Object {
     bool mPaused;
     Stream* mStream;
     void* mSongBuf;
+
 };
 
-float StreamPlayer::kStreamEndMs = -1.1920929E-7f;
-int StreamPlayer::kStreamEndSamples = -1;
+// float StreamPlayer::kStreamEndMs = -1.1920929E-7f;
+// int StreamPlayer::kStreamEndSamples = -1;
 
 #endif