diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-29 00:14:27 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-29 00:14:27 +0100 |
| commit | 03747ba93e29d76e664dcc493a21f320117d62d8 (patch) | |
| tree | ca18def718b109554df01ca4a65ec7a0c8ba9b4e /src/PlayerControl.hxx | |
| parent | 095c390df736ebff74a0e2a982ef4a1220dea135 (diff) | |
| download | mpd-03747ba93e29d76e664dcc493a21f320117d62d8.tar.gz mpd-03747ba93e29d76e664dcc493a21f320117d62d8.tar.xz mpd-03747ba93e29d76e664dcc493a21f320117d62d8.zip | |
PlayerControl: move attributes to struct CrossFadeSettings
Diffstat (limited to 'src/PlayerControl.hxx')
| -rw-r--r-- | src/PlayerControl.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/PlayerControl.hxx b/src/PlayerControl.hxx index 97e15b06c..38ba21a53 100644 --- a/src/PlayerControl.hxx +++ b/src/PlayerControl.hxx @@ -25,6 +25,7 @@ #include "thread/Cond.hxx" #include "thread/Thread.hxx" #include "util/Error.hxx" +#include "CrossFade.hxx" #include <stdint.h> @@ -155,9 +156,9 @@ struct PlayerControl { Song *next_song; double seek_where; - float cross_fade_seconds; - float mixramp_db; - float mixramp_delay_seconds; + + CrossFadeSettings cross_fade; + double total_play_time; /** @@ -430,19 +431,19 @@ public: void SetCrossFade(float cross_fade_seconds); float GetCrossFade() const { - return cross_fade_seconds; + return cross_fade.duration; } void SetMixRampDb(float mixramp_db); float GetMixRampDb() const { - return mixramp_db; + return cross_fade.mixramp_db; } void SetMixRampDelay(float mixramp_delay_seconds); float GetMixRampDelay() const { - return mixramp_delay_seconds; + return cross_fade.mixramp_delay; } double GetTotalPlayTime() const { |