diff --git a/core/callback.cpp b/core/callback.cpp index 16d43e3c..dca3094e 100644 --- a/core/callback.cpp +++ b/core/callback.cpp @@ -22,7 +22,6 @@ static struct Callbacks callbacks = { .on_queue_track_add = no_op, .on_queue_track_del = no_op, .on_queue_track_changed = no_op, - .on_queue_changed = no_op, }; diff --git a/core/queue.cpp b/core/queue.cpp index 67a8aeff..cd3bfe68 100644 --- a/core/queue.cpp +++ b/core/queue.cpp @@ -109,8 +109,6 @@ unsigned int Queue :: _add_at(Track *track, unsigned int pos) _tracks.insert(_tracks.begin() + pos, track); _length += track->length; get_callbacks()->on_queue_track_add(this, pos); - if (!(_flags & Q_DISABLE_CHANGED_SIZE)) - get_callbacks()->on_queue_changed(); return pos; } @@ -119,8 +117,6 @@ void Queue :: _del_at(Track *track, unsigned int pos) _tracks.erase(_tracks.begin() + pos); _length -= track->length; get_callbacks()->on_queue_track_del(this, pos); - if (!(_flags & Q_DISABLE_CHANGED_SIZE)) - get_callbacks()->on_queue_changed(); } unsigned int Queue :: add(Track *track) @@ -244,7 +240,6 @@ void Queue :: sort(sort_t field, bool reset) for (unsigned int i = 0; i < _tracks.size(); i++) get_callbacks()->on_queue_track_changed(this, i); - get_callbacks()->on_queue_changed(); } Track *Queue :: operator[](unsigned int i) diff --git a/include/core/callback.h b/include/core/callback.h index 37f709fc..55aa03fb 100644 --- a/include/core/callback.h +++ b/include/core/callback.h @@ -22,7 +22,6 @@ struct Callbacks { void (*on_queue_track_add)(Queue *, unsigned int); void (*on_queue_track_del)(Queue *, unsigned int); void (*on_queue_track_changed)(Queue *, unsigned int); - void (*on_queue_changed)(); }; diff --git a/include/core/queue.h b/include/core/queue.h index d1c2807a..4fda3f9f 100644 --- a/include/core/queue.h +++ b/include/core/queue.h @@ -15,10 +15,9 @@ enum queue_flags { Q_RANDOM = (1 << 1), Q_REPEAT = (1 << 2), Q_NO_SORT = (1 << 3), - Q_DISABLE_CHANGED_SIZE = (1 << 31), }; -static const unsigned int Q_FLAG_MASK = Q_ENABLED | Q_RANDOM | Q_REPEAT | Q_NO_SORT | Q_DISABLE_CHANGED_SIZE; +static const unsigned int Q_FLAG_MASK = Q_ENABLED | Q_RANDOM | Q_REPEAT | Q_NO_SORT; struct sort_info { sort_t field;