Reorganised the source tree. We now have src/ with a couple of subdirs:

 * daemon/ - Contains the files specific to the polypaudio daemon.
 * modules/ - All loadable modules.
 * polyp/ - Files that are part of the public, application interface or
   are only used in libpolyp.
 * polypcore/ - All other shared files.
 * tests/ - Test programs.
 * utils/ - Utility programs.


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

1 files changed, 0 insertions, 139 deletions

diff --git a/polyp/sound-file.c b/polyp/sound-file.c
deleted file mode 100644
index 0048ed74..00000000
--- a/polyp/sound-file.c
+++ /dev/null
@@ -1,139 +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 <string.h>
-#include <assert.h>
-
-#include <sndfile.h>
-
-#include "sound-file.h"
-#include "sample.h"
-#include "log.h"
-
-#define MAX_FILE_SIZE (1024*1024)
-
-int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s) {
-    SNDFILE*sf = NULL;
-    SF_INFO sfinfo;
-    int ret = -1;
-    size_t l;
-    sf_count_t (*readf_function)(SNDFILE *sndfile, void *ptr, sf_count_t frames);
-    assert(fname && ss && chunk);
-
-    chunk->memblock = NULL;
-    chunk->index = chunk->length = 0;
-
-    memset(&sfinfo, 0, sizeof(sfinfo));
-
-    if (!(sf = sf_open(fname, SFM_READ, &sfinfo))) {
-        pa_log(__FILE__": Failed to open file %s\n", fname);
-        goto finish;
-    }
-
-    switch (sfinfo.format & SF_FORMAT_SUBMASK) {
-        case SF_FORMAT_FLOAT:
-        case SF_FORMAT_DOUBLE:
-            /* Only float and double need a special case. */
-            ss->format = PA_SAMPLE_FLOAT32NE;
-            readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_float;
-            break;
-        default:
-            /* Everything else is cleanly converted to signed 16 bit. */
-            ss->format = PA_SAMPLE_S16NE;
-            readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_short;
-            break;
-    }
-
-    ss->rate = sfinfo.samplerate;
-    ss->channels = sfinfo.channels;
-
-    if (!pa_sample_spec_valid(ss)) {
-        pa_log(__FILE__": Unsupported sample format in file %s\n", fname);
-        goto finish;
-    }
-    
-    if ((l = pa_frame_size(ss)*sfinfo.frames) > MAX_FILE_SIZE) {
-        pa_log(__FILE__": File too large\n");
-        goto finish;
-    }
-
-    chunk->memblock = pa_memblock_new(l, s);
-    assert(chunk->memblock);
-    chunk->index = 0;
-    chunk->length = l;
-
-    if (readf_function(sf, chunk->memblock->data, sfinfo.frames) != sfinfo.frames) {
-        pa_log(__FILE__": Premature file end\n");
-        goto finish;
-    }
-
-    ret = 0;
-
-finish:
-
-    if (sf)
-        sf_close(sf);
-
-    if (ret != 0 && chunk->memblock)
-        pa_memblock_unref(chunk->memblock);
-    
-    return ret;
-    
-}
-
-int pa_sound_file_too_big_to_cache(const char *fname) {
-    SNDFILE*sf = NULL;
-    SF_INFO sfinfo;
-    pa_sample_spec ss;
-
-    if (!(sf = sf_open(fname, SFM_READ, &sfinfo))) {
-        pa_log(__FILE__": Failed to open file %s\n", fname);
-        return 0;
-    }
-
-    sf_close(sf);
-
-    switch (sfinfo.format & SF_FORMAT_SUBMASK) {
-        case SF_FORMAT_FLOAT:
-        case SF_FORMAT_DOUBLE:
-            /* Only float and double need a special case. */
-            ss.format = PA_SAMPLE_FLOAT32NE;
-            break;
-        default:
-            /* Everything else is cleanly converted to signed 16 bit. */
-            ss.format = PA_SAMPLE_S16NE;
-            break;
-    }
-
-    ss.rate = sfinfo.samplerate;
-    ss.channels = sfinfo.channels;
-
-    if ((pa_frame_size(&ss) * sfinfo.frames) > MAX_FILE_SIZE) {
-        pa_log(__FILE__": File too large %s\n", fname);
-        return 1;
-    }
-
-    return 0;
-}