fix: regeression in getPlayPortStatus and check win32 libs are present

nrkno · Jun 7, 2019 · d317e40 · d317e40
1 parent 0d2ccc7
commit d317e40
Show file tree

Hide file tree

Showing 25 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ src/types/coverage/
 crash.log
 
 build
+
diff --git a/include/quantel/Quentin.hh b/include/quantel/Quentin.hh
@@ -563,7 +563,7 @@ _CORBA_MODULE_BEG
       if( _s._pd_seq )  _pd_seq = new WStrings(*_s._pd_seq);
       else              _pd_seq = 0;
     }
-    inline ~WStrings_var() { printf("_pd_seq is %p\n", _pd_seq); if( _pd_seq )  delete _pd_seq;  }
+    inline ~WStrings_var() { if ( _pd_seq )  delete _pd_seq;  }
 
     inline WStrings_var& operator = (WStrings* _s) {
       if( _pd_seq )  delete _pd_seq;

diff --git a/lib/omniORB/win32_x64/msvcstub0.lib b/lib/omniORB/win32_x64/msvcstub0.lib
diff --git a/lib/omniORB/win32_x64/omnithread.lib b/lib/omniORB/win32_x64/omnithread.lib
diff --git a/lib/omniORB/win32_x64/omnithread.pdb b/lib/omniORB/win32_x64/omnithread.pdb
diff --git a/lib/omniORB/win32_x64/omnithread0.lib b/lib/omniORB/win32_x64/omnithread0.lib
diff --git a/lib/omniORB/win32_x64/omnithread0.pdb b/lib/omniORB/win32_x64/omnithread0.pdb
diff --git a/lib/omniORB/win32_x64/omnithread34_rt.lib b/lib/omniORB/win32_x64/omnithread34_rt.lib
diff --git a/lib/omniORB/win32_x64/omnithread34_rtd.lib b/lib/omniORB/win32_x64/omnithread34_rtd.lib
diff --git a/lib/omniORB/win32_x64/omnithread34_vc9_rt.dll b/lib/omniORB/win32_x64/omnithread34_vc9_rt.dll
diff --git a/lib/omniORB/win32_x64/omnithread34_vc9_rtd.dll b/lib/omniORB/win32_x64/omnithread34_vc9_rtd.dll
diff --git a/lib/omniORB/win32_x64/omnithread41_rt.lib b/lib/omniORB/win32_x64/omnithread41_rt.lib
diff --git a/lib/omniORB/win32_x64/omnithread41_rtd.lib b/lib/omniORB/win32_x64/omnithread41_rtd.lib
diff --git a/lib/omniORB/win32_x64/omnithread41_vc15_rt.pdb b/lib/omniORB/win32_x64/omnithread41_vc15_rt.pdb
diff --git a/lib/omniORB/win32_x64/omnithread41_vc15_rtd.dll b/lib/omniORB/win32_x64/omnithread41_vc15_rtd.dll
diff --git a/lib/omniORB/win32_x64/omnithread41_vc15_rtd.pdb b/lib/omniORB/win32_x64/omnithread41_vc15_rtd.pdb
diff --git a/lib/omniORB/win32_x64/omnithread_rtd.lib b/lib/omniORB/win32_x64/omnithread_rtd.lib
diff --git a/lib/omniORB/win32_x64/omnithread_rtd0.lib b/lib/omniORB/win32_x64/omnithread_rtd0.lib
diff --git a/lib/omniORB/win32_x64/omnithreadd.pdb b/lib/omniORB/win32_x64/omnithreadd.pdb
diff --git a/lib/omniORB/win32_x64/omnithreadd0.lib b/lib/omniORB/win32_x64/omnithreadd0.lib
diff --git a/lib/omniORB/win32_x64/omnithreadd0.pdb b/lib/omniORB/win32_x64/omnithreadd0.pdb
diff --git a/lib/omniORB/win32_x64/python15.dll b/lib/omniORB/win32_x64/python15.dll
diff --git a/lib/omniORB/win32_x64/python15.lib b/lib/omniORB/win32_x64/python15.lib
diff --git a/src/cxx/port.cc b/src/cxx/port.cc
@@ -240,7 +240,7 @@ void getPlayPortExecute(napi_env env, void* data) {
 		Quentin::Port_var port = server->getPort(wportName.data(), 0);
 
 	 	Quentin::PortListener::PlayPortStatus_var gps;
-		gps = &port->getStatus().playStatus();
+		gps = port->getStatus().playStatus();
 
 		c->refTime = formatTimecode(gps->refTime);
 		c->portTime = formatTimecode(gps->portTime);

diff --git a/src/server.ts b/src/server.ts
@@ -169,7 +169,7 @@ router.get('/default/clip', async (ctx) => {
 		ctx.status = 400
 		ctx.body = {
 			status: 400,
-			message: 'Bad requests. Missing search query parameter, e.g. \'?Title=...\'',
+			message: 'Bad request. Missing search query parameter, e.g. \'?Title=...\'',
 			stack: ''
 		} as JSONError
 	} else {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ src/types/coverage/
		crash.log

		build