Attachment #109623 for bug #166046

View | Details | Raw Unified | Return to bug 166046
Collapse All | Expand All





AC_DEFUN([KDE_CHECK_ALSA],
[
  AC_CHECK_LIB([asound], [snd_pcm_open], [have_alsa05=yes], [have_alsa04=no])

  PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa09=yes], [have_alsa09=no])
    [have_alsa=yes])

  if test "x$have_alsa09" = "xyes"; then
    have_alsa="yes"

  AC_LANG_SAVE
  AC_LANG_C
  if test "x$have_alsa" = xyes; then
    AC_TRY_COMPILE([
      #include "confdefs.h"
      #ifdef HAVE_SYS_ASOUNDLIB_H
      #include <sys/asoundlib.h>
      #endif
      #ifdef HAVE_ALSA_ASOUNDLIB_H
      #include <alsa/asoundlib.h>
      #endif
    ],[
      #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)
        /* we have ALSA 0.5.x */
      #else
        #error not ALSA 0.5.x
      #endif
    ],
    have_alsa_0_5=yes)

    AC_TRY_COMPILE([
      #include "confdefs.h"
      #ifdef HAVE_SYS_ASOUNDLIB_H
      #include <sys/asoundlib.h>
      #endif
      #ifdef HAVE_ALSA_ASOUNDLIB_H
      #include <alsa/asoundlib.h>
      #endif
    ],[
      #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)
        /* we have ALSA 0.9.x */
      #else
        #error not ALSA 0.9.x
      #endif
    ],
    have_alsa_0_9=yes)

    AC_TRY_COMPILE([
      #include "confdefs.h"
      #ifdef HAVE_SYS_ASOUNDLIB_H
      #include <sys/asoundlib.h>
      #endif
      #ifdef HAVE_ALSA_ASOUNDLIB_H
      #include <alsa/asoundlib.h>
      #endif
    ],[
      #if (SND_LIB_MAJOR == 1)
        /* we have ALSA 1.x */
      #else
        #error not ALSA 1.x
      #endif
    ],
    have_alsa_1=yes)
  fi
  AC_LANG_RESTORE

  if test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes; then
    # for kmix/ and akode/
    LIBASOUND="-lasound"
    AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
  elif test "x$have_alsa05" = "xyes"; then
    have_alsa="yes"
    AC_CHECK_HEADERS([sys/asoundlib.h])
    AC_DEFINE(HAVE_LIBASOUND1, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)])
    ALSA_LIBS="-lasound"

  if test "x$have_alsa_0_5" = xyes; then
    # for arts/
    ARTS_LIBASOUND="-lasound"
    AC_DEFINE(HAVE_ARTS_LIBASOUND, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)])
  fi

  AC_SUBST([ALSA_CFLAGS])
  AC_SUBST([ALSA_LIBS])
])

