From e4d7cd7f8f272b68b38e5d8f4d2a4f6e41265cb3 Mon Sep 17 00:00:00 2001
From: clangen <casey.langen@gmail.com>
Date: Sat, 11 Jun 2016 22:30:14 -0700
Subject: [PATCH] Some minor AlsaOut.cpp cleanups.

---
 src/contrib/alsaout/AlsaOut.cpp | 39 ++++++++++++++-------------------
 src/contrib/alsaout/AlsaOut.h   |  1 +
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/contrib/alsaout/AlsaOut.cpp b/src/contrib/alsaout/AlsaOut.cpp
index 1ca45a10d..5a14fea37 100755
--- a/src/contrib/alsaout/AlsaOut.cpp
+++ b/src/contrib/alsaout/AlsaOut.cpp
@@ -52,6 +52,15 @@
     err = snd_pcm_writei(handle, context->buffer->BufferPointer(), samples); \
     if (err < 0) { PRINT_ERROR(err); }
 
+
+static inline bool playable(snd_pcm_t* pcm) {
+    snd_pcm_state_t state = snd_pcm_state(pcm);
+
+    return
+        state == SND_PCM_STATE_RUNNING ||
+        state == SND_PCM_STATE_PREPARED;
+}
+
 using namespace musik::core::audio;
 
 AlsaOut::AlsaOut()
@@ -77,9 +86,12 @@ AlsaOut::~AlsaOut() {
     }
 
     this->writeThread->join();
+    this->CloseDevice();
+}
 
-    std::cerr << "AlsaOut: closing PCM handle\n";
+void AlsaOut::CloseDevice() {
     if (this->pcmHandle) {
+        std::cerr << "AlsaOut: closing PCM handle\n";
         snd_pcm_close(this->pcmHandle);
         this->pcmHandle = NULL;
     }
@@ -144,11 +156,7 @@ void AlsaOut::InitDevice() {
     return;
 
 error:
-
-    if (this->pcmHandle) {
-        snd_pcm_close(this->pcmHandle);
-        this->pcmHandle = NULL;
-    }
+    this->CloseDevice();
 }
 
 void AlsaOut::Destroy() {
@@ -165,11 +173,7 @@ void AlsaOut::Stop() {
 
         if (this->pcmHandle) {
             snd_pcm_drop(this->pcmHandle);
-
-            if (this->pcmHandle) {
-                snd_pcm_close(this->pcmHandle);
-                this->pcmHandle = NULL;
-            }
+            this->CloseDevice();
         }
     }
 
@@ -261,14 +265,6 @@ void AlsaOut::WriteLoop() {
     }
 }
 
-static inline bool playable(snd_pcm_t* pcm) {
-    snd_pcm_state_t state = snd_pcm_state(pcm);
-
-    return
-        state == SND_PCM_STATE_RUNNING ||
-        state == SND_PCM_STATE_PREPARED;
-}
-
 bool AlsaOut::Play(IBuffer *buffer, IBufferProvider* provider) {
     this->SetFormat(buffer);
 
@@ -303,10 +299,7 @@ void AlsaOut::SetFormat(IBuffer *buffer) {
         this->channels = buffer->Channels();
         this->rate = buffer->SampleRate();
 
-        if (this->pcmHandle) {
-            snd_pcm_close(this->pcmHandle);
-            this->pcmHandle = NULL;
-        }
+        this->CloseDevice();
 
         this->InitDevice();
 
diff --git a/src/contrib/alsaout/AlsaOut.h b/src/contrib/alsaout/AlsaOut.h
index 83dc96bbf..4baf48e91 100755
--- a/src/contrib/alsaout/AlsaOut.h
+++ b/src/contrib/alsaout/AlsaOut.h
@@ -70,6 +70,7 @@ class AlsaOut : public IOutput {
         size_t CountBuffersWithProvider(IBufferProvider* provider);
         void SetFormat(musik::core::audio::IBuffer *buffer);
         void InitDevice();
+        void CloseDevice();
         void WriteLoop();
 
         std::string device;