diff options
| -rw-r--r-- | src/common.h | 10 | ||||
| -rw-r--r-- | src/oss.c | 26 |
2 files changed, 19 insertions, 17 deletions
diff --git a/src/common.h b/src/common.h index 698dbf6..63fc991 100644 --- a/src/common.h +++ b/src/common.h @@ -23,10 +23,10 @@ struct sa_stream { char *codec; - size_t read_lower_watermark; - size_t read_upper_watermark; - size_t write_lower_watermark; - size_t write_upper_watermark; +/* size_t read_lower_watermark; */ +/* size_t read_upper_watermark; */ +/* size_t write_lower_watermark; */ +/* size_t write_upper_watermark; */ sa_xrun_mode_t xrun_mode; sa_bool_t ni_enabled; @@ -47,7 +47,7 @@ struct sa_stream { sa_adjust_t adjust_rate; sa_adjust_t adjust_nchannels; sa_adjust_t adjust_pcm_format; - sa_adjust_t adjust_watermarks; +/* sa_adjust_t adjust_watermarks; */ sa_error_t error; sa_notify_t notify; @@ -127,13 +127,15 @@ int driver_open(sa_stream_t *s) { /* Set fragment settings */ if (s->mode & SA_MODE_WRONLY) { - bs = s->write_lower_watermark; +/* bs = s->write_lower_watermark; */ + bs = 1024*10; /* FIXME */ } if (s->mode & SA_MODE_RDONLY) { int rbs; - rbs = s->read_upper_watermark; +/* rbs = s->read_upper_watermark; */ + bs = 1024*10; /* FIXME */ if (s->mode & SA_MODE_WRONLY) bs = bs > rbs ? bs : rbs; @@ -537,18 +539,18 @@ int driver_open(sa_stream_t *s) { goto fail; } - if (s->adjust_watermarks) { +/* if (s->adjust_watermarks) { */ - if (s->mode & SA_MODE_RDONLY) { - s->read_lower_watermark = oss->read_fragment_size; - s->read_upper_watermark = oss->read_fragment_size * oss->read_nfragments; - } +/* if (s->mode & SA_MODE_RDONLY) { */ +/* s->read_lower_watermark = oss->read_fragment_size; */ +/* s->read_upper_watermark = oss->read_fragment_size * oss->read_nfragments; */ +/* } */ - if (s->mode & SA_MODE_WRONLY) { - s->write_lower_watermark = oss->write_fragment_size; - s->write_upper_watermark = oss->write_fragment_size * oss->write_nfragments; - } - } +/* if (s->mode & SA_MODE_WRONLY) { */ +/* s->write_lower_watermark = oss->write_fragment_size; */ +/* s->write_upper_watermark = oss->write_fragment_size * oss->write_nfragments; */ +/* } */ +/* } */ if (s->mode & SA_MODE_RDONLY) printf("Chosen for read: %u fragments, %u fragsize\n", oss->read_nfragments, oss->read_fragment_size); |