diff --git a/src/CSFML/Audio/SoundRecorder.cpp b/src/CSFML/Audio/SoundRecorder.cpp index 80af68f..9269627 100644 --- a/src/CSFML/Audio/SoundRecorder.cpp +++ b/src/CSFML/Audio/SoundRecorder.cpp @@ -37,7 +37,7 @@ sfSoundRecorder* sfSoundRecorder_create(sfSoundRecorderStartCallback onStart, sfSoundRecorderStopCallback onStop, void* userData) { - return new sfSoundRecorder(onStart, onProcess, onStop, userData); + return new sfSoundRecorder{{onStart, onProcess, onStop, userData}, {}}; } diff --git a/src/CSFML/Audio/SoundRecorderStruct.hpp b/src/CSFML/Audio/SoundRecorderStruct.hpp index 8009063..55b8d01 100644 --- a/src/CSFML/Audio/SoundRecorderStruct.hpp +++ b/src/CSFML/Audio/SoundRecorderStruct.hpp @@ -85,14 +85,6 @@ private: //////////////////////////////////////////////////////////// struct sfSoundRecorder { - sfSoundRecorder(sfSoundRecorderStartCallback onStart, - sfSoundRecorderProcessCallback onProcess, - sfSoundRecorderStopCallback onStop, - void* userData) : - This(onStart, onProcess, onStop, userData) - { - } - sfSoundRecorderImpl This; std::string DeviceName; }; diff --git a/src/CSFML/Audio/SoundStream.cpp b/src/CSFML/Audio/SoundStream.cpp index 2508a41..43f4204 100644 --- a/src/CSFML/Audio/SoundStream.cpp +++ b/src/CSFML/Audio/SoundStream.cpp @@ -40,7 +40,7 @@ sfSoundStream* sfSoundStream_create( size_t channelMapSize, void* userData) { - return new sfSoundStream(onGetData, onSeek, channelCount, sampleRate, channelMapData, channelMapSize, userData); + return new sfSoundStream{{onGetData, onSeek, channelCount, sampleRate, channelMapData, channelMapSize, userData}}; } diff --git a/src/CSFML/Audio/SoundStreamStruct.hpp b/src/CSFML/Audio/SoundStreamStruct.hpp index 974b61c..e944bf2 100644 --- a/src/CSFML/Audio/SoundStreamStruct.hpp +++ b/src/CSFML/Audio/SoundStreamStruct.hpp @@ -88,16 +88,5 @@ private: //////////////////////////////////////////////////////////// struct sfSoundStream { - sfSoundStream(sfSoundStreamGetDataCallback onGetData, - sfSoundStreamSeekCallback onSeek, - unsigned int channelCount, - unsigned int sampleRate, - sfSoundChannel* channelMapData, - size_t channelMapSize, - void* userData) : - This(onGetData, onSeek, channelCount, sampleRate, channelMapData, channelMapSize, userData) - { - } - sfSoundStreamImpl This; };