From 5c2bd9231deb7030fdf34a817c41d127b0f0d44e Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Wed, 10 Sep 2014 08:24:34 -0400 Subject: [PATCH] core: Remove on_play() callback It has no users anymore. Signed-off-by: Anna Schumaker --- core/audio.cpp | 6 ++---- core/callback.cpp | 2 -- include/core/callback.h | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/audio.cpp b/core/audio.cpp index 87344a4d..9c45ab4a 100644 --- a/core/audio.cpp +++ b/core/audio.cpp @@ -91,10 +91,8 @@ void audio :: play() void audio :: pause() { - if (!cur_track) - return; - if (driver :: get_driver()->pause()) - get_callbacks()->on_pause(); + if (cur_track) + driver :: get_driver()->pause(); } void audio :: seek_to(long pos) diff --git a/core/callback.cpp b/core/callback.cpp index fdd01e6c..0c210f0c 100644 --- a/core/callback.cpp +++ b/core/callback.cpp @@ -4,7 +4,6 @@ #include -static void no_op() {} static void no_op(bool, unsigned int) {} static void no_op(Queue *, unsigned int) {} static void no_op(Queue *) {} @@ -12,7 +11,6 @@ static void no_op(Track *) {} static struct Callbacks callbacks = { - .on_pause = no_op, .on_track_loaded = no_op, .on_pause_count_changed = no_op, diff --git a/include/core/callback.h b/include/core/callback.h index 96668c78..d8f84df1 100644 --- a/include/core/callback.h +++ b/include/core/callback.h @@ -10,7 +10,6 @@ struct Callbacks { /* Audio callbacks */ - void (*on_pause)(); void (*on_track_loaded)(Track *); void (*on_pause_count_changed)(bool, unsigned int);