Minor updates and compiler warning fixes in SoX

	* src/media/media-sox.h (sxe_sox_ssize_t): SoX just uses size_t
	these days. So set to that if not HAVE_SOX_SSIZE_T.

	* src/media/media-sox.c (media_sox_rewind): SEEK_SET ->
	SOX_SEEK_SET.

	* src/media/media-sox.c (media_sox_close): Fix format spec.

	* src/media/media-sox.c (media_sox_read): Ditto.

	* src/media/media-sox.c (media_sox_rewind): Ditto.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/src/media/media-sox.c b/src/media/media-sox.c
index 76dd0b4..d525b74 100644 (file)
--- a/src/media/media-sox.c
+++ b/src/media/media-sox.c
@@ -191,8 +191,8 @@ media_sox_close(ms_driver_data_t arg)
        sxe_sox_t ft = arg;
        sxe_sox_close(ft);
 
-       SOX_DEBUG("closing SoX handle: 0x%x\n",
-                 (unsigned int)ft);
+       SOX_DEBUG("closing SoX handle: 0x%lx\n",
+                 (unsigned long int)ft);
 
        return;
 }
@@ -230,7 +230,7 @@ media_sox_read(media_substream *mss, void *outbuf, size_t length)
        bptr = (sxe_sox_sample_t*)outbuf;
        samples = sxe_sox_read(ft, bptr, mtap->channels*length);
 
-       SOX_DEBUG_S("read %d samples\n", samples);
+       SOX_DEBUG_S("read %zd samples\n", samples);
 
        if (samples < 0)
                return 0;
@@ -260,8 +260,8 @@ media_sox_rewind(media_substream *mss)
        if (!(ft = media_stream_data(ms)))
                return;
 
-       SOX_DEBUG_S("rewind stream 0x%x\n", (unsigned int)ft);
-       sxe_sox_seek(ft, 0, SEEK_SET);
+       SOX_DEBUG_S("rewind stream 0x%lx\n", (unsigned long int)ft);
+       sxe_sox_seek(ft, 0, SOX_SEEK_SET);
 }
 
 #undef MYSELF

diff --git a/src/media/media-sox.h b/src/media/media-sox.h
index 093be1f..2ed3e98 100644 (file)
--- a/src/media/media-sox.h
+++ b/src/media/media-sox.h
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #if defined HAVE_SOX_SSIZE_T
 # define sxe_sox_ssize_t       sox_ssize_t
 #else
-# define sxe_sox_ssize_t        ssize_t
+# define sxe_sox_ssize_t        size_t
 #endif
 
 #if defined HAVE_SOX_SAMPLE_T