more control on logging

passing · passing · commit d0e4f0fc445b · 2021-05-23T20:05:34.000+02:00
diff --git a/dummy_client.py b/dummy_client.py
@@ -36,9 +36,9 @@ def server_argument(string):
         help="print protocol data",
     )
     parser.add_argument(
-        "--hide-audio",
+        "--log-audio",
         action="store_true",
-        help="do not log audio messages",
+        help="log audio messages",
     )
 
     return parser.parse_args()
@@ -49,13 +49,11 @@ def main():
 
     args = argument_parser()
 
-    jc = jamulus.JamulusConnector(port=args.port, debug=args.debug, log_audio=not (args.hide_audio))
+    jc = jamulus.JamulusConnector(port=args.port, debug=args.debug, log_audio=args.log_audio)
 
     audio_values = jamulus.silent_audio(BASE_NETW_SIZE)
     jc.sendto(args.server, "AUDIO", audio_values)
 
-    audio_buffer = []
-
     while True:
         addr, key, count, values = jc.recvfrom()
 
diff --git a/dummy_server.py b/dummy_server.py
@@ -36,9 +36,9 @@ def server_argument(string):
         help="print protocol data",
     )
     parser.add_argument(
-        "--hide-audio",
+        "--log-audio",
         action="store_true",
-        help="do not log audio messages",
+        help="log audio messages",
     )
 
     return parser.parse_args()
@@ -49,7 +49,7 @@ def main():
 
     args = argument_parser()
 
-    jc = jamulus.JamulusConnector(port=args.port, debug=args.debug, log_audio=not (args.hide_audio))
+    jc = jamulus.JamulusConnector(port=args.port, debug=args.debug, log_audio=args.log_audio)
 
     if args.centralserver:
         jc.sendto(
@@ -81,8 +81,6 @@ def main():
         }
     clients_pending = []
 
-    audio_values = jamulus.silent_audio(BASE_NETW_SIZE)
-
     while True:
         addr, key, count, values = jc.recvfrom()
 
@@ -101,6 +99,7 @@ def main():
                     {"string": "<b>Server Welcome Message:</b> This is a Test Server"},
                 )
 
+            audio_values = jamulus.silent_audio(len(values["data"]))
             jc.sendto(addr, "AUDIO", audio_values)
 
         elif key == "CHANNEL_INFOS":
diff --git a/jamulus.py b/jamulus.py
@@ -499,7 +499,8 @@
 
 
 class JamulusConnector:
-    def __init__(self, host="", port=DEFAULT_PORT, debug=False, log_audio=True):
+    def __init__(self, host="", port=DEFAULT_PORT, log=True, debug=False, log_audio=True):
+        self.log = log
         self.debug = debug
         self.log_audio = log_audio
         self.host = host
@@ -847,7 +848,7 @@ def log_message(self, addr, key, count="-", length="", values=None, recv=True):
         recv : bool
             True for received / False for sent
         """
-        if key != "AUDIO" or self.log_audio:
+        if self.log and (key != "AUDIO" or self.log_audio):
             output = "{} {} #{} {} ({})".format(
                 addr,
                 " >" if recv else "< ",
