Deprecate autorestart

3 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d48b8f..75f3c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-29: Matthias P. Braendli <matthias@mpb.li>
+	(upcoming version):
+		Deprecate -R option.
+		Allow usage of zeromq IPC socket.
+
 2017-11-18: Matthias P. Braendli <matthias@mpb.li>
 	(v2.2.0):
 		Add a decoder option for loopback testing.
diff --git a/README.md b/README.md
index 73b06ed..ca91a98 100644
--- a/README.md
+++ b/README.md
@@ -185,10 +185,11 @@ odr-audioenc returns:
  * 4 it the ZeroMQ send failed
  * 5 if the input had a fault
 
-You can use the *-R* option to get ODR-AudioEnc to restart the input
-automatically up to five times after a fault. As this does not guarantee that
+The *-R* option to get ODR-AudioEnc to restart the input
+automatically has been deprecated. As this feature does not guarantee that
 the odr-audioenc process will never die, running it under a process supervisor
-is recommended regardless of this feature being enabled or not.
+is recommended regardless of this feature being enabled or not. It will be removed
+in a future version.
 
 
 Known Limitations
diff --git a/src/odr-audioenc.cpp b/src/odr-audioenc.cpp
index 9053eec..da9b93a 100644
--- a/src/odr-audioenc.cpp
+++ b/src/odr-audioenc.cpp
@@ -222,7 +222,6 @@ void usage(const char* name)
     "                                          (default: /tmp/pad.fifo).\n"
     "     -l, --level                          Show peak audio level indication.\n"
     "     -s, --silence=TIMEOUT                Abort encoding after TIMEOUT seconds of silence.\n"
-    "     -R, --restart                        Automatically restart input on fault, up to five times.\n"
     "\n"
     "Only the tcp:// zeromq transport has been tested until now,\n"
     " but epgm://, pgm:// and ipc:// are also accepted\n"
@@ -975,6 +974,11 @@ int main(int argc, char *argv[])
 
     unsigned char pad_buf[padlen + 1];
 
+    if (restart_on_fault) {
+        fprintf(stderr, "Autorestart has been deprecated and will be removed in the future!\n");
+        this_thread::sleep_for(chrono::seconds(2));
+    }
+
     fprintf(stderr, "Starting encoding\n");
 
     int retval = 0;