aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/sound/cdrom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob/sound/cdrom.cpp')
-rw-r--r--engines/gob/sound/cdrom.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp
index ec7da29fdb..4f3d783046 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -24,11 +24,13 @@
*/
#include "common/endian.h"
+#include "common/str.h"
#include "common/util.h"
+#include "backends/audiocd/audiocd.h"
+
#include "gob/gob.h"
#include "gob/sound/cdrom.h"
-#include "gob/helper.h"
#include "gob/dataio.h"
namespace Gob {
@@ -48,7 +50,7 @@ CDROM::~CDROM() {
stop();
}
-void CDROM::readLIC(DataStream &stream) {
+void CDROM::readLIC(Common::SeekableReadStream &stream) {
uint16 version, startChunk, pos;
freeLICBuffer();
@@ -91,7 +93,7 @@ void CDROM::startTrack(const char *trackName) {
return;
}
- strncpy0(_curTrack, trackName, 15);
+ Common::strlcpy(_curTrack, trackName, 16);
stopPlaying();
_curTrackBuffer = matchPtr;