vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Nov 17 18:11:39 2012 +0200| [70c1ea6b1b18dc40602c5a9adb1fff196ba05ae4] | committer: Rémi Denis-Courmont
Remove aout_PacketPause() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70c1ea6b1b18dc40602c5a9adb1fff196ba05ae4 --- include/vlc_aout.h | 1 - modules/audio_output/audioqueue.c | 2 +- modules/audio_output/auhal.c | 2 +- modules/audio_output/directx.c | 2 +- modules/audio_output/jack.c | 2 +- modules/audio_output/kai.c | 2 +- modules/audio_output/packet.c | 23 ----------------------- modules/audio_output/waveout.c | 2 +- 8 files changed, 6 insertions(+), 30 deletions(-) diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 637ad5b..be84182 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -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; diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c index 678ccfb..76eafe4 100644 --- a/modules/audio_output/audioqueue.c +++ b/modules/audio_output/audioqueue.c @@ -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); diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index 7f248b2..9cc68d4 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -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); diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index fff5c64..1c5c057 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -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; diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c index f4ed225..22200d5 100644 --- a/modules/audio_output/jack.c +++ b/modules/audio_output/jack.c @@ -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 ); diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c index 57aa63c..e2298af 100644 --- a/modules/audio_output/kai.c +++ b/modules/audio_output/kai.c @@ -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 ); diff --git a/modules/audio_output/packet.c b/modules/audio_output/packet.c index 3562c0e..b2b6137 100644 --- a/modules/audio_output/packet.c +++ b/modules/audio_output/packet.c @@ -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); diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index f26d9ff..de54f96 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -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; /* _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
