piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

SoundStream: change Start/Stop to Init/SetRunning/destruct

Browse Source
This commit is contained in:
Michael M
2017-10-21 16:23:40 -07:00
parent ad4a89d64b
commit 0baddbf9a8
18 changed files with 102 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/AudioCommon/CubebStream.cpp
View File

@ -32,7 +32,7 @@ void CubebStream::StateCallback(cubeb_stream* stream, void* user_data, cubeb_sta
{
}
bool CubebStream::Start()
bool CubebStream::Init()
{
m_ctx = CubebUtils::GetContext();
if (!m_ctx)
@ -60,37 +60,20 @@ bool CubebStream::Start()
ERROR_LOG(AUDIO, "Error getting minimum latency");
INFO_LOG(AUDIO, "Minimum latency: %i frames", minimum_latency);
if (cubeb_stream_init(m_ctx.get(), &m_stream, "Dolphin Audio Output", nullptr, nullptr, nullptr,
&params, std::max(BUFFER_SAMPLES, minimum_latency), DataCallback,
StateCallback, this) != CUBEB_OK)
{
ERROR_LOG(AUDIO, "Error initializing cubeb stream");
return false;
}
if (cubeb_stream_start(m_stream) != CUBEB_OK)
{
ERROR_LOG(AUDIO, "Error starting cubeb stream");
return false;
}
return true;
return cubeb_stream_init(m_ctx.get(), &m_stream, "Dolphin Audio Output", nullptr, nullptr,
nullptr, &params, std::max(BUFFER_SAMPLES, minimum_latency),
DataCallback, StateCallback, this) == CUBEB_OK;
}
void CubebStream::SetRunning(bool running)
bool CubebStream::SetRunning(bool running)
{
if (running)
{
if (cubeb_stream_start(m_stream) != CUBEB_OK)
ERROR_LOG(AUDIO, "Error starting cubeb stream");
}
return cubeb_stream_start(m_stream) == CUBEB_OK;
else
{
if (cubeb_stream_stop(m_stream) != CUBEB_OK)
ERROR_LOG(AUDIO, "Error stopping cubeb stream");
}
return cubeb_stream_stop(m_stream) == CUBEB_OK;
}
void CubebStream::Stop()
CubebStream::~CubebStream()
{
SetRunning(false);
cubeb_stream_destroy(m_stream);