valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Remove ClearTracks() and fix ref-assignment

Browse source
This commit is contained in:
krcroft 2020-01-07 10:31:45 -08:00 • committed by Patryk Obara
parent c776239c3c
commit 0f37f30246
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dos/cdrom.h
View file

@ -230,7 +230,6 @@ private:
} player;
// Private utility functions
void ClearTracks();
bool LoadIsoFile(char *filename);
bool CanReadPVD(TrackFile *file, int sectorSize, bool mode2);
std::vector<Track>::iterator GetTrack(int sector);

16
src/dos/cdrom_image.cpp
View file

@ -19,6 +19,7 @@
// #define DEBUG 1
#include "cdrom.h"
#include <cassert>
#include <cctype>
#include <cmath>
#include <cstdio>
@ -242,7 +243,7 @@ CDROM_Interface_Image::~CDROM_Interface_Image()
if (player.cd == this) {
player.cd = nullptr;
}
ClearTracks();
tracks.clear();
if (refCount == 0) {
StopAudio();
if (player.channel != nullptr) {
@ -439,10 +440,6 @@ bool CDROM_Interface_Image::PlayAudioSector(unsigned long start, unsigned long l
track->attr == 0x40 ||
track->file == nullptr ||
player.channel == nullptr) {
LOG_MSG("CDROM: PlayAudioSector at start sector %lu for %lu "
" number of frames => bad request, skipping",
start,
len);
StopAudio();
return false;
}
@ -1034,7 +1031,9 @@ bool CDROM_Interface_Image::AddTrack(Track &curr, int &shift, const int prestart
return true;
}
Track &prev = *(tracks.end() - 1);
// Guard against undefined behavior in subsequent tracks.back() call
assert(!tracks.empty());
Track &prev{ tracks.back() };
// current track consumes data from the same file as the previous
if (prev.file == curr.file) {
@ -1172,11 +1171,6 @@ bool CDROM_Interface_Image::GetCueString(string &str, istream &in)
return true;
}
void CDROM_Interface_Image::ClearTracks()
{
tracks.clear();
}
void CDROM_Image_Destroy(Section*) {
Sound_Quit();
}