chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When moving to a search result, only move if it's not visible already.
[disorder]
/
clients
/
playrtp-oss.c
diff --git
a/clients/playrtp-oss.c
b/clients/playrtp-oss.c
index 3c6312d41e38f03d1e4d716679b0dd92f25a2fd2..199487f6993efe800b9c063d3aea24556d4ceee9 100644
(file)
--- a/
clients/playrtp-oss.c
+++ b/
clients/playrtp-oss.c
@@
-1,6
+1,7
@@
/*
* This file is part of DisOrder.
* Copyright (C) 2007 Richard Kettlewell
/*
* 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
* it under the terms of the GNU General Public License as published by
*
* 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
@@
-21,22
+22,20
@@
* @brief RTP player - OSS and empeg support
*/
* @brief RTP player - OSS and empeg support
*/
-#include
<config.h>
+#include
"common.h"
#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
#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 <poll.h>
#include <sys/ioctl.h>
#if !EMPEG_HOST
#include <sys/soundcard.h>
#endif
-#include <assert.h>
#include <pthread.h>
#include <pthread.h>
-#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
+#include <arpa/inet.h>
#include "mem.h"
#include "log.h"
#include "mem.h"
#include "log.h"
@@
-137,6
+136,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(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;
}
playrtp_oss_bufused = 0;
return 0;
}
@@
-178,7
+186,7
@@
static void playrtp_oss_disable(int hard) {
/** @brief Write samples to OSS output device
* @param data Pointer to sample data
/** @brief Write samples to OSS output device
* @param data Pointer to sample data
- * @param
n
samples 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) {
* @return 0 on success, non-0 on error
*/
static int playrtp_oss_write(const char *data, size_t samples) {