[vlc-commits] aotu: disable recycling for the time being

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 10 22:40:44 2011 +0300| [649b587d84cbb23cf0cae5fabc40f331d541eb53] | committer: Rémi Denis-Courmont

aotu: disable recycling for the time being

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

 src/audio_output/dec.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index fb7340f..502997f 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -81,7 +81,7 @@ int aout_DecNew( audio_output_t *p_aout,
     }
 
     aout_owner_t *owner = aout_owner(p_aout);
-
+#ifdef RECYCLE
     /* Calling decoder is responsible for serializing aout_DecNew() and
      * aout_DecDelete(). So no need to lock to _read_ those properties. */
     if (owner->module != NULL) /* <- output exists */
@@ -96,7 +96,7 @@ int aout_DecNew( audio_output_t *p_aout,
         /* No recycling: delete everything and restart from scratch */
         aout_Shutdown (p_aout);
     }
-
+#endif
     int ret = -1;
 
     /* TODO: reduce lock scope depending on decoder's real need */
@@ -177,7 +177,11 @@ void aout_DecDelete (audio_output_t *aout)
     aout_owner_t *owner = aout_owner (aout);
 
     assert (owner->module != NULL);
+#ifdef RECYCLE
     (void) owner;
+#else
+    aout_Shutdown (aout);
+#endif
 }
 
 #define AOUT_RESTART_OUTPUT 1