From aaca06d83e2b9326a711e06f30e96fe6e7a4c3ec Mon Sep 17 00:00:00 2001 From: Colin McEwan Date: Thu, 10 Jun 2021 18:21:07 +0100 Subject: [PATCH] Revert "Add padding to JackEngineControl to account for inherited data" This reverts commit 3d8c7d83ad9483280f623171af7e40ccc76cef38. --- common/JackEngineControl.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/JackEngineControl.h b/common/JackEngineControl.h index b9e5b1d7..78d9a42b 100644 --- a/common/JackEngineControl.h +++ b/common/JackEngineControl.h @@ -48,14 +48,11 @@ class JackGraphManager; PRE_PACKED_STRUCTURE struct SERVER_EXPORT JackEngineControl : public JackShmMem { - // Padding to align start of JackEngineControl after inherited JackShmMem data - char fPadding1[ sizeof(UInt32) - sizeof(JackShmMem) % sizeof(UInt32) ]; - // Timer JackFrameTimer fFrameTimer; // Padding to align fTransport - char fPadding2[ sizeof(UInt32) - sizeof(fFrameTimer) % sizeof(UInt32) ]; + char padding[ sizeof(UInt32) - sizeof(fFrameTimer) % sizeof(UInt32) ]; // Shared state JackTransportEngine fTransport; @@ -104,7 +101,6 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem "fTransport must be aligned within JackEngineControl"); static_assert(offsetof(JackEngineControl, fFrameTimer) % sizeof(UInt32) == 0, "fFrameTimer must be aligned within JackEngineControl"); - fBufferSize = 512; fSampleRate = 48000; fPeriodUsecs = jack_time_t(1000000.f / fSampleRate * fBufferSize);