Skip to content

Commit a21176d

Browse files
titotito
committed
Merge branch 'master' of github.com:kivy/python-for-android
2 parents 075a465 + fc4f532 commit a21176d

File tree

21 files changed

+628
-45
lines changed

21 files changed

+628
-45
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ build
55
src/obj
66
src/local.properties
77
src/default.properties
8+
src/libs/armeabi
89
dist
910
*.pyc
1011
testsuite
12+
.packages
1113

1214
#ECLIPSE + PYDEV
1315
.project

‎distribute.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ function run_source_modules() {
389389
debug "Read $module recipe"
390390
recipe=$RECIPES_PATH/$module/recipe.sh
391391
if [ ! -f $recipe ]; then
392-
error "Recipe $module does not exit"
392+
error "Recipe $module does not exist"
393393
exit -1
394394
fi
395395
source $RECIPES_PATH/$module/recipe.sh
@@ -431,6 +431,15 @@ function run_get_packages() {
431431

432432
for module in $MODULES; do
433433
# download dependencies for this module
434+
# check if there is not an overload from environment
435+
module_dir=$(eval "echo \$P4A_${module}_DIR")
436+
if [ "$module_dir" ]
437+
then
438+
debug "\$P4A_${module}_DIR is not empty, using $module_dir dir instead of downloading"
439+
cp -rf $module_dir $directory
440+
directory=$(get_directory $filename)
441+
continue
442+
fi
434443
debug "Download package for $module"
435444

436445
url="URL_$module"

‎docs/source/android.rst‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,72 @@ Please have a look into the code and you are very welcome to contribute to
313313
this documentation.
314314

315315

316+
Android Service
317+
---------------
318+
319+
Service part of the application is controlled through the class :class:`AndroidService`.
320+
321+
.. module:: android
322+
323+
.. class:: AndroidService(title, description)
324+
325+
Run ``service/main.py`` from application directory as a service.
326+
327+
:Parameters:
328+
`title`: str, default to 'Python service'
329+
Notification title.
330+
331+
`description`: str, default to 'Kivy Python service started'
332+
Notification text.
333+
334+
.. method:: start(arg)
335+
336+
Start the service.
337+
338+
:Parameters:
339+
`arg`: str, default to ''
340+
Argument to pass to a service,
341+
through environment variable ``PYTHON_SERVICE_ARGUMENT``.
342+
343+
.. method:: stop()
344+
345+
Stop the service.
346+
347+
Application activity part example, ``main.py``:
348+
349+
.. code-block:: python
350+
351+
from android import AndroidService
352+
353+
...
354+
355+
class ServiceExample(App):
356+
357+
...
358+
359+
def start_service(self):
360+
self.service = AndroidService('Sevice example', 'service is running')
361+
self.service.start('Hello From Service')
362+
363+
def stop_service(self):
364+
self.service.stop()
365+
366+
Application service part example, ``service/main.py``:
367+
368+
.. code-block:: python
369+
370+
import os
371+
import time
372+
373+
# get the argument passed
374+
arg = os.getenv('PYTHON_SERVICE_ARGUMENT')
375+
376+
while True:
377+
# this will print 'Hello From Service' continually, even when application is switched
378+
print arg
379+
time.sleep(1)
380+
381+
316382
How it's working without PyJNIus
317383
--------------------------------
318384

‎docs/source/prerequisites.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Prerequisites
1414
You need the minimal environment for building python. Note that other libraries
1515
might need other tools (cython is used by some recipes, and ccache to speedup the build)::
1616

17-
sudo apt-get install build-essential patch git-core ccache ant pip python-dev
17+
sudo apt-get install build-essential patch git-core ccache ant python-pip python-dev
1818
1919
If you are on a 64 bit distro, you should install these packages too ::
2020

‎docs/source/usage.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ You can include other modules (or "recipes") to compile using `-m`::
1919

2020
For a full list, refer to :ref:`recipes`
2121

22+
.. note::
23+
24+
Recipes download a defined version of their needed package from the
25+
internet, and build from it, if you know what you are doing, and want to
26+
override that, you can export the env variable `P4A_recipe_name_DIR` and
27+
this directory will be copied and used instead.
28+
2229
Available options to `distribute.sh`::
2330

2431
-d directory Name of the distribution directory

‎recipes/android/src/android.pyx‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,3 +246,50 @@ class AndroidBrowser(object):
246246
import webbrowser
247247
webbrowser.register('android', AndroidBrowser, None, -1)
248248

249+
cdef extern void android_start_service(char *, char *, char *)
250+
def start_service(title=None, description=None, arg=None):
251+
cdef char *j_title = NULL
252+
cdef char *j_description = NULL
253+
if title is not None:
254+
j_title = <bytes>title
255+
if description is not None:
256+
j_description = <bytes>description
257+
if arg is not None:
258+
j_arg = <bytes>arg
259+
android_start_service(j_title, j_description, j_arg)
260+
261+
cdef extern void android_stop_service()
262+
def stop_service():
263+
android_stop_service()
264+
265+
class AndroidService(object):
266+
'''Android service class.
267+
Run ``service/main.py`` from application directory as a service.
268+
269+
:Parameters:
270+
`title`: str, default to 'Python service'
271+
Notification title.
272+
273+
`description`: str, default to 'Kivy Python service started'
274+
Notification text.
275+
'''
276+
277+
def __init__(self, title='Python service',
278+
description='Kivy Python service started'):
279+
self.title = title
280+
self.description = description
281+
282+
def start(self, arg=''):
283+
'''Start the service.
284+
285+
:Parameters:
286+
`arg`: str, default to ''
287+
Argument to pass to a service,
288+
through environment variable ``PYTHON_SERVICE_ARGUMENT``.
289+
'''
290+
start_service(self.title, self.description, arg)
291+
292+
def stop(self):
293+
'''Stop the service.
294+
'''
295+
stop_service()

‎recipes/android/src/android_jni.c‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,3 +311,46 @@ void android_open_url(char *url) {
311311
POP_FRAME;
312312
}
313313

314+
void android_start_service(char *title, char *description, char *arg) {
315+
static JNIEnv *env = NULL;
316+
static jclass *cls = NULL;
317+
static jmethodID mid = NULL;
318+
319+
if (env == NULL) {
320+
env = SDL_ANDROID_GetJNIEnv();
321+
aassert(env);
322+
cls = (*env)->FindClass(env, "org/renpy/android/PythonActivity");
323+
aassert(cls);
324+
mid = (*env)->GetStaticMethodID(env, cls, "start_service",
325+
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
326+
aassert(mid);
327+
}
328+
329+
jstring j_title = NULL;
330+
jstring j_description = NULL;
331+
jstring j_arg = NULL;
332+
if ( title != 0 )
333+
j_title = (*env)->NewStringUTF(env, title);
334+
if ( description != 0 )
335+
j_description = (*env)->NewStringUTF(env, description);
336+
if ( arg != 0 )
337+
j_arg = (*env)->NewStringUTF(env, arg);
338+
339+
(*env)->CallStaticVoidMethod(env, cls, mid, j_title, j_description, j_arg);
340+
}
341+
342+
void android_stop_service() {
343+
static JNIEnv *env = NULL;
344+
static jclass *cls = NULL;
345+
static jmethodID mid = NULL;
346+
347+
if (env == NULL) {
348+
env = SDL_ANDROID_GetJNIEnv();
349+
cls = (*env)->FindClass(env, "org/renpy/android/PythonActivity");
350+
aassert(cls);
351+
mid = (*env)->GetStaticMethodID(env, cls, "stop_service", "()V");
352+
aassert(mid);
353+
}
354+
355+
(*env)->CallStaticVoidMethod(env, cls, mid);
356+
}

‎recipes/android/src/android_mixer.py‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ def play(self, s, loops=0, maxtime=0, fade_ms=0):
113113
with condition:
114114
condition.notify()
115115

116+
def seek(self, position):
117+
sound.seek(self.id, position)
116118

117119
def stop(self):
118120
self.loop = None
@@ -159,6 +161,12 @@ def queue(self, s):
159161
def get_queue(self):
160162
return self.queued
161163

164+
def get_pos(self):
165+
return sound.get_pos(self.id)/1000.
166+
167+
def get_length(self):
168+
return sound.get_length(self.id)/1000.
169+
162170

163171
def Channel(n):
164172
"""
@@ -205,6 +213,7 @@ def play(self, loops=0, maxtime=0, fade_ms=0):
205213
channel.play(self, loops=loops)
206214
return channel
207215

216+
208217
def stop(self):
209218
for i in range(0, num_channels):
210219
if Channel(i).get_sound() is self:
@@ -254,6 +263,10 @@ def play(loops=0, start=0.0):
254263
def rewind():
255264
music_channel.play(music_sound)
256265

266+
@staticmethod
267+
def seek(position):
268+
music_channel.seek(position)
269+
257270
@staticmethod
258271
def stop():
259272
music_channel.stop()
@@ -284,7 +297,7 @@ def get_busy():
284297

285298
@staticmethod
286299
def get_pos():
287-
return 0
300+
return music_channel.get_pos()
288301

289302
@staticmethod
290303
def queue(filename):

‎recipes/android/src/android_sound.pyx‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cdef extern void android_sound_queue(int, char *, char *, long long, long long)
22
cdef extern void android_sound_play(int, char *, char *, long long, long long)
33
cdef extern void android_sound_stop(int)
4+
cdef extern void android_sound_seek(int, float)
45
cdef extern void android_sound_dequeue(int)
56
cdef extern void android_sound_playing_name(int, char *, int)
67
cdef extern void android_sound_pause(int)
@@ -11,15 +12,17 @@ cdef extern void android_sound_set_secondary_volume(int, float)
1112
cdef extern void android_sound_set_pan(int, float)
1213

1314
cdef extern int android_sound_queue_depth(int)
15+
cdef extern int android_sound_get_pos(int)
16+
cdef extern int android_sound_get_length(int)
1417

1518
channels = set()
1619
volumes = { }
1720

1821
def queue(channel, file, name, fadein=0, tight=False):
1922

2023
channels.add(channel)
21-
22-
real_fn = file.name
24+
25+
real_fn = file.name
2326
base = getattr(file, "base", -1)
2427
length = getattr(file, "length", -1)
2528

@@ -28,13 +31,16 @@ def queue(channel, file, name, fadein=0, tight=False):
2831
def play(channel, file, name, paused=False, fadein=0, tight=False):
2932

3033
channels.add(channel)
31-
34+
3235
real_fn = file.name
3336
base = getattr(file, "base", -1)
3437
length = getattr(file, "length", -1)
3538

3639
android_sound_play(channel, name, real_fn, base, length)
3740

41+
def seek(channel, position):
42+
android_sound_seek(channel, position)
43+
3844
def stop(channel):
3945
android_sound_stop(channel)
4046

@@ -70,20 +76,23 @@ def unpause_all():
7076
def pause_all():
7177
for i in channels:
7278
pause(i)
73-
79+
7480
def fadeout(channel, ms):
7581
stop(channel)
7682

7783
def busy(channel):
7884
return playing_name(channel) != None
7985

8086
def get_pos(channel):
81-
return 0
87+
return android_sound_get_pos(channel)
88+
89+
def get_length(channel):
90+
return android_sound_get_length(channel)
8291

8392
def set_volume(channel, volume):
8493
android_sound_set_volume(channel, volume)
8594
volumes[channel] = volume
86-
95+
8796
def set_secondary_volume(channel, volume):
8897
android_sound_set_secondary_volume(channel, volume)
8998

0 commit comments

Comments
 (0)