diff options
author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-08-27 18:49:11 +0000 |
---|---|---|
committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-08-27 18:49:11 +0000 |
commit | c088a546ac7ae55748e5421201f3387f3e1286f9 (patch) | |
tree | b655773370d082062c2842181bff1638354c57c8 /gnuradio-core/src/lib/runtime/gr_runtime.cc | |
parent | 06945c04b4af8af035aeee2e28d5e5626888f5ee (diff) |
Merged r6171:6186 from jcorgan/fg into trunk.
Changes hierarchical flow graph API to use gr.top_block instead
of gr.runtime.
See discuss-gnuradio mailing list for explanation of changes.
GRC has not been updated to use the changed API.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6187 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/runtime/gr_runtime.cc')
-rw-r--r-- | gnuradio-core/src/lib/runtime/gr_runtime.cc | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_runtime.cc b/gnuradio-core/src/lib/runtime/gr_runtime.cc deleted file mode 100644 index 6b1419e205..0000000000 --- a/gnuradio-core/src/lib/runtime/gr_runtime.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2007 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * 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 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <gr_runtime.h> -#include <gr_runtime_impl.h> -#include <iostream> - -gr_runtime_sptr -gr_make_runtime(gr_hier_block2_sptr top_block) -{ - return gr_runtime_sptr(new gr_runtime(top_block)); -} - -gr_runtime::gr_runtime(gr_hier_block2_sptr top_block) -{ - d_impl = new gr_runtime_impl(top_block, this); -} - -gr_runtime::~gr_runtime() -{ - delete d_impl; -} - -void -gr_runtime::start() -{ - d_impl->start(); -} - -void -gr_runtime::stop() -{ - d_impl->stop(); -} - -void -gr_runtime::wait() -{ - d_impl->wait(); -} - -void -gr_runtime::run() -{ - start(); - wait(); -} - -void -gr_runtime::restart() -{ - d_impl->restart(); -} - -void -gr_runtime::lock() -{ - d_impl->lock(); -} - -void -gr_runtime::unlock() -{ - d_impl->unlock(); -} - |