← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnuradio/trusty

« back to all changes in this revision

Viewing changes to gnuradio-core/src/lib/io/gr_oscope_sink_f.cc

  • Committer: Bazaar Package Importer
  • Author(s): Kamal Mostafa
  • Date: 2010-03-13 07:46:01 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100313074601-zjsa893a87bozyh7
Tags: 3.2.2.dfsg-1ubuntu1
https://launchpad.net/bugs/260406
* Fix build for Ubuntu lucid (LP: #260406)
  - add binary package dep for libusrp0, libusrp2-0: adduser
  - debian/rules clean: remove pre-built Qt moc files

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnuradio-core/src/lib/io/gr_oscope_sink_f.cc
38
38
 
39
39
gr_oscope_sink_f::gr_oscope_sink_f (double sampling_rate, gr_msg_queue_sptr msgq)
40
40
  : gr_oscope_sink_x ("oscope_sink_f",
41
 
                      gr_make_io_signature (1, MAX_CHANNELS, sizeof (float)),
 
41
                      gr_make_io_signature (1, gr_oscope_guts::MAX_CHANNELS, sizeof (float)),
42
42
                      sampling_rate),
43
43
    d_msgq(msgq)
44
44
{
 
45
  d_guts = new gr_oscope_guts (d_sampling_rate, d_msgq);
45
46
}
46
47
 
47
48
 
48
49
bool
49
50
gr_oscope_sink_f::check_topology (int ninputs, int noutputs)
50
51
{
51
 
  delete d_guts;
52
 
  d_guts = 0;
53
 
  d_guts = new gr_oscope_guts (ninputs, d_sampling_rate, d_msgq);
54
 
  return true;
 
52
  return d_guts->set_num_channels(ninputs);
55
53
}
56
54
 
57
55
 
65
63
                        gr_vector_void_star &output_items)
66
64
{
67
65
  int     ni = input_items.size ();
68
 
  float   tmp[MAX_CHANNELS];
 
66
  float   tmp[gr_oscope_guts::MAX_CHANNELS];
69
67
 
70
68
  for (int i = 0; i < noutput_items; i++){
71
69