Commit 70c1ea6b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove aout_PacketPause()

parent ba6c9da0
......@@ -328,7 +328,6 @@ VLC_DEPRECATED void aout_PacketDestroy(audio_output_t *);
VLC_DEPRECATED int aout_PacketTimeGet(audio_output_t *, mtime_t *);
VLC_DEPRECATED void aout_PacketPlay(audio_output_t *, block_t *);
VLC_DEPRECATED void aout_PacketPause(audio_output_t *, bool, mtime_t);
VLC_DEPRECATED void aout_PacketFlush(audio_output_t *, bool);
VLC_DEPRECATED block_t *aout_PacketNext(audio_output_t *, mtime_t) VLC_USED;
......
......@@ -125,7 +125,7 @@ static int Start( audio_output_t *aout, audio_sample_format_t *restrict fmt )
aout_PacketInit(p_aout, &p_sys->packet, FRAME_SIZE, fmt);
p_aout->time_get = aout_PacketTimeGet;
p_aout->play = aout_PacketPlay;
p_aout->pause = aout_PacketPause;
p_aout->pause = NULL;
p_aout->flush = aout_PacketFlush;
aout_SoftVolumeStart(p_aout);
......
......@@ -174,7 +174,7 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
p_aout->time_get = aout_PacketTimeGet;
p_aout->play = aout_PacketPlay;
p_aout->pause = aout_PacketPause;
p_aout->pause = NULL;
p_aout->flush = aout_PacketFlush;
aout_FormatPrint(p_aout, "VLC is looking for:", fmt);
......
......@@ -284,7 +284,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
p_aout->time_get = aout_PacketTimeGet;
p_aout->play = Play;
p_aout->pause = aout_PacketPause;
p_aout->pause = NULL;
p_aout->flush = aout_PacketFlush;
return VLC_SUCCESS;
......
......@@ -134,7 +134,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
p_aout->time_get = aout_PacketTimeGet;
p_aout->play = aout_PacketPlay;
p_aout->pause = aout_PacketPause;
p_aout->pause = NULL;
p_aout->flush = aout_PacketFlush;
aout_PacketInit( p_aout, &p_sys->packet,
jack_get_buffer_size( p_sys->p_jack_client ), fmt );
......
......@@ -197,7 +197,7 @@ static int Start ( audio_output_t *p_aout, audio_sample_format_t *fmt )
p_aout->time_get = aout_PacketTimeGet;
p_aout->play = Play;
p_aout->pause = aout_PacketPause;
p_aout->pause = NULL;
p_aout->flush = aout_PacketFlush;
aout_SoftVolumeStart( p_aout );
......
......@@ -185,29 +185,6 @@ void aout_PacketPlay (audio_output_t *aout, block_t *block)
vlc_mutex_unlock (&p->lock);
}
void aout_PacketPause (audio_output_t *aout, bool pause, mtime_t date)
{
aout_packet_t *p = aout_packet (aout);
if (pause)
{
assert (p->pause_date == VLC_TS_INVALID);
p->pause_date = date;
}
else
{
assert (p->pause_date != VLC_TS_INVALID);
mtime_t duration = date - p->pause_date;
p->pause_date = VLC_TS_INVALID;
vlc_mutex_lock (&p->lock);
aout_FifoMoveDates (&p->partial, duration);
aout_FifoMoveDates (&p->fifo, duration);
vlc_mutex_unlock (&p->lock);
}
}
void aout_PacketFlush (audio_output_t *aout, bool drain)
{
aout_packet_t *p = aout_packet (aout);
......
......@@ -162,7 +162,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
p_aout->time_get = aout_PacketTimeGet;
p_aout->play = Play;
p_aout->pause = aout_PacketPause;
p_aout->pause = NULL;
p_aout->flush = aout_PacketFlush;
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment