X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/a9f0ad12d639cdb5186f0482d2856278b41671a2..74cfbeaa0972bc7d1b1026bb1dfa7f6984084174:/clients/playrtp-oss.c?ds=sidebyside
diff --git a/clients/playrtp-oss.c b/clients/playrtp-oss.c
index 3c6312d..4b0ab83 100644
--- a/clients/playrtp-oss.c
+++ b/clients/playrtp-oss.c
@@ -1,42 +1,39 @@
/*
* This file is part of DisOrder.
* 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 .
*/
/** @file clients/playrtp-oss.c
* @brief RTP player - OSS and empeg support
*/
-#include
+#include "common.h"
#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
-#include "types.h"
#include
#include
#if !EMPEG_HOST
#include
#endif
-#include
#include
-#include
#include
#include
#include
+#include
#include "mem.h"
#include "log.h"
@@ -137,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;
}
@@ -178,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) {