add receiver index to output and -v now applies to all receivers, -v+ only the last one

Author: jvde-github

Source/Application/Main.cpp

@@ -275,6 +275,7 @@ int main(int argc, char *argv[])
 	bool timeout_nomsg = false, list_devices_JSON = false, no_run = false, show_copyright = true;
 	int own_mmsi = -1;
 	int cb = -1;
+	bool verbose = false;
 
 	Config c(_receivers, nrec, msg, json, screen, servers, own_mmsi);
 	extern IO::OutputMessage *commm_feed;
@@ -398,9 +399,17 @@ int main(int argc, char *argv[])
 			break;
 			case 'v':
 				Assert(count <= 1, param);
-				receiver.verbose = true;
-				if (count == 1)
-					screen.verboseUpdateTime = Util::Parse::Integer(arg1, 1, 3600);
+				if (param.length() == 3 && param[2] == '+') {
+					// -v+ applies to last receiver only, no time parameter
+					Assert(count == 0, param, "no parameters allowed with -v+");
+					receiver.verbose = true;
+				} else {
+					// -v or -v* applies to all receivers (after loop)
+					Assert(param.length() == 2 || (param.length() == 3 && param[2] == '*'), param, "invalid verbose option");
+					verbose = true;
+					if (count == 1)
+						screen.verboseUpdateTime = Util::Parse::Integer(arg1, 1, 3600);
+				}
 				break;
 			case 'O':
 				Assert(count == 1, param);
@@ -752,6 +761,13 @@ int main(int argc, char *argv[])
 			ptr += count + 1;
 		}
 
+		// Apply verbose setting to all receivers
+		if (verbose) {
+			for (auto &r : _receivers) {
+				r->verbose = true;
+			}
+		}
+
 		if (show_copyright)
 			printVersion();
 
@@ -793,7 +809,7 @@ int main(int argc, char *argv[])
 
 			r.setupDevice();
 			// set up the decoding model(s), group is the last output group used
-			r.setupModel(group);
+			r.setupModel(group, i);
 
 			// set up all the output and connect to the receiver outputs
 			for (auto &o : msg)

Source/Application/Receiver.cpp

@@ -166,8 +166,9 @@ std::unique_ptr<AIS::Model> &Receiver::addModel(int m)
 	return models.back();
 }
 
-void Receiver::setupModel(int &group)
+void Receiver::setupModel(int &group, int idx)
 {
+	receiver_index = idx;
 	auto* device = deviceManager.getDevice();
 	// if nothing defined, create one model
 	if (!models.size())
@@ -251,7 +252,7 @@ void Receiver::play()
 		ss << "Device    : " << device->getProduct() << "\n"
 		   << "Settings  : " << device->Get() << "\n";
 		for (int i = 0; i < models.size(); i++)
-			ss << "Model #" + std::to_string(i) << " -> (Src: " << std::to_string(Util::Helper::lsb(models[i]->Output().out.getGroupOut()) + 1)
+			ss << "Model #" + std::to_string(receiver_index) + "-" + std::to_string(i) << " -> (Src: " << std::to_string(Util::Helper::lsb(models[i]->Output().out.getGroupOut()) + 1)
 			   << ", Grp: " + std::to_string(models[i]->Output().out.getGroupOut()) + "): [" + models[i]->getName() + "] " + models[i]->Get() << "\n";
 
 		Info() << ss.str();

Source/Application/Receiver.h

@@ -54,6 +54,7 @@ class Receiver
 	bool timing = false;
 
 	int sample_rate = 0, bandwidth = 0, ppm = 0, own_mmsi = -1;
+	int receiver_index = -1;
 	FLOAT32 station_lat = LAT_UNDEFINED;
 	FLOAT32 station_lon = LON_UNDEFINED;
 
@@ -107,13 +108,13 @@ class Receiver
 	std::unique_ptr<AIS::Model> &Model(int i) { return models[i]; }
 	int Count() { return models.size(); }
 
-	void setup(int &g)
+	void setup(int &g, int idx)
 	{
 		setupDevice();
-		setupModel(g);
+		setupModel(g, idx);
 	}
 	void setupDevice();
-	void setupModel(int &g);
+	void setupModel(int &g, int idx);
 
 	void play();
 	void stop();