kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-07 02:39:20 +00:00
Code Issues Projects Releases Wiki Activity

terminate shoutcast read thread when requested

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14478 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Rupa Schomaker 2009-08-10 16:27:42 +00:00
parent 6c5becc0c1
commit 90f2c27cd0
1 changed files with 7 additions and 1 deletions

8
src/mod/formats/mod_shout/mod_shout.c

@ -144,8 +144,10 @@ static inline void free_context(shout_context_t *context)
int sanity = 0; int sanity = 0;
while (context->thread_running) { 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); switch_yield(500000);
if (++sanity > 10) { 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; break;
} }
} }
@ -368,7 +370,7 @@ static size_t stream_callback(void *ptr, size_t size, size_t nmemb, void *data)
context->eof++; context->eof++;
} else if (decode_status == MPG123_ERR || decode_status > 0) { } else if (decode_status == MPG123_ERR || decode_status > 0) {
if (++context->mp3err >= 5) { 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++; context->eof++;
goto error; 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); switch_mutex_unlock(context->audio_mutex);
} while (!context->err && !context->eof && decode_status != MPG123_NEED_MORE); } while (!context->err && !context->eof && decode_status != MPG123_NEED_MORE);
if (context->err) {
goto error;
}
return realsize; return realsize;
error: error: