Переглянути джерело

remove slider for adjusting volume

Fabian Peter Hammerle 7 місяців тому
батько
коміт
c5cad1514b
2 змінених файлів з 2 додано та 56 видалено
  1. 1 41
      fm_radio.grc
  2. 1 15
      fm_radio.py

+ 1 - 41
fm_radio.grc

@@ -90,27 +90,6 @@ blocks:
     coordinate: [33, 182]
     rotation: 0
     state: enabled
-- name: volume
-  id: variable_qtgui_range
-  parameters:
-    comment: ''
-    gui_hint: ''
-    label: Volume
-    min_len: '200'
-    orient: QtCore.Qt.Horizontal
-    rangeType: float
-    start: '0'
-    step: '0.05'
-    stop: '1'
-    value: '0.5'
-    widget: counter_slider
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [1563, 545]
-    rotation: 0
-    state: true
 - name: analog_wfm_rcv_0
   id: analog_wfm_rcv
   parameters:
@@ -145,24 +124,6 @@ blocks:
     coordinate: [1156, 503]
     rotation: 180
     state: enabled
-- name: blocks_multiply_const_vxx_0
-  id: blocks_multiply_const_vxx
-  parameters:
-    affinity: ''
-    alias: ''
-    comment: ''
-    const: volume
-    maxoutbuf: '0'
-    minoutbuf: '0'
-    type: float
-    vlen: '1'
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [1594, 479]
-    rotation: 180
-    state: true
 - name: low_pass_filter_0
   id: low_pass_filter
   parameters:
@@ -718,9 +679,8 @@ blocks:
 connections:
 - [analog_wfm_rcv_0, '0', qtgui_freq_sink_x_0, '0']
 - [analog_wfm_rcv_0, '0', rational_resampler_xxx_0, '0']
-- [blocks_multiply_const_vxx_0, '0', audio_sink_0, '0']
 - [low_pass_filter_0, '0', analog_wfm_rcv_0, '0']
-- [rational_resampler_xxx_0, '0', blocks_multiply_const_vxx_0, '0']
+- [rational_resampler_xxx_0, '0', audio_sink_0, '0']
 - [rtlsdr_source_0, '0', low_pass_filter_0, '0']
 - [rtlsdr_source_0, '0', qtgui_waterfall_sink_x_0, '0']
 

+ 1 - 15
fm_radio.py

@@ -26,7 +26,6 @@ from gnuradio.filter import firdes
 import sip
 from gnuradio import analog
 from gnuradio import audio
-from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import gr
 from gnuradio.fft import window
@@ -80,7 +79,6 @@ class fm_radio(gr.top_block, Qt.QWidget):
         ##################################################
         # Variables
         ##################################################
-        self.volume = volume = 0.5
         self.samp_rate = samp_rate = 2560000
         self.frequency_mhz = frequency_mhz = 98.3
         self.channel_width_hertz = channel_width_hertz = 250000
@@ -90,9 +88,6 @@ class fm_radio(gr.top_block, Qt.QWidget):
         # Blocks
         ##################################################
 
-        self._volume_range = Range(0, 1, 0.05, 0.5, 200)
-        self._volume_win = RangeWidget(self._volume_range, self.set_volume, "Volume", "counter_slider", float, QtCore.Qt.Horizontal)
-        self.top_layout.addWidget(self._volume_win)
         self._frequency_mhz_range = Range(87.5, 108, 0.1, 98.3, 200)
         self._frequency_mhz_win = RangeWidget(self._frequency_mhz_range, self.set_frequency_mhz, "Frequency MHz", "counter_slider", float, QtCore.Qt.Horizontal)
         self.top_layout.addWidget(self._frequency_mhz_win)
@@ -204,7 +199,6 @@ class fm_radio(gr.top_block, Qt.QWidget):
                 10000,
                 window.WIN_KAISER,
                 6.76))
-        self.blocks_multiply_const_vxx_0 = blocks.multiply_const_ff(volume)
         self.audio_sink_0 = audio.sink(audio_sample_rate_hertz, '', True)
         self.analog_wfm_rcv_0 = analog.wfm_rcv(
         	quad_rate=channel_width_hertz,
@@ -217,9 +211,8 @@ class fm_radio(gr.top_block, Qt.QWidget):
         ##################################################
         self.connect((self.analog_wfm_rcv_0, 0), (self.qtgui_freq_sink_x_0, 0))
         self.connect((self.analog_wfm_rcv_0, 0), (self.rational_resampler_xxx_0, 0))
-        self.connect((self.blocks_multiply_const_vxx_0, 0), (self.audio_sink_0, 0))
         self.connect((self.low_pass_filter_0, 0), (self.analog_wfm_rcv_0, 0))
-        self.connect((self.rational_resampler_xxx_0, 0), (self.blocks_multiply_const_vxx_0, 0))
+        self.connect((self.rational_resampler_xxx_0, 0), (self.audio_sink_0, 0))
         self.connect((self.rtlsdr_source_0, 0), (self.low_pass_filter_0, 0))
         self.connect((self.rtlsdr_source_0, 0), (self.qtgui_waterfall_sink_x_0, 0))
 
@@ -232,13 +225,6 @@ class fm_radio(gr.top_block, Qt.QWidget):
 
         event.accept()
 
-    def get_volume(self):
-        return self.volume
-
-    def set_volume(self, volume):
-        self.volume = volume
-        self.blocks_multiply_const_vxx_0.set_k(self.volume)
-
     def get_samp_rate(self):
         return self.samp_rate