diff options
author | stevie <stevie@65a5c917-d112-43f1-993d-58c26a4786be> | 2011-05-29 21:09:16 +0000 |
---|---|---|
committer | stevie <stevie@65a5c917-d112-43f1-993d-58c26a4786be> | 2011-05-29 21:09:16 +0000 |
commit | fa7f4643201523313fd6f6b58db34077c1469ad8 (patch) | |
tree | b9f60a57ecdb1a16e826e17bc8246cc09bf65e42 /decoder/src/lib/op25_fsk4_slicer_fb.h | |
parent | da6ffc8343221ca66789c2e9c62506e5653301ea (diff) |
Resolving conflicts caused by name change.
git-svn-id: http://op25.osmocom.org/svn/trunk@284 65a5c917-d112-43f1-993d-58c26a4786be
Diffstat (limited to 'decoder/src/lib/op25_fsk4_slicer_fb.h')
-rw-r--r-- | decoder/src/lib/op25_fsk4_slicer_fb.h | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/decoder/src/lib/op25_fsk4_slicer_fb.h b/decoder/src/lib/op25_fsk4_slicer_fb.h deleted file mode 100644 index aa7a92b..0000000 --- a/decoder/src/lib/op25_fsk4_slicer_fb.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ - -/* - * Copyright 2010 KA1RBI - * - * This file is part of OP25. - * - * OP25 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) - * any later version. - * - * OP25 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 OP25; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef INCLUDED_OP25_FSK4_SLICER_FB_H -#define INCLUDED_OP25_FSK4_SLICER_FB_H - -#include <gr_sync_block.h> - -/** - * 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<class op25_fsk4_slicer_fb> op25_fsk4_slicer_fb_sptr; - -/** - * Return a shared_ptr to a new instance of op25_fsk4_slicer_fb. To - * avoid accidental use of raw pointers, op25_fsk4_slicer_fb's - * constructor is private. op25_make_fsk4_slicer_fb is the public - * interface for creating new instances. - */ -op25_fsk4_slicer_fb_sptr op25_make_fsk4_slicer_fb (const std::vector<float> &slice_levels); - -/** - * Produce a stream of dibits, given a stream of floats in [-3,-1,1,3]. - * \ingroup block - * - * This uses the preferred technique: subclassing gr_sync_block. - */ -class op25_fsk4_slicer_fb : public gr_sync_block -{ - -public: - - virtual ~op25_fsk4_slicer_fb (); - - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - -private: - - /** - * The friend declaration allows op25_make_fsk4_slicer_fb to access - * the private constructor. - */ - friend op25_fsk4_slicer_fb_sptr op25_make_fsk4_slicer_fb (const std::vector<float> &slice_levels); - - op25_fsk4_slicer_fb (const std::vector<float> &slice_levels); - - float d_slice_levels[4]; - -}; - -#endif /* INCLUDED_OP25_FSK4_SLICER_FB_H */ |