From 781b4383d67957012a7941abc90e258f17286026 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 23 Nov 2020 15:26:01 +0100
Subject: [PATCH 1/2] remove port flag and turn rtltcp_compat into an option

---
 owrx/source/__init__.py  | 5 +----
 owrx/source/connector.py | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index c71c5a3..cf5e198 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -59,10 +59,7 @@ class SdrSource(ABC):
         self.activateProfile()
         self.wireEvents()
 
-        if "port" in props and props["port"] is not None:
-            self.port = props["port"]
-        else:
-            self.port = getAvailablePort()
+        self.port = getAvailablePort()
         self.monitor = None
         self.clients = []
         self.spectrumClients = []
diff --git a/owrx/source/connector.py b/owrx/source/connector.py
index f28da98..47eec5d 100644
--- a/owrx/source/connector.py
+++ b/owrx/source/connector.py
@@ -23,7 +23,7 @@ class ConnectorSource(SdrSource):
                 "controlPort": Option("-c"),
                 "device": Option("-d"),
                 "iqswap": Flag("-i"),
-                "rtltcp_compat": Flag("-r"),
+                "rtltcp_compat": Option("-r"),
                 "ppm": Option("-P"),
                 "rf_gain": Option("-g"),
             }

From d72f2d9e5cdc42b2945fb066b6b6e874e69147ba Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 23 Nov 2020 15:34:44 +0100
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af01871..4abf764 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 **unreleased**
 - Introduced `squelch_auto_margin` config option that allows configuring the auto squelch level
+- Removed `port` configuration option; `rtltcp_compat` takes the port number with the new connectors
 
 **0.20.0**
 - Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
diff --git a/debian/changelog b/debian/changelog
index 7357723..31272e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openwebrx (0.21.0) UNRELEASED; urgency=low
   * Introduced `squelch_auto_margin` config option that allows configuring the
     auto squelch level
+  * Removed `port` configuration option; `rtltcp_compat` takes the port number
+    with the new connectors
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sun, 11 Oct 2020 21:12:00 +0000