[polypaudio-commits] r489 - in /trunk/src: ./ modules/ polypcore/

svnmailer-noreply at 0pointer.de svnmailer-noreply at 0pointer.de
Thu Feb 16 14:08:07 PST 2006 

Author: lennart
Date: Thu Feb 16 23:08:06 2006
New Revision: 489

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=489&root=polypaudio&view=rev
Log:
move alsa-util.[ch], oss-util.[ch] and howl-wrap.[ch] to the modules directory since they are just helper source used exclusively by the modules

Added:
    trunk/src/modules/alsa-util.c
      - copied, changed from r488, trunk/src/polypcore/alsa-util.c
    trunk/src/modules/alsa-util.h
      - copied unchanged from r488, trunk/src/polypcore/alsa-util.h
    trunk/src/modules/howl-wrap.c
      - copied unchanged from r488, trunk/src/polypcore/howl-wrap.c
    trunk/src/modules/howl-wrap.h
      - copied unchanged from r488, trunk/src/polypcore/howl-wrap.h
    trunk/src/modules/oss-util.c
      - copied, changed from r488, trunk/src/polypcore/oss-util.c
    trunk/src/modules/oss-util.h
      - copied unchanged from r488, trunk/src/polypcore/oss-util.h
Removed:
    trunk/src/polypcore/alsa-util.c
    trunk/src/polypcore/alsa-util.h
    trunk/src/polypcore/howl-wrap.c
    trunk/src/polypcore/howl-wrap.h
    trunk/src/polypcore/oss-util.c
    trunk/src/polypcore/oss-util.h
Modified:
    trunk/src/   (props changed)
    trunk/src/Makefile.am
    trunk/src/modules/module-alsa-sink.c
    trunk/src/modules/module-alsa-source.c
    trunk/src/modules/module-oss-mmap.c
    trunk/src/modules/module-oss.c

Propchange: trunk/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 16 23:08:06 2006
@@ -1,3 +1,4 @@
+esdcompat.sh
 pax11publish
 voltest
 paplay

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=489&root=polypaudio&r1=488&r2=489&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Feb 16 23:08:06 2006
@@ -138,7 +138,7 @@
 bin_PROGRAMS += pabrowse
 endif
 
-bin_SCRIPTS = daemon/esdcompat.sh
+bin_SCRIPTS = esdcompat.sh
 
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-error- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la
@@ -651,19 +651,19 @@
 
 # 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)

Copied: trunk/src/modules/alsa-util.c (from r488, trunk/src/polypcore/alsa-util.c)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.c?p2=trunk/src/modules/alsa-util.c&p1=trunk/src/polypcore/alsa-util.c&r1=488&r2=489&rev=489&root=polypaudio&view=diff
==============================================================================
--- trunk/src/polypcore/alsa-util.c (original)
+++ trunk/src/modules/alsa-util.c Thu Feb 16 23:08:06 2006
@@ -26,10 +26,11 @@
 #include <sys/types.h>
 #include <asoundlib.h>
 
+#include <polyp/sample.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "alsa-util.h"
-#include <polyp/sample.h>
-#include "xmalloc.h"
-#include "log.h"
 
 /* Set the hardware parameters of the given ALSA device. Returns the
  * selected fragment settings in *period and *period_size */

Modified: trunk/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-sink.c?rev=489&root=polypaudio&r1=488&r2=489&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-sink.c (original)
+++ trunk/src/modules/module-alsa-sink.c Thu Feb 16 23:08:06 2006
@@ -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")

Modified: trunk/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-source.c?rev=489&root=polypaudio&r1=488&r2=489&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-source.c (original)
+++ trunk/src/modules/module-alsa-source.c Thu Feb 16 23:08:06 2006
@@ -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")

Modified: trunk/src/modules/module-oss-mmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss-mmap.c?rev=489&root=polypaudio&r1=488&r2=489&view=diff
==============================================================================
--- trunk/src/modules/module-oss-mmap.c (original)
+++ trunk/src/modules/module-oss-mmap.c Thu Feb 16 23:08:06 2006
@@ -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")

Modified: trunk/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss.c?rev=489&root=polypaudio&r1=488&r2=489&view=diff
==============================================================================
--- trunk/src/modules/module-oss.c (original)
+++ trunk/src/modules/module-oss.c Thu Feb 16 23:08:06 2006
@@ -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")

Copied: trunk/src/modules/oss-util.c (from r488, trunk/src/polypcore/oss-util.c)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.c?p2=trunk/src/modules/oss-util.c&p1=trunk/src/polypcore/oss-util.c&r1=488&r2=489&rev=489&root=polypaudio&view=diff
==============================================================================
--- trunk/src/polypcore/oss-util.c (original)
+++ trunk/src/modules/oss-util.c Thu Feb 16 23:08:06 2006
@@ -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;

More information about the pulseaudio-commits mailing list