Make sure mode also changes unique ID to prevent reconnection on mode change.

Author: cboulay

src/core/include/egiamp/AmpServerConfig.h

@@ -24,6 +24,15 @@ struct AmpServerConfig {
     /// .51 → "EGINetAmp_51", .52 → "EGINetAmp_52", localhost/127.* → "EGINetAmp_mock".
     std::string streamName() const;
 
+    /// Suffix for LSL source ID to distinguish native/decimated mode and timestamp alignment.
+    /// Ensures LSL consumers won't auto-reconnect across incompatible configurations.
+    std::string modeSuffix() const {
+        const bool native = sampleRate > 1000 || (fastRecovery && sampleRate >= 500);
+        std::string s = native ? "_native" : "_decimated";
+        if (alignTimestamps && !native) s += "_aligned";
+        return s;
+    }
+
     static AmpServerConfig loadFromFile(const std::string& filename);
     void saveToFile(const std::string& filename) const;
 };

src/core/include/egiamp/LSLStreamer.h

@@ -26,7 +26,8 @@ class LSLStreamer {
                       int physioChannelCount, int dinChannelCount, int sampleRate,
                       const std::string& hostname,
                       const AmplifierDetails& details,
-                      bool nativeFormat = false);
+                      bool nativeFormat = false,
+                      const std::string& modeSuffix = "");
 
     void createImpedanceOutlet(const std::string& streamName, int channelCount,
                                const std::string& hostname,

src/core/src/EGIAmpClient.cpp

@@ -815,7 +815,7 @@ void EGIAmpClient::readPacketFormat2() {
                     std::string streamName = config_.streamName();
                     streamer_.createOutlet(streamName, eegChannelCount, physioChannelCount, 0,
                                            config_.sampleRate, config_.serverAddress, details_,
-                                           config_.nativeFormat);
+                                           config_.nativeFormat, config_.modeSuffix());
 
                     // Create separate DIN event stream (irregular rate, no filter delay)
                     dinStreamer_.createDINOutlet(streamName + "_DIN", config_.serverAddress);
@@ -914,7 +914,7 @@ void EGIAmpClient::readPacketFormat2() {
                                                     (physioConnectionStatus_ > 0) ? 16 : 0;
                                 streamer_.createOutlet(streamName, nChannels + 1, physioChCount, 0,
                                                        config_.sampleRate, config_.serverAddress, details_,
-                                                       config_.nativeFormat);
+                                                       config_.nativeFormat, config_.modeSuffix());
                                 dinStreamer_.createDINOutlet(streamName + "_DIN", config_.serverAddress);
 
                                 // Apply timestamp offset for filter delay compensation if enabled

src/core/src/LSLStreamer.cpp

@@ -88,7 +88,8 @@ void LSLStreamer::createOutlet(const std::string& streamName, int eegChannelCoun
                                int physioChannelCount, int dinChannelCount, int sampleRate,
                                const std::string& hostname,
                                const AmplifierDetails& details,
-                               bool nativeFormat) {
+                               bool nativeFormat,
+                               const std::string& modeSuffix) {
     // Close existing outlet if any
     closeOutlet();
 
@@ -102,7 +103,7 @@ void LSLStreamer::createOutlet(const std::string& streamName, int eegChannelCoun
     std::string sourceId = "EGI_" + hostname +
                            "_ch" + std::to_string(totalChannelCount) +
                            "_sr" + std::to_string(sampleRate) +
-                           formatSuffix;
+                           formatSuffix + modeSuffix;
     lsl::channel_format_t channelFormat = nativeFormat ? lsl::cf_int32 : lsl::cf_float32;
     lsl::stream_info info(streamName, "EEG", totalChannelCount,
                           static_cast<double>(sampleRate),
@@ -399,6 +400,7 @@ void LSLStreamer::pushNotification(const std::string& text, const double timesta
 
 void LSLStreamer::closeOutlet() {
     outlet_.reset();
+    timestampOffset_ = 0.0;
 }
 
 } // namespace egiamp