[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-268-gd4bda31

Lennart Poettering gitmailer-noreply at 0pointer.de
Thu Jan 15 12:29:32 PST 2009 

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  bae221cca97816e0ae0395ac1e561aa208cb0346 (commit)

- Log -----------------------------------------------------------------
d4bda31... include libcli.la in libprotocol-cli's dependencies
4210119... add stub makefiles for oss and alsa subdirs
c7fff97... move alsa and oss modules into their own subdirectories
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am                             |   18 +++++++++---------
 src/modules/{bluetooth => alsa}/Makefile    |    0 
 src/modules/{ => alsa}/alsa-util.c          |    0 
 src/modules/{ => alsa}/alsa-util.h          |    0 
 src/modules/{ => alsa}/module-alsa-sink.c   |    0 
 src/modules/{ => alsa}/module-alsa-source.c |    0 
 src/modules/{bluetooth => oss}/Makefile     |    0 
 src/modules/{ => oss}/module-oss.c          |    0 
 src/modules/{ => oss}/oss-util.c            |    0 
 src/modules/{ => oss}/oss-util.h            |    0 
 10 files changed, 9 insertions(+), 9 deletions(-)
 copy src/modules/{bluetooth => alsa}/Makefile (100%)
 rename src/modules/{ => alsa}/alsa-util.c (100%)
 rename src/modules/{ => alsa}/alsa-util.h (100%)
 rename src/modules/{ => alsa}/module-alsa-sink.c (100%)
 rename src/modules/{ => alsa}/module-alsa-source.c (100%)
 copy src/modules/{bluetooth => oss}/Makefile (100%)
 rename src/modules/{ => oss}/module-oss.c (100%)
 rename src/modules/{ => oss}/oss-util.c (100%)
 rename src/modules/{ => oss}/oss-util.h (100%)

-----------------------------------------------------------------------

commit c7fff97782bb59815e7ebd38895cc1480719e24c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jan 15 21:02:01 2009 +0100

    move alsa and oss modules into their own subdirectories

diff --git a/src/Makefile.am b/src/Makefile.am
index 4b36f6f..62df962 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1036,9 +1036,9 @@ SYMDEF_FILES = \
 		modules/module-x11-bell-symdef.h \
 		modules/module-x11-publish-symdef.h \
 		modules/module-x11-xsmp-symdef.h \
-		modules/module-oss-symdef.h \
-		modules/module-alsa-sink-symdef.h \
-		modules/module-alsa-source-symdef.h \
+		modules/oss/module-oss-symdef.h \
+		modules/alsa/module-alsa-sink-symdef.h \
+		modules/alsa/module-alsa-source-symdef.h \
 		modules/module-solaris-symdef.h \
 		modules/module-waveout-symdef.h \
 		modules/module-detect-symdef.h \
@@ -1232,27 +1232,27 @@ module_x11_xsmp_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libpulsecore- at PA_MAJORMINOR
 
 # OSS
 
-liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h
+liboss_util_la_SOURCES = modules/oss/oss-util.c modules/oss/oss-util.h
 liboss_util_la_LDFLAGS = -avoid-version
 liboss_util_la_LIBADD = libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
 
-module_oss_la_SOURCES = modules/module-oss.c
+module_oss_la_SOURCES = modules/oss/module-oss.c
 module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_oss_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
 
 # ALSA
 
-libalsa_util_la_SOURCES = modules/alsa-util.c modules/alsa-util.h
+libalsa_util_la_SOURCES = modules/alsa/alsa-util.c modules/alsa/alsa-util.h
 libalsa_util_la_LDFLAGS = -avoid-version
 libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
-module_alsa_sink_la_SOURCES = modules/module-alsa-sink.c
+module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c
 module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
 module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
-module_alsa_source_la_SOURCES = modules/module-alsa-source.c
+module_alsa_source_la_SOURCES = modules/alsa/module-alsa-source.c
 module_alsa_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
 module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
diff --git a/src/modules/alsa-util.c b/src/modules/alsa/alsa-util.c
similarity index 100%
rename from src/modules/alsa-util.c
rename to src/modules/alsa/alsa-util.c
diff --git a/src/modules/alsa-util.h b/src/modules/alsa/alsa-util.h
similarity index 100%
rename from src/modules/alsa-util.h
rename to src/modules/alsa/alsa-util.h
diff --git a/src/modules/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c
similarity index 100%
rename from src/modules/module-alsa-sink.c
rename to src/modules/alsa/module-alsa-sink.c
diff --git a/src/modules/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
similarity index 100%
rename from src/modules/module-alsa-source.c
rename to src/modules/alsa/module-alsa-source.c
diff --git a/src/modules/module-oss.c b/src/modules/oss/module-oss.c
similarity index 100%
rename from src/modules/module-oss.c
rename to src/modules/oss/module-oss.c
diff --git a/src/modules/oss-util.c b/src/modules/oss/oss-util.c
similarity index 100%
rename from src/modules/oss-util.c
rename to src/modules/oss/oss-util.c
diff --git a/src/modules/oss-util.h b/src/modules/oss/oss-util.h
similarity index 100%
rename from src/modules/oss-util.h
rename to src/modules/oss/oss-util.h

commit 421011930aec61ac5ec8883b1084c439312fdaa3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jan 15 21:03:32 2009 +0100

    add stub makefiles for oss and alsa subdirs

diff --git a/src/modules/alsa/Makefile b/src/modules/alsa/Makefile
new file mode 120000
index 0000000..efe5a33
--- /dev/null
+++ b/src/modules/alsa/Makefile
@@ -0,0 +1 @@
+../../pulse/Makefile
\ No newline at end of file
diff --git a/src/modules/oss/Makefile b/src/modules/oss/Makefile
new file mode 120000
index 0000000..efe5a33
--- /dev/null
+++ b/src/modules/oss/Makefile
@@ -0,0 +1 @@
+../../pulse/Makefile
\ No newline at end of file

commit d4bda31ba12e66ebd246daf0d928f7a6d259022d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jan 15 21:29:18 2009 +0100

    include libcli.la in libprotocol-cli's dependencies

diff --git a/src/Makefile.am b/src/Makefile.am
index 62df962..99ed7b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -801,7 +801,7 @@ libcli_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecom
 
 libprotocol_cli_la_SOURCES = pulsecore/protocol-cli.c pulsecore/protocol-cli.h
 libprotocol_cli_la_LDFLAGS = -avoid-version
-libprotocol_cli_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
+libprotocol_cli_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la libcli.la
 
 libprotocol_http_la_SOURCES = pulsecore/protocol-http.c pulsecore/protocol-http.h
 libprotocol_http_la_LDFLAGS = -avoid-version

-- 
hooks/post-receive
PulseAudio Sound Server

More information about the pulseaudio-commits mailing list