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

Migrate some members of the Player class to smart pointers

Browse source 
1. Moves the mutex and mixer channel members to unique pointers
2. Moves the trackFile to a weak pointer
3. Move member initialization to the class definition

This class still retains a raw *cd member, however fixing this
ripples up to the array of [26] CD images, and across more
code that generically deals with mount points; so this work
remains to do.
This commit is contained in:
krcroft 2020-02-23 20:23:22 -08:00 • committed by Patryk Obara
parent 2d76132a8b
commit 91cd907c4e
4 changed files with 70 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/dos/cdrom.h
View file

@ -32,6 +32,7 @@
#include <SDL_thread.h>
#include "dosbox.h"
#include "support.h"
#include "mem.h"
#include "mixer.h"
#include "../libs/decoders/SDL_sound.h"
@ -220,18 +221,18 @@ public:
private:
static struct imagePlayer {
Bit16s buffer[MIXER_BUFSIZE * 2]; // 2 channels (max)
SDL_mutex *mutex;
TrackFile *trackFile;
MixerChannel *channel;
CDROM_Interface_Image *cd;
void (MixerChannel::*addFrames) (Bitu, const Bit16s*);
uint32_t startSector;
uint32_t totalRedbookFrames;
uint64_t playedTrackFrames;
uint64_t totalTrackFrames;
bool isPlaying;
bool isPaused;
Bit16s buffer[MIXER_BUFSIZE * 2] = {0};
std::unique_ptr<SDL_mutex, SdlMutexDeleter> mutex = nullptr;
std::unique_ptr<MixerChannel, MixerChannelDeleter> channel = nullptr;
std::weak_ptr<TrackFile> trackFile;
CDROM_Interface_Image *cd = nullptr;
void (MixerChannel::*addFrames) (Bitu, const Bit16s*) = nullptr;
uint64_t playedTrackFrames = 0;
uint64_t totalTrackFrames = 0;
uint32_t startSector = 0;
uint32_t totalRedbookFrames = 0;
bool isPlaying = false;
bool isPaused = false;
} player;
// Private utility functions