ngscopeclient · Jun 3, 2020 · Jun 3, 2020 · Jun 3, 2020
Showing with 17 additions and 8 deletions.

+14 −1 scopehal/SCPILxiTransport.cpp

+3 −1 scopehal/SCPILxiTransport.h

+0 −2 scopehal/scopehal.cpp

+0 −4 scopehal/scopehal.h
diff --git a/scopehal/SCPILxiTransport.cpp b/scopehal/SCPILxiTransport.cpp
@@ -29,19 +29,32 @@
 
 /**
 	@file
-	@author Andrew D. Zonenberg
+	@author Tom Verbeure 
 	@brief Implementation of SCPILxiTransport
  */
 
+extern "C"
+{
+#include <lxi.h>
+}
+
 #include "scopehal.h"
 
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Construction / destruction
 
+bool SCPILxiTransport::m_lxi_initialized = false;
+
 SCPILxiTransport::SCPILxiTransport(string args)
 {
+	if (!m_lxi_initialized)
+	{
+		lxi_init();
+		m_lxi_initialized = true;
+	}
+
 	char hostname[128];
 	unsigned int port = 0;
 	if (2 != sscanf(args.c_str(), "%127[^:]:%u", hostname, &port))

diff --git a/scopehal/SCPILxiTransport.h b/scopehal/SCPILxiTransport.h
@@ -29,7 +29,7 @@
 
 /**
 	@file
-	@author Andrew D. Zonenberg
+	@author Tom Verbeure
 	@brief Declaration of SCPILxiTransport
  */
 
@@ -62,6 +62,8 @@ class SCPILxiTransport : public SCPITransport
 	{ return m_hostname; }
 
 protected:
+	static bool m_lxi_initialized;
+
 	std::string m_hostname;
 	unsigned short m_port;
 

diff --git a/scopehal/scopehal.cpp b/scopehal/scopehal.cpp
@@ -51,8 +51,6 @@ using namespace std;
  */
 void TransportStaticInit()
 {
-	lxi_init();
-
 	AddTransportClass(SCPISocketTransport);
 	AddTransportClass(SCPILxiTransport);
 	AddTransportClass(SCPITMCTransport);

diff --git a/scopehal/scopehal.h b/scopehal/scopehal.h
@@ -46,10 +46,6 @@
 
 #include <yaml-cpp/yaml.h>
 
-extern "C"
-{
-#include <lxi.h>
-}
 
 #include "../log/log.h"
 #include "../graphwidget/Graph.h"