87f2283286
- Backport upstream fixes: A couple of USB-audio config addition/fix, dmix PCM stop fix, a memory leak fix, DSD format endianess fix, PCM timestamp fixes, etc. 0050-USB-Audio-Add-Scarlett-2i4-USB-to-S-PDIF-blacklist.patch 0051-snd_user_file-fix-memory-leak.patch 0052-pcm-dmix-Don-t-ignore-SND_TIMER_EVENT_MSTOP.patch 0053-snd_dlsym-only-do-versioning-checks-if-built-with-ve.patch 0054-dlmisc-Remove-unused-label.patch 0055-USB-audio-Add-five-more-cards-to-IEC958-blacklist.patch 0056-pcm-Fix-DSD-sample-format-endianess-and-add-big-endi.patch 0057-mixer-Fix-inclusion-of-config.h.patch 0058-mixer-Fix-unused-parameter-warnings.patch 0059-ucm-Fix-uninitialized-err-in-snd_use_case_set.patch 0060-pcm-Fix-assorted-tstamp_type-bugs-omissions.patch OBS-URL: https://build.opensuse.org/request/show/264171 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=174
43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
From c0a708180fa22133940c4bc50fbc627801f188eb Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Fri, 21 Nov 2014 15:20:48 +0100
|
|
Subject: [PATCH 57/60] mixer: Fix inclusion of config.h
|
|
|
|
config.h wasn't read or read too late in some files in src/mixer.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/mixer/simple.c | 1 +
|
|
src/mixer/simple_none.c | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/mixer/simple.c b/src/mixer/simple.c
|
|
index ec22a9c7d237..fd9ba93ee791 100644
|
|
--- a/src/mixer/simple.c
|
|
+++ b/src/mixer/simple.c
|
|
@@ -36,6 +36,7 @@
|
|
#include <fcntl.h>
|
|
#include <sys/ioctl.h>
|
|
#include <math.h>
|
|
+#include "config.h"
|
|
#include "mixer_local.h"
|
|
#include "mixer_simple.h"
|
|
|
|
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
|
|
index 1c2774acbc35..4e556604d6c3 100644
|
|
--- a/src/mixer/simple_none.c
|
|
+++ b/src/mixer/simple_none.c
|
|
@@ -39,8 +39,8 @@
|
|
#include <math.h>
|
|
#include <limits.h>
|
|
#include <alsa/asoundlib.h>
|
|
-#include "mixer_simple.h"
|
|
#include "config.h"
|
|
+#include "mixer_simple.h"
|
|
|
|
#ifndef DOC_HIDDEN
|
|
|
|
--
|
|
2.1.3
|
|
|