SHA256
1
0
forked from pool/alsa-utils
alsa-utils/0010-alsaloop-Make-alsaloop-working-without-libsamplerate.patch
Takashi Iwai 8bad45cd50 Accepting request 143675 from home:tiwai:branches:multimedia:libs
- Build with libsamplerate for aloop (bnc#792173)
- Add a patch to handle alsaloop properly without libsamplerate
  (bnc#792173):
  0010-alsaloop-Make-alsaloop-working-without-libsamplerate.patch
  0011-alsaloop-Fix-missing-endif.patch

- Backport fixes from upstream
  0006-alsamixer-fix-handling-of-removed-controls.patch
  0007-aplay-Show-usage-if-no-parameter-is-passed.patch
  0008-amixer-fix-rounding-of-relative-changes.patch
  0009-amixer-Fix-parsing-container-TLV-entries.patch

OBS-URL: https://build.opensuse.org/request/show/143675
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=66
2012-11-30 13:56:26 +00:00

61 lines
1.9 KiB
Diff

From b7ea343820a4616b5f6e3b200f776ab742893039 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 30 Nov 2012 14:35:31 +0100
Subject: [PATCH] alsaloop: Make alsaloop working without libsamplerate
When alsaloop is built with libsamplerate, it quits immediately with
No libsamplerate suppor
message. It's because the check of -A option and it's set as default
non-zero value.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
alsaloop/alsaloop.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/alsaloop/alsaloop.c b/alsaloop/alsaloop.c
index 8710dd1..6e94564 100644
--- a/alsaloop/alsaloop.c
+++ b/alsaloop/alsaloop.c
@@ -387,7 +387,9 @@ static int parse_config(int argc, char *argv[], snd_output_t *output,
int arg_nblock = 0;
int arg_effect = 0;
int arg_resample = 0;
+#ifdef USE_SAMPLERATE
int arg_samplerate = SRC_SINC_FASTEST + 1;
+#else
int arg_sync = SYNC_TYPE_AUTO;
int arg_slave = SLAVE_TYPE_AUTO;
int arg_thread = 0;
@@ -474,6 +476,7 @@ static int parse_config(int argc, char *argv[], snd_output_t *output,
case 'n':
arg_resample = 1;
break;
+#ifdef USE_SAMPLERATE
case 'A':
if (strcasecmp(optarg, "sincbest") == 0)
arg_samplerate = SRC_SINC_BEST_QUALITY;
@@ -491,6 +494,7 @@ static int parse_config(int argc, char *argv[], snd_output_t *output,
arg_sync = SRC_SINC_FASTEST;
arg_samplerate += 1;
break;
+#endif
case 'S':
if (strcasecmp(optarg, "samplerate") == 0)
arg_sync = SYNC_TYPE_SAMPLERATE;
@@ -610,11 +614,6 @@ static int parse_config(int argc, char *argv[], snd_output_t *output,
loop->src_enable = arg_samplerate > 0;
if (loop->src_enable)
loop->src_converter_type = arg_samplerate - 1;
-#else
- if (arg_samplerate > 0) {
- logit(LOG_CRIT, "No libsamplerate support.\n");
- exit(EXIT_FAILURE);
- }
#endif
set_loop_time(loop, arg_loop_time);
add_loop(loop);
--
1.8.0.1