From acac35087962eda02bbde64a4b874bb4dbf38db1 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Sat, 20 Dec 2014 15:34:18 -0500 Subject: [PATCH] audio: Remove on_pause_count_changed callback The UI should handle this directly on end-of-stream messages. Signed-off-by: Anna Schumaker --- core/audio.cpp | 3 --- core/callback.cpp | 3 --- include/core/callback.h | 11 ----------- 3 files changed, 17 deletions(-) diff --git a/core/audio.cpp b/core/audio.cpp index b4e559bf..5df71434 100644 --- a/core/audio.cpp +++ b/core/audio.cpp @@ -3,7 +3,6 @@ * Copyright 2013 (c) Anna Schumaker. */ #include -#include #include #include @@ -80,7 +79,6 @@ static bool continue_playback() _pause_enabled = false; } else _pause_count--; - get_callbacks()->on_pause_count_changed(_pause_enabled, _pause_count); } return ret; @@ -181,7 +179,6 @@ void audio :: pause_after(bool enabled, unsigned int n) _pause_enabled = enabled; _pause_count = n; - get_callbacks()->on_pause_count_changed(enabled, n); } bool audio :: pause_enabled() diff --git a/core/callback.cpp b/core/callback.cpp index 956457ec..27071ced 100644 --- a/core/callback.cpp +++ b/core/callback.cpp @@ -5,14 +5,11 @@ #include -static void no_op(bool, unsigned int) {} static void no_op(Queue *, unsigned int) {} static void no_op(Queue *) {} static struct Callbacks callbacks = { - .on_pause_count_changed = no_op, - .on_pq_removed = no_op, .on_queue_track_add = no_op, diff --git a/include/core/callback.h b/include/core/callback.h index 270bd40d..98d4a0ba 100644 --- a/include/core/callback.h +++ b/include/core/callback.h @@ -13,17 +13,6 @@ * A structure for managing callback function pointers */ struct Callbacks { - /* Audio callbacks */ - - /** - * Called when the audio layer's pause count changes. - * - * @param enabled The current status of automatic pausing. - * @param n The number of tracks before pausing. - */ - void (*on_pause_count_changed)(bool, unsigned int); - - /* Deck callbacks */ /**