- splitted pcm channels in two different devices to handle mmap correctly

- removed mmap control device
- reordered pcm shared and not shared code
- changed O_WRONLY oss pcm modifier in a more symmetric and elegant way
- changed slightly control interface
- added snd-debug-check
- uniformed null pointer check
- fixed a typo in linear plugin
This commit is contained in:
Abramo Bagnara 2000-01-08 20:11:33 +00:00
parent 62380b0f43
commit 63f5a79562
11 changed files with 263 additions and 216 deletions

View file

@ -191,7 +191,7 @@ int snd_pcm_plugin_build_interleave(snd_pcm_format_t *src_format,
combination_t cmd;
int size;
if (!r_plugin)
if (r_plugin == NULL)
return -EINVAL;
*r_plugin = NULL;

View file

@ -321,7 +321,7 @@ static ssize_t linear_src_size(snd_pcm_plugin_t *plugin, size_t size)
{
struct linear_private_data *data;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct linear_private_data *)snd_pcm_plugin_extra_data(plugin);
if (data == NULL)
@ -333,7 +333,7 @@ static ssize_t linear_dst_size(snd_pcm_plugin_t *plugin, size_t size)
{
struct linear_private_data *data;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct linear_private_data *)snd_pcm_plugin_extra_data(plugin);
if (data == NULL)
@ -351,7 +351,7 @@ int snd_pcm_plugin_build_linear(snd_pcm_format_t *src_format,
int src_endian, dst_endian, sign, src_width, dst_width;
int src_sample_size, dst_sample_size;
if (!r_plugin)
if (r_plugin == NULL)
return -EINVAL;
*r_plugin = NULL;
@ -424,7 +424,7 @@ int snd_pcm_plugin_build_linear(snd_pcm_format_t *src_format,
if (src_endian < 0)
src_endian = 0;
if (dst_endian < 0)
src_endian = 0;
dst_endian = 0;
func = convert_functions[src_width][dst_width][src_endian][dst_endian][sign];

View file

@ -378,7 +378,7 @@ static ssize_t mulaw_src_size(snd_pcm_plugin_t *plugin, size_t size)
{
struct mulaw_private_data *data;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct mulaw_private_data *)snd_pcm_plugin_extra_data(plugin);
switch (data->cmd) {
@ -406,7 +406,7 @@ static ssize_t mulaw_dst_size(snd_pcm_plugin_t *plugin, size_t size)
{
struct mulaw_private_data *data;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct mulaw_private_data *)snd_pcm_plugin_extra_data(plugin);
switch (data->cmd) {
@ -438,7 +438,7 @@ int snd_pcm_plugin_build_mulaw(snd_pcm_format_t *src_format,
snd_pcm_plugin_t *plugin;
combination_t cmd;
if (!r_plugin)
if (r_plugin == NULL)
return -EINVAL;
*r_plugin = NULL;

View file

@ -239,7 +239,7 @@ static ssize_t rate_src_size(snd_pcm_plugin_t *plugin, size_t size)
struct rate_private_data *data;
ssize_t res;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct rate_private_data *)snd_pcm_plugin_extra_data(plugin);
if (data->expand) {
@ -271,7 +271,7 @@ static ssize_t rate_dst_size(snd_pcm_plugin_t *plugin, size_t size)
struct rate_private_data *data;
ssize_t res;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct rate_private_data *)snd_pcm_plugin_extra_data(plugin);
if (data->expand) {
@ -366,7 +366,7 @@ int snd_pcm_plugin_build_rate(snd_pcm_format_t *src_format,
snd_pcm_plugin_t *plugin;
int voice;
if (!r_plugin)
if (r_plugin == NULL)
return -EINVAL;
*r_plugin = NULL;

View file

@ -148,7 +148,7 @@ static ssize_t voices_src_size(snd_pcm_plugin_t *plugin, size_t size)
{
struct voices_private_data *data;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct voices_private_data *)snd_pcm_plugin_extra_data(plugin);
return (size * data->src_voices) / data->dst_voices;
@ -158,7 +158,7 @@ static ssize_t voices_dst_size(snd_pcm_plugin_t *plugin, size_t size)
{
struct voices_private_data *data;
if (!plugin || size <= 0)
if (plugin == NULL || size <= 0)
return -EINVAL;
data = (struct voices_private_data *)snd_pcm_plugin_extra_data(plugin);
return (size * data->dst_voices) / data->src_voices;
@ -171,7 +171,7 @@ int snd_pcm_plugin_build_voices(snd_pcm_format_t *src_format,
struct voices_private_data *data;
snd_pcm_plugin_t *plugin;
if (!r_plugin)
if (r_plugin == NULL)
return -EINVAL;
*r_plugin = NULL;