From c5c5ed6c184963d6e98ce2204f86602ced72a123 Mon Sep 17 00:00:00 2001
From: cosmonaut <evan@moonside.games>
Date: Sat, 20 Nov 2021 02:00:02 -0800
Subject: [PATCH] some cleanup fixes

---
 .../TheorafileGMS/TheorafileGMS.dll           | Bin 1289216 -> 1289216 bytes
 .../objects/Renderer/CleanUp_0.gml            |   2 +-
 .../TheorafileGMS/objects/Renderer/Draw_0.gml |   2 +-
 .../TheorafileGMS_Scripts.gml                 |   6 +++++-
 src/TheorafileGMS.c                           |   4 +++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gamemaker/TheorafileGMS/extensions/TheorafileGMS/TheorafileGMS.dll b/gamemaker/TheorafileGMS/extensions/TheorafileGMS/TheorafileGMS.dll
index 43179a23387e871dd369b64471a4bea66a460498..3cfe54d1127edf9d92f6c12d3197852d9073db9a 100644
GIT binary patch
delta 5360
zcmeI!|4UV89KiACT+MEGdh%TRvdM6_C}&Q>r86~aveZn()Wzo7^`>RcN;c6JBH?ug
zDk~&2x-D8+KbXz9G%tB2qPZsaWwJJjFc2paLnO*nB+SvCd(Zol|H9x34=<n3^W}5S
zbDneVQ#X`TH<WWCMG0-$oM!*!+^Xr3sY+kD*g0D@E9)0KUsO#>vpT1%UPwE-XK=P^
z%3GhVdLo@3nXa7p+tY8(8_$yCcY4Q7Q4gu~^v~*?^w#tD?=AD>68yES3pM4Y3sKS#
zB+~m^P0E;I+}N@zywzxkRpwnu2Dj1`c;&Kk%=J^}F@s@ot!txmhe2_=8n0=Klo;0!
z*LyVOU~B%JR3+Ngdgo_@Qs+v)Z&Vb!E9du*1EaPThKS8Uic<HjDQ+<C-s|NFG7xv~
z=u2g3+OL^M`=Wju$b7w4DLi`pf&2OcCB0r5Y<!hxxcn+FV3+b&<9ug;EP=8ta?f`L
z4NogGjgK!Zmc=N`5?M^Lyybp;AvkcQ^4vYr9bCCYIntQd8|=>O4S7(wSkC^PDuny}
z2=xQSa4Do!3Ak$i<AB+F|4(rkeXCNrUvIC+Tx`bkSc(Z4gHGl<gH2eYYZv7Nc3~!N
zzz9^)fRiK`!n@doz8lE=QojKk*5GNcb|IVuZlQ|txCVU_hFkRs*JB!5u^emgIG)2U
zyzNou7Y_+cprKGtV8+!Li>a86lU!gW^;&GkOW2L~aY*XPFD3{Go1Qor!!a7SU>1&%
zxSDzsp2aTg#fSI==WJ$geqq|JCw>=WFawLQ46CsLPvceW!(j|8(&vxB1k5V3>kU={
z<yeQOunnDf6CdFeiei1fP>jI!n1-KWQ7-?~U?6*-lqD)D*C(vTlh}^8(Z(Yjb>wX|
zzi00+(1&$k6HcJv3%$L9x^Hi%9n|CbSb`f+#ntE=*SuFB*QRS1w+Ia4Kll<?l;{H@
zF$J^Hh81`OzsK{~g*S1)tK3y11fJm>n)d05!!Z_9FdMD-HP+!tY(ppZ;-E**t{x%q
z6h*0?co|x717>3ZmSQE=VgsJ^wX>o(s1Hi@x0*oES9;<IjK>VLVma2}32eg~IDo_W
z4CgVtjJG<vOi!GQ8EC~aJd90v7Q65k{)xjli9vkvOIeB0J-pR-_vjbk#8X(06<CBh
zn2eFQ3}<*rA7L+c;dy*!XTVObC>3LH1-A2u4Ag7U_gcmCn&w~$`r6m*Vo%{5?e;PL
z8N@z}r(-+zU_U;@F`U6nv|=+Jz-qjz=dp`=5}roi70>eF2;#f73@sRq37CPt@i!RX
zj`esF2fR8SMX8@OTGpwuER`kHZCR%sR}Ja?4(CQK+~a-e+VuW2#h#f%WGPT&$<jnY
zvgS?ZYg1cRt#nutwF*aKlBPK#6SYuBZdhnkYiPhWhb2jSTboQ&>*Qb|l5~xZ?Ma$T
zF**KC(vB@3Hwv+Se@XG7;x!+6I*li)BGK_<vgTOW6z^&Be2tGcZr`N2w{J3U4Okv2
z7jHaH6|tY|kJ;1bu;bzubJ*rU`O|xMqbkaB-!u)$*l4UOdKSb^$SoQBp(;i{ebdk4
zcp;}a*e4HC7TLXN$D1bMSw0!-SkV2jj9KDUk-FfwVnoJz<c$<9=r=B7L-K0Hf`0k(
z@l_|vC49$!(DWZP{Rd6qKWKVBVnX;2n*M{P|DfqVX#UR+nr>UBc{I$Vh(o2j_m+QC
jwa=YmHD6O2Z02rTm@#F^c*kVN%MNkH=+@4LJ=gvNaN8@d

delta 5355
zcmeI!k4uzy9KiACInB(SSI?Q|B%F#hYa%Y)yvm$w)>MY6ljfS;v~JBToSZGhvF@m$
zQW2S>$Hi6)!frOCdFjcJuqLaVR167=Y9b<Ti_J8|nah2jd)`O>3xgBBy!?K?KR(~*
z`~0}Cb1=_2n0Gu~E!}7eY|MPq(fxJo<bw&jubg#FRZoffS=Zz0abd1&vih;m)$s(U
zswcel$?6f|<bz53pZB$XGv0Wv7+>TaH$gqruJzA#jeF~byLXmrxg`EV@;6D6tu9EK
zayLcE!-k>Y#@MK)NJFwb=FTyA<ffQ_CGCOVotK;3trw0M40E5m)7rKe<W6_}MP-4U
z>i(*uOObar6<*7f<J?WxelW-l?oEBcviylV@0T|M6VkSaN*jV?+4*Tm%C9Lm=E7Hs
zK+26n)AHi1E7^y76MpK?o?G!x$)S#0o{n4cri1d;`lkhk^G^!`w#irOXD<YZ5-7?7
z&+LVu`;+oW{oOMQMF|#VktiXeyx_Te#u&Iv{>}5S(`a8L@2xNBF?tGmLT_zf`1@xy
zlXLz3o|mIdugHc|p-oD__l}<{%-#(c!2$GbOT})zy%w{v4o{*LlQ14znD00`(XQ)|
zYy=816IWvd2H^}7kKt|X!B+HLK;{Sf1#Cq-9`ovuq!t357=($q9DNg-OY{j>VmcO~
z4ej^^eu=I4qo&9&^%EGz84TI3CyK%Zv|tvFvA_!I`>_sBVH;k>+d?hBG)!O`1Fd>u
zGsfZTxDoG>xQe<HPhcx{VL#r-39H$gUow2CCtQm0n1RJuidA?3kKsA&#sQqgh*CXI
z5^gMY=z$^vHmt#;*o-ZB32)*bIE}$&`n(ai64Nmci}U%%j<am3l`YEOt50OZ19$@4
za4Wa2UoCjc{F38xu|DiubmB11U^)7p?esnRxLhp3)fj|P=o?qJQy<r?>ySDL^x;Ds
zN0Ut-5RIvrg<G*4_u)Z2iLH1Ed%cRM>JEWXoIt}zdSWvsU@B%|5$?hoJdDlQf?e3B
zsXf(q2#nw~8h7anh{V;Hh52a33fzwe@UX9)9c`!HC)D3+0?#nwV?A*qW?&K8(2fn*
zjP2Nq12~FL&|J=29apX=T!R@{gr!)CPCS9F*ooJ10LSndTG@%g9lX^&JM;y#;8Co_
zaxBKpxCW!qh>v(lZ(<j=;z=BJFyI|lWWjhe;c0Ho4E^^L_q|q$@9P(^8B5UDzI>bB
zZo~=N9ryUB54$muj;HY=UdDdBhmSB5>#zuSU=^Oz^Ejkh5*|a}ivQxn@eGZ8zalXX
zlh8M=o&KlsF!o|C>iyNx1k<|4<ly?4RVGmui?YNMvr0K?GEBMEwlpP5vro8U%H3S1
z4GI;dSQaH$k&4$T-g$g&rpDN1YK%pxG7ecxPSHsk7pk!qC0xx9TaqA-hHtAeYn4d#
zxJ6OaoVAKu4p9GHs~ia*3YMg#-L|rQW$~|RbBYP1O!b>}iaNh3Rcq3|#m@Si^@=BF
zz4@(x@My7hV<{#n`91w6Ykex!vl-^F4YOjqucw)$^8Dvbx5Y2VP_jwtnip#j4`lMI
zCTZy1=lvqp$6|^--QqYEBf2+idEPXw9kE2rHLrW6*w~m<lVq9qOL0fUE{Y2&o!4(j
z#0JG`rFs1_#7(TRh~0b9f6VkBGyTU*$$!k$K4OyOKW6%mnf_y@|CsqdKW2I=v(1BH
lp28Ayn=H<NOY5xWPHR|j`l2D%m}}fM?UFposj$D5{{RdFJ97X4

diff --git a/gamemaker/TheorafileGMS/objects/Renderer/CleanUp_0.gml b/gamemaker/TheorafileGMS/objects/Renderer/CleanUp_0.gml
index ce920f6..48ee872 100644
--- a/gamemaker/TheorafileGMS/objects/Renderer/CleanUp_0.gml
+++ b/gamemaker/TheorafileGMS/objects/Renderer/CleanUp_0.gml
@@ -1 +1 @@
-Theorafile_Close(video);
\ No newline at end of file
+Theorafile_Close(video);
diff --git a/gamemaker/TheorafileGMS/objects/Renderer/Draw_0.gml b/gamemaker/TheorafileGMS/objects/Renderer/Draw_0.gml
index 1487f70..374814e 100644
--- a/gamemaker/TheorafileGMS/objects/Renderer/Draw_0.gml
+++ b/gamemaker/TheorafileGMS/objects/Renderer/Draw_0.gml
@@ -1,3 +1,3 @@
 Theorafile_UpdateSurface(video);
 
-draw_surface_stretched(video.videoSurface, 0, 0, surface_get_width(application_surface), surface_get_height(application_surface));
\ No newline at end of file
+draw_surface_stretched(video.videoSurface, 0, 0, surface_get_width(application_surface), surface_get_height(application_surface));
diff --git a/gamemaker/TheorafileGMS/scripts/TheorafileGMS_Scripts/TheorafileGMS_Scripts.gml b/gamemaker/TheorafileGMS/scripts/TheorafileGMS_Scripts/TheorafileGMS_Scripts.gml
index 247dd36..df9aeaa 100644
--- a/gamemaker/TheorafileGMS/scripts/TheorafileGMS_Scripts/TheorafileGMS_Scripts.gml
+++ b/gamemaker/TheorafileGMS/scripts/TheorafileGMS_Scripts/TheorafileGMS_Scripts.gml
@@ -57,7 +57,11 @@ function Theorafile_Open(filename)
 
 function Theorafile_Close(video)
 {
-	buffer_delete(video.yuvBuffer);
+	surface_free(video.ySurface);
+	surface_free(video.uSurface);
+	surface_free(video.vSurface);
+	surface_free(video.videoSurface);
+	//buffer_delete(video.yuvBuffer);
 	vertex_format_delete(video.triangle_buffer_format);
 	vertex_delete_buffer(video.triangle_buffer);
 	TheorafileGMS_Close(video.handle);
diff --git a/src/TheorafileGMS.c b/src/TheorafileGMS.c
index 0d5c339..4f5b1ca 100644
--- a/src/TheorafileGMS.c
+++ b/src/TheorafileGMS.c
@@ -67,7 +67,9 @@ char* TheorafileGMS_Open(char* filename)
 
 void TheorafileGMS_Close(char* filePointer)
 {
-	SDL_free(filePointer);
+	OggTheora_File* file = (OggTheora_File*)filePointer;
+	tf_close(file);
+	/* SDL_free(file); */ /* FIXME: why the hell is this crashing game maker */
 }
 
 double TheorafileGMS_HasVideo(char* filePointer)