AC_DEFUN([KDE_CHECK_CDPARANOIA],

Lines 108-114 KSCD::KSCD( QWidget *parent, const char Link Here

(-)kdemultimedia-3.5.6/kscd/kscd.cpp (-1 / +1 lines)
108	#if defined(BUILD_CDDA)	108	#if defined(BUILD_CDDA)
109	audio_systems_list	109	audio_systems_list
110	<< "arts"	110	<< "arts"
111	#if defined(HAVE_ARTS_LIBASOUND2)	111	#if defined(HAVE_LIBASOUND2)
112	<< "alsa"	112	<< "alsa"
113	#endif	113	#endif
114	#ifdef USE_SUN_AUDIO	114	#ifdef USE_SUN_AUDIO




/**
 * compile real version if we have ALSA support, dummy version otherwise
 */
#if defined(HAVE_LIBASOUND2) || defined(HAVE_LIBASOUND1)

#ifdef HAVE_SYS_ASOUNDLIB_H
#include <alsa/asoundlib.h>
#elif defined(HAVE_SYS_ASOUNDLIB_H)
#include <sys/asoundlib.h>
#else
#include <asoundlib.h>
#endif

#include "alsamidiport_impl.h"

	};
	list<PortEntry> ports;

#ifdef HAVE_LIBASOUND2
/* ALSA-0.9 specific code */
	int alsaOpen() {
		return snd_seq_open(&seq, "hw", SND_SEQ_OPEN_DUPLEX, 0);





#include "alsamidiport_impl.h"

#if defined(HAVE_LIBASOUND2) || defined(HAVE_LIBASOUND1)
#include <arts/debug.h>

#ifdef HAVE_LIBASOUND1
#define snd_seq_queue_status_alloca(x) \
	*x = (snd_seq_queue_status_t *)alloca(sizeof(snd_seq_queue_status_t))
#define snd_seq_queue_status_get_tick_time(x) x->tick


void AlsaMidiPort_impl::flushAlsa()
{
#ifdef HAVE_LIBASOUND2
	snd_seq_drain_output(alsaSeq);
#else
	int err;




/**
 * compile real version if we have ALSA support, dummy version otherwise
 */
#if defined(HAVE_LIBASOUND2) || defined(HAVE_LIBASOUND1)

#ifdef HAVE_SYS_ASOUNDLIB_H
#include <alsa/asoundlib.h>
#elif defined(HAVE_SYS_ASOUNDLIB_H)
#include <sys/asoundlib.h>
#else
#include <asoundlib.h>
#endif

#include "artsmidi.h"

};

}
#endif /* HAVE_LIBASOUND2 */
#endif /* ARTS_ALSAMIDIPORT_IMPL_H */

Lines 30-36 libartsmidi_la_SOURCES = midimanager_imp Link Here

(-)kdemultimedia-3.5.6/arts/midi/Makefile.am (-1 / +2 lines)
30	alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc	30	alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc
31	libartsmidi_la_COMPILE_FIRST = artsmidi.h	31	libartsmidi_la_COMPILE_FIRST = artsmidi.h
32		32
33	libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow $(ARTS_LIBASOUND)	33	libartsmidi_la_CFLAGS = $(ALSA_CFLAGS)
		34	libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow $(ALSA_LIBS)
34	libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \	35	libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
35	-no-undefined	36	-no-undefined
36		37




	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp

kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version

kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
	mixertoolbox.cpp mixer_backend.cpp

kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version

kmix_panelapplet_la_SOURCES = kmixapplet.cpp \

	kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp

kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)

xdg_apps_DATA = kmix.desktop


Lines 18-24 Link Here

(-)kdemultimedia-3.5.6/kscd/libwm/audio/audio_alsa.c (-1 / +1 lines)
18		18
19	#include <config.h>	19	#include <config.h>
20		20
21	#if defined(HAVE_ARTS_LIBASOUND2)	21	#if defined(HAVE_LIBASOUND2)
22		22
23	#include <alsa/asoundlib.h>	23	#include <alsa/asoundlib.h>
24	#include "audio.h"	24	#include "audio.h"

Lines 16-22 struct audio_oops* setup_soundsystem(con Link Here

(-)kdemultimedia-3.5.6/kscd/libwm/audio/audio.c (-1 / +1 lines)
16	if(!strcmp(ss, "arts"))	16	if(!strcmp(ss, "arts"))
17	return setup_arts(dev, ctl);	17	return setup_arts(dev, ctl);
18	#endif	18	#endif
19	#if defined(HAVE_ARTS_LIBASOUND2)	19	#if defined(HAVE_LIBASOUND2)
20	if(!strcmp(ss, "alsa"))	20	if(!strcmp(ss, "alsa"))
21	return setup_alsa(dev, ctl);	21	return setup_alsa(dev, ctl);
22	#endif	22	#endif

Lines 10-16 INCLUDES = $(all_includes) Link Here

(-)kdemultimedia-3.5.6/kscd/libwm/Makefile.am (-1 / +1 lines)
10	noinst_LTLIBRARIES = libworkman.la	10	noinst_LTLIBRARIES = libworkman.la
11		11
12	libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)	12	libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)
13	libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)	13	libworkman_la_LIBADD = audio/libworkmanaudio.la $(ALSA_LIBS)
14		14
15	libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\	15	libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
16	database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\	16	database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\

