summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnuradio-core/src/lib/io/gr_oscope_guts.cc3
-rw-r--r--gr-howto-write-a-block-cmake/swig/CMakeLists.txt2
2 files changed, 3 insertions, 2 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();
}
}
diff --git a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
index 8691942fa9..ac5f700f14 100644
--- a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
+++ b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
@@ -53,5 +53,5 @@ install(
FILES
howto_swig.i
${CMAKE_CURRENT_BINARY_DIR}/howto_swig_doc.i
- DESTINATION $(GR_INCLUDE_DIR)/howto/swig
+ DESTINATION ${GR_INCLUDE_DIR}/howto/swig
)