Update SFML wrapper

3 files changed, 64 insertions, 64 deletions

diff --git a/src/sfml/audio/Music.zig b/src/sfml/audio/Music.zig
index b02b620..d55a718 100644
--- a/src/sfml/audio/Music.zig
+++ b/src/sfml/audio/Music.zig
@@ -11,92 +11,92 @@ pub fn createFromFile(path: [:0]const u8) !Music {
     var music = sf.c.sfMusic_createFromFile(path);
     if (music == null)
         return sf.Error.resourceLoadingError;
-    return Music{ .ptr = music.? };
+    return Music{ ._ptr = music.? };
 }
 
 pub const initFromMemory = @compileError("Function is not implemented yet.");
 pub const initFromStream = @compileError("Function is not implemented yet.");
 
 /// Destroys this music object
-pub fn destroy(self: Music) void {
-    sf.c.sfMusic_destroy(self.ptr);
+pub fn destroy(self: *Music) void {
+    sf.c.sfMusic_destroy(self._ptr);
 }
 
 // Music control functions
 
 /// Plays the music
-pub fn play(self: Music) void {
-    sf.c.sfMusic_play(self.ptr);
+pub fn play(self: *Music) void {
+    sf.c.sfMusic_play(self._ptr);
 }
 /// Pauses the music
-pub fn pause(self: Music) void {
-    sf.c.sfMusic_pause(self.ptr);
+pub fn pause(self: *Music) void {
+    sf.c.sfMusic_pause(self._ptr);
 }
 /// Stops the music and resets the player position
-pub fn stop(self: Music) void {
-    sf.c.sfMusic_stop(self.ptr);
+pub fn stop(self: *Music) void {
+    sf.c.sfMusic_stop(self._ptr);
 }
 
 // Getters / Setters
 
 /// Gets the total duration of the music
 pub fn getDuration(self: Music) sf.Time {
-    return sf.Time.fromCSFML(sf.c.sfMusic_getDuration(self.ptr));
+    return sf.Time._fromCSFML(sf.c.sfMusic_getDuration(self._ptr));
 }
 
 /// Gets the current stream position of the music
 pub fn getPlayingOffset(self: Music) sf.Time {
-    return sf.Time.fromCSFML(sf.c.sfMusic_getPlayingOffset(self.ptr));
+    return sf.Time._fromCSFML(sf.c.sfMusic_getPlayingOffset(self._ptr));
 }
 /// Sets the current stream position of the music
-pub fn setPlayingOffset(self: Music, offset: sf.Time) void {
-    sf.c.sfMusic_setPlayingOffset(self.ptr, offset.toCSFML());
+pub fn setPlayingOffset(self: *Music, offset: sf.Time) void {
+    sf.c.sfMusic_setPlayingOffset(self._ptr, offset._toCSFML());
 }
 
 /// Gets the loop points of the music
 pub fn getLoopPoints(self: Music) sf.TimeSpan {
-    return sf.TimeSpan.fromCSFML(sf.c.sfMusic_getLoopPoints(self.ptr));
+    return sf.TimeSpan._fromCSFML(sf.c.sfMusic_getLoopPoints(self._ptr));
 }
 /// Gets the loop points of the music
-pub fn setLoopPoints(self: Music, span: sf.TimeSpan) void {
-    sf.c.sfMusic_setLoopPoints(self.ptr, span.toCSFML());
+pub fn setLoopPoints(self: *Music, span: sf.TimeSpan) void {
+    sf.c.sfMusic_setLoopPoints(self._ptr, span._toCSFML());
 }
 
 /// Tells whether or not this stream is in loop mode
 pub fn getLoop(self: Music) bool {
-    return sf.c.sfMusic_getLoop(self.ptr) != 0;
+    return sf.c.sfMusic_getLoop(self._ptr) != 0;
 }
 /// Enable or disable auto loop
-pub fn setLoop(self: Music, loop: bool) void {
-    sf.c.sfMusic_setLoop(self.ptr, if (loop) 1 else 0);
+pub fn setLoop(self: *Music, loop: bool) void {
+    sf.c.sfMusic_setLoop(self._ptr, @boolToInt(loop));
 }
 
 /// Sets the pitch of the music
 pub fn getPitch(self: Music) f32 {
-    return sf.c.sfMusic_getPitch(self.ptr);
+    return sf.c.sfMusic_getPitch(self._ptr);
 }
 /// Gets the pitch of the music
-pub fn setPitch(self: Music, pitch: f32) void {
-    sf.c.sfMusic_setPitch(self.ptr, pitch);
+pub fn setPitch(self: *Music, pitch: f32) void {
+    sf.c.sfMusic_setPitch(self._ptr, pitch);
 }
 
 /// Sets the volume of the music
 pub fn getVolume(self: Music) f32 {
-    return sf.c.sfMusic_getVolume(self.ptr);
+    return sf.c.sfMusic_getVolume(self._ptr);
 }
 /// Gets the volume of the music
-pub fn setVolume(self: Music, volume: f32) void {
-    sf.c.sfMusic_setVolume(self.ptr, volume);
+pub fn setVolume(self: *Music, volume: f32) void {
+    sf.c.sfMusic_setVolume(self._ptr, volume);
 }
 
 /// Gets the sample rate of this music
 pub fn getSampleRate(self: Music) usize {
-    return @intCast(usize, sf.c.sfMusic_getSampleRate(self.ptr));
+    return @intCast(usize, sf.c.sfMusic_getSampleRate(self._ptr));
 }
 
 /// Gets the channel count of the music
 pub fn getChannelCount(self: Music) usize {
-    return @intCast(usize, sf.c.sfMusic_getChannelCount(self.ptr));
+    return @intCast(usize, sf.c.sfMusic_getChannelCount(self._ptr));
 }
 
 pub const getStatus = @compileError("Function is not implemented yet.");
@@ -108,4 +108,4 @@ pub const getMinDistance = @compileError("Function is not implemented yet.");
 pub const getAttenuation = @compileError("Function is not implemented yet.");
 
 /// Pointer to the csfml music
-ptr: *sf.c.sfMusic,
+_ptr: *sf.c.sfMusic,
diff --git a/src/sfml/audio/Sound.zig b/src/sfml/audio/Sound.zig
index 073aa5f..92acb46 100644
--- a/src/sfml/audio/Sound.zig
+++ b/src/sfml/audio/Sound.zig
@@ -14,7 +14,7 @@ pub fn create() !Sound {
     var sound = sf.c.sfSound_create();
     if (sound == null)
         return sf.Error.nullptrUnknownReason;
-    return Sound{ .ptr = sound.? };
+    return Sound{ ._ptr = sound.? };
 }
 
 /// Inits a sound with a SoundBuffer object
@@ -25,74 +25,74 @@ pub fn createFromBuffer(buffer: sf.SoundBuffer) !Sound {
 }
 
 /// Destroys this sound object
-pub fn destroy(self: Sound) void {
-    sf.c.sfSound_destroy(self.ptr);
+pub fn destroy(self: *Sound) void {
+    sf.c.sfSound_destroy(self._ptr);
 }
 
 // Sound control functions
 
 /// Plays the sound
-pub fn play(self: Sound) void {
-    sf.c.sfSound_play(self.ptr);
+pub fn play(self: *Sound) void {
+    sf.c.sfSound_play(self._ptr);
 }
 /// Pauses the sound
-pub fn pause(self: Sound) void {
-    sf.c.sfSound_pause(self.ptr);
+pub fn pause(self: *Sound) void {
+    sf.c.sfSound_pause(self._ptr);
 }
 /// Stops the sound and resets the player position
-pub fn stop(self: Sound) void {
-    sf.c.sfSound_stop(self.ptr);
+pub fn stop(self: *Sound) void {
+    sf.c.sfSound_stop(self._ptr);
 }
 
 // Getters / Setters
 
 /// Gets the buffer this sound is attached to
 pub fn getBuffer(self: Sound) ?sf.SoundBuffer {
-    var buf = sf.c.sfSound_getBuffer(self.ptr);
+    var buf = sf.c.sfSound_getBuffer(self._ptr);
     if (buf) |buffer| {
-        return .{ .ptr = buffer };
+        return .{ ._ptr = buffer };
     } else return null;
 }
 
 /// Sets the buffer this sound will play
-pub fn setBuffer(self: Sound, buffer: sf.SoundBuffer) void {
-    sf.c.sfSound_setBuffer(self.ptr, buffer.ptr);
+pub fn setBuffer(self: *Sound, buffer: sf.SoundBuffer) void {
+    sf.c.sfSound_setBuffer(self._ptr, buffer._ptr);
 }
 
 /// Gets the current playing offset of the sound
 pub fn getPlayingOffset(self: Sound) sf.Time {
-    return sf.Time.fromCSFML(sf.c.sfSound_getPlayingOffset(self.ptr));
+    return sf.Time._fromCSFML(sf.c.sfSound_getPlayingOffset(self._ptr));
 }
 /// Sets the current playing offset of the sound
-pub fn setPlayingOffset(self: Sound, offset: sf.Time) void {
-    sf.c.sfSound_setPlayingOffset(self.ptr, offset.toCSFML());
+pub fn setPlayingOffset(self: *Sound, offset: sf.Time) void {
+    sf.c.sfSound_setPlayingOffset(self._ptr, offset._toCSFML());
 }
 
 /// Tells whether or not this sound is in loop mode
 pub fn getLoop(self: Sound) bool {
-    return sf.c.sfSound_getLoop(self.ptr) != 0;
+    return sf.c.sfSound_getLoop(self._ptr) != 0;
 }
 /// Enable or disable auto loop
-pub fn setLoop(self: Sound, loop: bool) void {
-    sf.c.sfSound_setLoop(self.ptr, if (loop) 1 else 0);
+pub fn setLoop(self: *Sound, loop: bool) void {
+    sf.c.sfSound_setLoop(self._ptr, @boolToInt(loop));
 }
 
 /// Sets the pitch of the sound
 pub fn getPitch(self: Sound) f32 {
-    return sf.c.sfSound_getPitch(self.ptr);
+    return sf.c.sfSound_getPitch(self._ptr);
 }
 /// Gets the pitch of the sound
-pub fn setPitch(self: Sound, pitch: f32) void {
-    sf.c.sfSound_setPitch(self.ptr, pitch);
+pub fn setPitch(self: *Sound, pitch: f32) void {
+    sf.c.sfSound_setPitch(self._ptr, pitch);
 }
 
 /// Sets the volume of the sound
 pub fn getVolume(self: Sound) f32 {
-    return sf.c.sfSound_getVolume(self.ptr);
+    return sf.c.sfSound_getVolume(self._ptr);
 }
 /// Gets the volume of the sound
-pub fn setVolume(self: Sound, volume: f32) void {
-    sf.c.sfSound_setVolume(self.ptr, volume);
+pub fn setVolume(self: *Sound, volume: f32) void {
+    sf.c.sfSound_setVolume(self._ptr, volume);
 }
 
 pub const getStatus = @compileError("Function is not implemented yet.");
@@ -104,4 +104,4 @@ pub const getMinDistance = @compileError("Function is not implemented yet.");
 pub const getAttenuation = @compileError("Function is not implemented yet.");
 
 /// Pointer to the csfml sound
-ptr: *sf.c.sfSound,
+_ptr: *sf.c.sfSound,
diff --git a/src/sfml/audio/SoundBuffer.zig b/src/sfml/audio/SoundBuffer.zig
index 9727088..39ed082 100644
--- a/src/sfml/audio/SoundBuffer.zig
+++ b/src/sfml/audio/SoundBuffer.zig
@@ -10,56 +10,56 @@ pub fn createFromFile(path: [:0]const u8) !SoundBuffer {
     var sound = sf.c.sfSoundBuffer_createFromFile(path);
     if (sound == null)
         return sf.Error.resourceLoadingError;
-    return SoundBuffer{ .ptr = sound.? };
+    return SoundBuffer{ ._ptr = sound.? };
 }
 /// Creates a sound buffer from sample data
 pub fn createFromSamples(samples: []const i16, channel_count: usize, sample_rate: usize) !SoundBuffer {
     var sound = sf.c.sfSoundBuffer_createFromSamples(@ptrCast([*c]const c_short, samples.ptr), samples.len, @intCast(c_uint, channel_count), @intCast(c_uint, sample_rate));
     if (sound == null)
         return sf.Error.resourceLoadingError;
-    return SoundBuffer{ .ptr = sound.? };
+    return SoundBuffer{ ._ptr = sound.? };
 }
 
 pub const initFromMemory = @compileError("Function is not implemented yet.");
 pub const initFromStream = @compileError("Function is not implemented yet.");
 
 /// Destroys this music object
-pub fn destroy(self: SoundBuffer) void {
-    sf.c.sfSoundBuffer_destroy(self.ptr);
+pub fn destroy(self: *SoundBuffer) void {
+    sf.c.sfSoundBuffer_destroy(self._ptr);
 }
 
 // Getters / Setters
 
 /// Gets the duration of the sound
 pub fn getDuration(self: SoundBuffer) sf.system.Time {
-    return sf.system.Time.fromCSFML(sf.c.sfSoundBuffer_getDuration(self.ptr));
+    return sf.system.Time._fromCSFML(sf.c.sfSoundBuffer_getDuration(self._ptr));
 }
 
 /// Gets the sample count of this sound
 pub fn getSampleCount(self: SoundBuffer) usize {
-    return @intCast(usize, sf.c.sfSoundBuffer_getSampleCount(self.ptr));
+    return @intCast(usize, sf.c.sfSoundBuffer_getSampleCount(self._ptr));
 }
 
 /// Gets the sample rate of this sound (n° of samples per second, often 44100)
 pub fn getSampleRate(self: SoundBuffer) usize {
-    return @intCast(usize, sf.c.sfSoundBuffer_getSampleRate(self.ptr));
+    return @intCast(usize, sf.c.sfSoundBuffer_getSampleRate(self._ptr));
 }
 
 /// Gets the channel count (2 is stereo for instance)
 pub fn getChannelCount(self: SoundBuffer) usize {
-    return @intCast(usize, sf.c.sfSoundBuffer_getChannelCount(self.ptr));
+    return @intCast(usize, sf.c.sfSoundBuffer_getChannelCount(self._ptr));
 }
 
 // Misc
 
 /// Save the sound buffer to an audio file
 pub fn saveToFile(self: SoundBuffer, path: [:0]const u8) !void {
-    if (sf.c.sfSoundBuffer_saveToFile(self.ptr, path) != 1)
+    if (sf.c.sfSoundBuffer_saveToFile(self._ptr, path) != 1)
         return sf.Error.savingInFileFailed;
 }
 
 /// Pointer to the csfml texture
-ptr: *sf.c.sfSoundBuffer,
+_ptr: *sf.c.sfSoundBuffer,
 
 test "sound buffer: sane getter and setters" {
     const std = @import("std");