Switch to GPL v3

[disorder] / clients / playrtp-oss.c

diff --git a/clients/playrtp-oss.c b/clients/playrtp-oss.c
index 7281e1559851371d7daea32952ef1393275774c3..4b0ab835d2811f9e68f817b4557eea512c7837e9 100644 (file)
--- a/clients/playrtp-oss.c
+++ b/clients/playrtp-oss.c
@@ -3,41 +3,37 @@
  * Copyright (C) 2007 Richard Kettlewell
  * Portions copyright (C) 2007 Ross Younger
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program 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.
- *
+ * 
+ * This program 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 General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file clients/playrtp-oss.c
  * @brief RTP player - OSS and empeg support
  */
 
-#include <config.h>
+#include "common.h"
 
 #if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
-#include "types.h"
 
 #include <poll.h>
 #include <sys/ioctl.h>
 #if !EMPEG_HOST
 #include <sys/soundcard.h>
 #endif
-#include <assert.h>
 #include <pthread.h>
-#include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include "mem.h"
 #include "log.h"
@@ -138,6 +134,15 @@ static int playrtp_oss_flush(void) {
       if(nbyteswritten < playrtp_oss_bufsize)
         error(0, "%s: short write (%d/%d)",
               device, nbyteswritten, playrtp_oss_bufsize);
+      if(dump_buffer) {
+        int count;
+        const int16_t *sp = (const int16_t *)playrtp_oss_buffer;
+        
+        for(count = 0; count < playrtp_oss_bufsize; count += sizeof(int16_t)) {
+          dump_buffer[dump_index++] = (int16_t)ntohs(*sp++);
+          dump_index %= dump_size;
+        }
+      }
       playrtp_oss_bufused = 0;
       return 0;
     }
@@ -179,7 +184,7 @@ static void playrtp_oss_disable(int hard) {
 
 /** @brief Write samples to OSS output device
  * @param data Pointer to sample data
- * @param nsamples Number of samples
+ * @param samples Number of samples
  * @return 0 on success, non-0 on error
  */
 static int playrtp_oss_write(const char *data, size_t samples) {