Lines 40-50 enum { DECODE_TEST, DECODE_AUDIO, DECODE Link Here

(-)kdemultimedia-3.5.6/mpg123_artsplugin/mpg123/audio.h (-4 / +3 lines)
40	#include <dmedia/audio.h>	40	#include <dmedia/audio.h>
41	#endif	41	#endif
42		42
43		43	#ifdef HAVE_SYS_ASOUNDLIB_H
44	#ifdef HAVE_ALSA_ASOUNDLIB_H
45	#include <alsa/asoundlib.h>
46	#elif defined(HAVE_SYS_ASOUNDLIB_H)
47	#include <sys/asoundlib.h>	44	#include <sys/asoundlib.h>
		45	#else
		46	#include <asoundlib.h>
48	#endif	47	#endif
49		48
50	struct audio_info_struct	49	struct audio_info_struct

Return to bug 166046

Lines 152-239 AC_DEFUN([KDE_CHECK_OSSAUDIO], Link Here

(-)kdemultimedia-3.5.6/configure.in.in (-77 / +11 lines)
152		152
153	AC_DEFUN([KDE_CHECK_ALSA],	153	AC_DEFUN([KDE_CHECK_ALSA],
154	[	154	[
155	have_alsa=no	155	AC_CHECK_LIB([asound], [snd_pcm_open], [have_alsa05=yes], [have_alsa04=no])
156		156
157	AC_CHECK_HEADERS([sys/asoundlib.h alsa/asoundlib.h],	157	PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa09=yes], [have_alsa09=no])
158	[have_alsa=yes])
159		158
160	AC_CHECK_LIB(asound, snd_seq_create_simple_port,	159	if test "x$have_alsa09" = "xyes"; then
161	[:], [have_alsa=no])	160	have_alsa="yes"
162
163	AC_LANG_SAVE
164	AC_LANG_C
165	if test "x$have_alsa" = xyes; then
166	AC_TRY_COMPILE([
167	#include "confdefs.h"
168	#ifdef HAVE_SYS_ASOUNDLIB_H
169	#include <sys/asoundlib.h>
170	#endif
171	#ifdef HAVE_ALSA_ASOUNDLIB_H
172	#include <alsa/asoundlib.h>
173	#endif
174	],[
175	#if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)
176	/* we have ALSA 0.5.x */
177	#else
178	#error not ALSA 0.5.x
179	#endif
180	],
181	have_alsa_0_5=yes)
182
183	AC_TRY_COMPILE([
184	#include "confdefs.h"
185	#ifdef HAVE_SYS_ASOUNDLIB_H
186	#include <sys/asoundlib.h>
187	#endif
188	#ifdef HAVE_ALSA_ASOUNDLIB_H
189	#include <alsa/asoundlib.h>
190	#endif
191	],[
192	#if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)
193	/* we have ALSA 0.9.x */
194	#else
195	#error not ALSA 0.9.x
196	#endif
197	],
198	have_alsa_0_9=yes)
199
200	AC_TRY_COMPILE([
201	#include "confdefs.h"
202	#ifdef HAVE_SYS_ASOUNDLIB_H
203	#include <sys/asoundlib.h>
204	#endif
205	#ifdef HAVE_ALSA_ASOUNDLIB_H
206	#include <alsa/asoundlib.h>
207	#endif
208	],[
209	#if (SND_LIB_MAJOR == 1)
210	/* we have ALSA 1.x */
211	#else
212	#error not ALSA 1.x
213	#endif
214	],
215	have_alsa_1=yes)
216	fi
217	AC_LANG_RESTORE
218
219	if test "x$have_alsa_0_9" = xyes \|\| test "x$have_alsa_1" = xyes; then
220	# for kmix/ and akode/
221	LIBASOUND="-lasound"
222	AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])	161	AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
223		162	elif test "x$have_alsa05" = "xyes"; then
224	# for arts/	163	have_alsa="yes"
225	ARTS_LIBASOUND="-lasound"	164	AC_CHECK_HEADERS([sys/asoundlib.h])
226	AC_DEFINE(HAVE_ARTS_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])	165	AC_DEFINE(HAVE_LIBASOUND1, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)])
227	fi	166	ALSA_LIBS="-lasound"
228
229	if test "x$have_alsa_0_5" = xyes; then
230	# for arts/
231	ARTS_LIBASOUND="-lasound"
232	AC_DEFINE(HAVE_ARTS_LIBASOUND, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)])
233	fi	167	fi
234		168
235	AC_SUBST(LIBASOUND)	169	AC_SUBST([ALSA_CFLAGS])
236	AC_SUBST(ARTS_LIBASOUND)	170	AC_SUBST([ALSA_LIBS])
237	])	171	])
238		172
239	AC_DEFUN([KDE_CHECK_CDPARANOIA],	173	AC_DEFUN([KDE_CHECK_CDPARANOIA],

Lines 29-40 Link Here

(-)kdemultimedia-3.5.6/arts/midi/alsamidigateway_impl.cc (-5 / +5 lines)
29	/**	29	/**
30	* compile real version if we have ALSA support, dummy version otherwise	30	* compile real version if we have ALSA support, dummy version otherwise
31	*/	31	*/
32	#if defined(HAVE_ARTS_LIBASOUND2) \|\| defined(HAVE_ARTS_LIBASOUND)	32	#if defined(HAVE_LIBASOUND2) \|\| defined(HAVE_LIBASOUND1)
33		33
34	#ifdef HAVE_ALSA_ASOUNDLIB_H	34	#ifdef HAVE_SYS_ASOUNDLIB_H
35	#include <alsa/asoundlib.h>
36	#elif defined(HAVE_SYS_ASOUNDLIB_H)
37	#include <sys/asoundlib.h>	35	#include <sys/asoundlib.h>
		36	#else
		37	#include <asoundlib.h>
38	#endif	38	#endif
39		39
40	#include "alsamidiport_impl.h"	40	#include "alsamidiport_impl.h"
Lines 57-63 protected: Link Here
57	};	57	};
58	list<PortEntry> ports;	58	list<PortEntry> ports;
59		59
60	#ifdef HAVE_ARTS_LIBASOUND2	60	#ifdef HAVE_LIBASOUND2
61	/* ALSA-0.9 specific code */	61	/* ALSA-0.9 specific code */
62	int alsaOpen() {	62	int alsaOpen() {
63	return snd_seq_open(&seq, "hw", SND_SEQ_OPEN_DUPLEX, 0);	63	return snd_seq_open(&seq, "hw", SND_SEQ_OPEN_DUPLEX, 0);

Lines 25-37 kmix_la_SOURCES = main.cpp kmix.cpp kmix Link Here

(-)kdemultimedia-3.5.6/kmix/Makefile.am (-3 / +3 lines)
25	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \	25	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
26	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp	26	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
27		27
28	kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)	28	kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
29	kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version	29	kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
30		30
31	kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \	31	kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
32	mixertoolbox.cpp mixer_backend.cpp	32	mixertoolbox.cpp mixer_backend.cpp
33		33
34	kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)	34	kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
35	kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version	35	kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
36		36
37	kmix_panelapplet_la_SOURCES = kmixapplet.cpp \	37	kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
Lines 42-48 kmix_panelapplet_la_SOURCES = kmixapplet Link Here
42	kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp	42	kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp
43		43
44	kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module	44	kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
45	kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)	45	kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
46		46
47	xdg_apps_DATA = kmix.desktop	47	xdg_apps_DATA = kmix.desktop
48		48