Why is only one rtl-tcp source allowed?

[kc87]

I have two remote sources with different setups: SWL / VHF.
With the current implementaion I have to change all settings all the time when switching from one source to the other.

I've already tested this quick fix. But I'm not shure if this is the correct way to implement it.

index 7ed3769..6d6e62e 100644
--- a/rtl_tcp_source/src/main.cpp
+++ b/rtl_tcp_source/src/main.cpp
@@ -15,7 +15,7 @@ SDRPP_MOD_INFO {
     /* Description:     */ "RTL-TCP source module for SDR++",
     /* Author:          */ "Ryzerth",
     /* Version:         */ 0, 1, 0,
-    /* Max instances    */ 1
+    /* Max instances    */ -1
 };
 
 ConfigManager config;
@@ -66,16 +66,31 @@ public:
         srId = 7;
 
         config.acquire();
-        std::string hostStr = config.conf["host"];
-        port = config.conf["port"];
-        double wantedSr = config.conf["sampleRate"];
-        directSamplingMode = config.conf["directSamplingMode"];
-        ppm = config.conf["ppm"];
-        rtlAGC = config.conf["rtlAGC"];
-        tunerAGC = config.conf["tunerAGC"];
-        gain = std::clamp<int>(config.conf["gainIndex"], 0, 28);
-        biasTee = config.conf["biasTee"];
-        offsetTuning = config.conf["offsetTuning"];
+
+        if (!config.conf.contains(name)) {
+           config.conf[name]["host"] = "localhost";
+           config.conf[name]["port"] = 1234;
+           config.conf[name]["sampleRate"] = 2400000.0;
+           config.conf[name]["directSamplingMode"] = 0;
+           config.conf[name]["ppm"] = 0;
+           config.conf[name]["rtlAGC"] = false;
+           config.conf[name]["tunerAGC"] = false;
+           config.conf[name]["gainIndex"] = 0;
+           config.conf[name]["biasTee"] = false;
+           config.conf[name]["offsetTuning"] = false;
+        }
+
+        std::string hostStr = config.conf[name]["host"];
+        port = config.conf[name]["port"];
+        double wantedSr = config.conf[name]["sampleRate"];
+        directSamplingMode = config.conf[name]["directSamplingMode"];
+        ppm = config.conf[name]["ppm"];
+        rtlAGC = config.conf[name]["rtlAGC"];
+        tunerAGC = config.conf[name]["tunerAGC"];
+        gain = std::clamp<int>(config.conf[name]["gainIndex"], 0, 28);
+        biasTee = config.conf[name]["biasTee"];
+        offsetTuning = config.conf[name]["offsetTuning"];
+
         hostStr = hostStr.substr(0, 1023);
         strcpy(ip, hostStr.c_str());
         config.release();
@@ -102,12 +117,12 @@ public:
         handler.stopHandler = stop;
         handler.tuneHandler = tune;
         handler.stream = &stream;
-        sigpath::sourceManager.registerSource("RTL-TCP", &handler);
+        sigpath::sourceManager.registerSource(name, &handler);
     }
 
     ~RTLTCPSourceModule() {
         stop(this);
-        sigpath::sourceManager.unregisterSource("RTL-TCP");
+        sigpath::sourceManager.unregisterSource(name);
     }
 
     void postInit() {}
@@ -196,14 +211,14 @@ private:
         ImGui::SetNextItemWidth(menuWidth - portWidth);
         if (ImGui::InputText(CONCAT("##_ip_select_", _this->name), _this->ip, 1024)) {
             config.acquire();
-            config.conf["host"] = std::string(_this->ip);
+            config.conf[_this->name]["host"] = std::string(_this->ip);
             config.release(true);
         }
         ImGui::SameLine();
         ImGui::SetNextItemWidth(portWidth);
         if (ImGui::InputInt(CONCAT("##_port_select_", _this->name), &_this->port, 0)) {
             config.acquire();
-            config.conf["port"] = _this->port;
+            config.conf[_this->name]["port"] = _this->port;
             config.release(true);
         }
 
@@ -212,7 +227,7 @@ private:
             _this->sampleRate = sampleRates[_this->srId];
             core::setInputSampleRate(_this->sampleRate);
             config.acquire();
-            config.conf["sampleRate"] = _this->sampleRate;
+            config.conf[_this->name]["sampleRate"] = _this->sampleRate;
             config.release(true);
         }
 
@@ -226,7 +241,7 @@ private:
                 _this->client.setGainIndex(_this->gain);
             }
             config.acquire();
-            config.conf["directSamplingMode"] = _this->directSamplingMode;
+            config.conf[_this->name]["directSamplingMode"] = _this->directSamplingMode;
             config.release(true);
         }
 
@@ -237,7 +252,7 @@ private:
                 _this->client.setPPM(_this->ppm);
             }
             config.acquire();
