Fixing some errors n rtlradio example and usbpermission settings

dl1ksv · dl1ksv · commit 9aa58d8c05f6 · 2015-07-22T12:57:41.000+02:00
diff --git a/gnuradio-examples/rtlradio/main.py b/gnuradio-examples/rtlradio/main.py
@@ -7,59 +7,19 @@
 # Generated: Mon Jun  8 12:38:35 2015
 ##################################################
 from gnuradio import analog
-from gnuradio import blocks
-from gnuradio import eng_notation
 from gnuradio import filter
 from gnuradio import gr
 from gnuradio.eng_option import eng_option
 from gnuradio.filter import firdes
-from optparse import OptionParser
 import osmosdr
 import time
-
-from audiostream import get_output, AudioSample
-from struct import *
-import numpy
+import tinyalsa
 
 from kivy.app import App
 from kivy.uix.widget import Widget
 
 
-import os
-
-class AudioSink(gr.sync_block):
-    "AudioSink"
-    def __init__(self):
-        gr.sync_block.__init__(
-             self,
-             name = "AudioSink",
-             #in_sig = [numpy.float32,numpy.float32], # Input signature: 2 float at a time
-             in_sig = [numpy.int,numpy.int], # Input signature: 2 int at a time
-             out_sig = [], # Output signature: 1 float at a time
-        )
-        self.stream = get_output(channels=2, buffersize=2048 , rate= 48000  )
-        self.sample = AudioSample()
-        self.stream.add_sample(self.sample)
-        #self.scale=pow(2.,14)
-        self.first=True
-        print('AudioSink initialized')
-
-    def work(self, input_items, output_items):
-        if self.first :
-            self.sample.play()
-            self.first=False
-
-        count=len(input_items[0])
-        for i in range(0, count):
-            self.sample.write(pack('<hh',input_items[0][i],input_items[1][i]))
-        
-        return count
-    
-    def starte(self):
-        self.sample.play()
-
-    def halte(self):
-        self.sample.stop()
+#import os
 
 class Rtlradio(gr.top_block):
 
@@ -74,11 +34,8 @@ def __init__(self):
         ##################################################
         # Blocks
         ##################################################
-        self.tinyalsa_talsa_sink_0 = AudioSink()
-	self.blocks_float_to_int_0 = blocks.float_to_int(1, pow(2.,15))
-        print('+++Vor osmo')
+        self.tinyalsa_talsa_sink_0 = tinyalsa.talsa_sink(48000, 1, 0)
         self.rtlsdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + "rtl=0" )
-        print('+++Nach osmo')
         self.rtlsdr_source_0.set_sample_rate(samp_rate)
         self.rtlsdr_source_0.set_center_freq(88.8e6, 0)
         self.rtlsdr_source_0.set_freq_corr(0, 0)
@@ -90,7 +47,7 @@ def __init__(self):
         self.rtlsdr_source_0.set_bb_gain(20, 0)
         self.rtlsdr_source_0.set_antenna("", 0)
         self.rtlsdr_source_0.set_bandwidth(0, 0)
-          
+                                                                                    
         self.low_pass_filter_0 = filter.fir_filter_ccf(10, firdes.low_pass(
                 4, samp_rate, 48000, 5000, firdes.WIN_HAMMING, 6.76))
         self.analog_fm_demod_cf_0 = analog.fm_demod_cf(
@@ -106,13 +63,12 @@ def __init__(self):
         ##################################################
         # Connections
         ##################################################
-
-        self.connect((self.analog_fm_demod_cf_0, 0), (self.blocks_float_to_int_0, 0))    
-        self.connect((self.blocks_float_to_int_0, 0) , (self.tinyalsa_talsa_sink_0, 0))    
-        self.connect((self.blocks_float_to_int_0, 0) , (self.tinyalsa_talsa_sink_0, 1))    
+        self.connect((self.analog_fm_demod_cf_0, 0), (self.tinyalsa_talsa_sink_0, 0))    
+        self.connect((self.analog_fm_demod_cf_0, 0), (self.tinyalsa_talsa_sink_0, 1))    
         self.connect((self.low_pass_filter_0, 0), (self.analog_fm_demod_cf_0, 0))    
         self.connect((self.rtlsdr_source_0, 0), (self.low_pass_filter_0, 0))    
 
+
     def get_samp_rate(self):
         return self.samp_rate
 
@@ -131,7 +87,7 @@ def build(self):
         rootWindow=RtlradioWindow()
         self.tb=Rtlradio()
         self.started=0
-        print("####Environment", os.environ)
+#        print("####Environment", os.environ)
         return rootWindow
 
     def startstop_audio(self):
@@ -140,24 +96,12 @@ def startstop_audio(self):
             self.started= 0
             print('Vor stop')
             self.tb.stop()
-            #self.tb.tinyalsa_talsa_sink_0.halte()
             print('Nach stop')
         else:
             print('Vor start')
             self.started= 1
             self.tb.start()
-            #self.tb.tinyalsa_talsa_sink_0.starte()
             print('Nach start')
 
 if __name__ == '__main__':
     RtlradioApp().run()
-#    parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
-#    (options, args) = parser.parse_args()
-#    tb = dial_tone()
-#    tb.start()
-#    try:
-#        raw_input('Press Enter to quit: ')
-#    except EOFError:
-#        pass
-#    tb.stop()
-#    tb.wait()
diff --git a/gnuradio-examples/rtlradio/rtlradio.kv b/gnuradio-examples/rtlradio/rtlradio.kv
@@ -12,7 +12,7 @@
 		size_hint_y: None
 
 	Button:
-		text: 'Start/Stop Dialtone'
+		text: 'Start/Stop Radio'
 		size_hint_y: None
 		center_x: root.width / 3
 		top: root.top -200
diff --git a/gnuradio-examples/scripts/usbpolicy.sh b/gnuradio-examples/scripts/usbpolicy.sh
@@ -1,4 +1,4 @@
 #!/sytem/bin/sh
 chmod 666 /dev/bus/usb/002/*
-supolicy --live "allow:untrusted_app usb_device dir {open read}"
+supolicy --live "allow:untrusted_app usb_device dir {open read search}"
 supolicy --live "allow:untrusted_app usb_device chr_file {open read}"
diff --git a/src/blacklist.txt b/src/blacklist.txt
@@ -96,4 +96,4 @@ sqlite3/*
 lib-dynload/_sqlite3.so
 #<sqlite3
 
-numpy/distutils
+numpy/distutils/*
