Skip to content

V
vlc-2-2
Commit f9d72915 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

aout: disable recycling for the time being

parent b6455039
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/audio_output/dec.c
View file @ f9d72915
...@@ -81,7 +81,7 @@ int aout_DecNew( audio_output_t *p_aout, ...@@ -81,7 +81,7 @@ int aout_DecNew( audio_output_t *p_aout,
} }
aout_owner_t *owner = aout_owner(p_aout); aout_owner_t *owner = aout_owner(p_aout);
#ifdef RECYCLE
/* Calling decoder is responsible for serializing aout_DecNew() and /* Calling decoder is responsible for serializing aout_DecNew() and
* aout_DecDelete(). So no need to lock to _read_ those properties. */ * aout_DecDelete(). So no need to lock to _read_ those properties. */
if (owner->module != NULL) /* <- output exists */ if (owner->module != NULL) /* <- output exists */
...@@ -96,7 +96,7 @@ int aout_DecNew( audio_output_t *p_aout, ...@@ -96,7 +96,7 @@ int aout_DecNew( audio_output_t *p_aout,
/* No recycling: delete everything and restart from scratch */ /* No recycling: delete everything and restart from scratch */
aout_Shutdown (p_aout); aout_Shutdown (p_aout);
} }
#endif
int ret = -1; int ret = -1;
/* TODO: reduce lock scope depending on decoder's real need */ /* TODO: reduce lock scope depending on decoder's real need */
...@@ -177,7 +177,11 @@ void aout_DecDelete (audio_output_t *aout) ...@@ -177,7 +177,11 @@ void aout_DecDelete (audio_output_t *aout)
aout_owner_t *owner = aout_owner (aout); aout_owner_t *owner = aout_owner (aout);
assert (owner->module != NULL); assert (owner->module != NULL);
#ifdef RECYCLE
(void) owner; (void) owner;
#else
aout_Shutdown (aout);
#endif
} }
#define AOUT_RESTART_OUTPUT 1 #define AOUT_RESTART_OUTPUT 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment