From 16cca9f8e517f75507c76599eb85d26954cd0e40 Mon Sep 17 00:00:00 2001 From: vladimir Date: Thu, 16 Jul 2020 14:06:19 +0300 Subject: [PATCH] =?UTF-8?q?[Hit=20return=20to=20continue]=20=09=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20So?= =?UTF-8?q?urce/bin/settings.ini=20=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE:=20=20=20=20=20=20Source/bin/windowsSettings.ini?= =?UTF-8?q?=20=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20?= =?UTF-8?q?=20=20=20=20Source/cudaSDR.pro.user=20=09=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20Source/src/Dat?= =?UTF-8?q?aEngine/soundout.cpp=20=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE:=20=20=20=20=20=20Source/src/DataEngine/soundout.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/bin/settings.ini | 42 +++++------ Source/bin/windowsSettings.ini | 2 +- Source/cudaSDR.pro.user | 112 ++++++++++++++++++----------- Source/src/DataEngine/soundout.cpp | 13 ++-- Source/src/DataEngine/soundout.h | 3 +- 5 files changed, 103 insertions(+), 69 deletions(-) diff --git a/Source/bin/settings.ini b/Source/bin/settings.ini index 56f9575..5ce9ad0 100644 --- a/Source/bin/settings.ini +++ b/Source/bin/settings.ini @@ -1,7 +1,7 @@ [General] cudaSDR%20BETA=v0.3.2.13+ cudaSDR%20BETA%20=v0.3.2.13+ -saved=Saturday 13 January 2018 08:01:05 +saved=\x447\x435\x442\x432\x435\x440\x433 16 \x438\x44e\x43b\x44f 2020 14:05:00 [ChirpWSPR] chirpAmplitude=75 @@ -18,11 +18,11 @@ upperChirpFrequency=2500 amp6m=off amp6mHi=54000000 amp6mLo=50000000 -bypassAll=off +bypassAll=on hpf13MHz=off hpf13MHzHi=18168000 hpf13MHzLo=14000000 -hpf1_5MHz=on +hpf1_5MHz=off hpf1_5MHzHi=5500000 hpf1_5MHzLo=1500000 hpf20MHz=off @@ -40,7 +40,7 @@ lpf12_10mLo=24890000 lpf160m=off lpf160mHi=2000000 lpf160mLo=1800000 -lpf17_15m=off +lpf17_15m=on lpf17_15mHi=21450000 lpf17_15mLo=18068000 lpf30_20m=off @@ -52,7 +52,7 @@ lpf60_40mLo=5330000 lpf6m=off lpf6mHi=54000000 lpf6mLo=50000000 -lpf80m=on +lpf80m=off lpf80mHi=4000000 lpf80mLo=3500000 manual=off @@ -112,10 +112,10 @@ pennylane=false [network] audio_port=15000 -hpsdr_local_ipAddress=192.168.1.1 +hpsdr_local_ipAddress=192.168.2.5 listen_port=11000 -metis_port=50792 -server_ipAddress=192.168.1.1 +metis_port=33626 +server_ipAddress=192.168.2.5 server_port=52685 socketBufferSize=32 @@ -174,7 +174,7 @@ agcFixedGain=30 agcGain=100 agcHangTime=100 agcLines=on -agcMaximumGain=120 +agcMaximumGain=61 agcMode=MED agcSlope=0 attenuator10cm=off @@ -199,10 +199,10 @@ attenuator6m=off attenuator70cm=off attenuator80m=off attenuatorGen=off -audioVolume=34 +audioVolume=73 averaging=on averagingCnt=5 -centerFrequency=3713673 +centerFrequency=22830500 clickVFO=on dBmPanScaleMax10cm=-10 dBmPanScaleMax10m=-30 @@ -270,11 +270,11 @@ dspMode630m=LSB dspMode6m=LSB dspMode70cm=LSB dspMode80m=LSB -dspModeGen=LSB +dspModeGen=USB fftAuto=off -filterHi=-150 -filterLo=-3050 -framesPerSecond=25 +filterHi=3050 +filterLo=150 +framesPerSecond=28 freqRulerPosition=5 grid=on hairCross=off @@ -283,7 +283,7 @@ lastCenterFrequency10m=28676442 lastCenterFrequency125cm=222000000 lastCenterFrequency12m=24890000 lastCenterFrequency13cm=902000000 -lastCenterFrequency15m=21083828 +lastCenterFrequency15m=21259673 lastCenterFrequency160m=1810000 lastCenterFrequency17m=18068000 lastCenterFrequency20m=14000000 @@ -299,13 +299,13 @@ lastCenterFrequency630m=472000 lastCenterFrequency6m=50000000 lastCenterFrequency70cm=420000000 lastCenterFrequency80m=3713673 -lastCenterFrequencyGen=1374997 +lastCenterFrequencyGen=22830500 lastVfoFrequency10cm=902000000 lastVfoFrequency10m=28676442 lastVfoFrequency125cm=222000000 lastVfoFrequency12m=24890000 lastVfoFrequency13cm=902000000 -lastVfoFrequency15m=21066300 +lastVfoFrequency15m=21215000 lastVfoFrequency160m=1810000 lastVfoFrequency17m=18068000 lastVfoFrequency20m=14035300 @@ -320,12 +320,12 @@ lastVfoFrequency60m=5260000 lastVfoFrequency630m=472000 lastVfoFrequency6m=50000000 lastVfoFrequency70cm=420000000 -lastVfoFrequency80m=3793000 -lastVfoFrequencyGen=1371299 +lastVfoFrequency80m=3669000 +lastVfoFrequencyGen=22875900 mouseWheelFreqStep=100 panLocked=off panMode=FILLEDLINE -vfoFrequency=3793000 +vfoFrequency=22875900 waterfallMode=ENHANCED waterfallOffsetHi=20 waterfallOffsetLo=-5 diff --git a/Source/bin/windowsSettings.ini b/Source/bin/windowsSettings.ini index dce3f46..0009505 100644 --- a/Source/bin/windowsSettings.ini +++ b/Source/bin/windowsSettings.ini @@ -1,3 +1,3 @@ [General] geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x19\0\0\0\x1\0\0\x1\x8f\0\0\x3 \0\0\x3\xe6\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\x17\0\0\a\x7f\0\0\x4\x18) -windowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x1\0\0\0\xf5\0\0\x3\xc3\xfc\x2\0\0\0\x5\xfb\0\0\0\x12\0R\0\x61\0\x64\0i\0o\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x14\0S\0\x65\0r\0v\0\x65\0r\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x12\0H\0P\0S\0\x44\0R\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0h\0i\0r\0p\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x16\0\x44\0i\0s\0p\0l\0\x61\0y\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\0\0\a\x80\0\0\x3@\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x94\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\x1\0\0\0\x18\0\x44\0i\0s\0p\0l\0\x61\0y\0P\0\x61\0n\0\x65\0l\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x2\0\0\0\x1\0\0\0\x16\0M\0\x61\0i\0n\0\x42\0u\0t\0t\0o\0n\0s\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0) +windowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x1\0\0\0\xf5\0\0\x3@\xfc\x2\0\0\0\x5\xfb\0\0\0\x12\0R\0\x61\0\x64\0i\0o\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x14\0S\0\x65\0r\0v\0\x65\0r\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x12\0H\0P\0S\0\x44\0R\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0h\0i\0r\0p\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\xfb\0\0\0\x16\0\x44\0i\0s\0p\0l\0\x61\0y\0\x43\0t\0r\0l\0\0\0\0\0\xff\xff\xff\xff\0\0\0-\0\xff\xff\xff\0\0\a\x80\0\0\x3@\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x9a\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x2\0\0\0\x1\0\0\0\x18\0\x44\0i\0s\0p\0l\0\x61\0y\0P\0\x61\0n\0\x65\0l\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x2\0\0\0\x1\0\0\0\x16\0M\0\x61\0i\0n\0\x42\0u\0t\0t\0o\0n\0s\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0) diff --git a/Source/cudaSDR.pro.user b/Source/cudaSDR.pro.user index af95a52..cde8d39 100644 --- a/Source/cudaSDR.pro.user +++ b/Source/cudaSDR.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {974be962-b6da-4db1-b656-2716ea8841ad} + {15ea231e-b5c8-48e7-80f9-aa26c31ff3fa} ProjectExplorer.Project.ActiveTarget @@ -40,6 +40,7 @@ true false 0 + true true 0 8 @@ -53,92 +54,119 @@ ProjectExplorer.Project.PluginSettings - + + + true + Builtin.Questionable + + true + Builtin.DefaultTidyAndClazy + 4 + + + + true + + ProjectExplorer.Project.Target.0 - Qt 5.3.2 (qt5) - Qt 5.3.2 (qt5) - {c28b2f69-26d0-4219-96bf-795edbc3bba5} + Desktop + Desktop + {b99b464b-bcca-4177-862b-cd51b625c7d4} 0 0 0 - + false + 2 + /home/vladimir/repository/cudaSDR/Source + /home/vladimir/repository/cudaSDR/Source true - qmake - QtProjectManager.QMakeBuildStep - false - false false + true - Make - Qt4ProjectManager.MakeStep - - -w - -r - + false + false 2 Build - + Build ProjectExplorer.BuildSteps.Build true - Make - Qt4ProjectManager.MakeStep - - -w - -r - + true clean + false 1 Clean - + Clean ProjectExplorer.BuildSteps.Clean 2 false - Release - + Release Qt4ProjectManager.Qt4BuildConfiguration 0 - true + 2 + 2 1 0 Deploy - + Deploy ProjectExplorer.BuildSteps.Deploy 1 - Deploy locally - + + false ProjectExplorer.DefaultDeployConfiguration 1 + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true false false @@ -148,6 +176,7 @@ 0.01 10 true + kcachegrind 1 25 @@ -175,20 +204,19 @@ 2 - cudaSDR - - Qt4ProjectManager.Qt4RunConfiguration:/home/mh/RTL/LATEST_RTL/BETTERCODES_SVN/cusdrk/Source/cudaSDR.pro - - cudaSDR.pro - false - true - - 3768 + Qt4ProjectManager.Qt4RunConfiguration:/home/vladimir/repository/cudaSDR/Source/cudaSDR.pro + /home/vladimir/repository/cudaSDR/Source/cudaSDR.pro + + false + false true + true false false true + + /home/vladimir/repository/cudaSDR/Source/bin 1 @@ -199,10 +227,10 @@ ProjectExplorer.Project.Updater.FileVersion - 16 + 22 Version - 16 + 22 diff --git a/Source/src/DataEngine/soundout.cpp b/Source/src/DataEngine/soundout.cpp index ead2037..72c0f9e 100644 --- a/Source/src/DataEngine/soundout.cpp +++ b/Source/src/DataEngine/soundout.cpp @@ -84,6 +84,7 @@ CSoundOut::~CSoundOut() Stop(); } +#if defined(Q_OS_LINUX) void GetAlsaMasterVolume(long *volume) { long min, max; @@ -130,7 +131,7 @@ void SetAlsaMasterVolume(long volume) snd_mixer_close(handle); } - +#endif ///////////////////////////////////////////////////////////////////// // Starts up soundcard output thread using soundcard at list OutDevIndx ///////////////////////////////////////////////////////////////////// @@ -143,8 +144,10 @@ QAudioDeviceInfo DeviceInfo; //Get required soundcard from list m_OutDevices = DeviceInfo.availableDevices(QAudio::AudioOutput); - if (-1 == OutDevIndx) GetAlsaMasterVolume(&mvolume); - qDebug()<<"Soundcard volume" << mvolume; + #if defined(Q_OS_LINUX) + if (-1 == OutDevIndx) GetAlsaMasterVolume(&mvolume); + #endif + qDebug()<<"Soundcard volume" << mvolume; if (-1 == OutDevIndx) m_OutDeviceInfo = QAudioDeviceInfo::defaultOutputDevice(); else m_OutDeviceInfo = m_OutDevices.at(OutDevIndx); @@ -184,9 +187,11 @@ QAudioDeviceInfo DeviceInfo; ChangeUserDataRate(UsrDataRate); m_pOutput = m_pAudioOutput->start(); //start QT AudioOutput + #if defined(Q_OS_LINUX) //RRK workaround for default, for some reason choosing default //sets the master volume to max! - if (-1 == OutDevIndx) SetAlsaMasterVolume(50); + if (-1 == OutDevIndx) SetAlsaMasterVolume(50); +#endif //determine how long to sleep between low level reads based on samplerate and period size m_BlockTime = ( 250*m_pAudioOutput->periodSize() )/ diff --git a/Source/src/DataEngine/soundout.h b/Source/src/DataEngine/soundout.h index f5b4abf..823548b 100644 --- a/Source/src/DataEngine/soundout.h +++ b/Source/src/DataEngine/soundout.h @@ -14,9 +14,10 @@ #include #include #include "fractresampler.h" +#if defined(Q_OS_LINUX) #include #include - +#endif #define OUTQSIZE 16384 //max samples (keep power of 2 for ptr wrap around) #define SOUND_WRITEBUFSIZE 8192