RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-24 12:24:21 +00:00
Code Issues Releases Wiki Activity

ao_oss: move code around

Browse Source 
More logical, and preparation for the next commit. No functional
changes.
This commit is contained in:
wm4 2014-09-17 00:14:21 +02:00
parent f2c46bc1d1
commit c158e4641a
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
audio/out/ao_oss.c
View File

@ -508,23 +508,6 @@ static void reset(struct ao *ao)
#endif #endif
} }
// return: how many samples can be played without blocking
static int get_space(struct ao *ao)
{
struct priv *p = ao->priv;
audio_buf_info zz = {0};
if (ioctl(p->audio_fd, SNDCTL_DSP_GETOSPACE, &zz) != -1) {
// calculate exact buffer space:
return zz.fragments * zz.fragsize / ao->sstride;
}
if (p->audio_fd < 0 || device_writable(ao) > 0)
return p->outburst / ao->sstride;
return 0;
}
// plays 'len' samples of 'data' // plays 'len' samples of 'data'
// it should round it down to outburst*n // it should round it down to outburst*n
// return: number of samples played // return: number of samples played
@ -555,15 +538,6 @@ static int play(struct ao *ao, void **data, int samples, int flags)
return len / ao->sstride; return len / ao->sstride;
} }
// resume playing, after audio_pause()
static void audio_resume(struct ao *ao)
{
struct priv *p = ao->priv;
p->audio_end = 0;
if (p->prepause_samples > 0)
ao_play_silence(ao, p->prepause_samples);
}
// return: delay in seconds between first and last sample in buffer // return: delay in seconds between first and last sample in buffer
static float get_delay(struct ao *ao) static float get_delay(struct ao *ao)
{ {
@ -593,6 +567,24 @@ static float get_delay(struct ao *ao)
return ((float)p->buffersize) / (float)ao->bps; return ((float)p->buffersize) / (float)ao->bps;
} }
// return: how many samples can be played without blocking
static int get_space(struct ao *ao)
{
struct priv *p = ao->priv;
audio_buf_info zz = {0};
if (ioctl(p->audio_fd, SNDCTL_DSP_GETOSPACE, &zz) != -1) {
// calculate exact buffer space:
return zz.fragments * zz.fragsize / ao->sstride;
}
if (p->audio_fd < 0 || device_writable(ao) > 0)
return p->outburst / ao->sstride;
return 0;
}
// stop playing, keep buffers (for pause) // stop playing, keep buffers (for pause)
static void audio_pause(struct ao *ao) static void audio_pause(struct ao *ao)
{ {
@ -605,6 +597,15 @@ static void audio_pause(struct ao *ao)
#endif #endif
} }
// resume playing, after audio_pause()
static void audio_resume(struct ao *ao)
{
struct priv *p = ao->priv;
p->audio_end = 0;
if (p->prepause_samples > 0)
ao_play_silence(ao, p->prepause_samples);
}
#define OPT_BASE_STRUCT struct priv #define OPT_BASE_STRUCT struct priv
const struct ao_driver audio_out_oss = { const struct ao_driver audio_out_oss = {