-            config.conf["ppm"] = _this->ppm;
+            config.conf[_this->name]["ppm"] = _this->ppm;
             config.release(true);
         }
 
@@ -248,7 +263,7 @@ private:
                 _this->client.setGainIndex(_this->gain);
             }
             config.acquire();
-            config.conf["gainIndex"] = _this->gain;
+            config.conf[_this->name]["gainIndex"] = _this->gain;
             config.release(true);
         }
         if (_this->tunerAGC) { style::endDisabled(); }
@@ -258,7 +273,7 @@ private:
                 _this->client.setBiasTee(_this->biasTee);
             }
             config.acquire();
-            config.conf["biasTee"] = _this->biasTee;
+            config.conf[_this->name]["biasTee"] = _this->biasTee;
             config.release(true);
         }
 
@@ -267,7 +282,7 @@ private:
                 _this->client.setOffsetTuning(_this->offsetTuning);
             }
             config.acquire();
-            config.conf["offsetTuning"] = _this->offsetTuning;
+            config.conf[_this->name]["offsetTuning"] = _this->offsetTuning;
             config.release(true);
         }
 
@@ -279,7 +294,7 @@ private:
                 }
             }
             config.acquire();
-            config.conf["rtlAGC"] = _this->rtlAGC;
+            config.conf[_this->name]["rtlAGC"] = _this->rtlAGC;
             config.release(true);
         }
 
@@ -291,7 +306,7 @@ private:
                 }
             }
             config.acquire();
-            config.conf["tunerAGC"] = _this->tunerAGC;
+            config.conf[_this->name]["tunerAGC"] = _this->tunerAGC;
             config.release(true);
         }
     }
@@ -338,35 +353,9 @@ private:
 };
 
 MOD_EXPORT void _INIT_() {
+   json def = json({});
    config.setPath(options::opts.root + "/rtl_tcp_config.json");
-   json defConf;
-   defConf["host"] = "localhost";
-   defConf["port"] = 1234;
-   defConf["sampleRate"] = 2400000.0;
-   defConf["directSamplingMode"] = 0;
-   defConf["ppm"] = 0;
-   defConf["rtlAGC"] = false;
-   defConf["tunerAGC"] = false;
-   defConf["gainIndex"] = 0;
-   defConf["biasTee"] = false;
-   defConf["offsetTuning"] = false;
-   config.load(defConf);
-   config.enableAutoSave();
-
-    config.acquire();
-    if (!config.conf.contains("biasTee")) {
-        config.conf["biasTee"] = false;
-    }
-    if (!config.conf.contains("offsetTuning")) {
-        config.conf["offsetTuning"] = false;
-    }
-    if (!config.conf.contains("ppm")) {
-        config.conf["ppm"] = 0;
-    }
-    if (!config.conf.contains("sampleRate")) {
-        config.conf["sampleRate"] = 2400000.0;
-    }
-    config.release(true);
+   config.load(def);
 }
 
 MOD_EXPORT ModuleManager::Instance* _CREATE_INSTANCE_(std::string name) {

[AlexandreRouma]

Because that's not how sources work in SDR++
One instance registers a "RTL-TCP" option, just like in all other SDR software.
There is no clean way to switch quickly between two sdrs besides just running two instances of SDR++

[kc87]

Sorry, but I don't get it! You can switch between eg. "RTL-TCP" and "SpyServer". Now I can also switch between "RTL-TCP SWL" and
"RTL-TCP VHF" for example. Where is the difference? The diff just works. With "RTL-SDR" you can also switch between all directly connected Dongels.

[AlexandreRouma]

Because that's not what that menu is for. It's support to be a category, not an individual device list. Moreover, it multiplies the number of instances of the module in memory for no reason since only one can be used at once. What you'd want is some sort of "profile" list sdrconsole does but for most users it's just clunky and bloats up the UI.

[shuyuan-liu]

Idea: use a text + drop-down combo box for the IP address entry and show previously connected IPs in the list. On selecting an IP, automatically recall its related settings for the other fields.

This is kind of a simplified version of the profiles system but the UI won't be bloated.

[kc87]

Hi Alex,

Yea, I know this violates the "this is just a category" principle.

As a user I don't care about categories of sources, I care about sources!
The category is only important when I add a new source using the module manager.

As a use case lets say I want to add my three favorite spy servers to the source list:

I select "spyserver_source" in the manager, give it a name: "SpyServer Foo" and add it.
After doing this for the other two I have three sources now I can easily select as a source
WITHOUT having to remember and input the different ip's and ports ALL THE TIME.

Of course the memory footprint (having five source instances) now is huuuuge! I had to add 16 GiB of RAM
to my system to make it work but it was worth it, ha ha ;-)

I know you disagree with all that. But at least acknowledge that the source selection right now is a little inconvenient.

Still it's a great peace of software and I enjoy using it ( with my little mods ;-) )

Keep up the good work!!