From: rexim <reximkut@gmail.com>
Date: Thu, 29 Mar 2018 20:34:47 +0000 (+0700)
Subject: (#132) remove dead sound_sample entity
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;ds=sidebyside;h=7a25c9e73265d3f48fc4d63d9762c7b3200758f4;p=nothing.git

(#132) remove dead sound_sample entity
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddd34784..0d6ef057 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,6 @@ set(SOURCE_FILES
   src/lava.c
   src/wavy_rect.c
   src/sound_medium.c
-  src/sound_sample.c
   src/path.c
 )
 
@@ -62,7 +61,6 @@ set(HEADER_FILES
   src/lava.h
   src/wavy_rect.h
   src/sound_medium.h
-  src/sound_sample.h
   src/path.h
 )
 
diff --git a/src/main.c b/src/main.c
index 84d27208..0d6ba900 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,6 @@
 #include "./lt.h"
 #include "./path.h"
 #include "./point.h"
-#include "./sound_sample.h"
 #include "./sound_medium.h"
 
 #define SCREEN_WIDTH 800
diff --git a/src/sound_sample.c b/src/sound_sample.c
deleted file mode 100644
index 5e44deba..00000000
--- a/src/sound_sample.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
-
-#include "./lt.h"
-#include "./sound_sample.h"
-#include "./error.h"
-
-struct sound_sample_t
-{
-    lt_t *lt;
-    Mix_Chunk *chunk;
-};
-
-sound_sample_t *create_sound_sample_from_file(const char *filepath)
-{
-    assert(filepath);
-
-    lt_t *lt = create_lt();
-    if (lt == NULL) {
-        return NULL;
-    }
-
-    sound_sample_t *sound_sample = PUSH_LT(lt, malloc(sizeof(sound_sample_t)), free);
-    if (sound_sample == NULL) {
-        throw_error(ERROR_TYPE_LIBC);
-        RETURN_LT(lt, NULL);
-    }
-
-    sound_sample->chunk = PUSH_LT(lt, Mix_LoadWAV(filepath), Mix_FreeChunk);
-    if (sound_sample->chunk == NULL) {
-        throw_error(ERROR_TYPE_SDL2_MIXER);
-        RETURN_LT(lt, NULL);
-    }
-
-    sound_sample->lt = lt;
-
-    return sound_sample;
-}
-
-void destroy_sound_sample(sound_sample_t *sound_sample)
-{
-    assert(sound_sample);
-    RETURN_LT0(sound_sample->lt);
-}
-
-int sound_sample_play(sound_sample_t *sound_sample, int channel)
-{
-    assert(sound_sample);
-    return Mix_PlayChannel(channel, sound_sample->chunk, 1);
-}
diff --git a/src/sound_sample.h b/src/sound_sample.h
deleted file mode 100644
index 839b462b..00000000
--- a/src/sound_sample.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef SOUND_SAMPLE_H_
-#define SOUND_SAMPLE_H_
-
-typedef struct sound_sample_t sound_sample_t;
-
-sound_sample_t *create_sound_sample_from_file(const char *filepath);
-void destroy_sound_sample(sound_sample_t *sound_sample);
-int sound_sample_play(sound_sample_t *sound_sample, int channel);
-
-#endif  // SOUND_SAMPLE_H_