From 3aa01282662a5907cc283a151bba8a939672a065 Mon Sep 17 00:00:00 2001
From: lordjaxom <lordjaxom>
Date: Sat, 12 Mar 2005 12:54:19 +0000
Subject: [PATCH] - fixed pure virtual crash in server

---
 client/menu.c         |  4 ++--
 server/livestreamer.c | 12 ++++++++++++
 server/livestreamer.h |  4 ++--
 server/streamer.h     |  6 +++---
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/client/menu.c b/client/menu.c
index 9d0b2b3..268b3b2 100644
--- a/client/menu.c
+++ b/client/menu.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: menu.c,v 1.3 2005/02/08 17:22:35 lordjaxom Exp $
+ *  $Id: menu.c,v 1.4 2005/03/12 12:54:19 lordjaxom Exp $
  */
  
 #include <vdr/menuitems.h>
@@ -250,7 +250,7 @@ class cMenuWhatsOnItem : public cOsdItem {
 public:
   const cEvent *event;
   const cChannel *channel;
-  cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel, bool Now = false);
+  cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel); //, bool Now = false);
 };
 #endif
 
diff --git a/server/livestreamer.c b/server/livestreamer.c
index 35986f3..e2b4b6c 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -257,6 +257,18 @@ void cStreamdevLiveStreamer::Del(int Count)
 		break;
 	}
 }
+	
+void cStreamdevLiveStreamer::Attach(void) 
+{ 
+	printf("RIGHT ATTACH\n");
+	m_Device->AttachReceiver(m_Receiver); 
+}
+
+void cStreamdevLiveStreamer::Detach(void) 
+{ 
+	printf("RIGHT DETACH\n");
+	m_Device->Detach(m_Receiver); 
+}
 
 std::string cStreamdevLiveStreamer::Report(void) 
 {
diff --git a/server/livestreamer.h b/server/livestreamer.h
index e10d446..5c37d7f 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -59,8 +59,8 @@ public:
 	virtual uchar *Get(int &Count);
 	virtual void Del(int Count);
 
-	virtual void Attach(void) { m_Device->AttachReceiver(m_Receiver); }
-	virtual void Detach(void) { m_Device->Detach(m_Receiver); }
+	virtual void Attach(void);
+	virtual void Detach(void);
 
 	// Statistical purposes:
 	virtual std::string Report(void);
diff --git a/server/streamer.h b/server/streamer.h
index ed6c5cd..c27677c 100644
--- a/server/streamer.h
+++ b/server/streamer.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: streamer.h,v 1.6 2005/02/11 17:02:22 lordjaxom Exp $
+ *  $Id: streamer.h,v 1.7 2005/03/12 12:54:19 lordjaxom Exp $
  */
  
 #ifndef VDR_STREAMDEV_STREAMER_H
@@ -61,8 +61,8 @@ public:
 	virtual uchar *Get(int &Count) { return m_SendBuffer->Get(Count); }
 	virtual void Del(int Count) { m_SendBuffer->Del(Count); }
 
-	virtual void Detach(void) = 0;
-	virtual void Attach(void) = 0;
+	virtual void Detach(void) {}
+	virtual void Attach(void) {}
 };
 
 #endif // VDR_STREAMDEV_STREAMER_H