[SoX-devel] [git] sox branch master updated. 46f7237a7bb8123b869fade910ca2c3627052ca8

[Doug C. <idi...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sox".

The branch, master has been updated
       via  46f7237a7bb8123b869fade910ca2c3627052ca8 (commit)
       via  2d5b2941c9b541683937a66e92632461b7edd7fe (commit)
       via  b5d46fd0e56a3e302467ed51231a343f202a7917 (commit)
       via  abdbc76688fe0dc7fb74bd9d354fb45f53033036 (commit)
       via  0ef04719f745b408cbd12a411e824e93de404a62 (commit)
      from  125c881511aa2722514ce0b9b513f1b9e83118e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 46f7237a7bb8123b869fade910ca2c3627052ca8
Author: Doug Cook <idi...@us...>
Date:   Sun Mar 20 02:31:38 2011 -0700

    Fix warning regarding prototype of lsx_getopt
    
    The ifdefs appear to be guarding against redefinition of getopt(), but that
    shouldn't be a problem since we've renamed it to lsx_getopt.

diff --git a/src/sgetopt.h b/src/sgetopt.h
index 6b83831..296423c 100644
--- a/src/sgetopt.h
+++ b/src/sgetopt.h
@@ -145,14 +145,7 @@ struct option
    `getopt'.  */
 
 #if (defined __STDC__ && __STDC__) || defined __cplusplus
-# ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
 extern int lsx_getopt (int ___argc, char *const *___argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
-extern int lsx_getopt ();
-# endif /* __GNU_LIBRARY__ */
 
 # ifndef __need_getopt
 extern int lsx_getopt_long (int ___argc, char *const *___argv,

commit 2d5b2941c9b541683937a66e92632461b7edd7fe
Author: Doug Cook <idi...@us...>
Date:   Sun Mar 20 02:31:23 2011 -0700

    Fix warning for strict aliasing of magic

diff --git a/src/sox-fmt.c b/src/sox-fmt.c
index c30ccb8..fe76b9c 100644
--- a/src/sox-fmt.c
+++ b/src/sox-fmt.c
@@ -77,8 +77,11 @@ static int write_header(sox_format_t * ft)
   size_t comments_len = strlen(comments);
   size_t comments_bytes = (comments_len + 7) & ~7u; /* Multiple of 8 bytes */
   uint64_t size   = ft->olength? ft->olength : ft->signal.length;
-  sox_bool error  = sox_false
-  ||lsx_writedw(ft, *(uint32_t *)&magic[MACHINE_IS_BIGENDIAN])
+  int error;
+  uint32_t header;
+  memcpy(&header, magic[MACHINE_IS_BIGENDIAN], sizeof(header));
+  error = 0
+  ||lsx_writedw(ft, header)
   ||lsx_writedw(ft, FIXED_HDR + (unsigned)comments_bytes)
   ||lsx_writeqw(ft, size)
   ||lsx_writedf(ft, ft->signal.rate)

commit b5d46fd0e56a3e302467ed51231a343f202a7917
Author: Doug Cook <idi...@us...>
Date:   Sun Mar 20 02:30:48 2011 -0700

    Fix warning for unused tagtype function

diff --git a/src/mp3.c b/src/mp3.c
index 26d08ec..0c9a3f1 100644
--- a/src/mp3.c
+++ b/src/mp3.c
@@ -224,6 +224,8 @@ typedef struct mp3_priv_t {
 #endif /*HAVE_LAME*/
 } priv_t;
 
+#ifdef HAVE_MAD_H
+
 /* This function merges the functions tagtype() and id3_tag_query()
    from MAD's libid3tag, so we don't have to link to it
    Returns 0 if the frame is not an ID3 tag, tag length if it is */
@@ -253,6 +255,8 @@ static int tagtype(const unsigned char *data, size_t length)
     return 0;
 }
 
+#endif /*HAVE_MAD_H*/
+
 #include "mp3-util.h"
 
 #ifdef HAVE_MAD_H

commit abdbc76688fe0dc7fb74bd9d354fb45f53033036
Author: Doug Cook <idi...@us...>
Date:   Sun Mar 20 02:30:04 2011 -0700

    Fix warning for unused id3tagmap

diff --git a/src/mp3-util.h b/src/mp3-util.h
index 83ed065..6be49c4 100644
--- a/src/mp3-util.h
+++ b/src/mp3-util.h
@@ -17,6 +17,8 @@
 
 #include <sys/stat.h>
 
+#ifdef USING_ID3TAG
+
 static char const * id3tagmap[][2] =
 {
   {"TIT2", "Title"},
@@ -30,6 +32,8 @@ static char const * id3tagmap[][2] =
   {NULL, NULL}
 };
 
+#endif /* USING_ID3TAG */
+
 #if defined(HAVE_LAME)
 
 static void write_comments(sox_format_t * ft)

commit 0ef04719f745b408cbd12a411e824e93de404a62
Author: Doug Cook <idi...@us...>
Date:   Sun Mar 20 02:28:49 2011 -0700

    Add changelog for sox_globals.use_threads

diff --git a/ChangeLog b/ChangeLog
index e2ae9ae..3bcca42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@ Effects:
 
   o Improvements to man pages for tempo effect.  Really made in 14.3.2.
     (Jim Harkins).
+  o Added use_threads variable to sox_globals. This should be used to enable
+    or disable use of parallel effects processing instead of directly calling
+	omp_set_num_threads. (Doug Cook)
 
 sox-14.3.2	2011-02-27
 ----------

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    3 +++
 src/mp3-util.h |    4 ++++
 src/mp3.c      |    4 ++++
 src/sgetopt.h  |    7 -------
 src/sox-fmt.c  |    7 +++++--
 5 files changed, 16 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
sox