<!DOCTYPE html>
<html>
<head>
<title></title>
</head>
<body><div><br></div>
<div><br></div>
<div><br></div>
<div>On Tue, Jun 27, 2017, at 14:21, Rémi Denis-Courmont wrote:<br></div>
<blockquote type="cite"><div defang_data-gmailquote="yes"><div>Le 27 juin 2017 10:53:04 GMT+02:00, Thomas Guillem <git@videolan.org> a écrit :<br></div>
<blockquote defang_data-gmailquote="yes" style="margin-top:0pt;margin-right:0pt;margin-bottom:0pt;margin-left:0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204, 204, 204);padding-left:1ex;"><pre><div>vlc | branch: master | Thomas Guillem <thomas@gllm.fr> | Tue Jun 27 10:52:05 2017 +0200| [4074b544fb288b0703f4b8160c9feed6ecb8a318] | committer: Thomas Guillem<br></div>
<div><br></div>
<div>aout: simplify, remove unset_str[]<br></div>
<div><br></div>
<blockquote defang_data-gmailquote="yes" style="margin-top:0pt;margin-right:0pt;margin-bottom:1ex;margin-left:0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(114, 159, 207);padding-left:1ex;"> <a href="http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4074b544fb288b0703f4b8160c9feed6ecb8a318">http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4074b544fb288b0703f4b8160c9feed6ecb8a318</a><br></blockquote><div>---<br></div>
<div><br></div>
<div> src/audio_output/output.c | 13 +++++--------<br></div>
<div> 1 file changed, 5 insertions(+), 8 deletions(-)<br></div>
<div><br></div>
<div>diff --git a/src/audio_output/output.c b/src/audio_output/output.c<br></div>
<div>index 8a70cdfddc..dbf4f8169d 100644<br></div>
<div>--- a/src/audio_output/output.c<br></div>
<div>+++ b/src/audio_output/output.c<br></div>
<div>@@ -35,8 +35,6 @@<br></div>
<div> #include "libvlc.h"<br></div>
<div> #include "aout_internal.h"<br></div>
<div> <br></div>
<div>-static const char unset_str[1] = ""; /* Non-NULL constant string pointer */<br></div>
<div>-<br></div>
<div> struct aout_dev<br></div>
<div> {<br></div>
<div> aout_dev_t *next;<br></div>
<div>@@ -189,7 +187,7 @@ audio_output_t *aout_New (vlc_object_t *parent)<br></div>
<div> vlc_mutex_init (&owner->lock);<br></div>
<div> vlc_mutex_init (&owner->req.lock);<br></div>
<div> vlc_mutex_init (&owner->dev.lock);<br></div>
<div>- owner->req.device = (char *)unset_str;<br></div>
<div>+ owner->req.device = NULL;<br></div>
<div> owner->req.volume = -1.f;<br></div>
<div> owner->req.mute = -1;<br></div>
<div> <br></div>
<div>@@ -357,7 +355,7 @@ static void aout_Destructor (vlc_object_t *obj)<br></div>
<div> free (dev);<br></div>
<div> }<br></div>
<div> <br></div>
<div>- assert (owner->req.device == unset_str);<br></div>
<div>+ assert (owner->req.device == NULL);<br></div>
<div> vlc_mutex_destroy (&owner->req.lock);<br></div>
<div> vlc_mutex_destroy (&owner->lock);<br></div>
<div> }<br></div>
<div>@@ -564,11 +562,11 @@ void aout_OutputUnlock (audio_output_t *aout)<br></div>
<div> vlc_assert_locked (&owner->lock);<br></div>
<div> vlc_mutex_lock (&owner->req.lock);<br></div>
<div> <br></div>
<div>- if (owner->req.device != unset_str)<br></div>
<div>+ if (owner->req.device != NULL)<br></div>
<div> {<br></div>
<div> aout_OutputDeviceSet (aout, owner->req.device);<br></div>
<div> free (owner->req.device);<br></div>
<div>- owner->req.device = (char *)unset_str;<br></div>
<div>+ owner->req.device = NULL;<br></div>
<div> }<br></div>
<div> <br></div>
<div> if (owner->req.volume >= 0.f)<br></div>
<div>@@ -675,8 +673,7 @@ int aout_DeviceSet (audio_output_t *aout, const char *id)<br></div>
<div> }<br></div>
<div> <br></div>
<div> vlc_mutex_lock (&owner->req.lock);<br></div>
<div>- if (owner->req.device != unset_str)<br></div>
<div>- free (owner->req.device);<br></div>
<div>+ free (owner->req.device);<br></div>
<div> owner->req.device = dev;<br></div>
<div> vlc_mutex_unlock (&owner->req.lock);<br></div>
<div> <br></div>
<div><br></div>
<div><hr><br></div>
<div>vlc-commits mailing list<br></div>
<div>vlc-commits@videolan.org<br></div>
<div><a href="https://mailman.videolan.org/listinfo/vlc-commits">https://mailman.videolan.org/listinfo/vlc-commits</a><br></div>
</pre></blockquote></div>
<div><br></div>
<div>IIRC, the API documentation explains why this was needed: unsetting the audio device (however the aout wants to implement it) - and you just broke it. Please revert.<br></div>
</blockquote><div><br></div>
<div>Ah OK, I don't see anything in the documentation about that, but it seems logic now.<br></div>
<div><br></div>
<div><br></div>
<blockquote type="cite"><div> -- <br></div>
<div> Rémi Denis-Courmont<br></div>
<div> Typed on an inconvenient virtual keyboard <br></div>
<div><u>_______________________________________________</u><br></div>
<div>vlc-devel mailing list<br></div>
<div>To unsubscribe or modify your subscription options:<br></div>
<div><a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a><br></div>
</blockquote><div><br></div>
</body>
</html>