mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed partial transfer

Browse source
This commit is contained in:
Abramo Bagnara 2001-01-25 14:27:33 +00:00
parent 711c5bfa4e
commit 406587a531
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pcm/pcm_file.c
View file

@ -23,9 +23,9 @@
#include "pcm_local.h" #include "pcm_local.h"
#include "pcm_plugin.h" #include "pcm_plugin.h"
enum { typedef enum _snd_pcm_file_format {
SND_PCM_FILE_FORMAT_RAW SND_PCM_FILE_FORMAT_RAW
}; } snd_pcm_file_format_t;
typedef struct { typedef struct {
snd_pcm_t *slave; snd_pcm_t *slave;
@ -283,7 +283,7 @@ static snd_pcm_sframes_t snd_pcm_file_mmap_forward(snd_pcm_t *pcm, snd_pcm_ufram
if (n <= 0) if (n <= 0)
return n; return n;
while (xfer < (snd_pcm_uframes_t)n) { while (xfer < (snd_pcm_uframes_t)n) {
snd_pcm_uframes_t frames = size - xfer; snd_pcm_uframes_t frames = n - xfer;
snd_pcm_uframes_t cont = pcm->buffer_size - ofs; snd_pcm_uframes_t cont = pcm->buffer_size - ofs;
if (frames > cont) if (frames > cont)
frames = cont; frames = cont;
@ -414,7 +414,15 @@ int snd_pcm_file_open(snd_pcm_t **pcmp, char *name, char *fname, int fd, char *f
{ {
snd_pcm_t *pcm; snd_pcm_t *pcm;
snd_pcm_file_t *file; snd_pcm_file_t *file;
snd_pcm_file_format_t format;
assert(pcmp); assert(pcmp);
if (fmt == NULL ||
strcmp(fmt, "raw") == 0)
format = SND_PCM_FILE_FORMAT_RAW;
else {
ERR("file format %s is unknown", fmt);
return -EINVAL;
}
if (fname) { if (fname) {
fd = open(fname, O_WRONLY|O_CREAT, 0666); fd = open(fname, O_WRONLY|O_CREAT, 0666);
if (fd < 0) { if (fd < 0) {
@ -428,14 +436,10 @@ int snd_pcm_file_open(snd_pcm_t **pcmp, char *name, char *fname, int fd, char *f
close(fd); close(fd);
return -ENOMEM; return -ENOMEM;
} }
if (fmt == NULL ||
strcmp(fmt, "raw") == 0)
file->format = SND_PCM_FILE_FORMAT_RAW;
else
ERR("file format %s is unknown", fmt);
file->fname = fname; file->fname = fname;
file->fd = fd; file->fd = fd;
file->format = format;
file->slave = slave; file->slave = slave;
file->close_slave = close_slave; file->close_slave = close_slave;