Merge raspine's ZeroMQ RC and UHD staticdelay

Merge raspine/master pull request, fix indentation, code style, and two
minor conflicts in:
        doc/example.ini
        src/DabMod.cpp

1 files changed, 11 insertions, 6 deletions

diff --git a/doc/example.ini b/doc/example.ini
index ecb7440..3c81c04 100644
--- a/doc/example.ini
+++ b/doc/example.ini
@@ -129,8 +129,11 @@ filename=/dev/stdout
 ; or even a higher factor.
 ;
 ; Settings for a USRP B100:
-;device=master_clock_rate=32768000,type=b100
-;txgain=2
+device=
+; you can put additional UHD device settings here
+master_clock_rate=32768000
+type=b100
+txgain=2.0
 ; Try first with small gain values
 ; Also set rate to 2048000
 
@@ -139,9 +142,10 @@ filename=/dev/stdout
 ; http://opendigitalradio.org/index.php/USRP_B200_Measurements
 ;
 ; Settings:
-device=master_clock_rate=2048000,type=b200
-;device=master_clock_rate=20480000,type=b200
-txgain=40
+;device=
+;master_clock_rate=20480000
+;type=b200
+;txgain=40
 ; The B200 needs larger gains (up to 89dB) but,
 ; "Gain settings are application specific, but it is recommended that users
 ; consider using at least half of the available gain to get reasonable dynamic
@@ -151,7 +155,8 @@ txgain=40
 
 
 ; For the USRP1
-;device=type=usrp1
+;device=
+;type=usrp1
 ; the usrp1 can have two daughterboards, the subdevice parameter allows you
 ; to choose which one to use
 ;subdevice=A:0