1 files changed, 14 insertions, 14 deletions

diff --git a/src/main.c b/src/main.c
index d10ce0d5..be75b372 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,7 +10,7 @@
 #include "module.h"
 #include "mainloop-signal.h"
 
-int stdin_inuse = 0, stdout_inuse = 0;
+int pa_stdin_inuse = 0, pa_stdout_inuse = 0;
 
 static struct pa_mainloop *mainloop;
 
@@ -21,7 +21,7 @@ static void signal_callback(void *id, int sig, void *userdata) {
 }
 
 int main(int argc, char *argv[]) {
-    struct core *c;
+    struct pa_core *c;
     int r, retval = 0;
 
     r = lt_dlinit();
@@ -35,26 +35,26 @@ int main(int argc, char *argv[]) {
     pa_signal_register(SIGINT, signal_callback, NULL);
     signal(SIGPIPE, SIG_IGN);
 
-    c = core_new(pa_mainloop_get_api(mainloop));
+    c = pa_core_new(pa_mainloop_get_api(mainloop));
     assert(c);
 
-    module_load(c, "module-oss-mmap", "/dev/dsp1");
-/*    module_load(c, "module-pipe-sink", NULL);*/
-    module_load(c, "module-simple-protocol-tcp", NULL);
-/*    module_load(c, "module-simple-protocol-unix", NULL);
-    module_load(c, "module-cli-protocol-tcp", NULL);
-    module_load(c, "module-cli-protocol-unix", NULL);
-    module_load(c, "module-native-protocol-tcp", NULL);*/
-    module_load(c, "module-native-protocol-unix", NULL);
-/*    module_load(c, "module-esound-protocol-tcp", NULL);*/
-    module_load(c, "module-cli", NULL);
+    pa_module_load(c, "module-oss", "/dev/dsp");
+/*    pa_module_load(c, "module-pipe-sink", NULL);*/
+    pa_module_load(c, "module-simple-protocol-tcp", NULL);
+/*    pa_module_load(c, "module-simple-protocol-unix", NULL);
+    pa_module_load(c, "module-cli-protocol-tcp", NULL);
+    pa_module_load(c, "module-cli-protocol-unix", NULL);
+    pa_module_load(c, "module-native-protocol-tcp", NULL);*/
+    pa_module_load(c, "module-native-protocol-unix", NULL);
+/*    pa_module_load(c, "module-esound-protocol-tcp", NULL);*/
+    pa_module_load(c, "module-cli", NULL);
     
     fprintf(stderr, "main: mainloop entry.\n");
     if (pa_mainloop_run(mainloop, &retval) < 0)
         retval = 1;
     fprintf(stderr, "main: mainloop exit.\n");
     
-    core_free(c);
+    pa_core_free(c);
 
     pa_signal_done();
     pa_mainloop_free(mainloop);