RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

hacked aocontrol_set_device working, and cleaned up a bit 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1147 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
al3x 2001-06-17 17:44:56 +00:00
parent 39f60a9550
commit a71f146139
2 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libao2/ao_alsa1x.c
View File

@ -50,10 +50,19 @@ static int control(int cmd, int arg)
switch(cmd)
{
case AOCONTROL_GET_DEVICE:
return(char *)alsa_device; /* egy kicsit brutalis, dehat :) */
return((char *)alsa_device); /* egy kicsit brutalis, dehat :) */
case AOCONTROL_SET_DEVICE:
{
int ret;
strncpy(alsa_device, (char *)arg, ALSA_DEVICE_SIZE);
break;
uninit();
ret = init(ao_samplerate, ao_channels, ao_format, 0);
if (ret == 0)
return(CONTROL_ERROR);
else
return(CONTROL_OK);
}
}
return(CONTROL_UNKNOWN);
}
@ -142,18 +151,21 @@ static int init(int rate_hz, int channels, int format, int flags)
return(0);
}
if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
if (alsa_device == NULL)
{
printf("alsa-init: memory allocation error: %s\n", strerror(errno));
return(0);
if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
{
printf("alsa-init: memory allocation error: %s\n", strerror(errno));
return(0);
}
snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%d,%d",
snd_pcm_info_get_device(alsa_info),
snd_pcm_info_get_subdevice(alsa_info));
snd_pcm_info_free(alsa_info);
}
snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%d,%d",
snd_pcm_info_get_device(alsa_info),
snd_pcm_info_get_subdevice(alsa_info));
snd_pcm_info_free(alsa_info);
printf("alsa-init: %d soundcard%s found, using: %s\n", cards+1,
(cards >= 0) ? "" : "s", alsa_device);
@ -230,8 +242,9 @@ static int init(int rate_hz, int channels, int format, int flags)
return(0);
} else
{
printf("alsa-init: got buffersize %i\n", err);
ao_buffersize = err;
if (verbose)
printf("alsa-init: got buffersize %i\n", ao_buffersize);
}
#endif

37
libao2/ao_alsa9.c
View File

@ -50,10 +50,19 @@ static int control(int cmd, int arg)
switch(cmd)
{
case AOCONTROL_GET_DEVICE:
return(char *)alsa_device; /* egy kicsit brutalis, dehat :) */
return((char *)alsa_device); /* egy kicsit brutalis, dehat :) */
case AOCONTROL_SET_DEVICE:
{
int ret;
strncpy(alsa_device, (char *)arg, ALSA_DEVICE_SIZE);
break;
uninit();
ret = init(ao_samplerate, ao_channels, ao_format, 0);
if (ret == 0)
return(CONTROL_ERROR);
else
return(CONTROL_OK);
}
}
return(CONTROL_UNKNOWN);
}
@ -142,18 +151,21 @@ static int init(int rate_hz, int channels, int format, int flags)
return(0);
}
if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
if (alsa_device == NULL)
{
printf("alsa-init: memory allocation error: %s\n", strerror(errno));
return(0);
if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
{
printf("alsa-init: memory allocation error: %s\n", strerror(errno));
return(0);
}
snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%d,%d",
snd_pcm_info_get_device(alsa_info),
snd_pcm_info_get_subdevice(alsa_info));
snd_pcm_info_free(alsa_info);
}
snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%d,%d",
snd_pcm_info_get_device(alsa_info),
snd_pcm_info_get_subdevice(alsa_info));
snd_pcm_info_free(alsa_info);
printf("alsa-init: %d soundcard%s found, using: %s\n", cards+1,
(cards >= 0) ? "" : "s", alsa_device);
@ -230,8 +242,9 @@ static int init(int rate_hz, int channels, int format, int flags)
return(0);
} else
{
printf("alsa-init: got buffersize %i\n", err);
ao_buffersize = err;
if (verbose)
printf("alsa-init: got buffersize %i\n", ao_buffersize);
}
#endif