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/dabInputRawFifo.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/dabInputRawFifo.cpp')
-rw-r--r-- | src/dabInputRawFifo.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dabInputRawFifo.cpp b/src/dabInputRawFifo.cpp index 0da9727..cc6268b 100644 --- a/src/dabInputRawFifo.cpp +++ b/src/dabInputRawFifo.cpp @@ -40,8 +40,8 @@ struct dabInputOperations dabInputRawFifoOperations = { dabInputRawFifoOpen, dabInputRawFifoSetbuf, dabInputRawFifoRead, - NULL, - NULL, + nullptr, + nullptr, dabInputRawFifoReadFrame, dabInputSetbitrate, dabInputRawFifoClose, @@ -54,7 +54,7 @@ int dabInputRawFifoInit(void** args) { dabInputRawFifoData* data = new dabInputRawFifoData; data->file = -1; - data->buffer = NULL; + data->buffer = nullptr; data->bufferSize = 0; data->bufferOffset = 0; @@ -97,7 +97,7 @@ int dabInputRawFifoSetbuf(void* args, int size) } if (data->bufferSize != (size_t)size) { - if (data->buffer != NULL) { + if (data->buffer != nullptr) { delete[] data->buffer; } data->buffer = new uint8_t[size]; @@ -174,7 +174,7 @@ int dabInputRawFifoClose(void* args) int dabInputRawFifoClean(void** args) { dabInputRawFifoData* data = (dabInputRawFifoData*)*args; - if (data->buffer != NULL) { + if (data->buffer != nullptr) { delete[] data->buffer; } delete data; |