summaryrefslogtreecommitdiffstats
path: root/src/dabInputPacketFile.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/dabInputPacketFile.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/dabInputPacketFile.cpp')
-rw-r--r--src/dabInputPacketFile.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dabInputPacketFile.cpp b/src/dabInputPacketFile.cpp
index 3ff4e56..867d9fc 100644
--- a/src/dabInputPacketFile.cpp
+++ b/src/dabInputPacketFile.cpp
@@ -59,8 +59,8 @@ struct dabInputOperations dabInputPacketFileOperations = {
dabInputFileOpen,
dabInputSetbuf,
dabInputFileRead,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
dabInputPacketFileRead,
dabInputSetbitrate,
dabInputFileClose,
@@ -114,7 +114,7 @@ int dabInputPacketFileRead(dabInputOperations* ops, void* args, void* buffer,
dataBuffer[22] = 0x60;
dataBuffer[23] = 0x4b;
length = 24;
- } else if (data->enhancedPacketData != NULL) {
+ } else if (data->enhancedPacketData != nullptr) {
if (data->enhancedPacketLength + data->packetLength
> (12 * 188)) {
memset(dataBuffer, 0, 22);
@@ -131,7 +131,7 @@ int dabInputPacketFileRead(dabInputOperations* ops, void* args, void* buffer,
length = data->packetLength;
data->packetLength = 0;
}
- if (data->enhancedPacketData != NULL) {
+ if (data->enhancedPacketData != nullptr) {
indexCol = data->enhancedPacketLength / 12;
indexRow = data->enhancedPacketLength % 12; // TODO Check if always 0
for (int j = 0; j < length; ++j) {
@@ -179,7 +179,7 @@ int dabInputPacketFileRead(dabInputOperations* ops, void* args, void* buffer,
data->packetLength = length;
continue;
}
- if (data->enhancedPacketData != NULL) {
+ if (data->enhancedPacketData != nullptr) {
if (data->enhancedPacketLength + length > (12 * 188)) {
memcpy(data->packetData, header, 3);
ops->read(args, &data->packetData[3], length - 3);
@@ -203,7 +203,7 @@ int dabInputPacketFileRead(dabInputOperations* ops, void* args, void* buffer,
"read %i out of %i bytes\n", nbBytes, length - 3);
break;
}
- if (data->enhancedPacketData != NULL) {
+ if (data->enhancedPacketData != nullptr) {
indexCol = data->enhancedPacketLength / 12;
indexRow = data->enhancedPacketLength % 12; // TODO Check if always 0
for (int j = 0; j < length; ++j) {