[ekg2-commit] r4100 - trunk/ekg: trunk/ekg/audio.c trunk/ekg/userlist.c

[SVN commit]

Author: darkjames
Date: 2008-07-11 17:39:36 +0200 (Fri, 11 Jul 2008)
New Revision: 4100

Modified:
   trunk/ekg/audio.c
   trunk/ekg/userlist.c
Log:
audio, codecs.



Modified: trunk/ekg/audio.c
===================================================================
--- trunk/ekg/audio.c	2008-07-11 08:19:49 UTC (rev 4099)
+++ trunk/ekg/audio.c	2008-07-11 15:39:36 UTC (rev 4100)
@@ -30,6 +30,7 @@
 #include "commands.h"
 #include "debug.h"
 #include "dynstuff.h"
+#include "dynstuff_inline.h"
 #include "plugins.h"
 #include "themes.h"
 #include "stuff.h"
@@ -43,6 +44,16 @@
 
 AUDIO_DEFINE(stream);
 
+DYNSTUFF_LIST_DECLARE_NF(audio_inputs, audio_t, 
+	static __DYNSTUFF_LIST_ADD,		/* audio_inputs_add() */
+	static __DYNSTUFF_LIST_UNLINK)		/* audio_inputs_unlink() */
+
+DYNSTUFF_LIST_DECLARE_NF(audio_codecs, codec_t, 
+	static __DYNSTUFF_LIST_ADD,		/* audio_codecs_add() */
+	static __DYNSTUFF_LIST_UNLINK)		/* audio_codecs_unlink() */
+
+static __DYNSTUFF_LIST_ADD(streams, stream_t, NULL);	/* streams_add() */
+
 /*********************************************************************************/
 
 typedef struct {
@@ -229,7 +240,8 @@
 int codec_register(codec_t *codec) {
 	if (!codec)			return -1;
 	if (codec_find(codec->name))	return -2;
-	LIST_ADD2(&audio_codecs, codec);
+
+	audio_codecs_add(codec);
 	return 0;
 }
 
@@ -248,8 +260,7 @@
 	if (!codec) return;
 
 	/* XXX here, we should search for <b>all</b> streams using this codec, and unload them */
-
-	LIST_UNLINK2(&audio_codecs, codec);
+	audio_codecs_unlink(codec);
 }
 
 /**
@@ -300,7 +311,7 @@
 	if (!audio)			return -1;
 	if (audio_find(audio->name))	return -2;
 
-	LIST_ADD2(&audio_inputs, audio);
+	audio_inputs_add(audio);
 	return 0;
 }
 
@@ -319,8 +330,7 @@
 	if (!audio) return;
 
 	/* XXX here, we should search for <b>all</b> streams using this audio, and unload them */
-	
-	LIST_UNLINK2(&audio_inputs, audio);
+	audio_inputs_unlink(audio);
 }
 		/* READING / WRITING FROM FILEs */
 WATCHER_AUDIO(stream_audio_read) {
@@ -691,7 +701,7 @@
 	s->codec	= co;
 	s->output	= out;
 
-	LIST_ADD2(&streams, s);
+	streams_add(s);
 
 	watch_add(NULL, in->fd, WATCH_READ, stream_handle, s);
 /* allocate buffers */

Modified: trunk/ekg/userlist.c
===================================================================
--- trunk/ekg/userlist.c	2008-07-11 08:19:49 UTC (rev 4099)
+++ trunk/ekg/userlist.c	2008-07-11 15:39:36 UTC (rev 4100)
@@ -377,6 +377,7 @@
 	ekg_resources_destroy(&(u->resources));
 }
 
+__DYNSTUFF_REMOVE_SAFE(userlists, userlist_t, userlist_free_item);	/* userlists_remove() */
 __DYNSTUFF_DESTROY(userlists, userlist_t, userlist_free_item);		/* userlists_destroy() */
 
 /**
@@ -505,7 +506,7 @@
         if (!u)
                 return -1;
 
-        LIST_REMOVE2(userlist, u, userlist_free_item);
+	userlists_remove(userlist, u);
 
         return 0;
 }