argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

remove OSMOSDR_API usage where appropriate

This commit is contained in:
Dimitri Stolnikov 2012-05-27 13:50:58 +02:00
parent 9a5e93cf0d
commit 4b6018b68c
7 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/osmosdr/osmosdr_snk_c.h
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_OSMOSDR_SNK_C_H #ifndef INCLUDED_OSMOSDR_SNK_C_H
#define INCLUDED_OSMOSDR_SNK_C_H #define INCLUDED_OSMOSDR_SNK_C_H
#include <osmosdr_api.h>
#include <gr_hier_block2.h> #include <gr_hier_block2.h>
class osmosdr_snk_c; class osmosdr_snk_c;
@ -45,7 +44,7 @@ typedef boost::shared_ptr<osmosdr_snk_c> osmosdr_snk_c_sptr;
* constructor is private. osmosdr_make_snk_c is the public * constructor is private. osmosdr_make_snk_c is the public
* interface for creating new instances. * interface for creating new instances.
*/ */
OSMOSDR_API osmosdr_snk_c_sptr osmosdr_make_snk_c (const std::string & args = ""); osmosdr_snk_c_sptr osmosdr_make_snk_c (const std::string & args = "");
/*! /*!
* \brief Takes a stream of complex samples. * \brief Takes a stream of complex samples.
@ -53,14 +52,14 @@ OSMOSDR_API osmosdr_snk_c_sptr osmosdr_make_snk_c (const std::string & args = ""
* *
* This uses the preferred technique: subclassing gr_hier_block2. * This uses the preferred technique: subclassing gr_hier_block2.
*/ */
class OSMOSDR_API osmosdr_snk_c : class osmosdr_snk_c :
public gr_hier_block2 public gr_hier_block2
{ {
private: private:
// The friend declaration allows osmosdr_make_snk_c to // The friend declaration allows osmosdr_make_snk_c to
// access the private constructor. // access the private constructor.
friend OSMOSDR_API osmosdr_snk_c_sptr osmosdr_make_snk_c (const std::string & args); friend osmosdr_snk_c_sptr osmosdr_make_snk_c (const std::string & args);
/*! /*!
* \brief Takes a stream of complex samples. * \brief Takes a stream of complex samples.

7
lib/osmosdr/osmosdr_src_c.h
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_OSMOSDR_SRC_C_H #ifndef INCLUDED_OSMOSDR_SRC_C_H
#define INCLUDED_OSMOSDR_SRC_C_H #define INCLUDED_OSMOSDR_SRC_C_H
#include <osmosdr_api.h>
#include <gr_sync_block.h> #include <gr_sync_block.h>
#include <gruel/thread.h> #include <gruel/thread.h>
@ -52,7 +51,7 @@ typedef boost::shared_ptr<osmosdr_src_c> osmosdr_src_c_sptr;
* constructor is private. osmosdr_make_src_c is the public * constructor is private. osmosdr_make_src_c is the public
* interface for creating new instances. * interface for creating new instances.
*/ */
OSMOSDR_API osmosdr_src_c_sptr osmosdr_make_src_c (const std::string & args = ""); osmosdr_src_c_sptr osmosdr_make_src_c (const std::string & args = "");
/*! /*!
* \brief Provides a stream of complex samples. * \brief Provides a stream of complex samples.
@ -60,7 +59,7 @@ OSMOSDR_API osmosdr_src_c_sptr osmosdr_make_src_c (const std::string & args = ""
* *
* \sa osmosdr_sink_c for a version that subclasses gr_hier_block2. * \sa osmosdr_sink_c for a version that subclasses gr_hier_block2.
*/ */
class OSMOSDR_API osmosdr_src_c : class osmosdr_src_c :
public gr_sync_block, public gr_sync_block,
public osmosdr_src_iface public osmosdr_src_iface
{ {
@ -68,7 +67,7 @@ private:
// The friend declaration allows osmosdr_make_src_c to // The friend declaration allows osmosdr_make_src_c to
// access the private constructor. // access the private constructor.
friend OSMOSDR_API osmosdr_src_c_sptr osmosdr_make_src_c (const std::string & args); friend osmosdr_src_c_sptr osmosdr_make_src_c (const std::string & args);
/*! /*!
* \brief Provides a stream of complex samples. * \brief Provides a stream of complex samples.

5
lib/osmosdr_sink_c_impl.h
View File

@ -20,10 +20,9 @@
#ifndef INCLUDED_OSMOSDR_SINK_C_IMPL_H #ifndef INCLUDED_OSMOSDR_SINK_C_IMPL_H
#define INCLUDED_OSMOSDR_SINK_C_IMPL_H #define INCLUDED_OSMOSDR_SINK_C_IMPL_H
#include <osmosdr_api.h>
#include <osmosdr_sink_c.h> #include <osmosdr_sink_c.h>
class OSMOSDR_API osmosdr_sink_c_impl : public osmosdr_sink_c class osmosdr_sink_c_impl : public osmosdr_sink_c
{ {
public: public:
@ -32,7 +31,7 @@ private:
// The friend declaration allows osmosdr_make_sink_c to // The friend declaration allows osmosdr_make_sink_c to
// access the private constructor. // access the private constructor.
friend OSMOSDR_API osmosdr_sink_c_sptr osmosdr_make_sink_c (const std::string & args); friend osmosdr_sink_c_sptr osmosdr_make_sink_c (const std::string & args);
}; };
#endif /* INCLUDED_OSMOSDR_SINK_C_IMPL_H */ #endif /* INCLUDED_OSMOSDR_SINK_C_IMPL_H */

5
lib/osmosdr_source_c_impl.h
View File

@ -20,14 +20,13 @@
#ifndef INCLUDED_OSMOSDR_SOURCE_C_IMPL_H #ifndef INCLUDED_OSMOSDR_SOURCE_C_IMPL_H
#define INCLUDED_OSMOSDR_SOURCE_C_IMPL_H #define INCLUDED_OSMOSDR_SOURCE_C_IMPL_H
#include <osmosdr_api.h>
#include <osmosdr_source_c.h> #include <osmosdr_source_c.h>
#include <osmosdr_src_iface.h> #include <osmosdr_src_iface.h>
#include <map> #include <map>
class OSMOSDR_API osmosdr_source_c_impl : public osmosdr_source_c class osmosdr_source_c_impl : public osmosdr_source_c
{ {
public: public:
size_t get_num_channels( void ); size_t get_num_channels( void );
@ -61,7 +60,7 @@ private:
// The friend declaration allows osmosdr_make_source_c to // The friend declaration allows osmosdr_make_source_c to
// access the private constructor. // access the private constructor.
friend OSMOSDR_API osmosdr_source_c_sptr osmosdr_make_source_c (const std::string & args); friend osmosdr_source_c_sptr osmosdr_make_source_c (const std::string & args);
double _sample_rate; double _sample_rate;
std::map< size_t, double > _center_freq; std::map< size_t, double > _center_freq;

2
lib/osmosdr_src_iface.h
View File

@ -32,7 +32,7 @@ typedef boost::shared_ptr<osmosdr_src_iface> osmosdr_src_iface_sptr;
* TODO: document * TODO: document
* *
*/ */
class OSMOSDR_API osmosdr_src_iface class osmosdr_src_iface
{ {
public: public:
/*! /*!

7
lib/rtl/rtl_source_c.h
View File

@ -22,7 +22,6 @@
#ifndef INCLUDED_RTLSDR_SOURCE_C_H #ifndef INCLUDED_RTLSDR_SOURCE_C_H
#define INCLUDED_RTLSDR_SOURCE_C_H #define INCLUDED_RTLSDR_SOURCE_C_H
#include <osmosdr_api.h>
#include <gr_sync_block.h> #include <gr_sync_block.h>
#include <gruel/thread.h> #include <gruel/thread.h>
@ -54,14 +53,14 @@ typedef boost::shared_ptr<rtl_source_c> rtl_source_c_sptr;
* constructor is private. make_rtl_source_c is the public * constructor is private. make_rtl_source_c is the public
* interface for creating new instances. * interface for creating new instances.
*/ */
OSMOSDR_API rtl_source_c_sptr make_rtl_source_c (const std::string & args = ""); rtl_source_c_sptr make_rtl_source_c (const std::string & args = "");
/*! /*!
* \brief Provides a stream of complex samples. * \brief Provides a stream of complex samples.
* \ingroup block * \ingroup block
* *
*/ */
class OSMOSDR_API rtl_source_c : class rtl_source_c :
public gr_sync_block, public gr_sync_block,
public osmosdr_src_iface public osmosdr_src_iface
{ {
@ -69,7 +68,7 @@ private:
// The friend declaration allows make_rtl_source_c to // The friend declaration allows make_rtl_source_c to
// access the private constructor. // access the private constructor.
friend OSMOSDR_API rtl_source_c_sptr make_rtl_source_c (const std::string & args); friend rtl_source_c_sptr make_rtl_source_c (const std::string & args);
/*! /*!
* \brief Provides a stream of complex samples. * \brief Provides a stream of complex samples.

8
lib/rtl_tcp/rtl_tcp_source_f.h
View File

@ -21,8 +21,6 @@
#ifndef RTL_TCP_SOURCE_F_H #ifndef RTL_TCP_SOURCE_F_H
#define RTL_TCP_SOURCE_F_H #define RTL_TCP_SOURCE_F_H
#include <osmosdr_api.h>
#include <gr_sync_block.h> #include <gr_sync_block.h>
#include <gruel/thread.h> #include <gruel/thread.h>
@ -49,7 +47,7 @@ typedef void* optval_t;
class rtl_tcp_source_f; class rtl_tcp_source_f;
typedef boost::shared_ptr<rtl_tcp_source_f> rtl_tcp_source_f_sptr; typedef boost::shared_ptr<rtl_tcp_source_f> rtl_tcp_source_f_sptr;
OSMOSDR_API rtl_tcp_source_f_sptr make_rtl_tcp_source_f ( rtl_tcp_source_f_sptr make_rtl_tcp_source_f (
size_t itemsize, size_t itemsize,
const char *host, const char *host,
unsigned short port, unsigned short port,
@ -57,7 +55,7 @@ OSMOSDR_API rtl_tcp_source_f_sptr make_rtl_tcp_source_f (
bool eof, bool eof,
bool wait); bool wait);
class OSMOSDR_API rtl_tcp_source_f : public gr_sync_block class rtl_tcp_source_f : public gr_sync_block
{ {
private: private:
size_t d_itemsize; size_t d_itemsize;
@ -75,7 +73,7 @@ private:
// The friend declaration allows make_source_c to // The friend declaration allows make_source_c to
// access the private constructor. // access the private constructor.
friend OSMOSDR_API rtl_tcp_source_f_sptr make_rtl_tcp_source_f ( friend rtl_tcp_source_f_sptr make_rtl_tcp_source_f (
size_t itemsize, size_t itemsize,
const char *host, const char *host,
unsigned short port, unsigned short port,