move alsa-util.[ch], oss-util.[ch] and howl-wrap.[ch] to the modules directory since they are just helper source used exclusively by the modules

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@489 fefdeb5f-60dc-0310-8127-8f9354f1896f

6 files changed, 0 insertions, 511 deletions

diff --git a/src/polypcore/alsa-util.c b/src/polypcore/alsa-util.c
deleted file mode 100644
index 7528ee0b..00000000
--- a/src/polypcore/alsa-util.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
- 
-  polypaudio 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 of the License,
-  or (at your option) any later version.
- 
-  polypaudio 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 Lesser General Public License
-  along with polypaudio; 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 <sys/types.h>
-#include <asoundlib.h>
-
-#include "alsa-util.h"
-#include <polyp/sample.h>
-#include "xmalloc.h"
-#include "log.h"
-
-/* Set the hardware parameters of the given ALSA device. Returns the
- * selected fragment settings in *period and *period_size */
-int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, const pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size) {
-    int ret = -1;
-    snd_pcm_uframes_t buffer_size;
-    snd_pcm_hw_params_t *hwparams = NULL;
-    static const snd_pcm_format_t format_trans[] = {
-        [PA_SAMPLE_U8] = SND_PCM_FORMAT_U8,
-        [PA_SAMPLE_ALAW] = SND_PCM_FORMAT_A_LAW,
-        [PA_SAMPLE_ULAW] = SND_PCM_FORMAT_MU_LAW,
-        [PA_SAMPLE_S16LE] = SND_PCM_FORMAT_S16_LE,
-        [PA_SAMPLE_S16BE] = SND_PCM_FORMAT_S16_BE,
-        [PA_SAMPLE_FLOAT32LE] = SND_PCM_FORMAT_FLOAT_LE,
-        [PA_SAMPLE_FLOAT32BE] = SND_PCM_FORMAT_FLOAT_BE,
-    };
-    assert(pcm_handle && ss && periods && period_size);
-    
-    if (snd_pcm_hw_params_malloc(&hwparams) < 0 ||
-        snd_pcm_hw_params_any(pcm_handle, hwparams) < 0 ||
-        snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED) < 0 ||
-        snd_pcm_hw_params_set_format(pcm_handle, hwparams, format_trans[ss->format]) < 0 ||
-        snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &ss->rate, NULL) < 0 ||
-        snd_pcm_hw_params_set_channels(pcm_handle, hwparams, ss->channels) < 0 ||
-        (*periods > 0 && snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, periods, NULL) < 0) || 
-        (*period_size > 0 && snd_pcm_hw_params_set_period_size_near(pcm_handle, hwparams, period_size, NULL) < 0) || 
-        snd_pcm_hw_params(pcm_handle, hwparams) < 0)
-        goto finish;
-    
-    if (snd_pcm_prepare(pcm_handle) < 0)
-        goto finish;
-
-    if (snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size) < 0 ||
-        snd_pcm_hw_params_get_period_size(hwparams, period_size, NULL) < 0)
-        goto finish;
-    
-    assert(buffer_size > 0);
-    assert(*period_size > 0);
-    *periods = buffer_size / *period_size;
-    assert(*periods > 0);
-    
-    ret = 0;
-    
-finish:
-    if (hwparams)
-        snd_pcm_hw_params_free(hwparams);
-    
-    return ret;
-}
-
-/* Allocate an IO event for every ALSA poll descriptor for the
- * specified ALSA device. Return a pointer to such an array in
- * *io_events. Store the length of that array in *n_io_events. Use the
- * specified callback function and userdata. The array has to be freed
- * with pa_free_io_events(). */
-int pa_create_io_events(snd_pcm_t *pcm_handle, pa_mainloop_api* m, pa_io_event ***io_events, unsigned *n_io_events, void (*cb)(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata), void *userdata) {
-    unsigned i;
-    struct pollfd *pfds, *ppfd;
-    pa_io_event **ios;
-    assert(pcm_handle && m && io_events && n_io_events && cb);
-
-    *n_io_events = snd_pcm_poll_descriptors_count(pcm_handle);
-
-    pfds = pa_xmalloc(sizeof(struct pollfd) * *n_io_events);
-    if (snd_pcm_poll_descriptors(pcm_handle, pfds, *n_io_events) < 0) {
-        pa_xfree(pfds);
-        return -1;
-    }
-    
-    *io_events = pa_xmalloc(sizeof(void*) * *n_io_events);
-
-    for (i = 0, ios = *io_events, ppfd = pfds; i < *n_io_events; i++, ios++, ppfd++) {
-        *ios = m->io_new(m, ppfd->fd,
-                            ((ppfd->events & POLLIN) ? PA_IO_EVENT_INPUT : 0) |
-                            ((ppfd->events & POLLOUT) ? PA_IO_EVENT_OUTPUT : 0), cb, userdata);
-        assert(*ios);
-    }
-
-    pa_xfree(pfds);
-    return 0;
-}
-
-/* Free the memory allocated by pa_create_io_events() */
-void pa_free_io_events(pa_mainloop_api* m, pa_io_event **io_events, unsigned n_io_events) {
-    unsigned i;
-    pa_io_event **ios;
-    assert(m && io_events);
-    
-    for (ios = io_events, i = 0; i < n_io_events; i++, ios++)
-        m->io_free(*ios);
-    pa_xfree(io_events);
-}
diff --git a/src/polypcore/alsa-util.h b/src/polypcore/alsa-util.h
deleted file mode 100644
index 5d6d6634..00000000
--- a/src/polypcore/alsa-util.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef fooalsautilhfoo
-#define fooalsautilhfoo
-
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
- 
-  polypaudio 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 of the License,
-  or (at your option) any later version.
- 
-  polypaudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#include <asoundlib.h>
-
-#include <polyp/sample.h>
-#include <polyp/mainloop-api.h>
-
-int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, const pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size);
-
-int pa_create_io_events(snd_pcm_t *pcm_handle, pa_mainloop_api *m, pa_io_event ***io_events, unsigned *n_io_events, void (*cb)(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata), void *userdata);
-void pa_free_io_events(pa_mainloop_api* m, pa_io_event **io_sources, unsigned n_io_sources);
-
-#endif
diff --git a/src/polypcore/howl-wrap.c b/src/polypcore/howl-wrap.c
deleted file mode 100644
index 77d096ac..00000000
--- a/src/polypcore/howl-wrap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
- 
-  polypaudio 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 of the
-  License, or (at your option) any later version.
- 
-  polypaudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#include <assert.h>
-
-#include "howl-wrap.h"
-#include "log.h"
-#include "xmalloc.h"
-#include "props.h"
-
-#define HOWL_PROPERTY "howl"
-
-pa_howl_wrapper {
-    pa_core *core;
-    int ref;
-
-    pa_io_event *io_event;
-    sw_discovery discovery;
-
-};
-
-static void howl_io_event(pa_mainloop_api*m, pa_io_event *e, int fd, pa_io_event_flags f, void *userdata) {
-    pa_howl_wrapper *w = userdata;
-    assert(m && e && fd >= 0 && w && w->ref >= 1);
-
-    if (f & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR))
-        goto fail;
-
-    if (sw_discovery_read_socket(w->discovery) != SW_OKAY)
-        goto fail;
-
-    return;
-
-fail:
-    pa_log(__FILE__": howl connection died.\n");
-    w->core->mainloop->io_free(w->io_event);
-    w->io_event = NULL;
-}
-
-static pa_howl_wrapper* howl_wrapper_new(pa_core *c) {
-    pa_howl_wrapper *h;
-    sw_discovery session;
-    assert(c);
-
-    if (sw_discovery_init(&session) != SW_OKAY) {
-        pa_log("sw_discovery_init() failed.\n");
-        return NULL;
-    }
-
-    h = pa_xmalloc(sizeof(pa_howl_wrapper));
-    h->core = c;
-    h->ref = 1;
-    h->discovery = session;
-
-    h->io_event = c->mainloop->io_new(c->mainloop, sw_discovery_socket(session), PA_IO_EVENT_INPUT, howl_io_event, h);
-
-    return h;
-}
-
-static void howl_wrapper_free(pa_howl_wrapper *h) {
-    assert(h);
-
-    sw_discovery_fina(h->discovery);
-
-    if (h->io_event)
-        h->core->mainloop->io_free(h->io_event);
-
-    pa_xfree(h);
-}
-
-pa_howl_wrapper* pa_howl_wrapper_get(pa_core *c) {
-    pa_howl_wrapper *h;
-    assert(c);
-    
-    if ((h = pa_property_get(c, HOWL_PROPERTY)))
-        return pa_howl_wrapper_ref(h);
-
-    return howl_wrapper_new(c);
-}
-
-pa_howl_wrapper* pa_howl_wrapper_ref(pa_howl_wrapper *h) {
-    assert(h && h->ref >= 1);
-    h->ref++;
-    return h;
-}
-
-void pa_howl_wrapper_unref(pa_howl_wrapper *h) {
-    assert(h && h->ref >= 1);
-    if (!(--h->ref))
-        howl_wrapper_free(h);
-}
-
-sw_discovery pa_howl_wrapper_get_discovery(pa_howl_wrapper *h) {
-    assert(h && h->ref >= 1);
-
-    return h->discovery;
-}
-
diff --git a/src/polypcore/howl-wrap.h b/src/polypcore/howl-wrap.h
deleted file mode 100644
index a670b082..00000000
--- a/src/polypcore/howl-wrap.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef foohowlwrapperhfoo
-#define foohowlwrapperhfoo
-
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
- 
-  polypaudio 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 of the
-  License, or (at your option) any later version.
- 
-  polypaudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#include <howl.h>
-
-#include "core.h"
-
-pa_howl_wrapper;
-
-pa_howl_wrapper* pa_howl_wrapper_get(pa_core *c);
-pa_howl_wrapper* pa_howl_wrapper_ref(pa_howl_wrapper *h);
-void pa_howl_wrapper_unref(pa_howl_wrapper *h);
-
-sw_discovery pa_howl_wrapper_get_discovery(pa_howl_wrapper *h);
-
-#endif
diff --git a/src/polypcore/oss-util.c b/src/polypcore/oss-util.c
deleted file mode 100644
index ae6772fd..00000000
--- a/src/polypcore/oss-util.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
- 
-  polypaudio 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 of the License,
-  or (at your option) any later version.
- 
-  polypaudio 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 Lesser General Public License
-  along with polypaudio; 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 <assert.h>
-#include <sys/soundcard.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "oss-util.h"
-#include "util.h"
-#include "log.h"
-
-int pa_oss_open(const char *device, int *mode, int* pcaps) {
-    int fd = -1;
-    assert(device && mode && (*mode == O_RDWR || *mode == O_RDONLY || *mode == O_WRONLY));
-
-    if (*mode == O_RDWR) {
-        if ((fd = open(device, O_RDWR|O_NDELAY)) >= 0) {
-            int dcaps, *tcaps;
-            ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0);
-
-            tcaps = pcaps ? pcaps : &dcaps;
-            
-            if (ioctl(fd, SNDCTL_DSP_GETCAPS, tcaps) < 0) {
-                pa_log(__FILE__": SNDCTL_DSP_GETCAPS: %s\n", strerror(errno));
-                goto fail;
-            }
-
-            if (*tcaps & DSP_CAP_DUPLEX)
-                return fd;
-
-            goto fail;
-        }
-        
-        if ((fd = open(device, (*mode = O_WRONLY)|O_NDELAY)) < 0) {
-            if ((fd = open(device, (*mode = O_RDONLY)|O_NDELAY)) < 0) {
-                pa_log(__FILE__": open('%s'): %s\n", device, strerror(errno));
-                goto fail;
-            }
-        }
-    } else {
-        if ((fd = open(device, *mode|O_NDELAY)) < 0) {
-            pa_log(__FILE__": open('%s'): %s\n", device, strerror(errno));
-            goto fail;
-        }
-    } 
-
-    if (pcaps) {
-        if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) {
-            pa_log(__FILE__": SNDCTL_DSP_GETCAPS: %s\n", strerror(errno));
-            goto fail;
-        }
-    }
-
-    pa_fd_set_cloexec(fd, 1);
-    
-    return fd;
-
-fail:
-    if (fd >= 0)
-        close(fd);
-    return -1;
-}
-
-int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
-    int format, channels, speed, reqformat;
-    static const int format_trans[PA_SAMPLE_MAX] = {
-        [PA_SAMPLE_U8] = AFMT_U8,
-        [PA_SAMPLE_ALAW] = AFMT_A_LAW,
-        [PA_SAMPLE_ULAW] = AFMT_MU_LAW,
-        [PA_SAMPLE_S16LE] = AFMT_S16_LE,
-        [PA_SAMPLE_S16BE] = AFMT_S16_BE,
-        [PA_SAMPLE_FLOAT32LE] = AFMT_QUERY, /* not supported */
-        [PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
-    };
-
-    assert(fd >= 0 && ss);
-
-    reqformat = format = format_trans[ss->format];
-    if (reqformat == AFMT_QUERY || ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != reqformat) {
-        format = AFMT_S16_NE;
-        if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_S16_NE) {
-            int f = AFMT_S16_NE == AFMT_S16_LE ? AFMT_S16_BE : AFMT_S16_LE;
-            format = f;
-            if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != f) {
-                format = AFMT_U8;
-                if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_U8) {
-                    pa_log(__FILE__": SNDCTL_DSP_SETFMT: %s\n", format != AFMT_U8 ? "No supported sample format" : strerror(errno));
-                    return -1;
-                } else
-                    ss->format = PA_SAMPLE_U8;
-            } else
-                ss->format = f == AFMT_S16_LE ? PA_SAMPLE_S16LE : PA_SAMPLE_S16BE;
-        } else
-            ss->format = PA_SAMPLE_S16NE;
-    }
-        
-    channels = ss->channels;
-    if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
-        pa_log(__FILE__": SNDCTL_DSP_CHANNELS: %s\n", strerror(errno));
-        return -1;
-    }
-    assert(channels);
-    ss->channels = channels;
-
-    speed = ss->rate;
-    if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) < 0) {
-        pa_log(__FILE__": SNDCTL_DSP_SPEED: %s\n", strerror(errno));
-        return -1;
-    }
-    assert(speed);
-    ss->rate = speed;
-
-    return 0;
-}
-
-static int simple_log2(int v) {
-    int k = 0;
-
-    for (;;) {
-        v >>= 1;
-        if (!v) break;
-        k++;
-    }
-    
-    return k;
-}
-
-int pa_oss_set_fragments(int fd, int nfrags, int frag_size) {
-    int arg;
-    arg = ((int) nfrags << 16) | simple_log2(frag_size);
-    
-    if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &arg) < 0) {
-        pa_log(__FILE__": SNDCTL_DSP_SETFRAGMENT: %s\n", strerror(errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/src/polypcore/oss-util.h b/src/polypcore/oss-util.h
deleted file mode 100644
index 6b2746cc..00000000
--- a/src/polypcore/oss-util.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef fooossutilhfoo
-#define fooossutilhfoo
-
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
- 
-  polypaudio 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 of the License,
-  or (at your option) any later version.
- 
-  polypaudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#include <polyp/sample.h>
-
-int pa_oss_open(const char *device, int *mode, int* pcaps);
-int pa_oss_auto_format(int fd, pa_sample_spec *ss);
-
-int pa_oss_set_fragments(int fd, int frags, int frag_size);
-
-#endif