diff options
| author | Crystalwarrior <varsash@gmail.com> | 2021-01-10 14:27:27 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2021-01-10 14:27:27 +0300 |
| commit | 1ad8f3bf24a4e0a3dcbd0d172c9bfa1641907d7d (patch) | |
| tree | 2f4345fcc09eafa846cf5552e19e3443bdc07744 /include/aoblipplayer.h | |
| parent | de3533fbf2615a40efc60c9ed2e96f1a3b5da3c1 (diff) | |
| parent | e65072f8f1e885f7bbade9e9d84fbeea2ef8a097 (diff) | |
Merge branch 'master' into feature/timerclock
# Conflicts:
# include/courtroom.h
# src/courtroom.cpp
Diffstat (limited to 'include/aoblipplayer.h')
| -rw-r--r-- | include/aoblipplayer.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 4d3b5f14..a11e29db 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -22,12 +22,9 @@ public: int m_cycle = 0; private: - const int max_blip_ms = 60; - QWidget *m_parent; AOApplication *ao_app; qreal m_volume; - QElapsedTimer delay; void set_volume_internal(qreal p_volume); |