diff options
28 files changed, 265 insertions, 295 deletions
diff --git a/configure.ac b/configure.ac index 5a78ffb9..99e50b08 100644 --- a/configure.ac +++ b/configure.ac @@ -475,7 +475,7 @@ AC_FUNC_FORK AC_FUNC_GETGROUPS AC_FUNC_SELECT_ARGTYPES AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \ - getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \ + getpwnam_r getpwuid_r gettimeofday getuid mlock nanosleep \ pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \ sigaction sleep symlink sysconf uname pthread_setaffinity_np]) AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0]) diff --git a/src/Makefile.am b/src/Makefile.am index 78ee231f..fca7edad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,21 +27,23 @@ pulseincludedir=$(includedir)/pulse pulsecoreincludedir=$(includedir)/pulsecore pulseconfdir=$(sysconfdir)/pulse pulselibexecdir=$(libexecdir)/pulse +if HAVE_X11 xdgautostartdir=$(sysconfdir)/xdg/autostart +endif +if HAVE_ALSA alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths +endif +if HAVE_DBUS dbuspolicydir=$(sysconfdir)/dbus-1/system.d +endif ################################### # Defines # ################################### PA_BINARY=$(bindir)/pulseaudio$(EXEEXT) -if OS_IS_WIN32 -PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT% -else PA_DEFAULT_CONFIG_DIR=$(pulseconfdir) -endif ################################### # Compiler/linker flags # @@ -121,9 +123,9 @@ if HAVE_X11 xdgautostart_in_files = \ daemon/pulseaudio.desktop.in \ daemon/pulseaudio-kde.desktop.in -endif xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +endif ################################### @@ -588,8 +590,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/flist.c pulsecore/flist.h \ pulsecore/hashmap.c pulsecore/hashmap.h \ pulsecore/idxset.c pulsecore/idxset.h \ - pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ - pulsecore/inet_pton.c pulsecore/inet_pton.h \ + pulsecore/arpa-inet.c pulsecore/arpa-inet.h \ pulsecore/iochannel.c pulsecore/iochannel.h \ pulsecore/ioline.c pulsecore/ioline.h \ pulsecore/ipacl.h pulsecore/ipacl.c \ @@ -1920,21 +1921,28 @@ daemon.conf: daemon/daemon.conf.in Makefile $(AM_V_GEN) sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \ -e 's,@PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@ +if OS_IS_WIN32 +SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp +else +SYMLINK_PROGRAM=ln -sf +endif install-exec-hook: +if HAVE_BLUEZ -chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper - ln -sf pacat $(DESTDIR)$(bindir)/parec - ln -sf pacat $(DESTDIR)$(bindir)/pamon - ln -sf pacat $(DESTDIR)$(bindir)/paplay - ln -sf pacat $(DESTDIR)$(bindir)/parecord +endif + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT) + $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parecord$(EXEEXT) rm -f $(DESTDIR)$(libdir)/libpulsedsp.la rm -f $(DESTDIR)$(modlibexecdir)/*.la uninstall-hook: - rm -f $(DESTDIR)$(bindir)/parec - rm -f $(DESTDIR)$(bindir)/pamon - rm -f $(DESTDIR)$(bindir)/paplay - rm -f $(DESTDIR)$(bindir)/parecord + rm -f $(DESTDIR)$(bindir)/parec$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/pamon$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/paplay$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/parecord$(EXEEXT) rm -f $(DESTDIR)$(libdir)/libpulsedsp.* rm -f $(DESTDIR)$(modlibexecdir)/*.so diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index ce93dbc6..9b530a80 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -160,7 +160,21 @@ pa_daemon_conf* pa_daemon_conf_new(void) { } else #endif +#ifdef OS_IS_WIN32 + { + char *t; + char *majorminor = pa_xstrdup(VERSION); + char *toplevel = pa_win32_get_toplevel(NULL); + + if ((t = strchr(majorminor, '-'))) + *t = '\0'; + + c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%s" PA_PATH_SEP "modules", toplevel, majorminor); + pa_xfree(majorminor); + } +#else c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH); +#endif return c; } diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c index 1a14596c..29cb419d 100644 --- a/src/modules/module-protocol-stub.c +++ b/src/modules/module-protocol-stub.c @@ -30,9 +30,6 @@ #include <unistd.h> #include <limits.h> -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -49,6 +46,7 @@ #include <pulsecore/log.h> #include <pulsecore/native-common.h> #include <pulsecore/creds.h> +#include <pulsecore/arpa-inet.h> #ifdef USE_TCP_SOCKETS #define SOCKET_DESCRIPTION "(TCP sockets)" diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c index 1a3a6e18..9f119c59 100644 --- a/src/modules/module-waveout.c +++ b/src/modules/module-waveout.c @@ -52,6 +52,7 @@ PA_MODULE_USAGE( "sink_name=<name for the sink> " "source_name=<name for the source> " "device=<device number> " + "device_name=<name of the device> " "record=<enable source?> " "playback=<enable sink?> " "format=<sample format> " @@ -97,6 +98,7 @@ static const char* const valid_modargs[] = { "sink_name", "source_name", "device", + "device_name", "record", "playback", "fragments", @@ -157,12 +159,11 @@ static void do_write(struct userdata *u) { memchunk.memblock = NULL; } - /* Insufficient data in sink buffer? */ + /* Underflow detection */ if (hdr->dwBufferLength == 0) { u->sink_underflow = 1; break; } - u->sink_underflow = 0; res = waveOutPrepareHeader(u->hwo, hdr, sizeof(WAVEHDR)); @@ -255,20 +256,23 @@ static void thread_func(void *userdata) { for (;;) { int ret; + pa_bool_t need_timer = FALSE; - if (PA_SINK_IS_OPENED(u->sink->thread_info.state) || - PA_SOURCE_IS_OPENED(u->source->thread_info.state)) { - + if (u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state)) { if (u->sink->thread_info.rewind_requested) pa_sink_process_rewind(u->sink, 0); - if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) - do_write(u); - if (PA_SOURCE_IS_OPENED(u->source->thread_info.state)) - do_read(u); + do_write(u); + need_timer = TRUE; + } + if (u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state)) { + do_read(u); + need_timer = TRUE; + } + if (need_timer) pa_rtpoll_set_timer_relative(u->rtpoll, u->poll_timeout); - } else + else pa_rtpoll_set_timer_disabled(u->rtpoll); /* Hmm, nothing to do. Let's sleep */ @@ -290,8 +294,12 @@ finish: } static void CALLBACK chunk_done_cb(HWAVEOUT hwo, UINT msg, DWORD_PTR inst, DWORD param1, DWORD param2) { - struct userdata *u = (struct userdata *)inst; + struct userdata *u = (struct userdata*) inst; + if (msg == WOM_OPEN) + pa_log_debug("WaveOut subsystem opened."); + if (msg == WOM_CLOSE) + pa_log_debug("WaveOut subsystem closed."); if (msg != WOM_DONE) return; @@ -302,8 +310,12 @@ static void CALLBACK chunk_done_cb(HWAVEOUT hwo, UINT msg, DWORD_PTR inst, DWORD } static void CALLBACK chunk_ready_cb(HWAVEIN hwi, UINT msg, DWORD_PTR inst, DWORD param1, DWORD param2) { - struct userdata *u = (struct userdata *)inst; + struct userdata *u = (struct userdata*) inst; + if (msg == WIM_OPEN) + pa_log_debug("WaveIn subsystem opened."); + if (msg == WIM_CLOSE) + pa_log_debug("WaveIn subsystem closed."); if (msg != WIM_DATA) return; @@ -431,17 +443,6 @@ static int ss_to_waveformat(pa_sample_spec *ss, LPWAVEFORMATEX wf) { wf->nChannels = ss->channels; - switch (ss->rate) { - case 8000: - case 11025: - case 22005: - case 44100: - break; - default: - pa_log_error("Unsupported sample rate."); - return -1; - } - wf->nSamplesPerSec = ss->rate; if (ss->format == PA_SAMPLE_U8) @@ -449,7 +450,7 @@ static int ss_to_waveformat(pa_sample_spec *ss, LPWAVEFORMATEX wf) { else if (ss->format == PA_SAMPLE_S16NE) wf->wBitsPerSample = 16; else { - pa_log_error("Unsupported sample format."); + pa_log_error("Unsupported sample format, only u8 and s16 are supported."); return -1; } @@ -465,7 +466,7 @@ int pa__get_n_used(pa_module *m) { struct userdata *u; pa_assert(m); pa_assert(m->userdata); - u = (struct userdata *)m->userdata; + u = (struct userdata*) m->userdata; return (u->sink ? pa_sink_used_by(u->sink) : 0) + (u->source ? pa_source_used_by(u->source) : 0); @@ -476,12 +477,15 @@ int pa__init(pa_module *m) { HWAVEOUT hwo = INVALID_HANDLE_VALUE; HWAVEIN hwi = INVALID_HANDLE_VALUE; WAVEFORMATEX wf; + WAVEOUTCAPS pwoc; + MMRESULT result; int nfrags, frag_size; pa_bool_t record = TRUE, playback = TRUE; unsigned int device; pa_sample_spec ss; pa_channel_map map; pa_modargs *ma = NULL; + const char *device_name = NULL; unsigned int i; pa_assert(m); @@ -502,11 +506,31 @@ int pa__init(pa_module *m) { goto fail; } + /* Set the device to be opened. If set device_name is used, + * else device if set and lastly WAVE_MAPPER is the default */ device = WAVE_MAPPER; if (pa_modargs_get_value_u32(ma, "device", &device) < 0) { pa_log("failed to parse device argument"); goto fail; } + if ((device_name = pa_modargs_get_value(ma, "device_name", NULL)) != NULL) { + unsigned int num_devices = waveOutGetNumDevs(); + for (i = 0; i < num_devices; i++) { + if (waveOutGetDevCaps(i, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR) + if (_stricmp(device_name, pwoc.szPname) == 0) + break; + } + if (i < num_devices) + device = i; + else { + pa_log("device not found: %s", device_name); + goto fail; + } + } + if (waveOutGetDevCaps(device, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR) + device_name = pwoc.szPname; + else + device_name = "unknown"; nfrags = 5; frag_size = 8192; @@ -527,28 +551,45 @@ int pa__init(pa_module *m) { u = pa_xmalloc(sizeof(struct userdata)); if (record) { - if (waveInOpen(&hwi, device, &wf, (DWORD_PTR)chunk_ready_cb, (DWORD_PTR)u, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) { - pa_log("failed to open waveIn"); + result = waveInOpen(&hwi, device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY); + if (result != MMSYSERR_NOERROR) { + pa_log_warn("Sample spec not supported by WaveIn, falling back to default sample rate."); + ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate; + } + result = waveInOpen(&hwi, device, &wf, (DWORD_PTR) chunk_ready_cb, (DWORD_PTR) u, CALLBACK_FUNCTION); + if (result != MMSYSERR_NOERROR) { + char errortext[MAXERRORLENGTH]; + pa_log("Failed to open WaveIn."); + if (waveInGetErrorText(result, errortext, sizeof(errortext)) == MMSYSERR_NOERROR) + pa_log("Error: %s", errortext); goto fail; } if (waveInStart(hwi) != MMSYSERR_NOERROR) { pa_log("failed to start waveIn"); goto fail; } - pa_log_debug("Opened waveIn subsystem."); } if (playback) { - if (waveOutOpen(&hwo, device, &wf, (DWORD_PTR)chunk_done_cb, (DWORD_PTR)u, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) { - pa_log("failed to open waveOut"); + result = waveOutOpen(&hwo, device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY); + if (result != MMSYSERR_NOERROR) { + pa_log_warn("Sample spec not supported by WaveOut, falling back to default sample rate."); + ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate; + } + result = waveOutOpen(&hwo, device, &wf, (DWORD_PTR) chunk_done_cb, (DWORD_PTR) u, CALLBACK_FUNCTION); + if (result != MMSYSERR_NOERROR) { + char errortext[MAXERRORLENGTH]; + pa_log("Failed to open WaveOut."); + if (waveOutGetErrorText(result, errortext, sizeof(errortext)) == MMSYSERR_NOERROR) + pa_log("Error: %s", errortext); goto fail; } - pa_log_debug("Opened waveOut subsystem."); } InitializeCriticalSection(&u->crit); if (hwi != INVALID_HANDLE_VALUE) { + char *description = pa_sprintf_malloc("WaveIn on %s", device_name); pa_source_new_data data; pa_source_new_data_init(&data); data.driver = __FILE__; @@ -561,12 +602,14 @@ int pa__init(pa_module *m) { pa_assert(u->source); u->source->userdata = u; - pa_source_set_description(u->source, "Windows waveIn PCM"); + pa_source_set_description(u->source, description); u->source->parent.process_msg = process_msg; + pa_xfree(description); } else u->source = NULL; if (hwo != INVALID_HANDLE_VALUE) { + char *description = pa_sprintf_malloc("WaveOut on %s", device_name); pa_sink_new_data data; pa_sink_new_data_init(&data); data.driver = __FILE__; @@ -581,8 +624,9 @@ int pa__init(pa_module *m) { u->sink->get_volume = sink_get_volume_cb; u->sink->set_volume = sink_set_volume_cb; u->sink->userdata = u; - pa_sink_set_description(u->sink, "Windows waveOut PCM"); + pa_sink_set_description(u->sink, description); u->sink->parent.process_msg = process_msg; + pa_xfree(description); } else u->sink = NULL; @@ -602,6 +646,7 @@ int pa__init(pa_module *m) { u->sink_underflow = 1; u->poll_timeout = pa_bytes_to_usec(u->fragments * u->fragment_size / 10, &ss); + pa_log_debug("Poll timeout = %.1f ms", (double) u->poll_timeout / PA_USEC_PER_MSEC); u->cur_ihdr = 0; u->cur_ohdr = 0; @@ -609,7 +654,7 @@ int pa__init(pa_module *m) { pa_assert(u->ihdrs); u->ohdrs = pa_xmalloc0(sizeof(WAVEHDR) * u->fragments); pa_assert(u->ohdrs); - for (i = 0;i < u->fragments;i++) { + for (i = 0; i < u->fragments; i++) { u->ihdrs[i].dwBufferLength = u->fragment_size; u->ohdrs[i].dwBufferLength = u->fragment_size; u->ihdrs[i].lpData = pa_xmalloc(u->fragment_size); @@ -627,22 +672,26 @@ int pa__init(pa_module *m) { u->rtpoll = pa_rtpoll_new(); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); - if (!(u->thread = pa_thread_new("waveout-source", thread_func, u))) { - pa_log("Failed to create thread."); - goto fail; - } if (u->sink) { pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); pa_sink_set_rtpoll(u->sink, u->rtpoll); - pa_sink_put(u->sink); } if (u->source) { pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); pa_source_set_rtpoll(u->source, u->rtpoll); - pa_source_put(u->source); } + if (!(u->thread = pa_thread_new("waveout", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } + + if (u->sink) + pa_sink_put(u->sink); + if (u->source) + pa_source_put(u->source); + return 0; fail: @@ -671,7 +720,7 @@ void pa__done(pa_module *m) { pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); if (u->thread) - pa_thread_free(u->thread); + pa_thread_free(u->thread); pa_thread_mq_done(&u->thread_mq); if (u->sink) @@ -692,7 +741,7 @@ void pa__done(pa_module *m) { waveOutClose(u->hwo); } - for (i = 0;i < u->fragments;i++) { + for (i = 0; i < u->fragments; i++) { pa_xfree(u->ihdrs[i].lpData); pa_xfree(u->ohdrs[i].lpData); } diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c index 68ddabea..05c7b169 100644 --- a/src/modules/raop/raop_client.c +++ b/src/modules/raop/raop_client.c @@ -27,7 +27,6 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <arpa/inet.h> #include <unistd.h> #include <sys/ioctl.h> diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c index a920e66e..1144169b 100644 --- a/src/modules/rtp/module-rtp-recv.c +++ b/src/modules/rtp/module-rtp-recv.c @@ -27,7 +27,6 @@ #include <stdio.h> #include <sys/socket.h> #include <netinet/in.h> -#include <arpa/inet.h> #include <errno.h> #include <string.h> #include <unistd.h> @@ -54,6 +53,7 @@ #include <pulsecore/socket-util.h> #include <pulsecore/once.h> #include <pulsecore/poll.h> +#include <pulsecore/arpa-inet.h> #include "module-rtp-recv-symdef.h" diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c index ab815223..f53020d1 100644 --- a/src/modules/rtp/module-rtp-send.c +++ b/src/modules/rtp/module-rtp-send.c @@ -26,7 +26,6 @@ #include <stdio.h> #include <sys/socket.h> #include <netinet/in.h> -#include <arpa/inet.h> #include <errno.h> #include <string.h> #include <unistd.h> @@ -49,6 +48,7 @@ #include <pulsecore/sample-util.h> #include <pulsecore/macro.h> #include <pulsecore/socket-util.h> +#include <pulsecore/arpa-inet.h> #include "module-rtp-send-symdef.h" diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c index 74f0ac38..22e491bf 100644 --- a/src/modules/rtp/rtp.c +++ b/src/modules/rtp/rtp.c @@ -27,7 +27,6 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <arpa/inet.h> #include <unistd.h> #include <sys/ioctl.h> @@ -43,6 +42,7 @@ #include <pulsecore/log.h> #include <pulsecore/macro.h> #include <pulsecore/core-util.h> +#include <pulsecore/arpa-inet.h> #include "rtp.h" diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c index 72702cba..8a5a1d75 100644 --- a/src/modules/rtp/rtsp_client.c +++ b/src/modules/rtp/rtsp_client.c @@ -27,7 +27,6 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <arpa/inet.h> #include <unistd.h> #include <sys/ioctl.h> #include <netinet/in.h> @@ -46,6 +45,7 @@ #include <pulsecore/strbuf.h> #include <pulsecore/ioline.h> #include <pulsecore/poll.h> +#include <pulsecore/arpa-inet.h> #include "rtsp_client.h" diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c index adde16df..87c8b8f6 100644 --- a/src/modules/rtp/sap.c +++ b/src/modules/rtp/sap.c @@ -28,7 +28,6 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> -#include <arpa/inet.h> #include <errno.h> #include <string.h> #include <unistd.h> @@ -48,6 +47,7 @@ #include <pulsecore/core-util.h> #include <pulsecore/log.h> #include <pulsecore/macro.h> +#include <pulsecore/arpa-inet.h> #include "sap.h" #include "sdp.h" diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c index 7fc7e38c..3e61d9b8 100644 --- a/src/modules/rtp/sdp.c +++ b/src/modules/rtp/sdp.c @@ -28,7 +28,6 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> -#include <arpa/inet.h> #include <string.h> #include <pulse/xmalloc.h> @@ -37,6 +36,7 @@ #include <pulsecore/core-util.h> #include <pulsecore/log.h> #include <pulsecore/macro.h> +#include <pulsecore/arpa-inet.h> #include "sdp.h" #include "rtp.h" diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c index 8c261381..f02d31a1 100644 --- a/src/pulse/mainloop.c +++ b/src/pulse/mainloop.c @@ -151,7 +151,7 @@ static pa_io_event_flags_t map_flags_from_libc(short flags) { /* IO events */ static pa_io_event* mainloop_io_new( - pa_mainloop_api*a, + pa_mainloop_api *a, int fd, pa_io_event_flags_t events, pa_io_event_cb_t callback, @@ -244,7 +244,7 @@ static void mainloop_io_set_destroy(pa_io_event *e, pa_io_event_destroy_cb_t cal /* Defer events */ static pa_defer_event* mainloop_defer_new( - pa_mainloop_api*a, + pa_mainloop_api *a, pa_defer_event_cb_t callback, void *userdata) { @@ -331,7 +331,7 @@ static pa_usec_t make_rt(const struct timeval *tv, pa_bool_t *use_rtclock) { } static pa_time_event* mainloop_time_new( - pa_mainloop_api*a, + pa_mainloop_api *a, const struct timeval *tv, pa_time_event_cb_t callback, void *userdata) { @@ -355,7 +355,7 @@ static pa_time_event* mainloop_time_new( if ((e->enabled = (t != PA_USEC_INVALID))) { e->time = t; - e->use_rtclock= use_rtclock; + e->use_rtclock = use_rtclock; m->n_enabled_time_events++; @@ -438,7 +438,7 @@ static void mainloop_time_set_destroy(pa_time_event *e, pa_time_event_destroy_cb /* quit() */ -static void mainloop_quit(pa_mainloop_api*a, int retval) { +static void mainloop_quit(pa_mainloop_api *a, int retval) { pa_mainloop *m; pa_assert(a); @@ -591,7 +591,7 @@ static void cleanup_defer_events(pa_mainloop *m, pa_bool_t force) { } -void pa_mainloop_free(pa_mainloop* m) { +void pa_mainloop_free(pa_mainloop *m) { pa_assert(m); cleanup_io_events(m, TRUE); @@ -848,10 +848,15 @@ quit: } static int usec_to_timeout(pa_usec_t u) { + int timeout; + if (u == PA_USEC_INVALID) return -1; - return (u + PA_USEC_PER_MSEC - 1) / PA_USEC_PER_MSEC; + timeout = (u + PA_USEC_PER_MSEC - 1) / PA_USEC_PER_MSEC; + pa_assert(timeout >= 0); + + return timeout; } int pa_mainloop_poll(pa_mainloop *m) { @@ -988,7 +993,7 @@ void pa_mainloop_quit(pa_mainloop *m, int retval) { pa_mainloop_wakeup(m); } -pa_mainloop_api* pa_mainloop_get_api(pa_mainloop*m) { +pa_mainloop_api* pa_mainloop_get_api(pa_mainloop *m) { pa_assert(m); return &m->api; @@ -1001,7 +1006,7 @@ void pa_mainloop_set_poll_func(pa_mainloop *m, pa_poll_func poll_func, void *use m->poll_func_userdata = userdata; } -pa_bool_t pa_mainloop_is_our_api(pa_mainloop_api*m) { +pa_bool_t pa_mainloop_is_our_api(pa_mainloop_api *m) { pa_assert(m); return m->io_new == mainloop_io_new; diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/arpa-inet.c index 059b25cc..3d6f316a 100644 --- a/src/pulsecore/inet_ntop.c +++ b/src/pulsecore/arpa-inet.c @@ -23,16 +23,15 @@ #include <config.h> #endif -#include <stdio.h> -#include <errno.h> +#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32) -#ifndef HAVE_INET_NTOP +#include <errno.h> #include <pulsecore/core-util.h> #include <pulsecore/macro.h> #include <pulsecore/socket.h> -#include "inet_ntop.h" +#include "arpa-inet.h" const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { struct in_addr *in = (struct in_addr*)src; @@ -79,4 +78,31 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { return dst; } -#endif /* INET_NTOP */ +int inet_pton(int af, const char *src, void *dst) { + struct in_addr *in = (struct in_addr*)dst; +#ifdef HAVE_IPV6 + struct in6_addr *in6 = (struct in6_addr*)dst; +#endif + + pa_assert(src); + pa_assert(dst); + + switch (af) { + case AF_INET: + in->s_addr = inet_addr(src); + if (in->s_addr == INADDR_NONE) + return 0; + break; +#ifdef HAVE_IPV6 + case AF_INET6: + /* FIXME */ +#endif + default: + errno = EAFNOSUPPORT; + return -1; + } + + return 1; +} + +#endif diff --git a/src/pulsecore/arpa-inet.h b/src/pulsecore/arpa-inet.h new file mode 100644 index 00000000..303c905b --- /dev/null +++ b/src/pulsecore/arpa-inet.h @@ -0,0 +1,23 @@ +#ifndef fooarpa_inethfoo +#define fooarpa_inethfoo + + +#if defined(HAVE_ARPA_INET_H) + +#include <arpa/inet.h> + +#elif defined(OS_IS_WIN32) + +/* On Windows winsock2.h (here included via pulsecore/socket.h) provides most of the functionality of arpa/inet.h, except for + * the inet_ntop and inet_pton functions, which are implemented here. */ + +#include <pulsecore/socket.h> + +const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); + +int inet_pton(int af, const char *src, void *dst); + +#endif + + +#endif diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c index ac2c097a..331ac112 100644 --- a/src/pulsecore/core-rtclock.c +++ b/src/pulsecore/core-rtclock.c @@ -182,15 +182,13 @@ void pa_rtclock_hrtimer_enable(void) { } struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) { - -#ifdef HAVE_CLOCK_GETTIME struct timeval wc_now, rt_now; + pa_assert(tv); + pa_gettimeofday(&wc_now); pa_rtclock_get(&rt_now); - pa_assert(tv); - /* pa_timeval_sub() saturates on underflow! */ if (pa_timeval_cmp(&wc_now, tv) < 0) @@ -199,7 +197,6 @@ struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) { pa_timeval_sub(&rt_now, pa_timeval_diff(&wc_now, tv)); *tv = rt_now; -#endif return tv; } @@ -232,15 +229,13 @@ struct timespec* pa_timespec_store(struct timespec *ts, pa_usec_t v) { #endif static struct timeval* wallclock_from_rtclock(struct timeval *tv) { - -#ifdef HAVE_CLOCK_GETTIME struct timeval wc_now, rt_now; + pa_assert(tv); + pa_gettimeofday(&wc_now); pa_rtclock_get(&rt_now); - pa_assert(tv); - /* pa_timeval_sub() saturates on underflow! */ if (pa_timeval_cmp(&rt_now, tv) < 0) @@ -249,7 +244,6 @@ static struct timeval* wallclock_from_rtclock(struct timeval *tv) { pa_timeval_sub(&wc_now, pa_timeval_diff(&rt_now, tv)); *tv = wc_now; -#endif return tv; } diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index a713cae0..b5043a38 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -146,24 +146,29 @@ static pa_strlist *recorded_env = NULL; #ifdef OS_IS_WIN32 -#define PULSE_ROOTENV "PULSE_ROOT" +/* Returns the directory of the current DLL, with '/bin/' removed if it is the last component */ +char *pa_win32_get_toplevel(HANDLE handle) { + static char *toplevel = NULL; -int pa_set_root(HANDLE handle) { - char library_path[MAX_PATH], *sep; + if (!toplevel) { + char library_path[MAX_PATH]; + char *p; - /* FIXME: Needs to set errno */ + if (!GetModuleFileName(handle, library_path, MAX_PATH)) + return NULL; - if (!GetModuleFileName(handle, library_path, MAX_PATH)) - return 0; + toplevel = pa_xstrdup(library_path); - sep = strrchr(library_path, PA_PATH_SEP_CHAR); - if (sep) - *sep = '\0'; + p = strrchr(toplevel, PA_PATH_SEP_CHAR); + if (p) + *p = '\0'; - if (!SetEnvironmentVariable(PULSE_ROOTENV, library_path)) - return 0; + p = strrchr(toplevel, PA_PATH_SEP_CHAR); + if (p && (strcmp(p + 1, "bin") == 0)) + *p = '\0'; + } - return 1; + return toplevel; } #endif @@ -701,7 +706,7 @@ int pa_make_realtime(int rtprio) { #elif defined(OS_IS_WIN32) /* Windows only allows realtime scheduling to be set on a per process basis. * Therefore, instead of making the thread realtime, just give it the highest non-realtime priority. */ - if(SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) { + if (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) { pa_log_info("Successfully enabled THREAD_PRIORITY_TIME_CRITICAL scheduling for thread."); return 0; } @@ -932,7 +937,7 @@ const char *pa_sig2str(int sig) { } #else - switch(sig) { + switch (sig) { #ifdef SIGHUP case SIGHUP: return "SIGHUP"; #endif @@ -1219,11 +1224,11 @@ int pa_lock_fd(int fd, int b) { return 0; } - pa_log("%slock: %s", !b? "un" : "", pa_cstrerror(errno)); + pa_log("%slock: %s", !b ? "un" : "", pa_cstrerror(errno)); #endif #ifdef OS_IS_WIN32 - HANDLE h = (HANDLE)_get_osfhandle(fd); + HANDLE h = (HANDLE) _get_osfhandle(fd); if (b && LockFile(h, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF)) return 0; @@ -1676,23 +1681,9 @@ fail: * stored there.*/ FILE *pa_open_config_file(const char *global, const char *local, const char *env, char **result) { const char *fn; -#ifdef OS_IS_WIN32 - char buf[PATH_MAX]; - - if (!getenv(PULSE_ROOTENV)) - pa_set_root(NULL); -#endif + FILE *f; if (env && (fn = getenv(env))) { - FILE *f; - -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - fn = buf; -#endif - if ((f = pa_fopen_cloexec(fn, "r"))) { if (result) *result = pa_xstrdup(fn); @@ -1708,7 +1699,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env const char *e; char *lfn; char *h; - FILE *f; if ((e = getenv("PULSE_CONFIG_PATH"))) fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local); @@ -1718,15 +1708,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env } else return NULL; -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) { - /* FIXME: Needs to set errno! */ - pa_xfree(lfn); - return NULL; - } - fn = buf; -#endif - if ((f = pa_fopen_cloexec(fn, "r"))) { if (result) *result = pa_xstrdup(fn); @@ -1745,22 +1726,26 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env } if (global) { - FILE *f; + char *gfn; #ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(global, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - global = buf; + if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0) + gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s", + pa_win32_get_toplevel(NULL), + global + strlen(PA_DEFAULT_CONFIG_DIR)); + else #endif + gfn = pa_xstrdup(global); - if ((f = pa_fopen_cloexec(global, "r"))) { - + if ((f = pa_fopen_cloexec(gfn, "r"))) { if (result) - *result = pa_xstrdup(global); + *result = gfn; + else + pa_xfree(gfn); return f; } + pa_xfree(gfn); } errno = ENOENT; @@ -1769,22 +1754,8 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env char *pa_find_config_file(const char *global, const char *local, const char *env) { const char *fn; -#ifdef OS_IS_WIN32 - char buf[PATH_MAX]; - - if (!getenv(PULSE_ROOTENV)) - pa_set_root(NULL); -#endif if (env && (fn = getenv(env))) { - -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - fn = buf; -#endif - if (access(fn, R_OK) == 0) return pa_xstrdup(fn); @@ -1805,15 +1776,6 @@ char *pa_find_config_file(const char *global, const char *local, const char *env } else return NULL; -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) { - /* FIXME: Needs to set errno! */ - pa_xfree(lfn); - return NULL; - } - fn = buf; -#endif - if (access(fn, R_OK) == 0) { char *r = pa_xstrdup(fn); pa_xfree(lfn); @@ -1830,15 +1792,20 @@ char *pa_find_config_file(const char *global, const char *local, const char *env } if (global) { + char *gfn; + #ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(global, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - global = buf; + if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0) + gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s", + pa_win32_get_toplevel(NULL), + global + strlen(PA_DEFAULT_CONFIG_DIR)); + else #endif + gfn = pa_xstrdup(global); - if (access(global, R_OK) == 0) - return pa_xstrdup(global); + if (access(gfn, R_OK) == 0) + return gfn; + pa_xfree(gfn); } errno = ENOENT; diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index 8619330d..80b47395 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -271,4 +271,8 @@ void pa_nullify_stdfds(void); char *pa_read_line_from_file(const char *fn); pa_bool_t pa_running_in_vm(void); +#ifdef OS_IS_WIN32 +char *pa_win32_get_toplevel(HANDLE handle); +#endif + #endif diff --git a/src/pulsecore/dllmain.c b/src/pulsecore/dllmain.c index 491ec75f..c826bc08 100644 --- a/src/pulsecore/dllmain.c +++ b/src/pulsecore/dllmain.c @@ -31,7 +31,7 @@ #include <windows.h> -extern pa_set_root(HANDLE handle); +extern pa_win32_get_toplevel(HANDLE handle); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { WSADATA data; @@ -39,7 +39,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) { case DLL_PROCESS_ATTACH: - if (!pa_set_root(hinstDLL)) + if (!pa_win32_get_toplevel(hinstDLL)) return FALSE; WSAStartup(MAKEWORD(2, 0), &data); break; diff --git a/src/pulsecore/inet_ntop.h b/src/pulsecore/inet_ntop.h deleted file mode 100644 index 77ace6a4..00000000 --- a/src/pulsecore/inet_ntop.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef fooinet_ntophfoo -#define fooinet_ntophfoo - -#ifndef HAVE_INET_NTOP - -#include <pulsecore/socket.h> - -const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); - -#endif - -#endif diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c deleted file mode 100644 index efb15263..00000000 --- a/src/pulsecore/inet_pton.c +++ /dev/null @@ -1,63 +0,0 @@ -/*** - This file is part of PulseAudio. - - Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB - - PulseAudio is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - PulseAudio 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <stdio.h> -#include <errno.h> - -#ifndef HAVE_INET_PTON - -#include <pulsecore/macro.h> -#include <pulsecore/socket.h> - -#include "inet_pton.h" - -int inet_pton(int af, const char *src, void *dst) { - struct in_addr *in = (struct in_addr*)dst; -#ifdef HAVE_IPV6 - struct in6_addr *in6 = (struct in6_addr*)dst; -#endif - - pa_assert(src); - pa_assert(dst); - - switch (af) { - case AF_INET: - in->s_addr = inet_addr(src); - if (in->s_addr == INADDR_NONE) - return 0; - break; -#ifdef HAVE_IPV6 - case AF_INET6: - /* FIXME */ -#endif - default: - errno = EAFNOSUPPORT; - return -1; - } - - return 1; -} - -#endif /* INET_PTON */ diff --git a/src/pulsecore/inet_pton.h b/src/pulsecore/inet_pton.h deleted file mode 100644 index 913efc4c..00000000 --- a/src/pulsecore/inet_pton.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef fooinet_ptonhfoo -#define fooinet_ptonhfoo - -#ifndef HAVE_INET_PTON - -#include <pulsecore/socket.h> - -int inet_pton(int af, const char *src, void *dst); - -#endif - -#endif diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c index b9289386..5455d0e8 100644 --- a/src/pulsecore/ipacl.c +++ b/src/pulsecore/ipacl.c @@ -37,9 +37,6 @@ #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif #include <pulse/xmalloc.h> @@ -48,10 +45,7 @@ #include <pulsecore/log.h> #include <pulsecore/macro.h> #include <pulsecore/socket.h> - -#ifndef HAVE_INET_PTON -#include <pulsecore/inet_pton.h> -#endif +#include <pulsecore/arpa-inet.h> #include "ipacl.h" diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c index 99fdcbf4..4b6cf9db 100644 --- a/src/pulsecore/parseaddr.c +++ b/src/pulsecore/parseaddr.c @@ -26,16 +26,12 @@ #include <string.h> #include <stdlib.h> -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif - #include <pulse/xmalloc.h> #include <pulse/util.h> #include <pulsecore/core-util.h> #include <pulsecore/macro.h> -#include <pulsecore/inet_pton.h> +#include <pulsecore/arpa-inet.h> #include "parseaddr.h" diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c index ae7abc9e..23d5d880 100644 --- a/src/pulsecore/socket-client.c +++ b/src/pulsecore/socket-client.c @@ -35,9 +35,6 @@ #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -63,6 +60,7 @@ #include <pulsecore/parseaddr.h> #include <pulsecore/macro.h> #include <pulsecore/refcnt.h> +#include <pulsecore/arpa-inet.h> #include "socket-client.h" diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c index e45ded04..23096a0d 100644 --- a/src/pulsecore/socket-server.c +++ b/src/pulsecore/socket-server.c @@ -39,9 +39,6 @@ ((size_t)(((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path)) #endif #endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -50,13 +47,6 @@ #include <tcpd.h> #endif -#ifndef HAVE_INET_NTOP -#include <pulsecore/inet_ntop.h> -#endif -#ifndef HAVE_INET_PTON -#include <pulsecore/inet_pton.h> -#endif - #include <pulse/xmalloc.h> #include <pulse/util.h> @@ -67,6 +57,7 @@ #include <pulsecore/macro.h> #include <pulsecore/core-error.h> #include <pulsecore/refcnt.h> +#include <pulsecore/arpa-inet.h> #include "socket-server.h" diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c index 0b16e0f9..3023395c 100644 --- a/src/pulsecore/socket-util.c +++ b/src/pulsecore/socket-util.c @@ -54,13 +54,6 @@ #ifdef HAVE_NETDB_H #include <netdb.h> #endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif - -#ifndef HAVE_INET_NTOP -#include <pulsecore/inet_ntop.h> -#endif #include <pulse/xmalloc.h> @@ -69,6 +62,7 @@ #include <pulsecore/log.h> #include <pulsecore/macro.h> #include <pulsecore/socket.h> +#include <pulsecore/arpa-inet.h> #include "socket-util.h" diff --git a/src/tests/ipacl-test.c b/src/tests/ipacl-test.c index 58663468..be9caadf 100644 --- a/src/tests/ipacl-test.c +++ b/src/tests/ipacl-test.c @@ -17,14 +17,11 @@ #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif #include <pulsecore/socket.h> #include <pulsecore/macro.h> #include <pulsecore/ipacl.h> -#include <pulsecore/inet_pton.h> +#include <pulsecore/arpa-inet.h> int main(int argc, char *argv[]) { struct sockaddr_in sa; |