projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch source package format to 3.0 quilt
[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 51c28678e8b63334d9b67bafebb4f8eed2f1641a..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
*
* 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,
* any later version.
*
* GNU Radio is distributed in the hope that it will be useful,
@@
-16,8
+16,8
@@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- * Boston, MA 0211
1-1307
, USA.
+ * the Free Software Foundation, Inc., 5
1 Franklin Street
,
+ * Boston, MA 0211
0-1301
, USA.
*/
#ifdef HAVE_CONFIG_H
*/
#ifdef HAVE_CONFIG_H
@@
-68,6
+68,12
@@
gr_oscope_sink_x::set_trigger_mode (gr_trigger_mode mode)
return d_guts->set_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)
{
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);
}
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
// ACCESSORS
int
@@
-125,6
+137,12
@@
gr_oscope_sink_x::get_trigger_mode () const
return d_guts->get_trigger_mode ();
}
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
{
double
gr_oscope_sink_x::get_trigger_level () const
{