From: Mike Brady <mikebrady@eircom.net>
Date: Thu, 9 Mar 2017 14:08:06 +0000 (+0000)
Subject: Change the order of initialisation back to waht it was before de-globalising the... 
X-Git-Tag: 3.1.d1~1^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d90fd0df500d571f37bc9d4b3f14b13ef8896669;p=thirdparty%2Fshairport-sync.git

Change the order of initialisation back to waht it was before de-globalising the init_decoder, etc.
---

diff --git a/player.c b/player.c
index bec24faa..3b96f954 100644
--- a/player.c
+++ b/player.c
@@ -1473,6 +1473,12 @@ static void *player_thread_func(void *arg) {
   conn->please_stop = 0;
   conn->packet_count = 0;
   
+  init_decoder((int32_t *)&conn->stream.fmtp); // this sets up incoming rate, bit depth, channels
+  // must be after decoder init
+  init_buffer(conn);
+
+  debug(1, "Output frame bytes is %d.", output_bytes_per_frame);
+
   if (conn->stream.encrypted) {
 #ifdef HAVE_LIBMBEDTLS
     memset(&conn->dctx, 0, sizeof(mbedtls_aes_context));
@@ -1515,12 +1521,6 @@ static void *player_thread_func(void *arg) {
     break;
   }
   
-  init_decoder((int32_t *)&conn->stream.fmtp); // this sets up incoming rate, bit depth, channels
-  // must be after decoder init
-  init_buffer(conn);
-
-  debug(1, "Output frame bytes is %d.", output_bytes_per_frame);
-
   // create and start the timing, control and audio receiver threads
   pthread_t rtp_audio_thread, rtp_control_thread, rtp_timing_thread;
   pthread_create(&rtp_audio_thread, NULL, &rtp_audio_receiver, (void *)conn);