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

[Lennart Poettering]

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  209a8d7b5546e51ff1a88444c6d6282f6e74301b (commit)

- Log -----------------------------------------------------------------
cb6a919... Load module-volume-restore and module-device-restore before all other modules
3f20a15... Pass GDBM_NOLOCK to gdbm
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/default.pa.in            |    8 ++++----
 src/modules/module-device-restore.c |    2 +-
 src/modules/module-stream-restore.c |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

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

commit 3f20a152be5b57cb90cd4124cf60c29435cd1662
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Dec 17 20:22:42 2008 +0100

    Pass GDBM_NOLOCK to gdbm
    
    gdbm still uses BSD lockf for locking which is incompatible with NFS.
    Since we don't need the locking here since the db files in question
    should never be accessed by more than one process since they are
    per-home-dir and per-machine we can disable locking without any ill
    results.
    
    This should fix rhbz #471279.

diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
index 86a7881..c0cb0dc 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -332,7 +332,7 @@ int pa__init(pa_module*m) {
     if (!fname)
         goto fail;
 
-    if (!(u->gdbm_file = gdbm_open(fname, 0, GDBM_WRCREAT, 0600, NULL))) {
+    if (!(u->gdbm_file = gdbm_open(fname, 0, GDBM_WRCREAT|GDBM_NOLOCK, 0600, NULL))) {
         pa_log("Failed to open volume database '%s': %s", fname, gdbm_strerror(gdbm_errno));
         pa_xfree(fname);
         goto fail;
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 5589700..fdf69a2 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -741,7 +741,7 @@ int pa__init(pa_module*m) {
     if (!fname)
         goto fail;
 
-    if (!(u->gdbm_file = gdbm_open(fname, 0, GDBM_WRCREAT, 0600, NULL))) {
+    if (!(u->gdbm_file = gdbm_open(fname, 0, GDBM_WRCREAT|GDBM_NOLOCK, 0600, NULL))) {
         pa_log("Failed to open volume database '%s': %s", fname, gdbm_strerror(gdbm_errno));
         pa_xfree(fname);
         goto fail;

commit cb6a91973017160e9b10a8f86d831cbcf13bf53e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Dec 17 20:30:01 2008 +0100

    Load module-volume-restore and module-device-restore before all other modules
    
    Since m-v-r and m-d-r become active in the FIXATE hooks for
    stream/device creation we need to make sure the modules are loaded
    before the first devices/streams are created.

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index a831876..7de4c07 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -29,6 +29,10 @@
 
 .fail
 
+### Automatically restore the volume of streams and devices
+load-module module-device-restore
+load-module module-stream-restore
+
 ### Load audio drivers statically (it's probably better to not load
 ### these drivers manually, but instead use module-hal-detect --
 ### see below -- for doing this automatically)
@@ -75,10 +79,6 @@ load-module module-native-protocol-unix
 ### Enable flat volumes where possible
 load-module module-flat-volume
 
-### Automatically restore the volume of streams and devices
-load-module module-device-restore
-load-module module-stream-restore
-
 ### Automatically restore the default sink/source when changed by the user during runtime
 load-module module-default-device-restore
 

-- 
hooks/post-receive
PulseAudio Sound Server