[pulseaudio-discuss] [PATCH 08/25] raop: Rename client functions

[Hajime Fujita]

Client side functions now have `pa_raop_client_` prefix.

This modification is based on Martin Blanchard's work.
---
 src/modules/raop/module-raop-sink.c | 8 ++++----
 src/modules/raop/raop_client.c      | 6 +++---
 src/modules/raop/raop_client.h      | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c
index d94b0e1..5553b43 100644
--- a/src/modules/raop/module-raop-sink.c
+++ b/src/modules/raop/module-raop-sink.c
@@ -186,7 +186,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
 
                     /* Issue a FLUSH if we are connected. */
                     if (u->fd >= 0) {
-                        pa_raop_flush(u->raop);
+                        pa_raop_client_flush(u->raop);
                     }
                     break;
 
@@ -199,9 +199,9 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
                         /* The connection can be closed when idle, so check to
                          * see if we need to reestablish it. */
                         if (u->fd < 0)
-                            pa_raop_connect(u->raop);
+                            pa_raop_client_connect(u->raop);
                         else
-                            pa_raop_flush(u->raop);
+                            pa_raop_client_flush(u->raop);
                     }
 
                     break;
@@ -237,7 +237,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
 
             if (u->sink->thread_info.state == PA_SINK_SUSPENDED) {
                 /* Our stream has been suspended so we just flush it... */
-                pa_raop_flush(u->raop);
+                pa_raop_client_flush(u->raop);
             }
             return 0;
         }
diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c
index fdc2787..8982ecd 100644
--- a/src/modules/raop/raop_client.c
+++ b/src/modules/raop/raop_client.c
@@ -388,7 +388,7 @@ pa_raop_client* pa_raop_client_new(pa_core *core, const char *host,
     else
         c->port = RAOP_PORT;
 
-    if (pa_raop_connect(c)) {
+    if (pa_raop_client_connect(c)) {
         pa_raop_client_free(c);
         return NULL;
     }
@@ -407,7 +407,7 @@ void pa_raop_client_free(pa_raop_client *c) {
     pa_xfree(c);
 }
 
-int pa_raop_connect(pa_raop_client *c) {
+int pa_raop_client_connect(pa_raop_client *c) {
     char *sci;
     struct {
         uint32_t a;
@@ -441,7 +441,7 @@ int pa_raop_connect(pa_raop_client *c) {
     return pa_rtsp_connect(c->rtsp);
 }
 
-int pa_raop_flush(pa_raop_client *c) {
+int pa_raop_client_flush(pa_raop_client *c) {
     pa_assert(c);
 
     pa_rtsp_flush(c->rtsp, c->seq, c->rtptime);
diff --git a/src/modules/raop/raop_client.h b/src/modules/raop/raop_client.h
index fe669d1..3ecf8d9 100644
--- a/src/modules/raop/raop_client.h
+++ b/src/modules/raop/raop_client.h
@@ -34,8 +34,8 @@ typedef struct pa_raop_client pa_raop_client;
 pa_raop_client* pa_raop_client_new(pa_core *core, const char *host, pa_raop_protocol_t protocol);
 void pa_raop_client_free(pa_raop_client *c);
 
-int pa_raop_connect(pa_raop_client *c);
-int pa_raop_flush(pa_raop_client *c);
+int pa_raop_client_connect(pa_raop_client *c);
+int pa_raop_client_flush(pa_raop_client *c);
 
 int pa_raop_client_set_volume(pa_raop_client *c, pa_volume_t volume);
 int pa_raop_client_encode_sample(pa_raop_client *c, pa_memchunk *raw, pa_memchunk *encoded);
-- 
1.8.1.2