Store the source ID with the voice instead of the source pointer

2 files changed, 12 insertions, 12 deletions

diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index aa786244..d8e35d29 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -2332,7 +2332,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
             {
                 al_free(voice->Update.exchange(nullptr, std::memory_order_acq_rel));
 
-                if(voice->Source.load(std::memory_order_acquire) == nullptr)
+                if(voice->SourceID.load(std::memory_order_acquire) == 0u)
                     return;
 
                 if(device->AvgSpeakerDist > 0.0f)
diff --git a/Alc/alu.cpp b/Alc/alu.cpp
index ecf5f024..607798ba 100644
--- a/Alc/alu.cpp
+++ b/Alc/alu.cpp
@@ -1506,8 +1506,8 @@ void ProcessParamUpdates(ALCcontext *ctx, const ALeffectslotArray *slots)
         std::for_each(ctx->Voices, ctx->Voices+ctx->VoiceCount.load(std::memory_order_acquire),
             [ctx,force](ALvoice *voice) -> void
             {
-                ALsource *source{voice->Source.load(std::memory_order_acquire)};
-                if(source) CalcSourceParams(voice, ctx, force);
+                ALuint sid{voice->SourceID.load(std::memory_order_acquire)};
+                if(sid) CalcSourceParams(voice, ctx, force);
             }
         );
     }
@@ -1536,16 +1536,16 @@ void ProcessContext(ALCcontext *ctx, ALsizei SamplesToDo)
     std::for_each(ctx->Voices, ctx->Voices+ctx->VoiceCount.load(std::memory_order_acquire),
         [SamplesToDo,ctx](ALvoice *voice) -> void
         {
-            ALsource *source{voice->Source.load(std::memory_order_acquire)};
-            if(!source) return;
+            ALuint sid{voice->SourceID.load(std::memory_order_acquire)};
+            if(!sid) return;
             if(!voice->Playing.load(std::memory_order_relaxed) || voice->Step < 1)
                 return;
 
-            if(!MixSource(voice, source->id, ctx, SamplesToDo))
+            if(!MixSource(voice, sid, ctx, SamplesToDo))
             {
-                voice->Source.store(nullptr, std::memory_order_relaxed);
+                voice->SourceID.store(0u, std::memory_order_relaxed);
                 voice->Playing.store(false, std::memory_order_release);
-                SendSourceStoppedEvent(ctx, source->id);
+                SendSourceStoppedEvent(ctx, sid);
             }
         }
     );
@@ -1862,17 +1862,17 @@ void aluHandleDisconnect(ALCdevice *device, const char *msg, ...)
         std::for_each(ctx->Voices, ctx->Voices+ctx->VoiceCount.load(std::memory_order_acquire),
             [ctx](ALvoice *voice) -> void
             {
-                ALsource *source{voice->Source.load(std::memory_order_relaxed)};
-                if(!source || !voice->Playing.load(std::memory_order_relaxed))
+                ALuint sid{voice->SourceID.load(std::memory_order_relaxed)};
+                if(!sid || !voice->Playing.load(std::memory_order_relaxed))
                     return;
 
-                voice->Source.store(nullptr, std::memory_order_relaxed);
+                voice->SourceID.store(0u, std::memory_order_relaxed);
                 voice->Playing.store(false, std::memory_order_release);
                 /* If the source's voice was playing, it's now effectively
                  * stopped (the source state will be updated the next time it's
                  * checked).
                  */
-                SendSourceStoppedEvent(ctx, source->id);
+                SendSourceStoppedEvent(ctx, sid);
             }
         );