log: add \n

[oweals/gnunet.git] / src / conversation / gnunet-helper-audio-playback.c

diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c
index 272eda576e4fe61052c500fea20daf8619ddd931..e965cb2aaa0c259a05a93b9b8e729f5ceb8c5f2b 100644 (file)
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file conversation/gnunet-helper-audio-playback.c
@@ -137,9 +137,11 @@ struct OpusHeadPacket
 
 GNUNET_NETWORK_STRUCT_END
 
-/*Process an Opus header and setup the opus decoder based on it.
-  It takes several pointers for header values which are needed
-  elsewhere in the code.*/
+/**
+ * Process an Opus header and setup the opus decoder based on it.
+ * It takes several pointers for header values which are needed
+ * elsewhere in the code.
+ */
 static OpusDecoder *
 process_header (ogg_packet *op)
 {
@@ -149,7 +151,7 @@ process_header (ogg_packet *op)
 
   if (op->bytes < sizeof (header))
     return NULL;
-  memcpy (&header, op->packet, sizeof (header));
+  GNUNET_memcpy (&header, op->packet, sizeof (header));
   header.preskip = GNUNET_le16toh (header.preskip);
   header.sampling_rate = GNUNET_le32toh (header.sampling_rate);
   header.gain = GNUNET_le16toh (header.gain);
@@ -163,19 +165,24 @@ process_header (ogg_packet *op)
 
   if (header.channel_mapping != 0)
   {
-    fprintf (stderr, "This implementation does not support non-mono streams\n");
+    fprintf (stderr,
+            "This implementation does not support non-mono streams\n");
     return NULL;
   }
 
   dec = opus_decoder_create (SAMPLING_RATE, channels, &err);
   if (OPUS_OK != err)
   {
-    fprintf (stderr, "Cannot create encoder: %s\n", opus_strerror (err));
+    fprintf (stderr,
+            "Cannot create encoder: %s\n",
+            opus_strerror (err));
     return NULL;
   }
-  if (!dec)
+  if (! dec)
   {
-    fprintf (stderr, "Decoder initialization failed: %s\n", opus_strerror (err));
+    fprintf (stderr,
+            "Decoder initialization failed: %s\n",
+            opus_strerror (err));
     return NULL;
   }
 
@@ -202,7 +209,8 @@ process_header (ogg_packet *op)
 
 
 #ifdef DEBUG_DUMP_DECODED_OGG
-static size_t fwrite_le32(opus_int32 i32, FILE *file)
+static size_t
+fwrite_le32(opus_int32 i32, FILE *file)
 {
    unsigned char buf[4];
    buf[0]=(unsigned char)(i32&0xFF);
@@ -212,7 +220,9 @@ static size_t fwrite_le32(opus_int32 i32, FILE *file)
    return fwrite(buf,4,1,file);
 }
 
-static size_t fwrite_le16(int i16, FILE *file)
+
+static size_t
+fwrite_le16(int i16, FILE *file)
 {
    unsigned char buf[2];
    buf[0]=(unsigned char)(i16&0xFF);
@@ -220,7 +230,9 @@ static size_t fwrite_le16(int i16, FILE *file)
    return fwrite(buf,2,1,file);
 }
 
-static int write_wav_header()
+
+static int
+write_wav_header()
 {
    int ret;
    FILE *file = stdout;
@@ -245,6 +257,7 @@ static int write_wav_header()
 
 #endif
 
+
 static int64_t
 audio_write (int64_t maxout)
 {
@@ -279,9 +292,11 @@ audio_write (int64_t maxout)
       int64_t wrote = 0;
       wrote = to_write;
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Writing %u * %u * %u = %u bytes into PA\n",
-                  to_write, channels, sizeof (float),
-                  to_write * channels * sizeof (float));
+                  "Writing %u * %u * %u = %llu bytes into PA\n",
+                  to_write,
+                  channels,
+                  (unsigned int) sizeof (float),
+                  (unsigned long long) (to_write * channels * sizeof (float)));
 #ifdef DEBUG_DUMP_DECODED_OGG
       if (dump_to_stdout)
       {
@@ -440,12 +455,14 @@ ogg_demux_and_decode ()
           so that we can adjust the timestamp counting.*/
         gran_offset = preskip;
 
-        if (!pcm_buffer)
+        if (! pcm_buffer)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Allocating %u * %u * %u = %u bytes of buffer space\n",
-                  MAX_FRAME_SIZE, channels, sizeof (float),
-                  MAX_FRAME_SIZE * channels * sizeof (float));
+                      "Allocating %u * %u * %u = %llu bytes of buffer space\n",
+                      MAX_FRAME_SIZE,
+                      channels,
+                      (unsigned int) sizeof (float),
+                      (unsigned long long) (MAX_FRAME_SIZE * channels * sizeof (float)));
           pcm_buffer = pa_xmalloc (sizeof (float) * MAX_FRAME_SIZE * channels);
         }
       }
@@ -488,7 +505,9 @@ ogg_demux_and_decode ()
         frame_size = ret;
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "Decoded %d bytes/channel (%d bytes) from %u compressed bytes\n",
-                    ret, ret * channels, op.bytes);
+                    ret,
+                    ret * channels,
+                    (unsigned int) op.bytes);
 
         /*Apply header gain, if we're not using an opus library new
           enough to do this internally.*/
@@ -546,7 +565,7 @@ stdin_receiver (void *cls,
     /*Get the ogg buffer for writing*/
     data = ogg_sync_buffer (&oy, payload_len);
     /*Read bitstream from input file*/
-    memcpy (data, (const unsigned char *) &audio[1], payload_len);
+    GNUNET_memcpy (data, (const unsigned char *) &audio[1], payload_len);
     ogg_sync_wrote (&oy, payload_len);
 
     ogg_demux_and_decode ();
@@ -777,7 +796,7 @@ main (int argc, char *argv[])
     if (read_pure_ogg)
     {
       char *data = ogg_sync_buffer (&oy, ret);
-      memcpy (data, readbuf, ret);
+      GNUNET_memcpy (data, readbuf, ret);
       ogg_sync_wrote (&oy, ret);
       ogg_demux_and_decode ();
     }