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

diff --git a/freedv-server/source/drivers.h b/freedv-server/source/drivers.h
index d18c7cfb46fac1a2def573fb6bd9ef266a4ff9fa..2a259f08504c3338ddf14087475c8f365a1f35e3 100644 (file)
--- 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 360f6fb957bf539d8d40b808bf7aed998c04f4c9..638e35a7ac3f89406d6e584f48124227e8565b9b 100644 (file)
--- 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 6f9173a8e95c0ba5c67516339caef02164633792..5403bd3f14f00458e39856ab6e47c0ccd0fea26e 100644 (file)
--- 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()
   {