[pulseaudio-commits] 2 commits - man/pulseaudio.1.xml.in src/daemon

[Arun Raghavan]

 man/pulseaudio.1.xml.in |    7 -------
 src/daemon/cmdline.c    |    6 ++----
 2 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit e58ee03878d4d5fe9f10a1a89446b15e5b2c6e84
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Wed Jan 4 00:17:29 2012 +0530

    daemon: Drop --module-idle-time from docs
    
    This option does not exist any more.

diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index 4e58ffb..ab5fa05 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -188,13 +188,6 @@ USA.
     </option>
 
     <option>
-      <p><opt>--module-idle-time</opt><arg>=SECS</arg></p>
-
-      <optdesc><p>Unload autoloaded modules when idle and the
-      specified number of seconds passed.</p></optdesc>
-    </option>
-
-    <option>
       <p><opt>--scache-idle-time</opt><arg>=SECS</arg></p>
 
       <optdesc><p>Unload autoloaded samples from the cache when the
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 9f71783..2c4c4b5 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -137,8 +137,6 @@ void pa_cmdline_help(const char *argv0) {
            "      --disallow-exit[=BOOL]            Disallow user requested exit\n"
            "      --exit-idle-time=SECS             Terminate the daemon when idle and this\n"
            "                                        time passed\n"
-           "      --module-idle-time=SECS           Unload autoloaded modules when idle and\n"
-           "                                        this time passed\n"
            "      --scache-idle-time=SECS           Unload autoloaded samples when idle and\n"
            "                                        this time passed\n"
            "      --log-level[=LEVEL]               Increase or set verbosity level\n"

commit 86c9fb369153c568bfc62439ad27220d5d0fc247
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Tue Jan 3 23:49:09 2012 +0530

    daemon: Fix *-idle-time arguments
    
    --exit-idle-time and --scache-idle-time were marked as having an
    optional argument when the argument is actually mandatory. This causes a
    crash when using this argument.
    
    Thanks to Matthijs Kooijman (blathijs on IRC) for pointing this out.

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 5ad37f6..9f71783 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -85,8 +85,8 @@ static const struct option long_options[] = {
     {"realtime",                    2, 0, ARG_REALTIME},
     {"disallow-module-loading",     2, 0, ARG_DISALLOW_MODULE_LOADING},
     {"disallow-exit",               2, 0, ARG_DISALLOW_EXIT},
-    {"exit-idle-time",              2, 0, ARG_EXIT_IDLE_TIME},
-    {"scache-idle-time",            2, 0, ARG_SCACHE_IDLE_TIME},
+    {"exit-idle-time",              1, 0, ARG_EXIT_IDLE_TIME},
+    {"scache-idle-time",            1, 0, ARG_SCACHE_IDLE_TIME},
     {"log-target",                  1, 0, ARG_LOG_TARGET},
     {"log-meta",                    2, 0, ARG_LOG_META},
     {"log-time",                    2, 0, ARG_LOG_TIME},