caiyu/qspectrumanalyzer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pipe for communication with soapy_power on Windows

Browse Source
This commit is contained in:
Michal Krenek (Mikos) 2017-03-15 00:58:10 +01:00
parent 50ff8d517d
commit 9de4c25269
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qspectrumanalyzer/backends/soapy_power.py
View File

@ -74,7 +74,6 @@ class PowerThread(BasePowerThread):
if sys.platform == 'win32': if sys.platform == 'win32':
self.pipe_write_handle = _make_inheritable_handle(self.pipe_write_fd) self.pipe_write_handle = _make_inheritable_handle(self.pipe_write_fd)
self.pipe_write_fd = int(self.pipe_write_handle)
# Prepare soapy_power cmdline parameters # Prepare soapy_power cmdline parameters
settings = QtCore.QSettings() settings = QtCore.QSettings()
@ -88,7 +87,9 @@ class PowerThread(BasePowerThread):
"-r", "{}".format(self.params["sample_rate"]), "-r", "{}".format(self.params["sample_rate"]),
"-p", "{}".format(self.params["ppm"]), "-p", "{}".format(self.params["ppm"]),
"-F", "soapy_power_bin", "-F", "soapy_power_bin",
"--output-fd", "{}".format(self.pipe_write_fd), "--output-fd", "{}".format(
int(self.pipe_write_handle) if sys.platform == 'win32' else self.pipe_write_fd
),
]) ])
if self.params["gain"] >= 0: if self.params["gain"] >= 0:
@ -105,6 +106,8 @@ class PowerThread(BasePowerThread):
# Start soapy_power process and close write part of pipe # Start soapy_power process and close write part of pipe
self.process = subprocess.Popen(cmdline, close_fds=False, universal_newlines=False) self.process = subprocess.Popen(cmdline, close_fds=False, universal_newlines=False)
os.close(self.pipe_write_fd) os.close(self.pipe_write_fd)
if sys.platform == 'win32':
self.pipe_write_handle.Close()
def process_stop(self): def process_stop(self):
"""Stop soapy_power process""" """Stop soapy_power process"""
@ -119,8 +122,6 @@ class PowerThread(BasePowerThread):
# Close pipe used for communication with soapy_power process # Close pipe used for communication with soapy_power process
self.pipe_read.close() self.pipe_read.close()
if sys.platform == 'win32':
self.pipe_write_handle.Close()
self.pipe_read = None self.pipe_read = None
self.pipe_read_fd = None self.pipe_read_fd = None