From f46c764dc09c710867580f3ca3906a2af83dc886 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Sat, 2 Nov 2019 22:54:21 -0400
Subject: add tspin audio

---
 frontends/gl/config.h   | 1 -
 frontends/gl/drawable.c | 1 -
 frontends/gl/skin.c     | 3 +++
 frontends/gl/skin.h     | 3 +++
 ini                     | 2 +-
 test/line_count.sh      | 3 ++-
 6 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 frontends/gl/config.h

diff --git a/frontends/gl/config.h b/frontends/gl/config.h
deleted file mode 100644
index 8b13789..0000000
--- a/frontends/gl/config.h
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/frontends/gl/drawable.c b/frontends/gl/drawable.c
index 38502d2..e3d959c 100644
--- a/frontends/gl/drawable.c
+++ b/frontends/gl/drawable.c
@@ -29,7 +29,6 @@ bool load_image(char* file_name, drawable_t *drawable) {
 
   glGenerateMipmap(GL_TEXTURE_2D);
 
-  //glBindTexture(GL_TEXTURE_2D, 0);
   stbi_image_free(data);
   
   drawable->w = w;
diff --git a/frontends/gl/skin.c b/frontends/gl/skin.c
index 5975aec..7dad4ee 100644
--- a/frontends/gl/skin.c
+++ b/frontends/gl/skin.c
@@ -52,6 +52,9 @@ void load_skin(char* name, cetris_skin_t* skin) {
   load_multiple_audio("erase", dir_name, 
       &skin->clear_sound_count, &skin->clear_sound);
 
+  load_multiple_audio("tspin", dir_name, 
+      &skin->clear_sound_count, &skin->clear_sound);
+
   load_multiple_audio("combo", dir_name, 
       &skin->combo_sound_count, &skin->combo_sound);
 
diff --git a/frontends/gl/skin.h b/frontends/gl/skin.h
index 8cb8f7e..a423d22 100644
--- a/frontends/gl/skin.h
+++ b/frontends/gl/skin.h
@@ -22,6 +22,9 @@ typedef struct {
   Mix_Chunk **tetris_sound;
   int tetris_sound_count;
 
+  Mix_Chunk **tspin_sound;
+  int tspin_sound_count;
+
   Mix_Chunk *lock_sound;
   Mix_Chunk *move_sound;
 } cetris_skin_t;
diff --git a/ini b/ini
index 3401f2e..9b15f72 160000
--- a/ini
+++ b/ini
@@ -1 +1 @@
-Subproject commit 3401f2ed3153c6093c2f434e205cf6e7775a02d5
+Subproject commit 9b15f721fd53b1beb8364f8763e2207963ac4fd6
diff --git a/test/line_count.sh b/test/line_count.sh
index 4d72d46..6cdde39 100755
--- a/test/line_count.sh
+++ b/test/line_count.sh
@@ -2,4 +2,5 @@
 wc frontends/curses/curses_ui.c frontends/curses/meson.build \
   frontends/sdl/cetris_sdl.c frontends/sdl/cetris_sdl.h frontends/gl/drawable.c frontends/gl/drawable.h \
   frontends/gl/skin.c frontends/gl/skin.h frontends/gl/main.c frontends/gl/shader.c frontends/gl/shader.h \
-  frontends/gl/ui.c frontends/gl/ui.h frontends/gl/meson.build lib/*
+  frontends/gl/ui.c frontends/gl/ui.h frontends/gl/audio.c frontends/gl/audio.c frontends/gl/events.c \
+  frontends/gl/events.h frontends/gl/meson.build lib/*
-- 
cgit v1.2.3-101-g0448