diff options
| author | Max Kellermann <max@duempel.org> | 2011-01-07 23:50:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-07 23:50:23 +0100 |
| commit | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (patch) | |
| tree | ec4d9131c4e1cb5e1a832e4b70712884f2406a81 /src | |
| parent | 2a56300f7bad00860f5ff44dfea061386173a852 (diff) | |
| parent | 0022fb100b7d22b9612474ebee944e66c2a7b33b (diff) | |
| download | mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.gz mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.xz mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.zip | |
Merge branch 'v0.15.x' into v0.16.x
Conflicts:
NEWS
configure.ac
src/directory.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/directory.h | 4 | ||||
| -rw-r--r-- | src/encoder/lame_encoder.c | 7 | ||||
| -rw-r--r-- | src/output/httpd_client.c | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/directory.h b/src/directory.h index dde741a71..69e2b3638 100644 --- a/src/directory.h +++ b/src/directory.h @@ -30,8 +30,8 @@ #define DIRECTORY_DIR "directory: " -#define DEVICE_INARCHIVE (dev_t)(-1) -#define DEVICE_CONTAINER (dev_t)(-2) +#define DEVICE_INARCHIVE (dev_t)(-1) +#define DEVICE_CONTAINER (dev_t)(-2) struct directory { struct dirvec children; diff --git a/src/encoder/lame_encoder.c b/src/encoder/lame_encoder.c index a8ef72020..df843471b 100644 --- a/src/encoder/lame_encoder.c +++ b/src/encoder/lame_encoder.c @@ -170,6 +170,13 @@ lame_encoder_setup(struct lame_encoder *encoder, GError **error) 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)) { g_set_error(error, lame_encoder_quark(), 0, "error initializing lame params"); diff --git a/src/output/httpd_client.c b/src/output/httpd_client.c index 6bd095838..f5e14925b 100644 --- a/src/output/httpd_client.c +++ b/src/output/httpd_client.c @@ -29,6 +29,9 @@ #include <assert.h> #include <string.h> +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "httpd_output" + struct httpd_client { /** * The httpd output object this client is connected to. |