Skip to content

Commit 806f468

Browse files
misl6misl6
committed
Fix pep8
1 parent 6db8770 commit 806f468

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎pythonforandroid/recipes/kivy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def get_recipe_env(self, arch):
4848
env['KIVY_SDL2_PATH'] = ':'.join([
4949
join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include'),
5050
join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_image'),
51-
join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_mixer','include'),
51+
join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_mixer', 'include'),
5252
join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_ttf'),
5353
])
5454

‎pythonforandroid/recipes/sdl2/mutex.patch

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
77
{
88
- SDL_LockMutex(Android_ActivityMutex);
99
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativeSetScreenResolution()");
10-
+ SDL_LockMutex(Android_ActivityMutex);
10+
+ //SDL_LockMutex(Android_ActivityMutex);
1111

1212
Android_SetScreenResolution(surfaceWidth, surfaceHeight, deviceWidth, deviceHeight, rate);
1313

1414
- SDL_UnlockMutex(Android_ActivityMutex);
15-
+ SDL_UnlockMutex(Android_ActivityMutex);
15+
+ //SDL_UnlockMutex(Android_ActivityMutex);
1616
}
1717

1818
/* Resize */
@@ -21,15 +21,15 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
2121
{
2222
- SDL_LockMutex(Android_ActivityMutex);
2323
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "onNativeResize()");
24-
+ SDL_LockMutex(Android_ActivityMutex);
24+
+ //SDL_LockMutex(Android_ActivityMutex);
2525

2626
if (Android_Window)
2727
{
2828
Android_SendResize(Android_Window);
2929
}
3030

3131
- SDL_UnlockMutex(Android_ActivityMutex);
32-
+ SDL_UnlockMutex(Android_ActivityMutex);
32+
+ //SDL_UnlockMutex(Android_ActivityMutex);
3333
}
3434

3535
JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeOrientationChanged)(
@@ -38,7 +38,7 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
3838
{
3939
- SDL_LockMutex(Android_ActivityMutex);
4040
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "onNativeOrientationChanged()");
41-
+ SDL_LockMutex(Android_ActivityMutex);
41+
+ //SDL_LockMutex(Android_ActivityMutex);
4242

4343
displayOrientation = (SDL_DisplayOrientation)orientation;
4444

@@ -47,7 +47,7 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
4747
}
4848

4949
- SDL_UnlockMutex(Android_ActivityMutex);
50-
+ SDL_UnlockMutex(Android_ActivityMutex);
50+
+ //SDL_UnlockMutex(Android_ActivityMutex);
5151
}
5252

5353
JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeAddTouch)(
@@ -57,7 +57,7 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
5757
{
5858
- SDL_LockMutex(Android_ActivityMutex);
5959
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "onNativeSurfaceCreated()");
60-
+ SDL_LockMutex(Android_ActivityMutex);
60+
+ //SDL_LockMutex(Android_ActivityMutex);
6161

6262
if (Android_Window)
6363
{
@@ -66,15 +66,15 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
6666
}
6767

6868
- SDL_UnlockMutex(Android_ActivityMutex);
69-
+ SDL_UnlockMutex(Android_ActivityMutex);
69+
+ //SDL_UnlockMutex(Android_ActivityMutex);
7070
}
7171

7272
/* Called from surfaceChanged() */
7373
JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceChanged)(JNIEnv *env, jclass jcls)
7474
{
7575
- SDL_LockMutex(Android_ActivityMutex);
7676
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "onNativeSurfaceChanged()");
77-
+ SDL_LockMutex(Android_ActivityMutex);
77+
+ //SDL_LockMutex(Android_ActivityMutex);
7878

7979
#if SDL_VIDEO_OPENGL_EGL
8080
if (Android_Window)
@@ -83,7 +83,7 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
8383
#endif
8484

8585
- SDL_UnlockMutex(Android_ActivityMutex);
86-
+ SDL_UnlockMutex(Android_ActivityMutex);
86+
+ //SDL_UnlockMutex(Android_ActivityMutex);
8787
}
8888

8989
/* Called from surfaceDestroyed() */
@@ -94,7 +94,7 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
9494
-
9595
- SDL_LockMutex(Android_ActivityMutex);
9696
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "onNativeSurfaceDestroyed()");
97-
+ SDL_LockMutex(Android_ActivityMutex);
97+
+ //SDL_LockMutex(Android_ActivityMutex);
9898

9999
if (Android_Window)
100100
{
@@ -103,7 +103,7 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
103103
SDL_SetError("Try to release egl_surface with context probably still active");
104104
} else {
105105
- SDL_UnlockMutex(Android_ActivityMutex);
106-
+ SDL_UnlockMutex(Android_ActivityMutex);
106+
+ //SDL_UnlockMutex(Android_ActivityMutex);
107107
SDL_Delay(10);
108108
goto retry;
109109
}
@@ -112,7 +112,7 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
112112
}
113113

114114
- SDL_UnlockMutex(Android_ActivityMutex);
115-
+ SDL_UnlockMutex(Android_ActivityMutex);
115+
+ //SDL_UnlockMutex(Android_ActivityMutex);
116116
}
117117

118118
/* Keydown */
@@ -122,12 +122,12 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
122122
{
123123
- SDL_LockMutex(Android_ActivityMutex);
124124
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "onNativeTouch()");
125-
+ //SDL_LockMutex(Android_ActivityMutex);
125+
+ SDL_LockMutex(Android_ActivityMutex);
126126

127127
Android_OnTouch(Android_Window, touch_device_id_in, pointer_finger_id_in, action, x, y, p);
128128

129129
- SDL_UnlockMutex(Android_ActivityMutex);
130-
+ //SDL_UnlockMutex(Android_ActivityMutex);
130+
+ SDL_UnlockMutex(Android_ActivityMutex);
131131
}
132132

133133
/* Mouse */
@@ -137,12 +137,12 @@ diff -Naur SDL.orig/src/core/android/SDL_android.c SDL/src/core/android/SDL_andr
137137
{
138138
- SDL_LockMutex(Android_ActivityMutex);
139139
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "onNativeMouse()");
140-
+ SDL_LockMutex(Android_ActivityMutex);
140+
+ //SDL_LockMutex(Android_ActivityMutex);
141141

142142
Android_OnMouse(Android_Window, button, action, x, y, relative);
143143

144144
- SDL_UnlockMutex(Android_ActivityMutex);
145-
+ SDL_UnlockMutex(Android_ActivityMutex);
145+
+ //SDL_UnlockMutex(Android_ActivityMutex);
146146
}
147147

148148
/* Accelerometer */

0 commit comments

Comments
 (0)