From 07078be4568a60b2aa3d10164e315f55f27b149f Mon Sep 17 00:00:00 2001 From: bruceperens Date: Fri, 21 Mar 2014 06:48:46 +0000 Subject: [PATCH] Doxygen revealed that I had set the ancestry of the KeyingOutput class incorrectly. git-svn-id: https://svn.code.sf.net/p/freetel/code@1468 01035d8c-6547-0410-b346-abe4f91aad63 --- freedv-server/source/drivers.h | 6 +----- freedv-server/source/keying.cpp | 2 +- freedv-server/source/keying_sink.cpp | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/freedv-server/source/drivers.h b/freedv-server/source/drivers.h index d18c7cfb..2a259f08 100644 --- a/freedv-server/source/drivers.h +++ b/freedv-server/source/drivers.h @@ -463,7 +463,7 @@ public: /// Radio device keying driver. /// -class KeyingOutput : public ::FreeDV::Base { +class KeyingOutput : public ::FreeDV::IODevice { protected: /// Create an radio keying output device instance. /// \param name Name of the driver. This is expected to be a single @@ -479,10 +479,6 @@ public: /// Key or un-key the transmitter. /// \param value If true, key the transmitter. If false, un-key. virtual void key(bool value) = 0; - - /// Return the amount of bytes ready to write. - /// - virtual std::size_t ready() = 0; }; /// Softmodem driver. diff --git a/freedv-server/source/keying.cpp b/freedv-server/source/keying.cpp index 360f6fb9..638e35a7 100644 --- a/freedv-server/source/keying.cpp +++ b/freedv-server/source/keying.cpp @@ -8,7 +8,7 @@ namespace FreeDV { KeyingOutput::KeyingOutput(const char * name, const char * parameters) - : Base(name, parameters) + : IODevice(name, parameters) { } diff --git a/freedv-server/source/keying_sink.cpp b/freedv-server/source/keying_sink.cpp index 6f9173a8..5403bd3f 100644 --- a/freedv-server/source/keying_sink.cpp +++ b/freedv-server/source/keying_sink.cpp @@ -19,6 +19,14 @@ namespace FreeDV { KeyingSink(const char *); virtual ~KeyingSink(); + /// Return file descriptors for poll() + /// \param array The address of an array that will be written + /// with a sequence of file descriptors. + /// \param space The maximum number of file descriptors that may be + /// stored in the array. + /// \return The number of file descriptors written to the array. + int poll_fds(PollType *, int); + /// If the value is true, transmit. Otherwise receive. /// void key(bool value); @@ -46,6 +54,12 @@ namespace FreeDV { std::cerr << "keying: RECEIVE" << std::endl; } + int + KeyingSink::poll_fds(PollType *, int) + { + return 0; + } + std::size_t KeyingSink::ready() { -- 2.25.1