diff options
| author | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
| commit | ef48eca9cac875f65622daf500bd702e20d666f3 (patch) | |
| tree | 52fe455c347fd0f0ab14b471e2482c17c8aed5e6 /src/decoder/FlacInput.hxx | |
| parent | 906d2fbadf075b7d8e3a5be7134a9bebb09b7285 (diff) | |
| parent | e9e55b08127dc45b4c6045e1f42e34115086a521 (diff) | |
| download | mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.gz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.xz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.zip | |
Merge branch 'master' of git://git.musicpd.org/dk/mpd
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/FlacInput.hxx (renamed from src/decoder/FLACInput.hxx) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoder/FLACInput.hxx b/src/decoder/FlacInput.hxx index 7661567d1..8fc69f960 100644 --- a/src/decoder/FLACInput.hxx +++ b/src/decoder/FlacInput.hxx @@ -26,13 +26,13 @@ * This class wraps an #input_stream in libFLAC stream decoder * callbacks. */ -class FLACInput { +class FlacInput { struct decoder *decoder; struct input_stream *input_stream; public: - FLACInput(struct input_stream *_input_stream, + FlacInput(struct input_stream *_input_stream, struct decoder *_decoder=nullptr) :decoder(_decoder), input_stream(_input_stream) {} |