diff options
author | Tom Rondeau <trondeau@vt.edu> | 2012-02-06 11:05:14 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2012-02-06 11:05:14 -0500 |
commit | f4dc476d9113017d36623a101b726ce1f1aa7db2 (patch) | |
tree | 576e5ca0735dc86d7d4591b3f5d2c95b6ef06ec2 | |
parent | 1023c48cc7e05a0d6c9ae72587304a86c57d6ca8 (diff) | |
parent | d6126a670383791dc8e24926b0d84e1c1fbefdac (diff) |
Merge branch 'maint'
-rw-r--r-- | gnuradio-core/src/lib/io/gr_oscope_guts.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/io/gr_oscope_guts.cc b/gnuradio-core/src/lib/io/gr_oscope_guts.cc index f1bdeb9c1b..7bdc53ab05 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_guts.cc +++ b/gnuradio-core/src/lib/io/gr_oscope_guts.cc @@ -31,7 +31,7 @@ #include <math.h> #include <assert.h> -static const int OUTPUT_RECORD_SIZE = 16384; // Must be power of 2 +static const int OUTPUT_RECORD_SIZE = 8192; // Must be power of 2 static inline int wrap_bi (int buffer_index) // wrap buffer index { @@ -144,6 +144,7 @@ gr_oscope_guts::process_sample (const float *channel_data) } d_buffer[i][0] = channel_data[i]; } + d_trigger_off = 0; write_output_records(); } } |