Avoid hardcoding some sublist counts

kcat · Feb 4, 2024 · 2c9e9fd · 2c9e9fd
1 parent 9be3721
commit 2c9e9fd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
@@ -250,7 +250,7 @@ bool EnsureEffectSlots(ALCcontext *context, size_t needed)
             sublist.FreeMask = ~0_u64;
             sublist.EffectSlots = SubListAllocator{}.allocate(1);
             context->mEffectSlotList.emplace_back(std::move(sublist));
-            count += 64;
+            count += std::tuple_size_v<SubListAllocator::value_type>;
         }
     }
     catch(...) {

diff --git a/al/buffer.cpp b/al/buffer.cpp
@@ -190,7 +190,7 @@ bool EnsureBuffers(ALCdevice *device, size_t needed)
             sublist.FreeMask = ~0_u64;
             sublist.Buffers = SubListAllocator{}.allocate(1);
             device->BufferList.emplace_back(std::move(sublist));
-            count += 64;
+            count += std::tuple_size_v<SubListAllocator::value_type>;
         }
     }
     catch(...) {

diff --git a/al/effect.cpp b/al/effect.cpp
@@ -140,7 +140,7 @@ bool EnsureEffects(ALCdevice *device, size_t needed)
             sublist.FreeMask = ~0_u64;
             sublist.Effects = SubListAllocator{}.allocate(1);
             device->EffectList.emplace_back(std::move(sublist));
-            count += 64;
+            count += std::tuple_size_v<SubListAllocator::value_type>;
         }
     }
     catch(...) {

diff --git a/al/filter.cpp b/al/filter.cpp
@@ -135,7 +135,7 @@ bool EnsureFilters(ALCdevice *device, size_t needed)
             sublist.FreeMask = ~0_u64;
             sublist.Filters = SubListAllocator{}.allocate(1);
             device->FilterList.emplace_back(std::move(sublist));
-            count += 64;
+            count += std::tuple_size_v<SubListAllocator::value_type>;
         }
     }
     catch(...) {

diff --git a/al/source.cpp b/al/source.cpp
@@ -728,7 +728,7 @@ bool EnsureSources(ALCcontext *context, size_t needed)
             sublist.FreeMask = ~0_u64;
             sublist.Sources = SubListAllocator{}.allocate(1);
             context->mSourceList.emplace_back(std::move(sublist));
-            count += 64;
+            count += std::tuple_size_v<SubListAllocator::value_type>;
         }
     }
     catch(...) {