[xiph-commits] r18691 - icecast/branches/ph3/icecast/src

[ph3-der-loewe at svn.xiph.org]

Author: ph3-der-loewe
Date: 2012-11-12 17:26:14 -0800 (Mon, 12 Nov 2012)
New Revision: 18691

Added:
   icecast/branches/ph3/icecast/src/icecastplugin.h
Modified:
   icecast/branches/ph3/icecast/src/Makefile.am
   icecast/branches/ph3/icecast/src/plugins.c
   icecast/branches/ph3/icecast/src/plugins.h
   icecast/branches/ph3/icecast/src/roarapi.h
Log:
export a simple plugin header

Modified: icecast/branches/ph3/icecast/src/Makefile.am
===================================================================
--- icecast/branches/ph3/icecast/src/Makefile.am	2012-11-12 21:51:54 UTC (rev 18690)
+++ icecast/branches/ph3/icecast/src/Makefile.am	2012-11-13 01:26:14 UTC (rev 18691)
@@ -6,6 +6,8 @@
 
 bin_PROGRAMS = icecast
 
+include_HEADERS = icecastplugin.h
+
 noinst_HEADERS = admin.h cfgfile.h logging.h sighandler.h connection.h \
     global.h util.h slave.h source.h stats.h refbuf.h client.h \
     compat.h fserve.h xslt.h yp.h event.h md5.h \

Added: icecast/branches/ph3/icecast/src/icecastplugin.h
===================================================================
--- icecast/branches/ph3/icecast/src/icecastplugin.h	                        (rev 0)
+++ icecast/branches/ph3/icecast/src/icecastplugin.h	2012-11-13 01:26:14 UTC (rev 18691)
@@ -0,0 +1,17 @@
+/* Icecast
+ *
+ * This program is distributed under the GNU General Public License, version 2.
+ * A copy of this license is included with this source.
+ *
+ * Copyright 2012,      Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>,
+ */
+
+#ifndef __ICECASTPLUGINS_H__
+#define __ICECASTPLUGINS_H__
+
+#define ICECASTPH_APPNAME    "Icecast <Xiph Foundation>"
+#define ICECASTPH_ABIVERSION "2.3.99.0-ph3-api0"
+
+#define ICECASTPH_CHECK_VERSIONS() ROAR_DL_PLUGIN_CHECK_VERSIONS(ICECASTPH_APPNAME, ICECASTPH_ABIVERSION)
+
+#endif  /* __ICECASTPLUGIN_H__ */

Modified: icecast/branches/ph3/icecast/src/plugins.c
===================================================================
--- icecast/branches/ph3/icecast/src/plugins.c	2012-11-12 21:51:54 UTC (rev 18690)
+++ icecast/branches/ph3/icecast/src/plugins.c	2012-11-13 01:26:14 UTC (rev 18691)
@@ -43,7 +43,7 @@
 #ifdef HAVE_ROARAUDIO
     DEBUG0("Plugin Interface is being initialized");
     roarapi_lock();
-    container = roar_plugincontainer_new_simple(ICECAST_HOST_STRING, PACKAGE_VERSION);
+    container = roar_plugincontainer_new_simple(ICECASTPH_APPNAME, ICECASTPH_ABIVERSION);
     roar_plugincontainer_set_autoappsched(container, 1);
     sched = roar_scheduler_new(ROAR_SCHEDULER_FLAG_DEFAULT, ROAR_SCHEDULER_STRATEGY_DEFAULT);
     source_container.handle.container = container;
@@ -88,7 +88,7 @@
 #ifdef HAVE_ROARAUDIO
     struct roar_dl_librarypara * para = NULL;
 
-    para = roar_dl_para_new(plugin->args, NULL, ICECAST_HOST_STRING, PACKAGE_VERSION);
+    para = roar_dl_para_new(plugin->args, NULL, ICECASTPH_APPNAME, ICECASTPH_ABIVERSION);
     if (!para)
         return;
 

Modified: icecast/branches/ph3/icecast/src/plugins.h
===================================================================
--- icecast/branches/ph3/icecast/src/plugins.h	2012-11-12 21:51:54 UTC (rev 18690)
+++ icecast/branches/ph3/icecast/src/plugins.h	2012-11-13 01:26:14 UTC (rev 18691)
@@ -15,6 +15,7 @@
 #define __PLUGINS_H__
 
 #include "cfgfile.h"
+#include "icecastplugin.h"
 
 void plugins_initialize(void);
 void plugins_shutdown(void);

Modified: icecast/branches/ph3/icecast/src/roarapi.h
===================================================================
--- icecast/branches/ph3/icecast/src/roarapi.h	2012-11-12 21:51:54 UTC (rev 18690)
+++ icecast/branches/ph3/icecast/src/roarapi.h	2012-11-13 01:26:14 UTC (rev 18691)
@@ -26,8 +26,6 @@
 #include <roaraudio.h>
 #endif
 
-#define ICECAST_HOST_STRING "Icecast <Xiph Foundation>"
-
 void roarapi_initialize(void);
 void roarapi_shutdown(void);
 void roarapi_lock(void);