output/raop: move RTSP client code to rtsp_client.c

Makefile.am

@@ -776,6 +776,7 @@ endif
 if ENABLE_RAOP_OUTPUT
 OUTPUT_SRC += \
 	src/ntp_server.c src/ntp_server.h \
+	src/rtsp_client.c src/rtsp_client.h \
 	src/output/raop_output_plugin.c
 MIXER_SRC += src/mixer/raop_mixer_plugin.c
 OUTPUT_LIBS += $(OPENSSL_LIBS)

src/output/raop_output_plugin.h

@@ -21,26 +21,13 @@
 #define MPD_OUTPUT_RAOP_PLUGIN_H
 
 #include "ntp_server.h"
+#include "rtsp_client.h"
 
 #include <glib.h>
 #include <stdbool.h>
 #include <sys/time.h>
 #include <openssl/aes.h>
 
-#ifdef WIN32
-#define WINVER 0x0501
-#include <ws2tcpip.h>
-#include <winsock.h>
-#else
-#include <netinet/in.h>
-#endif
-
-struct key_data {
-	char *key;
-	char *data;
-	struct key_data *next;
-};
-
 struct play_state {
 	bool playing;
 	unsigned short seq_num;
@@ -53,22 +40,6 @@ struct play_state {
 
 /*********************************************************************/
 
-struct rtspcl_data {
-	int fd;
-	char url[128];
-	int cseq;
-	struct key_data *kd;
-	struct key_data *exthds;
-	char *session;
-	char *transport;
-	unsigned short server_port;
-	unsigned short control_port;
-	struct in_addr host_addr;
-	struct in_addr local_addr;
-	const char *useragent;
-
-};
-
 enum pause_state {
 	NO_PAUSE = 0,
 	OP_PAUSE,

src/rtsp_client.h

+/*
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Based on the RTSP client by Shiro Ninomiya <shiron@snino.com>
+ */
+
+#ifndef MPD_RTSP_CLIENT_H
+#define MPD_RTSP_CLIENT_H
+
+#include <stdbool.h>
+#include <glib.h>
+
+#ifdef WIN32
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#include <winsock.h>
+#else
+#include <netinet/in.h>
+#endif
+
+struct key_data {
+	char *key;
+	char *data;
+	struct key_data *next;
+};
+
+struct rtspcl_data {
+	int fd;
+	char url[128];
+	int cseq;
+	struct key_data *kd;
+	struct key_data *exthds;
+	char *session;
+	char *transport;
+	unsigned short server_port;
+	unsigned short control_port;
+	struct in_addr host_addr;
+	struct in_addr local_addr;
+	const char *useragent;
+
+};
+
+/**
+ * The quark used for GError.domain.
+ */
+static inline GQuark
+rtsp_client_quark(void)
+{
+	return g_quark_from_static_string("rtsp_client");
+}
+
+void
+free_kd(struct key_data *kd);
+
+char *
+kd_lookup(struct key_data *kd, const char *key);
+
+G_GNUC_MALLOC
+struct rtspcl_data *
+rtspcl_open(void);
+
+bool
+rtspcl_connect(struct rtspcl_data *rtspcld, const char *host, short destport,
+	       const char *sid, GError **error_r);
+
+void
+rtspcl_close(struct rtspcl_data *rtspcld);
+
+void
+rtspcl_add_exthds(struct rtspcl_data *rtspcld, const char *key, char *data);
+
+bool
+exec_request(struct rtspcl_data *rtspcld, const char *cmd,
+	     const char *content_type, const char *content,
+	     int get_response,
+	     const struct key_data *hds, struct key_data **kd,
+	     GError **error_r);
+
+bool
+rtspcl_set_parameter(struct rtspcl_data *rtspcld, const char *parameter,
+		     GError **error_r);
+
+void
+rtspcl_set_useragent(struct rtspcl_data *rtspcld, const char *name);
+
+bool
+rtspcl_announce_sdp(struct rtspcl_data *rtspcld, const char *sdp,
+		    GError **error_r);
+
+bool
+rtspcl_setup(struct rtspcl_data *rtspcld, struct key_data **kd,
+	     int control_port, int ntp_port,
+	     GError **error_r);
+
+bool
+rtspcl_record(struct rtspcl_data *rtspcld,
+	      int seq_num, int rtptime,
+	      GError **error_r);
+
+char *
+rtspcl_local_ip(struct rtspcl_data *rtspcld);
+
+#endif