From e61c2dddb7bc392ab4073d5691870615ada82922 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 3 Jul 2004 23:35:12 +0000
Subject: add pa_ prefix to all identifiers. fix downsampling/resampling add
 support for U8 samples

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@49 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/module-protocol-stub.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/module-protocol-stub.c')

diff --git a/src/module-protocol-stub.c b/src/module-protocol-stub.c
index 29ce6b18..1a655454 100644
--- a/src/module-protocol-stub.c
+++ b/src/module-protocol-stub.c
@@ -9,23 +9,23 @@
 
 #ifdef USE_PROTOCOL_SIMPLE
   #include "protocol-simple.h"
-  #define protocol_free protocol_simple_free
+  #define protocol_free pa_protocol_simple_free
   #define IPV4_PORT 4711
   #define UNIX_SOCKET_DIR "/tmp/polypaudio"
   #define UNIX_SOCKET "/tmp/polypaudio/simple"
 #else
   #ifdef USE_PROTOCOL_CLI
     #include "protocol-cli.h" 
-    #define protocol_new protocol_cli_new
-    #define protocol_free protocol_cli_free
+    #define protocol_new pa_protocol_cli_new
+    #define protocol_free pa_protocol_cli_free
     #define IPV4_PORT 4712
     #define UNIX_SOCKET_DIR "/tmp/polypaudio"
     #define UNIX_SOCKET "/tmp/polypaudio/cli"
   #else
     #ifdef USE_PROTOCOL_NATIVE
       #include "protocol-native.h"
-      #define protocol_new protocol_native_new
-      #define protocol_free protocol_native_free
+      #define protocol_new pa_protocol_native_new
+      #define protocol_free pa_protocol_native_free
       #define IPV4_PORT 4713
       #define UNIX_SOCKET_DIR "/tmp/polypaudio"
       #define UNIX_SOCKET "/tmp/polypaudio/native"
@@ -33,8 +33,8 @@
       #ifdef USE_PROTOCOL_ESOUND
         #include "protocol-esound.h"
         #include "esound-spec.h"
-        #define protocol_new protocol_esound_new
-        #define protocol_free protocol_esound_free
+        #define protocol_new pa_protocol_esound_new
+        #define protocol_free pa_protocol_esound_free
         #define IPV4_PORT ESD_DEFAULT_PORT
         #define UNIX_SOCKET_DIR ESD_UNIX_SOCKET_DIR
         #define UNIX_SOCKET ESD_UNIX_SOCKET_NAME
@@ -45,27 +45,27 @@
   #endif
 #endif
 
-int module_init(struct core *c, struct module*m) {
-    struct socket_server *s;
+int module_init(struct pa_core *c, struct pa_module*m) {
+    struct pa_socket_server *s;
     assert(c && m);
 
 #ifdef USE_TCP_SOCKETS
-    if (!(s = socket_server_new_ipv4(c->mainloop, INADDR_LOOPBACK, IPV4_PORT)))
+    if (!(s = pa_socket_server_new_ipv4(c->mainloop, INADDR_LOOPBACK, IPV4_PORT)))
         return -1;
 #else
-    if (make_secure_dir(UNIX_SOCKET_DIR) < 0) {
+    if (pa_make_secure_dir(UNIX_SOCKET_DIR) < 0) {
         fprintf(stderr, "Failed to create secure socket directory.\n");
         return -1;
     }
     
-    if (!(s = socket_server_new_unix(c->mainloop, UNIX_SOCKET))) {
+    if (!(s = pa_socket_server_new_unix(c->mainloop, UNIX_SOCKET))) {
         rmdir(UNIX_SOCKET_DIR);
         return -1;
     }
 #endif
 
 #ifdef USE_PROTOCOL_SIMPLE
-    m->userdata = protocol_simple_new(c, s, PROTOCOL_SIMPLE_PLAYBACK);
+    m->userdata = pa_protocol_simple_new(c, s, PA_PROTOCOL_SIMPLE_PLAYBACK);
 #else
     m->userdata = protocol_new(c, s);
 #endif
@@ -74,7 +74,7 @@ int module_init(struct core *c, struct module*m) {
     return 0;
 }
 
-void module_done(struct core *c, struct module*m) {
+void module_done(struct pa_core *c, struct pa_module*m) {
     assert(c && m);
 
     protocol_free(m->userdata);
-- 
cgit