summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2019-12-09 01:10:50 +0100
committerRobin Gareus <robin@gareus.org>2019-12-09 01:10:50 +0100
commitb1b29a631719cbf5238af3818e7707e869d3f87d (patch)
tree454008ceb7b5ca26c77ef4fb96f791b8bce63c65 /libs
parente291948dcb2f5456ad78cb69822cf317da17435c (diff)
Fix two compiler warnings
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/mp3fileimportable.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/mp3fileimportable.cc b/libs/ardour/mp3fileimportable.cc
index d2ab4ad5bb..278ff1e80d 100644
--- a/libs/ardour/mp3fileimportable.cc
+++ b/libs/ardour/mp3fileimportable.cc
@@ -120,7 +120,7 @@ Mp3FileImportableSource::unmap_mem ()
UnmapViewOfFile (_map_addr);
}
#else
- munmap ((void*)_map_addr, _map_length);
+ munmap (const_cast<unsigned char*>(_map_addr), _map_length);
#endif
close (_fd);
_map_addr = 0;
@@ -175,7 +175,7 @@ Mp3FileImportableSource::seek (samplepos_t pos)
_n_frames -= pos - _read_position;
_read_position = pos;
}
- assert (_pcm_off >= 0 && _pcm_off < MINIMP3_MAX_SAMPLES_PER_FRAME);
+ assert (_pcm_off < MINIMP3_MAX_SAMPLES_PER_FRAME);
}
samplecnt_t