[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test7-4-g6152c52

[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  380e97a596e8e7be122285b005a50635e20d58fc (commit)

- Log -----------------------------------------------------------------
6152c52 Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
143e1ba downgrade a few messages
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/main.c            |    6 +++---
 src/modules/alsa/alsa-util.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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

commit 143e1ba73947b1a721916243ffc6f88579fc0b12
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 3 17:49:05 2009 +0200

    downgrade a few messages

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 2faf650..16c87bd 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -538,7 +538,7 @@ int main(int argc, char *argv[]) {
 
         if ((conf->high_priority && !allow_high_priority) ||
             (conf->realtime_scheduling && !allow_realtime))
-            pa_log_notice(_("Called SUID root and real-time and/or high-priority scheduling was requested in the configuration. However, we lack the necessary privileges:\n"
+            pa_log_info(_("Called SUID root and real-time and/or high-priority scheduling was requested in the configuration. However, we lack the necessary privileges:\n"
                             "We are not in group '%s', PolicyKit refuse to grant us the requested privileges and we have no increase RLIMIT_NICE/RLIMIT_RTPRIO resource limits.\n"
                             "For enabling real-time/high-priority scheduling please acquire the appropriate PolicyKit privileges, or become a member of '%s', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user."),
                           PA_REALTIME_GROUP, PA_REALTIME_GROUP);
@@ -563,7 +563,7 @@ int main(int argc, char *argv[]) {
 #endif
 
     if (conf->high_priority && !pa_can_high_priority()) {
-        pa_log_warn(_("High-priority scheduling enabled in configuration but not allowed by policy."));
+        pa_log_info(_("High-priority scheduling enabled in configuration but not allowed by policy."));
         conf->high_priority = FALSE;
     }
 
@@ -609,7 +609,7 @@ int main(int argc, char *argv[]) {
     }
 
     if (conf->realtime_scheduling && !pa_can_realtime()) {
-        pa_log_warn(_("Real-time scheduling enabled in configuration but not allowed by policy."));
+        pa_log_info(_("Real-time scheduling enabled in configuration but not allowed by policy."));
         conf->realtime_scheduling = FALSE;
     }
 
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 5b5270b..bdeea06 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -1063,7 +1063,7 @@ snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const
                 fallback_elem = NULL;
         }
 
-        pa_log_warn("Cannot find fallback mixer control \"%s\" or mixer control is no combination of switch/volume.", snd_mixer_selem_id_get_name(sid));
+        pa_log_info("Cannot find fallback mixer control \"%s\" or mixer control is no combination of switch/volume.", snd_mixer_selem_id_get_name(sid));
     }
 
     if (elem && fallback_elem) {

commit 6152c524203649e1592a0ef21fc28dd7d2c4d101
Merge: 143e1ba 380e97a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 3 17:50:37 2009 +0200

    Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio


-- 
hooks/post-receive
PulseAudio Sound Server