Bugfix for SDL2 + clean

sdl.asm

@@ -8,9 +8,6 @@ Extern SDL_PauseAudio
 Extern SDL_WaitEvent
 Extern SDL_GetError
 
-;Extern SDL_QUIT
-;Extern SDL_AUDIODEVICEADDED
-
 %ifdef SDL1
 	%define SDL_QUIT 0x0C
 %endif
@@ -18,9 +15,14 @@ Extern SDL_GetError
 	%define SDL_QUIT 0x100
 	%define SDL_AUDIODEVICEADDED 0x1100
 %endif
+%ifdef MIX_AUDIO
+	Extern SDL_MixAudio
+	%define SDL_MAX_VOLUME 128
+%endif
 
 %define SDL_SWSURFACE 0
 
+
 %define AUDIO_U8        0x0008  ; Unsigned 8-bit samples 
 %define AUDIO_S8        0x8008  ; Signed 8-bit samples 
 %define AUDIO_U16LSB    0x0010  ; Unsigned 16-bit samples 

yaglitch.asm

@@ -92,8 +92,13 @@ section .bss
 	%ifdef SDL1
 		event: resb 24
 	%endif
-	%ifdef SDL 2
+	%ifdef SDL2
 		event: resb 56
+		evt_cnt: resb 1
+	%endif
+	%ifdef MIX_AUDIO
+		cllbck_heap: resq 1
+		cllbck_heapsz: resw 1
 	%endif
 
 section .text
@@ -358,11 +363,19 @@ dbginit:
 	;xor rcx, rcx
 	;call SDL_SetVideoMode
 
-%ifdef SDL1
 	audio_start:
 		;start audio
 		xor rdi, rdi
 		call SDL_PauseAudio
+%ifdef MIX_AUDIO
+	; init callback heap infos
+	mov rax, 0xc ; brk
+	xor rdi, rdi ; get heap start addr
+	mov [cllbck_heapsz], rdi
+	syscall
+	cmp rax, -1
+	je exit_fatal
+	mov [cllbck_heap], rax
 %endif
 
 loop_event:
@@ -387,21 +400,12 @@ loop_event:
 %endif
 %ifdef SDL2
 		mov edi, [event]
-		cmp edi, SDL_AUDIODEVICEADDED
-		je sdl2_audiostart
 		cmp edi, SDL_QUIT
 		je exit
 %endif
 
 	jmp loop_event
 
-%ifdef SDL2
-	sdl2_audiostart:
-		xor rdi, rdi
-		call SDL_PauseAudio
-		jmp loop_event
-%endif
-
 sdl_error:
 	; display error & exit
 	call SDL_GetError
@@ -415,6 +419,10 @@ sdl_error:
 	mov rdi, 0xF
 	jmp exit.exit_err
 
+exit_fatal:
+	mov rdi, 42
+	jmp exit.exit_err
+
 exit:
 	call SDL_Quit
 
@@ -604,23 +612,78 @@ print_hnum:
 		add al, "A" - 10
 		ret
 
+%ifndef MIX_AUDIO
+; simplest/shortes audio_callback : copy byte returned by run_glitch in *stream
 audio_cllbck:
 	; rdi -> *userdata
 	; rsi -> *stream
 	; rdx -> stream_len
-	mov rcx, rdx
-	mov rdi, rsi
-	.loop:
-		push rcx
+	%ifdef SDL2
+		push rbx ; strange, but nescessary...
+	%endif
+		mov rcx, rdx
+		mov rdi, rsi
+		.loop:
+			push rcx
+			push rdi
+			call run_glitch
+			pop rdi
+			stosb
+			pop rcx
+			inc dword [t]
+			loop .loop
+	%ifdef SDL2
+		pop rbx ; if rbx change SDL2 segfault :/
+	%endif
+		ret
+%endif
+%ifdef MIX_AUDIO
+; another version of the audio callback using heap to store the data
+; and SDL_MixAudio to copy data in *stream
+audio_cllbck:
+	; rdi -> *userdata
+	; rsi -> *stream
+	; rdx -> stream_len
+	push rbx
+	mov rcx, [cllbck_heapsz]
+	cmp rcx, rdx
+	jle .heap_brk
+	.continue:
+		mov rdi, [cllbck_heap]
+		push rdx ; len
 		push rdi
-		call run_glitch
+		push rsi ; *stream, dst
+		mov rcx, rdx
+		.pop_loop: ; populating heap with glitch datas
+			push rcx
+			push rdi
+			call run_glitch
+			pop rdi
+			stosb
+			pop rcx
+			inc dword [t]
+			loop .pop_loop
+		pop rdi ; *stream
+		pop rsi ; heap_start
+		pop rdx ; len
+		mov rcx, SDL_MAX_VOLUME
+		pop rbx
+		ret
+	.heap_brk: ; resize heap to handle 
+		push rdi
+		push rsi
+		push rdx
+		mov rdi, [cllbck_heap]
+		add rdi, rdx
+		sub rdi, rcx
+		mov rax, 0xc ; brk
+		syscall
+		mov [cllbck_heap], rax
+		pop rdx
+		pop rsi
 		pop rdi
-		stosb
-		pop rcx
-		inc dword [t]
-		loop .loop
-dbg0:
-	ret
+		jmp .continue
+%endif
 
 run_glitch:
 	; Run the glitch_pgm