Changeset 5451:db1e0b38bfb0 in roaraudio

Timestamp:

03/25/12 04:08:52 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ported to new proto stuff, moved init() so it is only run when unload will also be run.

File:

• plugins/roard/protocol-irc.c (modified) (4 diffs)

plugins/roard/protocol-irc.c

@@ -88 +88 @@
 };
 
-static void init(void) {
- struct roar_event event;
-
- memset(&event, 0, sizeof(event));
-
- event.event = ROAR_OE_BASICS_DELETE;
-
- event.emitter = -1;
- event.target = -1;
- event.target_type = ROAR_OT_CLIENT;
-
- memset(g_channels, 0, sizeof(g_channels));
-
- subscription_client_delete = roar_notify_core_subscribe(NULL, &event, cb_client_delete, NULL);
-}
-
 static int is_valid_name (const char * name) {
  register char c;
@@ -855 +839 @@
 
 // plugin handling suff:
+static int init(struct roar_dl_librarypara * para, struct roar_dl_libraryinst * lib) {
+ struct roar_event event;
+
+ (void)para, (void)lib;
+
+ memset(&event, 0, sizeof(event));
+
+ event.event = ROAR_OE_BASICS_DELETE;
+
+ event.emitter = -1;
+ event.target = -1;
+ event.target_type = ROAR_OT_CLIENT;
+
+ memset(g_channels, 0, sizeof(g_channels));
+
+ subscription_client_delete = roar_notify_core_subscribe(NULL, &event, cb_client_delete, NULL);
+
+ return 0;
+}
 
 static int unload(struct roar_dl_librarypara * para, struct roar_dl_libraryinst * lib) {
@@ -865 +868 @@
 
 static struct roard_proto proto[1] = {
- {ROAR_PROTO_IRC, ROAR_SUBSYS_NONE, "Internet Relay Chat", NULL, new_client, check_client, NULL, NULL}
+ {ROAR_PROTO_IRC, ROAR_SUBSYS_NONE, "Internet Relay Chat", NULL, new_client, NULL, check_client, NULL, NULL}
 };
 
@@ -879 +882 @@
  ROAR_DL_PLUGIN_META_DESC("Implementation of the Internet Relay Chat (IRC)");
 
+ ROAR_DL_PLUGIN_REG(ROAR_DL_FN_INIT, init);
  ROAR_DL_PLUGIN_REG_UNLOAD(unload);
  ROARD_DL_REGFN_PROTO();
- init();
 } ROAR_DL_PLUGIN_END