From 6570620cc3717eb82acd19788538fda3786c7b99 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 1 May 2008 23:51:45 +0000 Subject: Start the raop sink. It's based on pipe sink and isn't anywhere near finished. It does however compile. git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2335 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index f2771980..831e4565 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1004,7 +1004,13 @@ libsocket_util_la_SOURCES = \ libsocket_util_la_LDFLAGS = -avoid-version libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) libpulsecore.la -librtp_la_SOURCES = modules/rtp/rtp.c modules/rtp/rtp.h modules/rtp/sdp.c modules/rtp/sdp.h modules/rtp/sap.c modules/rtp/sap.h +librtp_la_SOURCES = \ + 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/headerlist.c modules/rtp/headerlist.h \ + modules/rtp/base64.c modules/rtp/base64.h librtp_la_LDFLAGS = -avoid-version librtp_la_LIBADD = $(AM_LIBADD) libpulsecore.la @@ -1053,6 +1059,7 @@ modlibexec_LTLIBRARIES += \ module-remap-sink.la \ module-ladspa-sink.la \ module-esound-sink.la \ + module-raop-sink.la \ module-tunnel-sink.la \ module-tunnel-source.la \ module-position-event-sounds.la @@ -1199,6 +1206,7 @@ SYMDEF_FILES = \ modules/module-esound-compat-spawnfd-symdef.h \ modules/module-esound-compat-spawnpid-symdef.h \ modules/module-match-symdef.h \ + modules/module-raop-sink-symdef.h \ modules/module-tunnel-sink-symdef.h \ modules/module-tunnel-source-symdef.h \ modules/module-null-sink-symdef.h \ @@ -1367,6 +1375,10 @@ module_match_la_SOURCES = modules/module-match.c module_match_la_LDFLAGS = -module -avoid-version module_match_la_LIBADD = $(AM_LIBADD) libpulsecore.la +module_raop_sink_la_SOURCES = modules/module-raop-sink.c +module_raop_sink_la_LDFLAGS = -module -avoid-version +module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la + module_tunnel_sink_la_SOURCES = modules/module-tunnel.c module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) module_tunnel_sink_la_LDFLAGS = -module -avoid-version -- cgit From 20478a4544e8ef622434c5af5dcb4c66269a7dd9 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 6 May 2008 00:20:35 +0000 Subject: Add a skeleton raop client which builds on the rtsp client. It still requires a socket client and callback system to be added before it will be functional. git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2366 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 831e4565..5bd6388b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1009,6 +1009,7 @@ librtp_la_SOURCES = \ 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/raop_client.c modules/rtp/raop_client.h \ modules/rtp/headerlist.c modules/rtp/headerlist.h \ modules/rtp/base64.c modules/rtp/base64.h librtp_la_LDFLAGS = -avoid-version -- cgit From 41e31ab204ca48ea749c416eb270ebfa2f74b086 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 7 May 2008 01:23:16 +0000 Subject: Rename rtsp.{c,h} to rtsp_client.{c,h}. Renate pa_rtsp_context to pa_rtsp_client. git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2376 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 5bd6388b..91979207 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1008,7 +1008,7 @@ librtp_la_SOURCES = \ 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 -- cgit From 264a1c2ffc3b38fd88421c7d7ad9ebbab6b7e1bb Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 11 May 2008 12:20:14 +0000 Subject: Add more libraries to librtp now that it's doing a lot more. This currently hacks in -lssl rather than writing a configure hook to detect it as I want to replace this with nss before official release. git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2397 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 91979207..5a9b9024 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1013,7 +1013,7 @@ librtp_la_SOURCES = \ modules/rtp/headerlist.c modules/rtp/headerlist.h \ modules/rtp/base64.c modules/rtp/base64.h librtp_la_LDFLAGS = -avoid-version -librtp_la_LIBADD = $(AM_LIBADD) libpulsecore.la +librtp_la_LIBADD = $(AM_LIBADD) libsocket-util.la libiochannel.la libsocket-client.la libioline.la libpulsecore.la -lssl # X11 -- cgit From 729bbaf88485207c8637f3c30fffed60a1f73ca1 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 11 Jun 2008 22:44:09 +0000 Subject: Automatic discovery of airtunes devices via Bonjour/Avahi. This also does some minor reordering in the Makefile.am Refs #69 git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2519 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 5a9b9024..4ffdfd93 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1127,7 +1127,8 @@ endif if HAVE_AVAHI modlibexec_LTLIBRARIES += \ module-zeroconf-publish.la \ - module-zeroconf-discover.la + module-zeroconf-discover.la \ + module-raop-discover.la endif if HAVE_LIRC @@ -1207,7 +1208,6 @@ SYMDEF_FILES = \ modules/module-esound-compat-spawnfd-symdef.h \ modules/module-esound-compat-spawnpid-symdef.h \ modules/module-match-symdef.h \ - modules/module-raop-sink-symdef.h \ modules/module-tunnel-sink-symdef.h \ modules/module-tunnel-source-symdef.h \ modules/module-null-sink-symdef.h \ @@ -1242,6 +1242,8 @@ SYMDEF_FILES = \ modules/bluetooth/module-bluetooth-proximity-symdef.h \ modules/bluetooth/module-bluetooth-discover-symdef.h \ modules/bluetooth/module-bluetooth-device-symdef.h \ + modules/module-raop-sink-symdef.h \ + modules/module-raop-discover-symdef.h \ modules/gconf/module-gconf-symdef.h \ modules/module-position-event-sounds-symdef.h \ modules/module-console-kit-symdef.h @@ -1376,10 +1378,6 @@ module_match_la_SOURCES = modules/module-match.c module_match_la_LDFLAGS = -module -avoid-version module_match_la_LIBADD = $(AM_LIBADD) libpulsecore.la -module_raop_sink_la_SOURCES = modules/module-raop-sink.c -module_raop_sink_la_LDFLAGS = -module -avoid-version -module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la - module_tunnel_sink_la_SOURCES = modules/module-tunnel.c module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) module_tunnel_sink_la_LDFLAGS = -module -avoid-version @@ -1608,6 +1606,17 @@ module_bluetooth_device_la_LDFLAGS = -module -avoid-version module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la libbluetooth-ipc.la libbluetooth-sbc.la libsocket-util.la module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +# Apple Airtunes/RAOP +module_raop_sink_la_SOURCES = modules/module-raop-sink.c +module_raop_sink_la_LDFLAGS = -module -avoid-version +module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la + +module_raop_discover_la_SOURCES = modules/module-raop-discover.c +module_raop_discover_la_LDFLAGS = -module -avoid-version +module_raop_discover_la_LIBADD = $(AM_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la libpulsecore.la +module_raop_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) + + ################################### # Some minor stuff # ################################### -- cgit From 8715121755ad1aa9c083dd70781a63ced13359c2 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 3 Aug 2008 22:46:21 +0100 Subject: Modularise the RAOP stuff that requires OpenSSL and make it optional at compile time --- src/Makefile.am | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 4ffdfd93..f216b71b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,6 +62,10 @@ AM_CFLAGS += -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" # This cool debug trap works on i386/gcc only AM_CFLAGS += '-DDEBUG_TRAP=__asm__("int $$3")' +if HAVE_OPENSSL +AM_CFLAGS += -I$(top_builddir)/src/modules/raop +endif + AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS) AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS) @@ -89,6 +93,7 @@ PA_THREAD_OBJS = \ pulsecore/semaphore-posix.c pulsecore/semaphore.h endif + ################################### # Extra files # ################################### @@ -1009,11 +1014,16 @@ librtp_la_SOURCES = \ modules/rtp/sdp.c modules/rtp/sdp.h \ modules/rtp/sap.c modules/rtp/sap.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 + modules/rtp/headerlist.c modules/rtp/headerlist.h librtp_la_LDFLAGS = -avoid-version -librtp_la_LIBADD = $(AM_LIBADD) libsocket-util.la libiochannel.la libsocket-client.la libioline.la libpulsecore.la -lssl +librtp_la_LIBADD = $(AM_LIBADD) libsocket-util.la libiochannel.la libsocket-client.la libioline.la libpulsecore.la + +libraop_la_SOURCES = \ + modules/raop/raop_client.c modules/raop/raop_client.h \ + modules/raop/base64.c modules/raop/base64.h +libraop_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS) +libraop_la_LDFLAGS = -avoid-version +libraop_la_LIBADD = $(AM_LIBADD) $(OPENSSL_LIBS) libsocket-util.la libiochannel.la libsocket-client.la libioline.la libpulsecore.la librtp.la # X11 @@ -1060,7 +1070,6 @@ modlibexec_LTLIBRARIES += \ module-remap-sink.la \ module-ladspa-sink.la \ module-esound-sink.la \ - module-raop-sink.la \ module-tunnel-sink.la \ module-tunnel-source.la \ module-position-event-sounds.la @@ -1127,8 +1136,7 @@ endif if HAVE_AVAHI modlibexec_LTLIBRARIES += \ module-zeroconf-publish.la \ - module-zeroconf-discover.la \ - module-raop-discover.la + module-zeroconf-discover.la endif if HAVE_LIRC @@ -1186,6 +1194,17 @@ pulselibexec_PROGRAMS += \ proximity-helper endif +if HAVE_OPENSSL +modlibexec_LTLIBRARIES += \ + libraop.la \ + module-raop-sink.la +if HAVE_AVAHI +modlibexec_LTLIBRARIES += \ + module-raop-discover.la +endif +endif + + # These are generated by a M4 script SYMDEF_FILES = \ @@ -1609,7 +1628,7 @@ module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) # Apple Airtunes/RAOP module_raop_sink_la_SOURCES = modules/module-raop-sink.c module_raop_sink_la_LDFLAGS = -module -avoid-version -module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la +module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la libraop.la module_raop_discover_la_SOURCES = modules/module-raop-discover.c module_raop_discover_la_LDFLAGS = -module -avoid-version -- cgit