From 276c178bb792038de757bd5a0a1c8a10676cf9f0 Mon Sep 17 00:00:00 2001
From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 17 Jan 2014 19:47:39 +0000
Subject: [PATCH] Let's try libevent instead of a POSIX event handler.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1369 01035d8c-6547-0410-b346-abe4f91aad63
---
 freedv-server/CMakeLists.txt                  |  2 +-
 freedv-server/source/drivers.h                |  2 +-
 .../source/{event_posix.cpp => libevent.cpp}  | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename freedv-server/source/{event_posix.cpp => libevent.cpp} (77%)

diff --git a/freedv-server/CMakeLists.txt b/freedv-server/CMakeLists.txt
index 7a4f492c..1d7f491f 100644
--- a/freedv-server/CMakeLists.txt
+++ b/freedv-server/CMakeLists.txt
@@ -96,10 +96,10 @@ set(Compile.sources
   source/codec_noop.cpp
   source/driver_manager.cpp
   source/event_handler.cpp
-  source/event_posix.cpp
   source/interfaces.cpp
   source/keying.cpp
   source/keying_sink.cpp
+  source/libevent.cpp
   source/modem.cpp
   source/modem_noop.cpp
   source/ptt_constant.cpp
diff --git a/freedv-server/source/drivers.h b/freedv-server/source/drivers.h
index e269feb5..9ac02e28 100644
--- a/freedv-server/source/drivers.h
+++ b/freedv-server/source/drivers.h
@@ -430,8 +430,8 @@ namespace FreeDV {
     AudioInput *	Tone(const char * parameter);
     AudioOutput *	AudioSink(const char * parameter);
     Codec *		CodecNoOp(const char * parameter);
-    EventHandler *	EventHandlerPOSIX(const char * parameter);
     Keying *		KeyingSink(const char * parameter);
+    EventHandler *	LibEvent(const char * parameter);
     Modem *		ModemNoOp(const char * parameter);
     PTTInput *		PTTConstant(const char * parameter);
     TextInput *		TextConstant(const char * parameter);
diff --git a/freedv-server/source/event_posix.cpp b/freedv-server/source/libevent.cpp
similarity index 77%
rename from freedv-server/source/event_posix.cpp
rename to freedv-server/source/libevent.cpp
index bb1c964f..20cd344c 100644
--- a/freedv-server/source/event_posix.cpp
+++ b/freedv-server/source/libevent.cpp
@@ -4,16 +4,16 @@
 
 namespace FreeDV {
   /// Event handler class for POSIX.
-  class EventHandlerPOSIX : public EventHandler {
+  class LibEvent : public EventHandler {
   protected:
 	/// Run one iteration of the event handler.
 	void		iterate();
 
   public:
 	/// Create an event handler instance.
-			EventHandlerPOSIX(const char * parameters);
+			LibEvent(const char * parameters);
 
-	virtual		~EventHandlerPOSIX();
+	virtual		~LibEvent();
 
 	/// Monitor a file descriptor in the event loop. Call a function if the
 	/// file descriptor is ready for I/O.
@@ -38,34 +38,34 @@ namespace FreeDV {
 	virtual void	unmonitor(int fd);
   };
 
-  EventHandlerPOSIX::EventHandlerPOSIX(const char * parameters)
+  LibEvent::LibEvent(const char * parameters)
   : EventHandler("posix", parameters)
   {
   }
 
-  EventHandlerPOSIX::~EventHandlerPOSIX()
+  LibEvent::~LibEvent()
   {
   }
 
   void
-  EventHandlerPOSIX::iterate()
+  LibEvent::iterate()
   {
   }
 
   EventHandler *
-  Driver::EventHandlerPOSIX(const char * parameter)
+  Driver::LibEvent(const char * parameter)
   {
-    return new ::FreeDV::EventHandlerPOSIX(parameter);
+    return new ::FreeDV::LibEvent(parameter);
   }
 
   void
-  EventHandlerPOSIX::monitor(int fd, unsigned int type, void * private_data,
+  LibEvent::monitor(int fd, unsigned int type, void * private_data,
    void (*event)(int fd, unsigned int type, void * private_data))
   {
   }
 
   void
-  EventHandlerPOSIX::unmonitor(int fd)
+  LibEvent::unmonitor(int fd)
   {
   }
 
-- 
2.25.1