X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/41f6aea8fdbc744c13bc461056a2d694a5c4d06f..fa499dad06ba6558111cdef64c18f2401e803cff:/polyp/sample-util.h

diff --git a/polyp/sample-util.h b/polyp/sample-util.h
index 73101ab4..aafdda63 100644
--- a/polyp/sample-util.h
+++ b/polyp/sample-util.h
@@ -7,7 +7,7 @@
   This file is part of polypaudio.
  
   polypaudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
+  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.
  
@@ -16,7 +16,7 @@
   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
+  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.
@@ -26,8 +26,6 @@
 #include "memblock.h"
 #include "memchunk.h"
 
-#define PA_VOLUME_NORM (0x100)
-#define PA_VOLUME_MUTE (0)
 
 struct pa_memblock *pa_silence_memblock(struct pa_memblock* b, const struct pa_sample_spec *spec);
 void pa_silence_memchunk(struct pa_memchunk *c, const struct pa_sample_spec *spec);
@@ -35,14 +33,12 @@ void pa_silence_memory(void *p, size_t length, const struct pa_sample_spec *spec
 
 struct pa_mix_info {
     struct pa_memchunk chunk;
-    uint32_t volume;
+    pa_volume_t volume;
     void *userdata;
 };
 
-size_t pa_mix(struct pa_mix_info channels[], unsigned nchannels, void *data, size_t length, const struct pa_sample_spec *spec, uint32_t volume);
+size_t pa_mix(struct pa_mix_info channels[], unsigned nchannels, void *data, size_t length, const struct pa_sample_spec *spec, pa_volume_t volume);
 
-void pa_volume_memchunk(struct pa_memchunk*c, const struct pa_sample_spec *spec, uint32_t volume);
-
-uint32_t pa_volume_multiply(uint32_t a, uint32_t b);
+void pa_volume_memchunk(struct pa_memchunk*c, const struct pa_sample_spec *spec, pa_volume_t volume);
 
 #endif