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

Merge branch 'v0.15.x' into v0.16.x

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/directory.h
This commit is contained in:
Max Kellermann 2011-01-07 23:50:23 +01:00
commit 8c0afd8557
6 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -127,6 +127,11 @@ ver 0.16 (2010/12/11)
* make single mode 'sticky' * make single mode 'sticky'
ver 0.15.16 (2010/??/??)
* encoders:
- lame: explicitly configure the output sample rate
ver 0.15.15 (2010/11/08) ver 0.15.15 (2010/11/08)
* input: * input:
- rewind: fix assertion failure - rewind: fix assertion failure

12
m4/faad.m4
View File

@ -58,7 +58,7 @@ if test x$enable_aac = xyes; then
fi fi
if test x$enable_aac = xyes; then if test x$enable_aac = xyes; then
AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen) AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen)
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <faad.h> #include <faad.h>
int main() { int main() {
@ -82,9 +82,9 @@ int main() {
return 0; return 0;
} }
],[AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FAAD_BUFLEN_FUNCS,1,[Define if FAAD2 uses buflen in function calls])],[AC_MSG_RESULT(no); ])],[AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FAAD_BUFLEN_FUNCS,1,[Define if FAAD2 uses buflen in function calls])],[AC_MSG_RESULT(no);
AC_MSG_CHECKING(that FAAD2 can even be used) AC_MSG_CHECKING(that FAAD2 can even be used)
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <faad.h> #include <faad.h>
int main() { int main() {
@ -113,7 +113,7 @@ int main() {
return 0; return 0;
} }
],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no]) ])],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no])
]) ])
fi fi
if test x$enable_aac = xyes; then if test x$enable_aac = xyes; then
@ -136,7 +136,7 @@ if test x$enable_aac = xyes; then
CPPFLAGS=$CFLAGS CPPFLAGS=$CFLAGS
AC_MSG_CHECKING(for broken libfaad headers) AC_MSG_CHECKING(for broken libfaad headers)
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <faad.h> #include <faad.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -148,7 +148,7 @@ int main() {
faacDecInit2(NULL, NULL, 0, &sample_rate, &channels); faacDecInit2(NULL, NULL, 0, &sample_rate, &channels);
return 0; return 0;
} }
], ])],
[AC_MSG_RESULT(correct)], [AC_MSG_RESULT(correct)],
[AC_MSG_RESULT(broken); [AC_MSG_RESULT(broken);
AC_DEFINE(HAVE_FAAD_LONG, 1, [Define if faad.h uses the broken "unsigned long" pointers])]) AC_DEFINE(HAVE_FAAD_LONG, 1, [Define if faad.h uses the broken "unsigned long" pointers])])

4
m4/mpd_check_cflag.m4
View File

@ -4,9 +4,9 @@ AC_DEFUN([MPD_CHECK_FLAG],[
[mpd_check_cflag_$var],[ [mpd_check_cflag_$var],[
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $1" CFLAGS="$CFLAGS $1"
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
int main(void) { return 0; } int main(void) { return 0; }
], [ eval "mpd_check_cflag_$var=yes" ])], [ eval "mpd_check_cflag_$var=yes"
], [ eval "mpd_check_cflag_$var=no" ]) ], [ eval "mpd_check_cflag_$var=no" ])
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
]) ])

4
src/directory.h
View File

@ -30,8 +30,8 @@
#define DIRECTORY_DIR "directory: " #define DIRECTORY_DIR "directory: "
#define DEVICE_INARCHIVE (dev_t)(-1) #define DEVICE_INARCHIVE (dev_t)(-1)
#define DEVICE_CONTAINER (dev_t)(-2) #define DEVICE_CONTAINER (dev_t)(-2)
struct directory { struct directory {
struct dirvec children; struct dirvec children;

7
src/encoder/lame_encoder.c
View File

@ -170,6 +170,13 @@ lame_encoder_setup(struct lame_encoder *encoder, GError **error)
return false; return false;
} }
if (0 != lame_set_out_samplerate(encoder->gfp,
encoder->audio_format.sample_rate)) {
g_set_error(error, lame_encoder_quark(), 0,
"error setting lame out sample rate");
return false;
}
if (0 > lame_init_params(encoder->gfp)) { if (0 > lame_init_params(encoder->gfp)) {
g_set_error(error, lame_encoder_quark(), 0, g_set_error(error, lame_encoder_quark(), 0,
"error initializing lame params"); "error initializing lame params");

3
src/output/httpd_client.c
View File

@ -29,6 +29,9 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "httpd_output"
struct httpd_client { struct httpd_client {
/** /**
* The httpd output object this client is connected to. * The httpd output object this client is connected to.