asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 00:45:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

more 64-bit stuff

Browse source
This commit is contained in:
Jaroslav Kysela 2004-03-09 13:18:29 +00:00
parent b5cb7ac07d
commit 9a30928540
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
aplay/aplay.c
View file

@ -36,6 +36,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <assert.h> #include <assert.h>
#include <sys/poll.h> #include <sys/poll.h>
@ -46,6 +47,10 @@
#include "formats.h" #include "formats.h"
#include "version.h" #include "version.h"
#ifndef LLONG_MAX
#define LLONG_MAX 9223372036854775807LL
#endif
#define DEFAULT_SPEED 8000 #define DEFAULT_SPEED 8000
#define FORMAT_DEFAULT -1 #define FORMAT_DEFAULT -1
@ -93,7 +98,7 @@ static size_t chunk_bytes;
static snd_output_t *log; static snd_output_t *log;
static int fd = -1; static int fd = -1;
static off64_t pbrec_count = (size_t)-1, fdcount; static off64_t pbrec_count = LLONG_MAX, fdcount;
static int vocmajor, vocminor; static int vocmajor, vocminor;
/* needed prototypes */ /* needed prototypes */
@ -1513,15 +1518,11 @@ static off64_t calc_count(void)
{ {
off64_t count; off64_t count;
if (!timelimit && pbrec_count == (size_t)-1) { if (timelimit == 0) {
count = (off64_t)-1; count = pbrec_count;
} else { } else {
if (timelimit == 0) { count = snd_pcm_format_size(hwparams.format, hwparams.rate * hwparams.channels);
count = pbrec_count; count *= (off64_t)timelimit;
} else {
count = snd_pcm_format_size(hwparams.format, hwparams.rate * hwparams.channels);
count *= (off64_t)timelimit;
}
} }
return count < pbrec_count ? count : pbrec_count; return count < pbrec_count ? count : pbrec_count;
} }
@ -1766,11 +1767,11 @@ static void header(int rtype, char *name)
/* playing raw data */ /* playing raw data */
void playback_go(int fd, size_t loaded, size_t count, int rtype, char *name) void playback_go(int fd, size_t loaded, off64_t count, int rtype, char *name)
{ {
int l, r; int l, r;
size_t written = 0; off64_t written = 0;
size_t c; off64_t c;
header(rtype, name); header(rtype, name);
set_params(); set_params();
@ -1817,9 +1818,10 @@ void playback_go(int fd, size_t loaded, size_t count, int rtype, char *name)
/* capturing raw data, this proc handels WAVE files and .VOCs (as one block) */ /* capturing raw data, this proc handels WAVE files and .VOCs (as one block) */
void capture_go(int fd, size_t count, int rtype, char *name) void capture_go(int fd, off64_t count, int rtype, char *name)
{ {
size_t c, cur; size_t c;
off64_t cur;
ssize_t r, err; ssize_t r, err;
header(rtype, name); header(rtype, name);
@ -1854,7 +1856,7 @@ static void playback(char *name)
size_t dta; size_t dta;
ssize_t dtawave; ssize_t dtawave;
pbrec_count = (size_t)-1; pbrec_count = LLONG_MAX;
fdcount = 0; fdcount = 0;
if (!name || !strcmp(name, "-")) { if (!name || !strcmp(name, "-")) {
fd = fileno(stdin); fd = fileno(stdin);
@ -1905,7 +1907,7 @@ static void playback(char *name)
static void capture(char *name) static void capture(char *name)
{ {
pbrec_count = (size_t)-1; pbrec_count = LLONG_MAX;
if (!name || !strcmp(name, "-")) { if (!name || !strcmp(name, "-")) {
fd = fileno(stdout); fd = fileno(stdout);
name = "stdout"; name = "stdout";
@ -1929,7 +1931,7 @@ static void capture(char *name)
fmt_rec_table[file_type].end(fd); fmt_rec_table[file_type].end(fd);
} }
void playbackv_go(int* fds, unsigned int channels, size_t loaded, size_t count, int rtype, char **names) void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t count, int rtype, char **names)
{ {
int r; int r;
size_t vsize; size_t vsize;
@ -1979,7 +1981,7 @@ void playbackv_go(int* fds, unsigned int channels, size_t loaded, size_t count,
snd_pcm_drain(handle); snd_pcm_drain(handle);
} }
void capturev_go(int* fds, unsigned int channels, size_t count, int rtype, char **names) void capturev_go(int* fds, unsigned int channels, off64_t count, int rtype, char **names)
{ {
size_t c; size_t c;
ssize_t r; ssize_t r;