move alsa-util.[ch], oss-util.[ch] and howl-wrap.[ch] to the modules directory since...

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@489 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/Makefile.am b/src/Makefile.am
index 8131794..7e8e73b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,7 +138,7 @@ if HAVE_HOWL
 bin_PROGRAMS += pabrowse
 endif
 
-bin_SCRIPTS = daemon/esdcompat.sh
+bin_SCRIPTS = esdcompat.sh
 
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
@@ -651,19 +651,19 @@ libx11prop_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS
 
 # OSS
 
-liboss_util_la_SOURCES = polypcore/oss-util.c polypcore/oss-util.h
+liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h
 liboss_util_la_LDFLAGS = -avoid-version
 
 # ALSA
 
-libalsa_util_la_SOURCES = polypcore/alsa-util.c polypcore/alsa-util.h
+libalsa_util_la_SOURCES = modules/alsa-util.c modules/alsa-util.h
 libalsa_util_la_LDFLAGS = -avoid-version
 libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS)
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 # HOWL
 
-libhowl_wrap_la_SOURCES = polypcore/howl-wrap.c polypcore/howl-wrap.h
+libhowl_wrap_la_SOURCES = modules/howl-wrap.c modules/howl-wrap.h
 libhowl_wrap_la_LDFLAGS = -avoid-version
 libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS)
 libhowl_wrap_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)

diff --git a/src/polypcore/alsa-util.c b/src/modules/alsa-util.c
similarity index 98%
rename from src/polypcore/alsa-util.c
rename to src/modules/alsa-util.c
index 7528ee0..8318f94 100644 (file)
--- a/src/polypcore/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -26,10 +26,11 @@
 #include <sys/types.h>
 #include <asoundlib.h>
 
-#include "alsa-util.h"
 #include <polyp/sample.h>
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
+#include "alsa-util.h"
 
 /* Set the hardware parameters of the given ALSA device. Returns the
  * selected fragment settings in *period and *period_size */

diff --git a/src/polypcore/alsa-util.h b/src/modules/alsa-util.h
similarity index 100%
rename from src/polypcore/alsa-util.h
rename to src/modules/alsa-util.h

diff --git a/src/polypcore/howl-wrap.c b/src/modules/howl-wrap.c
similarity index 100%
rename from src/polypcore/howl-wrap.c
rename to src/modules/howl-wrap.c

diff --git a/src/polypcore/howl-wrap.h b/src/modules/howl-wrap.h
similarity index 100%
rename from src/polypcore/howl-wrap.h
rename to src/modules/howl-wrap.h

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 48e90e9..d3fe71a 100644 (file)
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -41,11 +41,11 @@
 #include <polypcore/modargs.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/alsa-util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "module-alsa-sink-symdef.h"
+#include "alsa-util.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Sink")

diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index f03e51a..9453f84 100644 (file)
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -41,11 +41,11 @@
 #include <polypcore/modargs.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/alsa-util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "module-alsa-source-symdef.h"
+#include "alsa-util.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Source")

diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index 6986b03..80c762f 100644 (file)
--- a/src/modules/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -40,13 +40,13 @@
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
-#include <polypcore/oss-util.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
+#include "oss-util.h"
 #include "module-oss-mmap-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 0445841..264e879 100644 (file)
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -39,7 +39,6 @@
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
-#include <polypcore/oss-util.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
@@ -47,6 +46,7 @@
 #include <polypcore/log.h>
 
 #include "module-oss-symdef.h"
+#include "oss-util.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("OSS Sink/Source")

diff --git a/src/polypcore/oss-util.c b/src/modules/oss-util.c
similarity index 98%
rename from src/polypcore/oss-util.c
rename to src/modules/oss-util.c
index ae6772f..e9a133f 100644 (file)
--- a/src/polypcore/oss-util.c
+++ b/src/modules/oss-util.c
@@ -34,9 +34,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "oss-util.h"
-#include "util.h"
-#include "log.h"
 
 int pa_oss_open(const char *device, int *mode, int* pcaps) {
     int fd = -1;

diff --git a/src/polypcore/oss-util.h b/src/modules/oss-util.h
similarity index 100%
rename from src/polypcore/oss-util.h
rename to src/modules/oss-util.h