summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2018-08-01 23:55:59 -0400
committerGravatar Lioncash2018-08-01 23:56:02 -0400
commit2bc4ab395850efa84ba879c7a9bcff5df6768a39 (patch)
treeb98ab7cd3c22772ba4108c3c8e7f8185f3caf09a
parentsink_details: std::move std::function instances (diff)
downloadyuzu-2bc4ab395850efa84ba879c7a9bcff5df6768a39.tar.gz
yuzu-2bc4ab395850efa84ba879c7a9bcff5df6768a39.tar.xz
yuzu-2bc4ab395850efa84ba879c7a9bcff5df6768a39.zip
sink_details: Deduplicate long std::function repetition
We can just use type aliases to avoid needing to write the same long type twice
-rw-r--r--src/audio_core/sink_details.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/audio_core/sink_details.h b/src/audio_core/sink_details.h
index 4f9027762..ea666c554 100644
--- a/src/audio_core/sink_details.h
+++ b/src/audio_core/sink_details.h
@@ -14,16 +14,18 @@ namespace AudioCore {
14class Sink; 14class Sink;
15 15
16struct SinkDetails { 16struct SinkDetails {
17 SinkDetails(const char* id_, std::function<std::unique_ptr<Sink>(std::string)> factory_, 17 using FactoryFn = std::function<std::unique_ptr<Sink>(std::string)>;
18 std::function<std::vector<std::string>()> list_devices_) 18 using ListDevicesFn = std::function<std::vector<std::string>()>;
19
20 SinkDetails(const char* id_, FactoryFn factory_, ListDevicesFn list_devices_)
19 : id(id_), factory(std::move(factory_)), list_devices(std::move(list_devices_)) {} 21 : id(id_), factory(std::move(factory_)), list_devices(std::move(list_devices_)) {}
20 22
21 /// Name for this sink. 23 /// Name for this sink.
22 const char* id; 24 const char* id;
23 /// A method to call to construct an instance of this type of sink. 25 /// A method to call to construct an instance of this type of sink.
24 std::function<std::unique_ptr<Sink>(std::string device_id)> factory; 26 FactoryFn factory;
25 /// A method to call to list available devices. 27 /// A method to call to list available devices.
26 std::function<std::vector<std::string>()> list_devices; 28 ListDevicesFn list_devices;
27}; 29};
28 30
29extern const std::vector<SinkDetails> g_sink_details; 31extern const std::vector<SinkDetails> g_sink_details;