removed serialization pointer from queue; used new base class instead

1 files changed, 2 insertions, 10 deletions

diff --git a/queue.h b/queue.h
index 8bf308ba..b62a4804 100644
--- a/queue.h
+++ b/queue.h
@@ -24,6 +24,7 @@
 #define QUEUE_H_INCLUDED
 
 #include <pthread.h>
+#include "obj.h"
 
 /* queue types */
 typedef enum {
@@ -51,12 +52,6 @@ typedef struct queue_s {
 	rsRetVal (*qDestruct)(struct queue_s *pThis);
 	rsRetVal (*qAdd)(struct queue_s *pThis, void *pUsr);
 	rsRetVal (*qDel)(struct queue_s *pThis, void **ppUsr);
-	/* the following two are currently only required for disk queuing, but
-	 * we keep them global because we otherwise needed to change the interface
-	 * too much.
-	 */
-	rsRetVal (*serializer)(uchar **ppOutBuf, size_t *lenBuf, void *pUsr);
-	rsRetVal (*deSerializer)(void *ppUsr, uchar *ppBuf, size_t lenBuf);
 	/* end type-specific handler */
 	/* synchronization variables */
 	pthread_mutex_t *mut;
@@ -88,9 +83,6 @@ typedef struct queue_s {
 /* prototypes */
 rsRetVal queueDestruct(queue_t *pThis);
 rsRetVal queueEnqObj(queue_t *pThis, void *pUsr);
-rsRetVal queueConstruct(queue_t **ppThis, queueType_t qType, int iMaxQueueSize, rsRetVal (*pConsumer)(void*),
-	rsRetVal (*serializer)(uchar **ppOutBuf, size_t *lenBuf, void *pUsr),
-	rsRetVal (*deSerializer)(void *ppUsr, uchar *ppBuf, size_t lenBuf)
-	);
+rsRetVal queueConstruct(queue_t **ppThis, queueType_t qType, int iMaxQueueSize, rsRetVal (*pConsumer)(void*));
 
 #endif /* #ifndef QUEUE_H_INCLUDED */