[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/kscd/libwm
From:       alex kern <alex.kern () gmx ! de>
Date:       2003-07-07 21:39:05
[Download RAW message or body]

CVS commit by kernalex: 

Another fix of building, thanks to Martijn Klingens <klingens@kde.org> for attention


  M +1 -1      Makefile.am   1.16
  M +2 -4      audio/audio.c   1.4
  M +0 -2      audio/audio.h   1.3
  M +4 -2      audio/audio_alsa.c   1.5
  M +2 -5      audio/audio_arts.c   1.5


--- kdemultimedia/kscd/libwm/Makefile.am  #1.15:1.16
@@ -29,3 +29,3 @@
 cddaslave_SOURCES = cddaslave.c plat_linux_cdda.c plat_sun_cdda.c
 
-cddaslave_LDADD = audio/libworkmanaudio.a libworkman.la $(ARTSC_LIBS) $(ALSA_LIBS)
+cddaslave_LDADD = audio/libworkmanaudio.a libworkman.la $(ARTSC_LIBS) $(ARTS_LIBASOUND)

--- kdemultimedia/kscd/libwm/audio/audio.c  #1.3:1.4
@@ -5,11 +5,9 @@
 struct audio_oops* setup_soundsystem(const char* ss, const char* dev, const char* ctl)
 {
+  if(!strcmp(ss, "arts"))
+    return setup_arts(dev, ctl);
 #if defined(HAVE_ARTS_LIBASOUND2)
   if(!strcmp(ss, "alsa"))
     return setup_alsa(dev, ctl);
-#endif
-#ifdef USE_ARTS
-  if(!strcmp(ss, "arts"))
-    return setup_arts(dev, ctl);
 #endif
 #ifdef USE_SUN_AUDIO

--- kdemultimedia/kscd/libwm/audio/audio.h  #1.2:1.3
@@ -8,6 +8,4 @@
 #endif
 
-#define USE_ARTS
-
 struct audio_oops {
   int (*wmaudio_open)(void);

--- kdemultimedia/kscd/libwm/audio/audio_alsa.c  #1.4:1.5
@@ -13,9 +13,11 @@
 
 
-/*#include "audio.h"*/  
+
+#include "config.h"
 
 #if defined(HAVE_ARTS_LIBASOUND2)
-#include <alsa/asoundlib.h>
 
+#include <alsa/asoundlib.h>
+#include "audio.h"
 
 char* device = NULL;

--- kdemultimedia/kscd/libwm/audio/audio_arts.c  #1.4:1.5
@@ -22,10 +22,9 @@
  * Alexander Kern alex.kern@gmx.de
  */
-#include "audio.h"
-
-#ifdef include_ARTS_TRUE
 
 #include <artsc.h>
 
+#include "audio.h"
+
 arts_stream_t arts_stream = NULL;
 
@@ -129,4 +128,2 @@ setup_arts(const char *dev, const char *
   return &arts_oops;
 }
-
-#endif /* USE_ARTS */


[prev in list] [next in list] [prev in thread] [next in thread]