Browse Source

mmdevice: pass play date to streams

pull/95/head
Thomas Guillem 7 years ago
parent
commit
fd04c9b2fa
  1. 3
      modules/audio_output/directsound.c
  2. 3
      modules/audio_output/mmdevice.c
  3. 7
      modules/audio_output/mmdevice.h
  4. 3
      modules/audio_output/wasapi.c

3
modules/audio_output/directsound.c

@ -294,8 +294,9 @@ static HRESULT Play( vlc_object_t *obj, aout_stream_sys_t *sys,
return dsresult;
}
static HRESULT StreamPlay( aout_stream_t *s, block_t *block )
static HRESULT StreamPlay( aout_stream_t *s, block_t *block, vlc_tick_t date )
{
(void) date;
return Play( VLC_OBJECT(s), s->sys, block );
}

3
modules/audio_output/mmdevice.c

@ -141,11 +141,10 @@ static void Play(audio_output_t *aout, block_t *block, vlc_tick_t date)
HRESULT hr;
EnterMTA();
hr = aout_stream_Play(sys->stream, block);
hr = aout_stream_Play(sys->stream, block, date);
LeaveMTA();
vlc_FromHR(aout, hr);
(void) date;
}
static void Pause(audio_output_t *aout, bool paused, vlc_tick_t date)

7
modules/audio_output/mmdevice.h

@ -38,7 +38,7 @@ struct aout_stream
void (*stop)(aout_stream_t *);
HRESULT (*time_get)(aout_stream_t *, vlc_tick_t *);
HRESULT (*play)(aout_stream_t *, block_t *);
HRESULT (*play)(aout_stream_t *, block_t *, vlc_tick_t);
HRESULT (*pause)(aout_stream_t *, bool);
HRESULT (*flush)(aout_stream_t *);
@ -71,9 +71,10 @@ static inline HRESULT aout_stream_TimeGet(aout_stream_t *s, vlc_tick_t *delay)
return (s->time_get)(s, delay);
}
static inline HRESULT aout_stream_Play(aout_stream_t *s, block_t *block)
static inline HRESULT aout_stream_Play(aout_stream_t *s, block_t *block,
vlc_tick_t date)
{
return (s->play)(s, block);
return (s->play)(s, block, date);
}
static inline HRESULT aout_stream_Pause(aout_stream_t *s, bool paused)

3
modules/audio_output/wasapi.c

@ -140,8 +140,9 @@ static HRESULT TimeGet(aout_stream_t *s, vlc_tick_t *restrict delay)
return hr;
}
static HRESULT Play(aout_stream_t *s, block_t *block)
static HRESULT Play(aout_stream_t *s, block_t *block, vlc_tick_t date)
{
(void) date;
aout_stream_sys_t *sys = s->sys;
void *pv;
HRESULT hr;

Loading…
Cancel
Save