diff --git a/data/nian_gooz.wav b/data/nian_gooz.wav new file mode 100644 index 0000000..830d3c8 Binary files /dev/null and b/data/nian_gooz.wav differ diff --git a/main.py b/main.py index 6334911..78f29f8 100755 --- a/main.py +++ b/main.py @@ -5,6 +5,7 @@ import pyxhook from term_utils import Term from command_helper import CommandHelper from trick import Trick +from tricks.anim_ascii import AnimAsciiTrick class AnonymousGoose: @@ -53,6 +54,7 @@ class AnonymousGoose: if __name__ == "__main__": + AnimAsciiTrick().run() goose = AnonymousGoose() goose.run() goose.stop() diff --git a/trick.py b/trick.py index 0f7e2ac..4e20356 100644 --- a/trick.py +++ b/trick.py @@ -36,7 +36,7 @@ class Trick(ABC): tricks = [ LaughingGooseTrick, GlorifyGooseTrick, - #AnimAsciiTrick, + AnimAsciiTrick, ReflectionTrick ] diff --git a/tricks/anim_ascii.py b/tricks/anim_ascii.py index ce33241..e4f41dc 100644 --- a/tricks/anim_ascii.py +++ b/tricks/anim_ascii.py @@ -1,9 +1,21 @@ from trick import Trick from nian_cat import nian from term_utils import Term -from playsound import playsound +import simpleaudio as sa import time -import asyncio +import threading + + +def print_anim(terminal): + is_open = True + musicobj = sa.WaveObject.from_wave_file("data/nian_gooz.wav") + playobj = musicobj.play() + terminal.print("ouioui") + while is_open: + for frame in nian: + is_open = terminal.print(frame) + time.sleep(.2) + playobj.stop() class AnimAsciiTrick(Trick): @@ -24,8 +36,6 @@ class AnimAsciiTrick(Trick): def run(self): term = Term() - playsound('data/nian_gooz.mp3', False) - while True: - for frame in nian: - term.print(frame) - time.sleep(.2) + thread_anim = threading.Thread(target=print_anim, args=[term]) + thread_anim.start() +