[pulseaudio-commits] r2376 - in /branches/coling/airtunes/src: Makefile.am modules/rtp/raop_client.c modules/rtp/rtsp.c modules/rtp/rtsp.h modules/rtp/rtsp_client.c modules/rtp/rtsp_client.h
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Tue May 6 18:23:18 PDT 2008
Author: coling
Date: Wed May 7 03:23:16 2008
New Revision: 2376
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2376&root=pulseaudio&view=rev
Log:
Rename rtsp.{c,h} to rtsp_client.{c,h}.
Renate pa_rtsp_context to pa_rtsp_client.
Added:
branches/coling/airtunes/src/modules/rtp/rtsp_client.c
- copied, changed from r2373, branches/coling/airtunes/src/modules/rtp/rtsp.c
branches/coling/airtunes/src/modules/rtp/rtsp_client.h
- copied, changed from r2365, branches/coling/airtunes/src/modules/rtp/rtsp.h
Removed:
branches/coling/airtunes/src/modules/rtp/rtsp.c
branches/coling/airtunes/src/modules/rtp/rtsp.h
Modified:
branches/coling/airtunes/src/Makefile.am
branches/coling/airtunes/src/modules/rtp/raop_client.c
Modified: branches/coling/airtunes/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/coling/airtunes/src/Makefile.am?rev=2376&root=pulseaudio&r1=2375&r2=2376&view=diff
==============================================================================
--- branches/coling/airtunes/src/Makefile.am (original)
+++ branches/coling/airtunes/src/Makefile.am Wed May 7 03:23:16 2008
@@ -968,7 +968,7 @@
modules/rtp/rtp.c modules/rtp/rtp.h \
modules/rtp/sdp.c modules/rtp/sdp.h \
modules/rtp/sap.c modules/rtp/sap.h \
- modules/rtp/rtsp.c modules/rtp/rtsp.h \
+ modules/rtp/rtsp_client.c modules/rtp/rtsp_client.h \
modules/rtp/raop_client.c modules/rtp/raop_client.h \
modules/rtp/headerlist.c modules/rtp/headerlist.h \
modules/rtp/base64.c modules/rtp/base64.h
Modified: branches/coling/airtunes/src/modules/rtp/raop_client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/coling/airtunes/src/modules/rtp/raop_client.c?rev=2376&root=pulseaudio&r1=2375&r2=2376&view=diff
==============================================================================
--- branches/coling/airtunes/src/modules/rtp/raop_client.c (original)
+++ branches/coling/airtunes/src/modules/rtp/raop_client.c Wed May 7 03:23:16 2008
@@ -56,7 +56,7 @@
#include <pulsecore/poll.h>
#include "raop_client.h"
-#include "rtsp.h"
+#include "rtsp_client.h"
#include "base64.h"
#define AES_CHUNKSIZE 16
@@ -76,7 +76,7 @@
pa_mainloop_api *mainloop;
const char *host;
char *sid;
- pa_rtsp_context *rtsp;
+ pa_rtsp_client *rtsp;
uint8_t jack_type;
uint8_t jack_status;
@@ -273,7 +273,7 @@
pa_iochannel_set_callback(c->io, io_callback, c);
}
-static void rtsp_cb(pa_rtsp_context *rtsp, pa_rtsp_state state, pa_headerlist* headers, void *userdata)
+static void rtsp_cb(pa_rtsp_client *rtsp, pa_rtsp_state state, pa_headerlist* headers, void *userdata)
{
pa_raop_client* c = userdata;
pa_assert(c);
@@ -396,7 +396,7 @@
c->mainloop = mainloop;
c->host = host;
- c->rtsp = pa_rtsp_context_new("iTunes/4.6 (Macintosh; U; PPC Mac OS X 10.3)");
+ c->rtsp = pa_rtsp_client_new("iTunes/4.6 (Macintosh; U; PPC Mac OS X 10.3)");
/* Initialise the AES encryption system */
pa_random_seed();
Copied: branches/coling/airtunes/src/modules/rtp/rtsp_client.c (from r2373, branches/coling/airtunes/src/modules/rtp/rtsp.c)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/coling/airtunes/src/modules/rtp/rtsp_client.c?p2=branches/coling/airtunes/src/modules/rtp/rtsp_client.c&p1=branches/coling/airtunes/src/modules/rtp/rtsp.c&r1=2373&r2=2376&rev=2376&root=pulseaudio&view=diff
==============================================================================
--- branches/coling/airtunes/src/modules/rtp/rtsp.c (original)
+++ branches/coling/airtunes/src/modules/rtp/rtsp_client.c Wed May 7 03:23:16 2008
@@ -48,9 +48,9 @@
#include <pulsecore/poll.h>
#include <pulsecore/ioline.h>
-#include "rtsp.h"
-
-struct pa_rtsp_context {
+#include "rtsp_client.h"
+
+struct pa_rtsp_client {
pa_socket_client *sc;
pa_iochannel *io;
pa_ioline *ioline;
@@ -76,7 +76,7 @@
char *transport;
};
-static int pa_rtsp_exec(pa_rtsp_context* c, const char* cmd,
+static int pa_rtsp_exec(pa_rtsp_client* c, const char* cmd,
const char* content_type, const char* content,
int expect_response,
pa_headerlist* headers) {
@@ -132,10 +132,10 @@
}
-pa_rtsp_context* pa_rtsp_context_new(const char* useragent) {
- pa_rtsp_context *c;
-
- c = pa_xnew0(pa_rtsp_context, 1);
+pa_rtsp_client* pa_rtsp_client_new(const char* useragent) {
+ pa_rtsp_client *c;
+
+ c = pa_xnew0(pa_rtsp_client, 1);
c->headers = pa_headerlist_new();
if (useragent)
@@ -147,7 +147,7 @@
}
-void pa_rtsp_context_free(pa_rtsp_context* c) {
+void pa_rtsp_client_free(pa_rtsp_client* c) {
if (c) {
if (c->sc)
pa_socket_client_unref(c->sc);
@@ -167,7 +167,7 @@
}
-static void headers_read(pa_rtsp_context *c) {
+static void headers_read(pa_rtsp_client *c) {
char* token;
char delimiters[] = ";";
@@ -221,7 +221,7 @@
char *delimpos;
char *s2, *s2p;
- pa_rtsp_context *c = userdata;
+ pa_rtsp_client *c = userdata;
pa_assert(line);
pa_assert(c);
pa_assert(s);
@@ -313,7 +313,7 @@
static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata) {
- pa_rtsp_context *c = userdata;
+ pa_rtsp_client *c = userdata;
union {
struct sockaddr sa;
struct sockaddr_in in;
@@ -359,7 +359,7 @@
c->callback(c, c->state, NULL, c->userdata);
}
-int pa_rtsp_connect(pa_rtsp_context *c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port) {
+int pa_rtsp_connect(pa_rtsp_client *c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port) {
pa_assert(c);
pa_assert(mainloop);
pa_assert(hostname);
@@ -375,14 +375,14 @@
return 0;
}
-void pa_rtsp_set_callback(pa_rtsp_context *c, pa_rtsp_cb_t callback, void *userdata) {
+void pa_rtsp_set_callback(pa_rtsp_client *c, pa_rtsp_cb_t callback, void *userdata) {
pa_assert(c);
c->callback = callback;
c->userdata = userdata;
}
-void pa_rtsp_disconnect(pa_rtsp_context *c) {
+void pa_rtsp_disconnect(pa_rtsp_client *c) {
pa_assert(c);
if (c->io)
@@ -391,25 +391,25 @@
}
-const char* pa_rtsp_localip(pa_rtsp_context* c) {
+const char* pa_rtsp_localip(pa_rtsp_client* c) {
pa_assert(c);
return c->localip;
}
-uint32_t pa_rtsp_serverport(pa_rtsp_context* c) {
+uint32_t pa_rtsp_serverport(pa_rtsp_client* c) {
pa_assert(c);
return c->port;
}
-void pa_rtsp_set_url(pa_rtsp_context* c, const char* url) {
+void pa_rtsp_set_url(pa_rtsp_client* c, const char* url) {
pa_assert(c);
c->url = pa_xstrdup(url);
}
-void pa_rtsp_add_header(pa_rtsp_context *c, const char* key, const char* value)
+void pa_rtsp_add_header(pa_rtsp_client *c, const char* key, const char* value)
{
pa_assert(c);
pa_assert(key);
@@ -418,7 +418,7 @@
pa_headerlist_puts(c->headers, key, value);
}
-void pa_rtsp_remove_header(pa_rtsp_context *c, const char* key)
+void pa_rtsp_remove_header(pa_rtsp_client *c, const char* key)
{
pa_assert(c);
pa_assert(key);
@@ -426,7 +426,7 @@
pa_headerlist_remove(c->headers, key);
}
-int pa_rtsp_announce(pa_rtsp_context *c, const char* sdp) {
+int pa_rtsp_announce(pa_rtsp_client *c, const char* sdp) {
pa_assert(c);
if (!sdp)
return -1;
@@ -436,7 +436,7 @@
}
-int pa_rtsp_setup(pa_rtsp_context* c) {
+int pa_rtsp_setup(pa_rtsp_client* c) {
pa_headerlist* headers;
int rv;
@@ -452,7 +452,7 @@
}
-int pa_rtsp_record(pa_rtsp_context* c) {
+int pa_rtsp_record(pa_rtsp_client* c) {
pa_headerlist* headers;
int rv;
@@ -473,7 +473,7 @@
}
-int pa_rtsp_teardown(pa_rtsp_context *c) {
+int pa_rtsp_teardown(pa_rtsp_client *c) {
pa_assert(c);
c->state = STATE_TEARDOWN;
@@ -481,7 +481,7 @@
}
-int pa_rtsp_setparameter(pa_rtsp_context *c, const char* param) {
+int pa_rtsp_setparameter(pa_rtsp_client *c, const char* param) {
pa_assert(c);
if (!param)
return -1;
@@ -491,7 +491,7 @@
}
-int pa_rtsp_flush(pa_rtsp_context *c) {
+int pa_rtsp_flush(pa_rtsp_client *c) {
pa_headerlist* headers;
int rv;
Copied: branches/coling/airtunes/src/modules/rtp/rtsp_client.h (from r2365, branches/coling/airtunes/src/modules/rtp/rtsp.h)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/coling/airtunes/src/modules/rtp/rtsp_client.h?p2=branches/coling/airtunes/src/modules/rtp/rtsp_client.h&p1=branches/coling/airtunes/src/modules/rtp/rtsp.h&r1=2365&r2=2376&rev=2376&root=pulseaudio&view=diff
==============================================================================
--- branches/coling/airtunes/src/modules/rtp/rtsp.h (original)
+++ branches/coling/airtunes/src/modules/rtp/rtsp_client.h Wed May 7 03:23:16 2008
@@ -1,5 +1,5 @@
-#ifndef foortsphfoo
-#define foortsphfoo
+#ifndef foortspclienthfoo
+#define foortspclienthfoo
/* $Id$ */
@@ -36,7 +36,7 @@
#include "headerlist.h"
-typedef struct pa_rtsp_context pa_rtsp_context;
+typedef struct pa_rtsp_client pa_rtsp_client;
typedef enum {
STATE_CONNECT,
STATE_ANNOUNCE,
@@ -46,29 +46,29 @@
STATE_SET_PARAMETER,
STATE_FLUSH
} pa_rtsp_state;
-typedef void (*pa_rtsp_cb_t)(pa_rtsp_context *c, pa_rtsp_state state, pa_headerlist* hl, void *userdata);
+typedef void (*pa_rtsp_cb_t)(pa_rtsp_client *c, pa_rtsp_state state, pa_headerlist* hl, void *userdata);
-pa_rtsp_context* pa_rtsp_context_new(const char* useragent);
-void pa_rtsp_context_free(pa_rtsp_context* c);
+pa_rtsp_client* pa_rtsp_client_new(const char* useragent);
+void pa_rtsp_client_free(pa_rtsp_client* c);
-int pa_rtsp_connect(pa_rtsp_context* c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port);
-void pa_rtsp_set_callback(pa_rtsp_context *c, pa_rtsp_cb_t callback, void *userdata);
+int pa_rtsp_connect(pa_rtsp_client* c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port);
+void pa_rtsp_set_callback(pa_rtsp_client *c, pa_rtsp_cb_t callback, void *userdata);
-void pa_rtsp_disconnect(pa_rtsp_context* c);
+void pa_rtsp_disconnect(pa_rtsp_client* c);
-const char* pa_rtsp_localip(pa_rtsp_context* c);
-uint32_t pa_rtsp_serverport(pa_rtsp_context* c);
-void pa_rtsp_set_url(pa_rtsp_context* c, const char* url);
-void pa_rtsp_add_header(pa_rtsp_context *c, const char* key, const char* value);
-void pa_rtsp_remove_header(pa_rtsp_context *c, const char* key);
+const char* pa_rtsp_localip(pa_rtsp_client* c);
+uint32_t pa_rtsp_serverport(pa_rtsp_client* c);
+void pa_rtsp_set_url(pa_rtsp_client* c, const char* url);
+void pa_rtsp_add_header(pa_rtsp_client *c, const char* key, const char* value);
+void pa_rtsp_remove_header(pa_rtsp_client *c, const char* key);
-int pa_rtsp_announce(pa_rtsp_context* c, const char* sdp);
+int pa_rtsp_announce(pa_rtsp_client* c, const char* sdp);
-int pa_rtsp_setup(pa_rtsp_context* c);
-int pa_rtsp_record(pa_rtsp_context* c);
-int pa_rtsp_teardown(pa_rtsp_context* c);
+int pa_rtsp_setup(pa_rtsp_client* c);
+int pa_rtsp_record(pa_rtsp_client* c);
+int pa_rtsp_teardown(pa_rtsp_client* c);
-int pa_rtsp_setparameter(pa_rtsp_context* c, const char* param);
-int pa_rtsp_flush(pa_rtsp_context* c);
+int pa_rtsp_setparameter(pa_rtsp_client* c, const char* param);
+int pa_rtsp_flush(pa_rtsp_client* c);
#endif
More information about the pulseaudio-commits
mailing list