kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

even more mod_shout logging 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16705 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Rupa Schomaker 2010-02-19 18:53:02 +00:00
parent dc5c383d20
commit 969688a0d3
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mod/formats/mod_shout/mod_shout.c
View File

@ -584,12 +584,14 @@ static void launch_write_stream_thread(shout_context_t *context)
} }
#define TC_BUFFER_SIZE 1024 * 32 #define TC_BUFFER_SIZE 1024 * 32
#define MPGERROR() {err = "MPG123 Error at __FILE__:__LINE__."; mpg123err = mpg123_strerror(context->mh); goto error; }
static switch_status_t shout_file_open(switch_file_handle_t *handle, const char *path) static switch_status_t shout_file_open(switch_file_handle_t *handle, const char *path)
{ {
shout_context_t *context; shout_context_t *context;
char *host, *file; char *host, *file;
char *username, *password, *port; char *username, *password, *port;
char *err = NULL; char *err = NULL;
const char *mpg123err = NULL;
int portno = 0; int portno = 0;
if ((context = switch_core_alloc(handle->memory_pool, sizeof(*context))) == 0) { if ((context = switch_core_alloc(handle->memory_pool, sizeof(*context))) == 0) {
@ -617,14 +619,20 @@ static switch_status_t shout_file_open(switch_file_handle_t *handle, const char
} }
context->mh = our_mpg123_new(NULL, NULL); context->mh = our_mpg123_new(NULL, NULL);
mpg123_format_all(context->mh); if (mpg123_format_all(context->mh) != MPG123_OK) {
mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); MPGERROR();
}
if (mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0) != MPG123_OK) {
MPGERROR();
}
if (handle->handler) { if (handle->handler) {
mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_MONO_MIX, 0); if (mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_MONO_MIX, 0) != MPG123_OK) {
MPGERROR();
}
if (mpg123_open_feed(context->mh) != MPG123_OK) { if (mpg123_open_feed(context->mh) != MPG123_OK) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening mpg feed\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening mpg feed\n");
err = (char*) mpg123_strerror(context->mh); mpg123err = mpg123_strerror(context->mh);
goto error; goto error;
} }
context->stream_url = switch_core_sprintf(context->memory_pool, "http://%s", path); context->stream_url = switch_core_sprintf(context->memory_pool, "http://%s", path);
@ -632,10 +640,12 @@ static switch_status_t shout_file_open(switch_file_handle_t *handle, const char
launch_read_stream_thread(context); launch_read_stream_thread(context);
} else { } else {
handle->seekable = 1; handle->seekable = 1;
mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); if (mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0) != MPG123_OK) {
MPGERROR();
}
if (mpg123_open(context->mh, path) != MPG123_OK) { if (mpg123_open(context->mh, path) != MPG123_OK) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path);
err = (char*) mpg123_strerror(context->mh); mpg123err = mpg123_strerror(context->mh);
goto error; goto error;
} }
@ -789,6 +799,9 @@ static switch_status_t shout_file_open(switch_file_handle_t *handle, const char
if (err) { if (err) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: %s\n", err); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: %s\n", err);
} }
if (mpg123err) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error from mpg123: %s\n", mpg123err);
}
free_context(context); free_context(context);
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;