Merge branch 'next' into tii

2 files changed, 7 insertions, 11 deletions

diff --git a/doc/example.ini b/doc/example.ini
index d7f0a4f..317d652 100644
--- a/doc/example.ini
+++ b/doc/example.ini
@@ -221,16 +221,11 @@ synchronous=0
 ; Whether to mute the TX when incoming frames have no timestamp
 mutenotimestamps=0
 
-; Choose between fixed and dynamic offset definition
-; fixed defines an offset in this file that cannot be changed while
-; the modulator runs.
-;
-; dynamic reads the offset from a file, and if the value changes,
-; the chain does a re-sync.
-management=dynamic
+; This offset is added to the TIST, and the sum defines the
+; TX time of the transmission frame. It can by changed at runtime
+; through the remote control.
+offset=0.002
 
-fixedoffset=0.002
+; The previous static vs dynamic offset distinction, and reading the
+; modulatoroffset from a file has been removed.
 
-; The file should contain a single floating point value, written
-; in ASCII (it's human-readable, not binary)
-dynamicoffsetfile=modulator_offset
diff --git a/doc/zmq-ctrl/cpp/OdrModCtrl.cpp b/doc/zmq-ctrl/cpp/OdrModCtrl.cpp
index 731a9af..416ffcd 100644
--- a/doc/zmq-ctrl/cpp/OdrModCtrl.cpp
+++ b/doc/zmq-ctrl/cpp/OdrModCtrl.cpp
@@ -51,6 +51,7 @@ COdrModCtrl::COdrModCtrl(zmq::context_t *pContext, std::string odrEndpoint,
 	m_pContext = pContext;
 	m_odrEndpoint = odrEndpoint;
 	m_timeoutMs = (uint32_t) timeoutMs;
+	m_pReqSocket = NULL;
 }
 
 COdrModCtrl::~COdrModCtrl()