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

Address code-review comments (squash-me)

Browse source
This commit is contained in:
krcroft 2020-03-03 16:19:28 -08:00 • committed by Patryk Obara
parent 908ddafb5f
commit eef8c51419
3 changed files with 51 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/dos/cdrom.h
View file

@ -221,19 +221,20 @@ public:
private:
static struct imagePlayer {
std::unique_ptr<SDL_mutex, SdlMutexDeleter> mutex = nullptr;
std::weak_ptr<TrackFile> trackFile;
MixerObject channelManager;
MixerChannel *channel = nullptr;
CDROM_Interface_Image *cd = nullptr;
// Objects, pointers, and then scalars; in descending size-order.
MixerObject mixerChannel = {};
std::weak_ptr<TrackFile> trackFile = {};
SDL_mutex *mutex = nullptr;
MixerChannel *channel = nullptr;
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;
int16_t buffer[MIXER_BUFSIZE * REDBOOK_CHANNELS] = {0};
bool isPlaying = false;
bool isPaused = false;
uint64_t playedTrackFrames = 0;
uint64_t totalTrackFrames = 0;
uint32_t startSector = 0;
uint32_t totalRedbookFrames = 0;
int16_t buffer[MIXER_BUFSIZE * REDBOOK_CHANNELS] = {0};
bool isPlaying = false;
bool isPaused = false;
} player;
// Private utility functions