oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

httpd: use get_mime_type to determine encoder content

Browse Source
This commit is contained in:
Viliam Mateicka 2009-12-03 20:27:08 +01:00
parent 7b80e73810
commit ac0bf1a445
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/output/httpd_output_plugin.c
View File

@ -117,13 +117,6 @@ httpd_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
return NULL; return NULL;
} }
if (strcmp(encoder_name, "vorbis") == 0)
httpd->content_type = "application/x-ogg";
else if (strcmp(encoder_name, "lame") == 0)
httpd->content_type = "audio/mpeg";
else
httpd->content_type = "application/octet-stream";
httpd->clients_max = config_get_block_unsigned(param,"max_clients", 0); httpd->clients_max = config_get_block_unsigned(param,"max_clients", 0);
/* initialize listen address */ /* initialize listen address */
@ -144,6 +137,12 @@ httpd_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
if (httpd->encoder == NULL) if (httpd->encoder == NULL)
return NULL; return NULL;
/* determine content type */
httpd->content_type = encoder_get_mime_type(httpd->encoder);
if (httpd->content_type == NULL) {
httpd->content_type = "application/octet-stream";
}
httpd->mutex = g_mutex_new(); httpd->mutex = g_mutex_new();
return httpd; return httpd;