vlc | branch: master | Thomas Guillem <[email protected]> | Fri Jul 31 09:50:49 2015 +0200| [9d9f6d4d7466e0f960644bf663d285d236b2f1c9] | committer: Thomas Guillem
android_window: use vlc_mutex > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d9f6d4d7466e0f960644bf663d285d236b2f1c9 --- modules/video_output/android/utils.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/video_output/android/utils.c b/modules/video_output/android/utils.c index bbcb140..c49383a 100644 --- a/modules/video_output/android/utils.c +++ b/modules/video_output/android/utils.c @@ -45,7 +45,7 @@ struct AWindowHandler native_window_api_t anw_api; native_window_priv_api_t anwpriv_api; - pthread_mutex_t lock; + vlc_mutex_t lock; struct { bool b_registered; struct { @@ -502,7 +502,7 @@ AWindowHandler_new(vlc_object_t *p_obj) p_awh->p_jvm = p_jvm; p_awh->jobj = (*p_env)->NewGlobalRef(p_env, jobj); LoadNativeWindowAPI(p_awh); - pthread_mutex_init(&p_awh->lock, NULL); + vlc_mutex_init(&p_awh->lock); p_awh->event.mouse.i_action = p_awh->event.mouse.i_button = p_awh->event.mouse.i_x = p_awh->event.mouse.i_y = -1; p_awh->event.window.i_width = p_awh->event.window.i_height = -1; @@ -528,7 +528,7 @@ AWindowHandler_destroy(AWindowHandler *p_awh) (*p_env)->DeleteGlobalRef(p_env, p_awh->jobj); } - pthread_mutex_destroy(&p_awh->lock); + vlc_mutex_destroy(&p_awh->lock); if (p_awh->p_anw_dl) dlclose(p_awh->p_anw_dl); @@ -680,12 +680,12 @@ AndroidNativeWindow_onMouseEvent(JNIEnv* env, jobject clazz, jlong handle, (void) env; (void) clazz; AWindowHandler *p_awh = jlong_AWindowHandler(handle); - pthread_mutex_lock(&p_awh->lock); + vlc_mutex_lock(&p_awh->lock); p_awh->event.mouse.i_action = action; p_awh->event.mouse.i_button = button; p_awh->event.mouse.i_x = x; p_awh->event.mouse.i_y = y; - pthread_mutex_unlock(&p_awh->lock); + vlc_mutex_unlock(&p_awh->lock); } static void @@ -695,10 +695,10 @@ AndroidNativeWindow_onWindowSize(JNIEnv* env, jobject clazz, jlong handle, (void) env; (void) clazz; AWindowHandler *p_awh = jlong_AWindowHandler(handle); - pthread_mutex_lock(&p_awh->lock); + vlc_mutex_lock(&p_awh->lock); p_awh->event.window.i_width = width; p_awh->event.window.i_height = height; - pthread_mutex_unlock(&p_awh->lock); + vlc_mutex_unlock(&p_awh->lock); } static bool @@ -724,19 +724,19 @@ AWindowHandler_getMouseCoordinates(AWindowHandler *p_awh, if (!AWindowHandler_registerCallback(p_awh)) return false; - pthread_mutex_lock(&p_awh->lock); + vlc_mutex_lock(&p_awh->lock); if (p_awh->event.mouse.i_action == -1 || p_awh->event.mouse.i_button == -1 || p_awh->event.mouse.i_x <= 0 || p_awh->event.mouse.i_y <= 0) { - pthread_mutex_unlock(&p_awh->lock); + vlc_mutex_unlock(&p_awh->lock); return false; } *p_action = p_awh->event.mouse.i_action; *p_button = p_awh->event.mouse.i_button; *p_x = p_awh->event.mouse.i_x; *p_y = p_awh->event.mouse.i_y; - pthread_mutex_unlock(&p_awh->lock); + vlc_mutex_unlock(&p_awh->lock); return true; } @@ -747,16 +747,16 @@ AWindowHandler_getWindowSize(AWindowHandler *p_awh, if (!AWindowHandler_registerCallback(p_awh)) return false; - pthread_mutex_lock(&p_awh->lock); + vlc_mutex_lock(&p_awh->lock); if (p_awh->event.window.i_width <= 0 || p_awh->event.window.i_height <= 0) { - pthread_mutex_unlock(&p_awh->lock); + vlc_mutex_unlock(&p_awh->lock); return false; } *p_width = p_awh->event.window.i_width; *p_height = p_awh->event.window.i_height; - pthread_mutex_unlock(&p_awh->lock); + vlc_mutex_unlock(&p_awh->lock); return true; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
