blob: 1346f740445db216a6c6c3cd787ecaa7d38e6e69 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
commit 006fda07f559206f9f9f1ccc29080ce71a367b09
Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun Apr 16 21:23:58 2017 +0200
Fix linking with ALSA
REVIEW: 130089
diff --git a/src/kcompactdisc.cpp b/src/kcompactdisc.cpp
index 437648f..2e297d1 100644
--- a/src/kcompactdisc.cpp
+++ b/src/kcompactdisc.cpp
@@ -22,6 +22,8 @@
#include "kcompactdisc.h"
#include "kcompactdisc_p.h"
+#include <config-alsa.h>
+
#include <QtDBus>
#include <QUrl>
#include <QtGlobal>
diff --git a/src/wmlib/audio/audio.c b/src/wmlib/audio/audio.c
index 9ed7a82..729ada5 100644
--- a/src/wmlib/audio/audio.c
+++ b/src/wmlib/audio/audio.c
@@ -19,9 +19,8 @@
#include "audio.h"
#include "../include/wm_config.h"
-#ifdef HAVE_ALSA
#include <config-alsa.h>
-#endif
+
#include <string.h>
struct audio_oops *setup_phonon(const char *dev, const char *ctl);
diff --git a/src/wmlib/audio/audio_alsa.c b/src/wmlib/audio/audio_alsa.c
index 87bbca5..af1a1cb 100644
--- a/src/wmlib/audio/audio_alsa.c
+++ b/src/wmlib/audio/audio_alsa.c
@@ -26,9 +26,10 @@
#include "../include/wm_struct.h"
#include "../include/wm_config.h"
+#include <config-alsa.h>
+
#ifdef HAVE_ALSA
-#include <config-alsa.h>
#include <alsa/asoundlib.h>
static char *device = NULL;
|
GitWeb
