summaryrefslogtreecommitdiffstats
path: root/src/dabInputDabplusFile.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-29 22:09:31 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-29 22:09:31 +0200
commit5132756f09c7a0dafe4644db92718ee3d1a58d6c (patch)
tree094343cedcd9fe8bacb3380e98d96e952b7115ea /src/dabInputDabplusFile.cpp
parent5c3c6d734ff0c57fd3d45746df23b96e0e7fc99e (diff)
parente7ad2e1fab9c51189fdc8b4f2d81f625da9dd422 (diff)
downloaddabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.gz
dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.bz2
dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.zip
Merge branch 'next' into servicelinking
Diffstat (limited to 'src/dabInputDabplusFile.cpp')
-rw-r--r--src/dabInputDabplusFile.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dabInputDabplusFile.cpp b/src/dabInputDabplusFile.cpp
index 396a376..64b7f07 100644
--- a/src/dabInputDabplusFile.cpp
+++ b/src/dabInputDabplusFile.cpp
@@ -40,8 +40,8 @@ struct dabInputOperations dabInputDabplusFileOperations = {
dabInputDabplusFileOpen,
dabInputSetbuf,
dabInputDabplusFileRead,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
dabInputDabplusFileReadFrame,
dabInputSetbitrate,
dabInputDabplusFileClose,
@@ -54,7 +54,7 @@ int dabInputDabplusFileInit(void** args)
{
dabInputDabplusFileData* data = new dabInputDabplusFileData;
data->file = -1;
- data->buffer = NULL;
+ data->buffer = nullptr;
data->bufferSize = 0;
data->bufferIndex = 0;
@@ -80,7 +80,7 @@ int dabInputDabplusFileRead(void* args, void* buffer, int size)
{
dabInputDabplusFileData* data = (dabInputDabplusFileData*)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];
@@ -158,7 +158,7 @@ int dabInputDabplusFileClose(void* args)
int dabInputDabplusFileClean(void** args)
{
dabInputDabplusFileData* data = (dabInputDabplusFileData*)*args;
- if (data->buffer != NULL) {
+ if (data->buffer != nullptr) {
delete[] data->buffer;
}
delete data;