Skip to content

Commit

Permalink
PINK: Implemented Sound Class
Browse files Browse the repository at this point in the history
  • Loading branch information
whitertandrek authored and sev- committed Jun 28, 2018
1 parent 280b249 commit b3c656c
Show file tree
Hide file tree
Showing 2 changed files with 164 additions and 0 deletions.
100 changes: 100 additions & 0 deletions engines/pink/sound.cpp
@@ -0,0 +1,100 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/

#include <audio/audiostream.h>
#include <audio/decoders/wave.h>
#include <audio/decoders/adpcm.h>
#include "sound.h"

namespace Pink {

Sound::Sound(Audio::Mixer *mixer, AudioFormat format, Common::SeekableReadStream *stream)
: _mixer(mixer)
{
load(format, stream);
}

Sound::~Sound() {
//look for mem leak
stop();
}

bool Sound::isPlaying() {
return _mixer->isSoundHandleActive(_handle);

}

void Sound::pause() {
_mixer->pauseHandle(_handle, true);
}

void Sound::resume() {
_mixer->pauseHandle(_handle, false);
}

void Sound::stop() {
_mixer->stopHandle(_handle);
}

void Sound::play(Audio::Mixer::SoundType type, int volume, bool isLoop) {
_mixer->stopHandle(_handle);

if (isLoop) {
//bad impl?
Audio::SeekableAudioStream *seekableStream = dynamic_cast<Audio::SeekableAudioStream*>(_stream);
_stream = Audio::makeLoopingAudioStream(seekableStream, 0, 0, 0);
}

_mixer->playStream(type, &_handle ,_stream);
}

bool Sound::load(AudioFormat format, Common::SeekableReadStream *stream) {
//may be mem leak

// checked vox files in hex editor and they have WAVEfmt .
// It seems strange for me
// linux file says wav and vox are
// RIFF (little-endian) data, WAVE audio, Microsoft PCM, 8 bit, mono 22050 Hz

switch (format){
case AudioFormat::kWAV:
_stream = Audio::makeWAVStream(stream, DisposeAfterUse::NO);
break;
case AudioFormat::kVOX:
//TODO
// check for last arg; nBlockAlign(1, 4 or other)
_stream = Audio::makeADPCMStream(stream, DisposeAfterUse::NO, 0, Audio::kADPCMOki, 22050, 1, 0);
break;
}

return isLoaded();
}

bool Sound::isLoaded() {
return _stream != nullptr;
}

void Sound::setBalance(int8 balance) {
_mixer->setChannelBalance(_handle, balance);
}

} // End of namespace Pink
64 changes: 64 additions & 0 deletions engines/pink/sound.h
@@ -0,0 +1,64 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/

#ifndef PINK_SOUND_H
#define PINK_SOUND_H

#include <common/stream.h>
#include <audio/mixer.h>

namespace Pink {

enum class AudioFormat{kWAV, kVOX};

/*TODO
from disasm foreground 100 %, background 80 %
dont know how to properly do it
may be use ConfMan
*/

class Sound {
public:
Sound(Audio::Mixer *mixer, AudioFormat format, Common::SeekableReadStream *stream);
~Sound();

bool load(AudioFormat format, Common::SeekableReadStream *stream);
void play(Audio::Mixer::SoundType type, int volume, bool isLoop);

bool isLoaded();
bool isPlaying();

void pause();
void resume();
void stop();

void setBalance(int8 balance);

private:
Audio::Mixer *_mixer;
Audio::AudioStream *_stream;
Audio::SoundHandle _handle;
};

} // End of namespace Pink

#endif

0 comments on commit b3c656c

Please sign in to comment.