[Commit-gnuradio] gr-error-correcting-codes/src/python qa_test_co...

[Michael Dickens]

CVSROOT:        /sources/gnuradio
Module name:    gr-error-correcting-codes
Changes by:     Michael Dickens <michaelld>     06/07/14 18:08:30

Modified files:
        src/python     : qa_test_coding_1.py qa_test_coding_2.py 
                         qa_test_encoder_convolutional_1.py 

Log message:
        Fixed OSX-specific audio parameters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/python/qa_test_coding_1.py?cvsroot=gnuradio&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/python/qa_test_coding_2.py?cvsroot=gnuradio&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/python/qa_test_encoder_convolutional_1.py?cvsroot=gnuradio&r1=1.4&r2=1.5

Patches:
Index: qa_test_coding_1.py
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/python/qa_test_coding_1.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- qa_test_coding_1.py 14 Jul 2006 17:46:39 -0000      1.3
+++ qa_test_coding_1.py 14 Jul 2006 18:08:30 -0000      1.4
@@ -42,8 +42,8 @@
             parser.print_help()
             raise SystemExit, 1
 
-        sample_rate = 44100 # int(options.sample_rate)
-       audio_option = "2" # options.audio_output
+        sample_rate = int(options.sample_rate)
+       audio_option = options.audio_output
         src = audio.source (sample_rate, audio_option)
        src_out_chan = src.output_signature().max_streams()
         dst = audio.sink (sample_rate, str(src_out_chan))

Index: qa_test_coding_2.py
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/python/qa_test_coding_2.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- qa_test_coding_2.py 14 Jul 2006 17:46:39 -0000      1.2
+++ qa_test_coding_2.py 14 Jul 2006 18:08:30 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2006 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,11 +20,11 @@
 # Boston, MA 02111-1307, USA.
 # 
 
-from gnuradio import gr
-from gnuradio import audio
+from gnuradio import gr, audio
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-#from und import error-correcting-codes
+# must be imported from local directory so that make check
+# can run before installation
 import ecc
 
 class my_graph(gr.flow_graph):
@@ -42,8 +42,8 @@
             parser.print_help()
             raise SystemExit, 1
 
-        sample_rate = 44100 # int(options.sample_rate)
-       audio_option = "2" # options.audio_output
+        sample_rate = int(options.sample_rate)
+       audio_option = options.audio_output
         src = audio.source (sample_rate, audio_option)
        enc_chan_in = 2
        src_out_chan = src.output_signature().max_streams()
@@ -56,7 +56,7 @@
        enc_code_out_chan = len (code_generators) / enc_code_in_chan
        do_termination = 1
 
-       ss_enc = error-correcting-codes.streams_encode_convolutional 
(frame_size,
+       ss_enc = ecc.streams_encode_convolutional (frame_size,
                                                   enc_code_in_chan,
                                                   enc_code_out_chan,
                                                   code_generators,

Index: qa_test_encoder_convolutional_1.py
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/python/qa_test_encoder_convolutional_1.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- qa_test_encoder_convolutional_1.py  14 Jul 2006 17:46:39 -0000      1.4
+++ qa_test_encoder_convolutional_1.py  14 Jul 2006 18:08:30 -0000      1.5
@@ -23,6 +23,8 @@
 from gnuradio import gr, audio
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
+# must be imported from local directory so that make check
+# can run before installation
 import ecc
 
 class my_graph(gr.flow_graph):
@@ -40,8 +42,8 @@
             parser.print_help()
             raise SystemExit, 1
 
-        sample_rate = 4410 # int(options.sample_rate)
-       audio_option = "2" # options.audio_output
+        sample_rate = int(options.sample_rate)
+       audio_option = options.audio_output
         src = audio.source (sample_rate, audio_option)
        src_out_chan = src.output_signature().max_streams()
         dst = audio.sink (sample_rate, str(src_out_chan))