[vlc-commits] DirectSound: do not disable thread cancellation
Rémi Denis-Courmont
git at videolan.org
Wed Feb 1 22:42:37 CET 2012
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 1 20:24:17 2012 +0200| [a4eca1f08a1cc067386b9ff431b00d88dc9a1929] | committer: Jean-Baptiste Kempf
DirectSound: do not disable thread cancellation
The thread is never cancelled anyway.
(cherry picked from commit 1ec3a5262ea053f7d96e00a4b38539176e628a16)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=a4eca1f08a1cc067386b9ff431b00d88dc9a1929
---
modules/audio_output/directx.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 4afa919..b5d7b7e 100644
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -992,7 +992,6 @@ static void* DirectSoundThread( void *data )
audio_output_t *p_aout = (audio_output_t *)data;
notification_thread_t *p_notif = &p_aout->sys->notif;
mtime_t last_time;
- int canc = vlc_savecancel ();
msg_Dbg( p_aout, "DirectSoundThread ready" );
@@ -1082,7 +1081,6 @@ static void* DirectSoundThread( void *data )
/* make sure the buffer isn't playing */
IDirectSoundBuffer_Stop( p_aout->sys->p_dsbuffer );
- vlc_restorecancel (canc);
msg_Dbg( p_aout, "DirectSoundThread exiting" );
return NULL;
}
More information about the vlc-commits
mailing list