Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-core / src / lib / io / gr_oscope_sink_x.cc

diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc b/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc
index f10b8c55293f1e77b48de56a14a09afbfb72ddfa..2bbd5746329f2adc6fa5d9584c876e07fae4e4f4 100644 (file)
--- a/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc
+++ b/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc
@@ -6,7 +6,7 @@
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -68,6 +68,12 @@ gr_oscope_sink_x::set_trigger_mode (gr_trigger_mode mode)
   return d_guts->set_trigger_mode (mode);
 }
 
+bool
+gr_oscope_sink_x::set_trigger_slope (gr_trigger_slope slope)
+{
+  return d_guts->set_trigger_slope (slope);
+}
+
 bool
 gr_oscope_sink_x::set_trigger_level (double trigger_level)
 {
@@ -87,6 +93,12 @@ gr_oscope_sink_x::set_sample_rate (double sample_rate)
   return d_guts->set_sample_rate (sample_rate);
 }
 
+bool
+gr_oscope_sink_x::set_num_channels (int nchannels)
+{
+  return d_guts->set_num_channels (nchannels);
+}
+
 // ACCESSORS
 
 int
@@ -125,6 +137,12 @@ gr_oscope_sink_x::get_trigger_mode () const
   return d_guts->get_trigger_mode ();
 }
 
+gr_trigger_slope
+gr_oscope_sink_x::get_trigger_slope () const
+{
+  return d_guts->get_trigger_slope ();
+}
+
 double
 gr_oscope_sink_x::get_trigger_level () const
 {