diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
| commit | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (patch) | |
| tree | 094343cedcd9fe8bacb3380e98d96e952b7115ea /src/dabInputDabplusFifo.cpp | |
| parent | 5c3c6d734ff0c57fd3d45746df23b96e0e7fc99e (diff) | |
| parent | e7ad2e1fab9c51189fdc8b4f2d81f625da9dd422 (diff) | |
| download | dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.gz dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.bz2 dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.zip | |
Merge branch 'next' into servicelinking
Diffstat (limited to 'src/dabInputDabplusFifo.cpp')
| -rw-r--r-- | src/dabInputDabplusFifo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dabInputDabplusFifo.cpp b/src/dabInputDabplusFifo.cpp index 81f373b..94aec13 100644 --- a/src/dabInputDabplusFifo.cpp +++ b/src/dabInputDabplusFifo.cpp @@ -68,7 +68,7 @@ int dabInputDabplusFifoInit(void** args) dabInputDabplusFifoData* data = new dabInputDabplusFifoData; dabInputFifoInit(&data->fifoData); - data->buffer = NULL; + data->buffer = nullptr; data->bufferSize = 0; data->bufferIndex = 0; data->bufferOffset = 0; @@ -100,7 +100,7 @@ int dabInputDabplusFifoRead(void* args, void* buffer, int size) dabInputDabplusFifoData* data = (dabInputDabplusFifoData*)args; if (data->bufferSize != (size_t)size * 5) { - if (data->buffer != NULL) { + if (data->buffer != nullptr) { delete[] data->buffer; } data->buffer = new uint8_t[size * 5]; |