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

Expand trackFile's shared_ptr life

Browse source
This commit is contained in:
krcroft 2020-02-28 18:22:43 -08:00 • committed by Patryk Obara
parent 1d123367a5
commit 5bbf876f0c
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/dos/cdrom_image.cpp
View file

@ -413,8 +413,9 @@ bool CDROM_Interface_Image::GetAudioSub(unsigned char& attr,
if (!tracks.empty()) { // We have a useable CD; get a valid play-position
track_iter track = tracks.begin();
// the CD's current track is valid
if (player.trackFile.lock()) {
const uint32_t sample_rate = player.trackFile.lock()->getRate();
const auto track_file = player.trackFile.lock(); // lock() creates a shared_ptr!
if (track_file) {
const uint32_t sample_rate = track_file->getRate();
const uint32_t played_frames = (player.playedTrackFrames
* REDBOOK_FRAMES_PER_SECOND
+ sample_rate - 1) / sample_rate;