terminate shoutcast read thread when requested

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14478 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c
index 3c624b578e97717a91589640dd0969427099cffc..e181a0013b53c1d875791076a64062188914d833 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.c
+++ b/src/mod/formats/mod_shout/mod_shout.c
@@ -144,8 +144,10 @@ static inline void free_context(shout_context_t *context)
                        int sanity = 0;
 
                        while (context->thread_running) {
+                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for stream to terminate: %s\n", context->stream_url);
                                switch_yield(500000);
                                if (++sanity > 10) {
+                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Giving up waiting for stream to terminate: %s\n", context->stream_url);
                                        break;
                                }
                        }
@@ -368,7 +370,7 @@ static size_t stream_callback(void *ptr, size_t size, size_t nmemb, void *data)
                        context->eof++;
                } else if (decode_status == MPG123_ERR || decode_status > 0) {
                        if (++context->mp3err >= 5) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error!\n");
+                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error! %s\n", context->stream_url);
                                context->eof++;
                                goto error;
                        }
@@ -382,6 +384,10 @@ static size_t stream_callback(void *ptr, size_t size, size_t nmemb, void *data)
                switch_mutex_unlock(context->audio_mutex);
        } while (!context->err && !context->eof && decode_status != MPG123_NEED_MORE);
 
+       if (context->err) {
+               goto error;
+       }
+       
        return realsize;
 
   error: