Date: Tue, 26 Oct 2010 19:12:17 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r419 - branches/experimental/www/seamonkey2/files trunk/www/seamonkey2/files Message-ID: <201010261912.o9QJCHUi078811@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Tue Oct 26 19:12:16 2010 New Revision: 419 Log: - Fix patch name Added: branches/experimental/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c - copied unchanged from r418, branches/experimental/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c trunk/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c - copied unchanged from r418, trunk/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c Deleted: branches/experimental/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c trunk/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c Deleted: branches/experimental/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c ============================================================================== --- branches/experimental/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c Tue Oct 26 19:12:16 2010 (r418) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,33 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig 2010-10-12 21:45:53.000000000 +0400 -+++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c 2010-10-25 23:33:08.919096567 +0400 -@@ -258,6 +258,7 @@ - int - sa_stream_destroy(sa_stream_t *s) { - int result = SA_SUCCESS; -+ pthread_t thread_id; - - if (s == NULL) { - return SA_SUCCESS; -@@ -265,8 +266,10 @@ - - pthread_mutex_lock(&s->mutex); - -+ thread_id = s->thread_id; -+ - /* -- * This causes the thread sending data to ALSA to stop -+ * This causes the thread sending data to OSS to stop - */ - s->thread_id = 0; - -@@ -281,6 +284,8 @@ - - pthread_mutex_unlock(&s->mutex); - -+ pthread_join(thread_id, NULL); -+ - /* - * Release resources. - */ - - Copied: branches/experimental/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c (from r418, branches/experimental/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c Tue Oct 26 19:12:16 2010 (r419, copy of r418, branches/experimental/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c) @@ -0,0 +1,33 @@ +--- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig 2010-10-12 21:45:53.000000000 +0400 ++++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c 2010-10-25 23:33:08.919096567 +0400 +@@ -258,6 +258,7 @@ + int + sa_stream_destroy(sa_stream_t *s) { + int result = SA_SUCCESS; ++ pthread_t thread_id; + + if (s == NULL) { + return SA_SUCCESS; +@@ -265,8 +266,10 @@ + + pthread_mutex_lock(&s->mutex); + ++ thread_id = s->thread_id; ++ + /* +- * This causes the thread sending data to ALSA to stop ++ * This causes the thread sending data to OSS to stop + */ + s->thread_id = 0; + +@@ -281,6 +284,8 @@ + + pthread_mutex_unlock(&s->mutex); + ++ pthread_join(thread_id, NULL); ++ + /* + * Release resources. + */ + + Deleted: trunk/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c ============================================================================== --- trunk/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c Tue Oct 26 19:12:16 2010 (r418) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,33 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig 2010-10-12 21:45:53.000000000 +0400 -+++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c 2010-10-25 23:33:08.919096567 +0400 -@@ -258,6 +258,7 @@ - int - sa_stream_destroy(sa_stream_t *s) { - int result = SA_SUCCESS; -+ pthread_t thread_id; - - if (s == NULL) { - return SA_SUCCESS; -@@ -265,8 +266,10 @@ - - pthread_mutex_lock(&s->mutex); - -+ thread_id = s->thread_id; -+ - /* -- * This causes the thread sending data to ALSA to stop -+ * This causes the thread sending data to OSS to stop - */ - s->thread_id = 0; - -@@ -281,6 +284,8 @@ - - pthread_mutex_unlock(&s->mutex); - -+ pthread_join(thread_id, NULL); -+ - /* - * Release resources. - */ - - Copied: trunk/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c (from r418, trunk/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey2/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c Tue Oct 26 19:12:16 2010 (r419, copy of r418, trunk/www/seamonkey2/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c) @@ -0,0 +1,33 @@ +--- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig 2010-10-12 21:45:53.000000000 +0400 ++++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c 2010-10-25 23:33:08.919096567 +0400 +@@ -258,6 +258,7 @@ + int + sa_stream_destroy(sa_stream_t *s) { + int result = SA_SUCCESS; ++ pthread_t thread_id; + + if (s == NULL) { + return SA_SUCCESS; +@@ -265,8 +266,10 @@ + + pthread_mutex_lock(&s->mutex); + ++ thread_id = s->thread_id; ++ + /* +- * This causes the thread sending data to ALSA to stop ++ * This causes the thread sending data to OSS to stop + */ + s->thread_id = 0; + +@@ -281,6 +284,8 @@ + + pthread_mutex_unlock(&s->mutex); + ++ pthread_join(thread_id, NULL); ++ + /* + * Release resources. + */ + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010261912.o9QJCHUi078811>