Changeset 3354:c0856cfec872 in roaraudio

Timestamp:

02/08/10 15:05:43 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

preinit, init, free plugins

Location:

roard

Files:

• include/plugins.h (modified) (1 diff)
• plugins.c (modified) (1 diff)
• roard.c (modified) (3 diffs)

roard/include/plugins.h

@@ -28 +28 @@
 #include <roaraudio.h>
 
-int plugins_init  (void);
-int plugins_free  (void);
+int plugins_preinit  (void);
+int plugins_init     (void);
+int plugins_free     (void);
 
-int plugins_load  (const char * filename);
+int plugins_load     (const char * filename);
 
 #endif

roard/plugins.c

@@ -25 +25 @@
 #include "roard.h"
 
-int plugins_init  (void);
-int plugins_free  (void);
+int plugins_preinit  (void) {
+ return 0;
+}
 
-int plugins_load  (const char * filename);
+int plugins_init  (void) {
+ return 0;
+}
+
+int plugins_free  (void) {
+ return 0;
+}
+
+int plugins_load  (const char * filename) {
+ return -1;
+}
 
 //ll

roard/roard.c

@@ -999 +999 @@
 #endif
 
+ if ( plugins_preinit() == -1 ) {
+  ROAR_ERR("Can not pre-init plugins!");
+  return 1;
+ }
+
 #ifdef ROAR_SUPPORT_LISTEN
 #ifndef ROAR_TARGET_WIN32
@@ -1518 +1523 @@
 #endif
 
+ if ( plugins_init() == -1 ) {
+  ROAR_ERR("Can not initialize plugins");
+ }
+
 #ifdef ROAR_SUPPORT_LISTEN
  if ( add_listen(sock_addr, port, sock_type, sock_user, sock_grp, sock_proto, sock_dir, &sock_info) != 0 ) {
@@ -1751 +1760 @@
  cleanup_listen_socket(0);
 
+ plugins_free();
+
 #ifndef ROAR_WITHOUT_DCOMP_SOURCES
  sources_free();