diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
| commit | e55b0d8a97d0be6be188d5d13f675da935c039ef (patch) | |
| tree | ce9d7834fc75cd1c072bceff614ef3b1eb39052c /src/libaudcore/timer.cc | |
| parent | df5213d83c2bf1abd97568cef5a1a763bc425926 (diff) | |
| parent | 66d524c01720835a30716cb6861606f95629faea (diff) | |
fix conflict
Diffstat (limited to 'src/libaudcore/timer.cc')
| -rw-r--r-- | src/libaudcore/timer.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libaudcore/timer.cc b/src/libaudcore/timer.cc index 173eb9a..4de6abf 100644 --- a/src/libaudcore/timer.cc +++ b/src/libaudcore/timer.cc @@ -35,13 +35,10 @@ struct TimerItem { struct TimerList { - QueuedFunc & source; + QueuedFunc source; Index<TimerItem> items; int use_count = 0; - TimerList (QueuedFunc & source) : - source (source) {} - bool contains (TimerFunc func, void * data) const { for (auto & item : items) @@ -69,10 +66,7 @@ struct TimerList }; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; - -// QueuedFunc cannot be used in aud::array due to lack of a move constructor -static QueuedFunc qf_1Hz, qf_4Hz, qf_10Hz, qf_30Hz; -static aud::array<TimerRate, TimerList> lists {qf_1Hz, qf_4Hz, qf_10Hz, qf_30Hz}; +static aud::array<TimerRate, TimerList> lists; static void timer_run (void * list_) { |