Merge "C++ cleanup"
diff --git a/audio/talsa.cpp b/audio/talsa.cpp
index b0f2e59..3844609 100644
--- a/audio/talsa.cpp
+++ b/audio/talsa.cpp
@@ -133,12 +133,12 @@
     LOG_ALWAYS_FATAL_IF(::pcm_close(x) != 0);
 };
 
-std::unique_ptr<pcm_t, PcmDeleter> pcmOpen(const unsigned int dev,
-                                           const unsigned int card,
-                                           const unsigned int nChannels,
-                                           const size_t sampleRateHz,
-                                           const size_t frameCount,
-                                           const bool isOut) {
+PcmPtr pcmOpen(const unsigned int dev,
+               const unsigned int card,
+               const unsigned int nChannels,
+               const size_t sampleRateHz,
+               const size_t frameCount,
+               const bool isOut) {
     const PcmPeriodSettings periodSettings = pcmGetPcmPeriodSettings();
 
     struct pcm_config pcm_config;