summaryrefslogtreecommitdiffstats
path: root/src/audio_core/cubeb_sink.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-03 00:54:25 +0200
committerbunnei <bunneidev@gmail.com>2018-08-04 20:34:12 +0200
commit34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207 (patch)
treecd23ebe31cd718f8ad0637bee744e75bfe94b65e /src/audio_core/cubeb_sink.cpp
parentaudio_core: Streams need unique names for CoreTiming. (diff)
downloadyuzu-34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207.tar
yuzu-34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207.tar.gz
yuzu-34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207.tar.bz2
yuzu-34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207.tar.lz
yuzu-34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207.tar.xz
yuzu-34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207.tar.zst
yuzu-34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207.zip
Diffstat (limited to 'src/audio_core/cubeb_sink.cpp')
-rw-r--r--src/audio_core/cubeb_sink.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp
index 34ae5b062..cf4839989 100644
--- a/src/audio_core/cubeb_sink.cpp
+++ b/src/audio_core/cubeb_sink.cpp
@@ -13,7 +13,7 @@ namespace AudioCore {
class SinkStreamImpl final : public SinkStream {
public:
- SinkStreamImpl(cubeb* ctx, cubeb_devid output_device) : ctx{ctx} {
+ SinkStreamImpl(cubeb* ctx, cubeb_devid output_device, const std::string& name) : ctx{ctx} {
cubeb_stream_params params;
params.rate = 48000;
params.channels = GetNumChannels();
@@ -25,8 +25,8 @@ public:
LOG_CRITICAL(Audio_Sink, "Error getting minimum latency");
}
- if (cubeb_stream_init(ctx, &stream_backend, "yuzu Audio Output", nullptr, nullptr,
- output_device, &params, std::max(512u, minimum_latency),
+ if (cubeb_stream_init(ctx, &stream_backend, name.c_str(), nullptr, nullptr, output_device,
+ &params, std::max(512u, minimum_latency),
&SinkStreamImpl::DataCallback, &SinkStreamImpl::StateCallback,
this) != CUBEB_OK) {
LOG_CRITICAL(Audio_Sink, "Error initializing cubeb stream");
@@ -129,8 +129,9 @@ CubebSink::~CubebSink() {
cubeb_destroy(ctx);
}
-SinkStream& CubebSink::AcquireSinkStream(u32 sample_rate, u32 num_channels) {
- sink_streams.push_back(std::make_unique<SinkStreamImpl>(ctx, output_device));
+SinkStream& CubebSink::AcquireSinkStream(u32 sample_rate, u32 num_channels,
+ const std::string& name) {
+ sink_streams.push_back(std::make_unique<SinkStreamImpl>(ctx, output_device, name));
return *sink_streams.back();
}