From dee8b948b0b0c3d2ea7f30c026428712f9a61998 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Thu, 24 Dec 2015 12:51:04 -0500 Subject: [PATCH] gui/gst: Remove gst :: toggle() Signed-off-by: Anna Schumaker --- gui/gst.cpp | 8 -------- gui/window.cpp | 5 ++++- include/gui/ocarina.h | 1 - 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gui/gst.cpp b/gui/gst.cpp index 01238d65..b35bc6a3 100644 --- a/gui/gst.cpp +++ b/gui/gst.cpp @@ -111,14 +111,6 @@ static bool on_timeout() return true; } -void gst :: toggle() -{ - if (audio_cur_state() == GST_STATE_PLAYING) - audio_pause(); - else - audio_play(); -} - void gst :: init_pre() { o_seek = GTK_SCALE(gui_builder_widget("o_seek")); diff --git a/gui/window.cpp b/gui/window.cpp index 937e5c59..ee13788b 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -55,7 +55,10 @@ static bool on_window_key_released(GdkEventKey *event) if (key != "space") return false; - gst :: toggle(); + if (audio_cur_state() == GST_STATE_PLAYING) + audio_pause(); + else + audio_play(); return true; } diff --git a/include/gui/ocarina.h b/include/gui/ocarina.h index aea5d765..bba23d7e 100644 --- a/include/gui/ocarina.h +++ b/include/gui/ocarina.h @@ -27,7 +27,6 @@ void post_init_queue_tabs(); /* gst.cpp */ namespace gst { - void toggle(); void init_pre(); void init(); }