[vlc-commits] Revert "aout: always signal when the aout changed"

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Sep 26 14:44:12 2016 +0200| [9818e88e608d6c06d93848fdfb7f2a7b3585ef53] | committer: Thomas Guillem

Revert "aout: always signal when the aout changed"

This reverts commit 4bba1e84a13a8d340b8a06df155bec8034bcd012.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9818e88e608d6c06d93848fdfb7f2a7b3585ef53
---

 src/audio_output/aout_internal.h | 1 -
 src/audio_output/dec.c           | 6 ------
 src/audio_output/output.c        | 1 -
 3 files changed, 8 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index a0574fa..c6edf8e 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -83,7 +83,6 @@ typedef struct
     atomic_uint buffers_lost;
     atomic_uint buffers_played;
     atomic_uchar restart;
-    bool device_changed;
 } aout_owner_t;
 
 typedef struct
diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 2f97848..1751e30 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -83,7 +83,6 @@ int aout_DecNew( audio_output_t *p_aout,
     owner->input_format = *p_format;
     owner->mixer_format = owner->input_format;
     owner->request_vout = *p_request_vout;
-    owner->device_changed = false;
 
     if (aout_OutputNew (p_aout, &owner->mixer_format))
         goto error;
@@ -175,11 +174,6 @@ static int aout_CheckReady (audio_output_t *aout)
          * left over by an audio visualization:
         input_resource_TerminatVout(MAGIC HERE); */
     }
-    if (owner->device_changed)
-    {
-        owner->device_changed = false;
-        status = AOUT_DEC_CHANGED;
-    }
     return (owner->mixer_format.i_format) ? status : AOUT_DEC_FAILED;
 }
 
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 600705d..90db056 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -561,7 +561,6 @@ void aout_OutputUnlock (audio_output_t *aout)
         aout_OutputDeviceSet (aout, owner->req.device);
         free (owner->req.device);
         owner->req.device = (char *)unset_str;
-        owner->device_changed = true;
     }
 
     if (owner->req.volume >= 0.f)