diff --git a/lib/osmosdr/CMakeLists.txt b/lib/osmosdr/CMakeLists.txt index 6474840..350076e 100644 --- a/lib/osmosdr/CMakeLists.txt +++ b/lib/osmosdr/CMakeLists.txt @@ -27,7 +27,6 @@ include_directories( ) set(osmosdr_srcs - ${CMAKE_CURRENT_SOURCE_DIR}/osmosdr_snk_c.cc ${CMAKE_CURRENT_SOURCE_DIR}/osmosdr_src_c.cc ) diff --git a/lib/osmosdr/osmosdr_snk_c.cc b/lib/osmosdr/osmosdr_snk_c.cc deleted file mode 100644 index 2dd3555..0000000 --- a/lib/osmosdr/osmosdr_snk_c.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Dimitri Stolnikov - * - * 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. - */ - -/* - * config.h is generated by configure. It contains the results - * of probing for features, options etc. It should be the first - * file included in your .cc file. - */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "osmosdr_snk_c.h" -#include -#include -#include - -/* - * Create a new instance of osmosdr_snk_c and return - * a boost shared_ptr. This is effectively the public constructor. - */ -osmosdr_snk_c_sptr -osmosdr_make_snk_c (const std::string &args) -{ - return gnuradio::get_initial_sptr(new osmosdr_snk_c (args)); -} - -/* - * Specify constraints on number of input and output streams. - * This info is used to construct the input and output signatures - * (2nd & 3rd args to gr_block's constructor). The input and - * output signatures are used by the runtime system to - * check that a valid number and type of inputs and outputs - * are connected to this block. In this case, we accept - * only 1 input and 0 output. - */ -static const int MIN_IN = 1; // mininum number of input streams -static const int MAX_IN = 1; // maximum number of input streams -static const int MIN_OUT = 0; // minimum number of output streams -static const int MAX_OUT = 0; // maximum number of output streams - -/* - * The private constructor - */ -osmosdr_snk_c::osmosdr_snk_c (const std::string & args) - : gr_hier_block2 ("osmosdr_snk_c", - gr_make_io_signature (MIN_IN, MAX_IN, sizeof (gr_complex)), - gr_make_io_signature (MIN_OUT, MAX_OUT, sizeof (gr_complex))) -{ - throw std::runtime_error("FIXME: OsmoSDR sink is not yet implemented."); -} - -/* - * Our virtual destructor. - */ -osmosdr_snk_c::~osmosdr_snk_c () -{ - // nothing else required in this example -} diff --git a/lib/osmosdr/osmosdr_snk_c.h b/lib/osmosdr/osmosdr_snk_c.h deleted file mode 100644 index d1e520f..0000000 --- a/lib/osmosdr/osmosdr_snk_c.h +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Dimitri Stolnikov - * - * 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. - */ -#ifndef INCLUDED_OSMOSDR_SNK_C_H -#define INCLUDED_OSMOSDR_SNK_C_H - -#include - -class osmosdr_snk_c; - -/* - * We use boost::shared_ptr's instead of raw pointers for all access - * to gr_blocks (and many other data structures). The shared_ptr gets - * us transparent reference counting, which greatly simplifies storage - * management issues. This is especially helpful in our hybrid - * C++ / Python system. - * - * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm - * - * As a convention, the _sptr suffix indicates a boost::shared_ptr - */ -typedef boost::shared_ptr osmosdr_snk_c_sptr; - -/*! - * \brief Return a shared_ptr to a new instance of osmosdr_snk_c. - * - * To avoid accidental use of raw pointers, osmosdr_snk_c's - * constructor is private. osmosdr_make_snk_c is the public - * interface for creating new instances. - */ -osmosdr_snk_c_sptr osmosdr_make_snk_c (const std::string & args = ""); - -/*! - * \brief Takes a stream of complex samples. - * \ingroup block - * - * This uses the preferred technique: subclassing gr_hier_block2. - */ -class osmosdr_snk_c : - public gr_hier_block2 -{ -private: - // The friend declaration allows osmosdr_make_snk_c to - // access the private constructor. - - friend osmosdr_snk_c_sptr osmosdr_make_snk_c (const std::string & args); - - /*! - * \brief Takes a stream of complex samples. - */ - osmosdr_snk_c (const std::string & args); // private constructor - - public: - ~osmosdr_snk_c (); // public destructor - -}; - -#endif /* INCLUDED_OSMOSDR_SNK_C_H */