emanuele-f
diff --git a/‎.gitignore
Lines changed: 2 additions & 0 deletions b/‎.gitignore
Lines changed: 2 additions & 0 deletions
diff --git a/‎distribute.sh
Lines changed: 10 additions & 1 deletion b/‎distribute.sh
Lines changed: 10 additions & 1 deletion
diff --git a/‎docs/source/android.rst
Lines changed: 66 additions & 0 deletions b/‎docs/source/android.rst
Lines changed: 66 additions & 0 deletions
diff --git a/‎docs/source/prerequisites.rst
Lines changed: 1 addition & 1 deletion b/‎docs/source/prerequisites.rst
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/source/usage.rst
Lines changed: 7 additions & 0 deletions b/‎docs/source/usage.rst
Lines changed: 7 additions & 0 deletions
diff --git a/‎recipes/android/src/android.pyx
Lines changed: 47 additions & 0 deletions b/‎recipes/android/src/android.pyx
Lines changed: 47 additions & 0 deletions
diff --git a/‎recipes/android/src/android_jni.c
Lines changed: 43 additions & 0 deletions b/‎recipes/android/src/android_jni.c
Lines changed: 43 additions & 0 deletions
diff --git a/‎recipes/android/src/android_mixer.py
Lines changed: 14 additions & 1 deletion b/‎recipes/android/src/android_mixer.py
Lines changed: 14 additions & 1 deletion
diff --git a/‎recipes/android/src/android_sound.pyx
Lines changed: 15 additions & 6 deletions b/‎recipes/android/src/android_sound.pyx
Lines changed: 15 additions & 6 deletions
@@ -5,9 +5,11 @@ build
 src/obj
 src/local.properties
 src/default.properties
+src/libs/armeabi
 dist
 *.pyc
 testsuite
+.packages
 
 #ECLIPSE + PYDEV
 .project
 
@@ -389,7 +389,7 @@ function run_source_modules() {
 		debug "Read $module recipe"
 		recipe=$RECIPES_PATH/$module/recipe.sh
 		if [ ! -f $recipe ]; then
-			error "Recipe $module does not exit"
+			error "Recipe $module does not exist"
 			exit -1
 		fi
 		source $RECIPES_PATH/$module/recipe.sh
@@ -431,6 +431,15 @@ function run_get_packages() {
 
 	for module in $MODULES; do
 		# download dependencies for this module
+		# check if there is not an overload from environment
+		module_dir=$(eval "echo \$P4A_${module}_DIR")
+		if [ "$module_dir" ]
+		then
+			debug "\$P4A_${module}_DIR is not empty, using $module_dir dir instead of downloading"
+			cp -rf $module_dir $directory
+			directory=$(get_directory $filename)
+			continue
+		fi
 		debug "Download package for $module"
 
 		url="URL_$module"
 
@@ -313,6 +313,72 @@ Please have a look into the code and you are very welcome to contribute to
 this documentation.
 
 
+Android Service
+---------------
+
+Service part of the application is controlled through the class :class:`AndroidService`.
+
+.. module:: android
+
+.. class:: AndroidService(title, description)
+
+    Run ``service/main.py`` from application directory as a service.
+
+    :Parameters:
+        `title`: str, default to 'Python service'
+            Notification title.
+
+        `description`: str, default to 'Kivy Python service started'
+            Notification text.
+
+    .. method:: start(arg)
+
+        Start the service.
+
+            :Parameters:
+                `arg`: str, default to ''
+                    Argument to pass to a service,
+                    through environment variable ``PYTHON_SERVICE_ARGUMENT``.
+
+    .. method:: stop()
+
+        Stop the service.
+
+Application activity part example, ``main.py``:
+
+.. code-block:: python
+
+  from android import AndroidService
+
+  ...
+
+   class ServiceExample(App):
+
+    ...
+
+       def start_service(self):
+           self.service = AndroidService('Sevice example', 'service is running')
+           self.service.start('Hello From Service')
+
+       def stop_service(self):
+           self.service.stop()
+
+Application service part example, ``service/main.py``:
+
+.. code-block:: python
+
+   import os
+   import time
+
+   # get the argument passed
+   arg = os.getenv('PYTHON_SERVICE_ARGUMENT')
+
+   while True:
+       # this will print 'Hello From Service' continually, even when application is switched
+       print arg
+       time.sleep(1)
+
+
 How it's working without PyJNIus
 --------------------------------
 
 
@@ -14,7 +14,7 @@ Prerequisites
 You need the minimal environment for building python. Note that other libraries
 might need other tools (cython is used by some recipes, and ccache to speedup the build)::
 
-    sudo apt-get install build-essential patch git-core ccache ant pip python-dev
+    sudo apt-get install build-essential patch git-core ccache ant python-pip python-dev
  
 If you are on a 64 bit distro, you should install these packages too ::
 
 
@@ -19,6 +19,13 @@ You can include other modules (or "recipes") to compile using `-m`::
 
 For a full list, refer to :ref:`recipes`
 
+.. note::
+
+   Recipes download a defined version of their needed package from the
+   internet, and build from it, if you know what you are doing, and want to
+   override that, you can export the env variable `P4A_recipe_name_DIR` and
+   this directory will be copied and used instead.
+
 Available options to `distribute.sh`::
 
     -d directory           Name of the distribution directory
 
@@ -246,3 +246,50 @@ class AndroidBrowser(object):
 import webbrowser
 webbrowser.register('android', AndroidBrowser, None, -1)
 
+cdef extern void android_start_service(char *, char *, char *)
+def start_service(title=None, description=None, arg=None):
+    cdef char *j_title = NULL
+    cdef char *j_description = NULL
+    if title is not None:
+        j_title = <bytes>title
+    if description is not None:
+        j_description = <bytes>description
+    if arg is not None:
+        j_arg = <bytes>arg
+    android_start_service(j_title, j_description, j_arg)
+
+cdef extern void android_stop_service()
+def stop_service():
+    android_stop_service()
+
+class AndroidService(object):
+    '''Android service class.
+    Run ``service/main.py`` from application directory as a service.
+
+    :Parameters:
+        `title`: str, default to 'Python service'
+            Notification title.
+
+        `description`: str, default to 'Kivy Python service started'
+            Notification text.
+    '''
+
+    def __init__(self, title='Python service',
+                 description='Kivy Python service started'):
+        self.title = title
+        self.description = description
+
+    def start(self, arg=''):
+        '''Start the service.
+
+        :Parameters:
+            `arg`: str, default to ''
+                Argument to pass to a service,
+                through environment variable ``PYTHON_SERVICE_ARGUMENT``.
+        '''
+        start_service(self.title, self.description, arg)
+
+    def stop(self):
+        '''Stop the service.
+        '''
+        stop_service()
@@ -311,3 +311,46 @@ void android_open_url(char *url) {
     POP_FRAME;
 }
 
+void android_start_service(char *title, char *description, char *arg) {
+    static JNIEnv *env = NULL;
+    static jclass *cls = NULL;
+    static jmethodID mid = NULL;
+
+    if (env == NULL) {
+        env = SDL_ANDROID_GetJNIEnv();
+        aassert(env);
+        cls = (*env)->FindClass(env, "org/renpy/android/PythonActivity");
+        aassert(cls);
+        mid = (*env)->GetStaticMethodID(env, cls, "start_service",
+                                       "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+        aassert(mid);
+    }
+
+    jstring j_title = NULL;
+    jstring j_description = NULL;
+    jstring j_arg = NULL;
+    if ( title != 0 )
+            j_title = (*env)->NewStringUTF(env, title);
+    if ( description != 0 )
+            j_description = (*env)->NewStringUTF(env, description);
+    if ( arg != 0 )
+            j_arg = (*env)->NewStringUTF(env, arg);
+
+    (*env)->CallStaticVoidMethod(env, cls, mid, j_title, j_description, j_arg);
+}
+
+void android_stop_service() {
+    static JNIEnv *env = NULL;
+    static jclass *cls = NULL;
+    static jmethodID mid = NULL;
+
+    if (env == NULL) {
+        env = SDL_ANDROID_GetJNIEnv();
+        cls = (*env)->FindClass(env, "org/renpy/android/PythonActivity");
+        aassert(cls);
+        mid = (*env)->GetStaticMethodID(env, cls, "stop_service", "()V");
+        aassert(mid);
+    }
+
+    (*env)->CallStaticVoidMethod(env, cls, mid);
+}
@@ -113,6 +113,8 @@ def play(self, s, loops=0, maxtime=0, fade_ms=0):
         with condition:
             condition.notify()
 
+    def seek(self, position):
+        sound.seek(self.id, position)
 
     def stop(self):
         self.loop = None
@@ -159,6 +161,12 @@ def queue(self, s):
     def get_queue(self):
         return self.queued
 
+    def get_pos(self):
+        return sound.get_pos(self.id)/1000.
+
+    def get_length(self):
+        return sound.get_length(self.id)/1000.
+
 
 def Channel(n):
     """
@@ -205,6 +213,7 @@ def play(self, loops=0, maxtime=0, fade_ms=0):
         channel.play(self, loops=loops)
         return channel
 
+
     def stop(self):
         for i in range(0, num_channels):
             if Channel(i).get_sound() is self:
@@ -254,6 +263,10 @@ def play(loops=0, start=0.0):
     def rewind():
         music_channel.play(music_sound)
 
+    @staticmethod
+    def seek(position):
+        music_channel.seek(position)
+
     @staticmethod
     def stop():
         music_channel.stop()
@@ -284,7 +297,7 @@ def get_busy():
 
     @staticmethod
     def get_pos():
-        return 0
+        return music_channel.get_pos()
 
     @staticmethod
     def queue(filename):
 
@@ -1,6 +1,7 @@
 cdef extern void android_sound_queue(int, char *, char *, long long, long long)
 cdef extern void android_sound_play(int, char *, char *, long long, long long)
 cdef extern void android_sound_stop(int)
+cdef extern void android_sound_seek(int, float)
 cdef extern void android_sound_dequeue(int)
 cdef extern void android_sound_playing_name(int, char *, int)
 cdef extern void android_sound_pause(int)
@@ -11,15 +12,17 @@ cdef extern void android_sound_set_secondary_volume(int, float)
 cdef extern void android_sound_set_pan(int, float)
 
 cdef extern int android_sound_queue_depth(int)
+cdef extern int android_sound_get_pos(int)
+cdef extern int android_sound_get_length(int)
 
 channels = set()
 volumes = { }
 
 def queue(channel, file, name, fadein=0, tight=False):
 
     channels.add(channel)
-    
-    real_fn = file.name    
+
+    real_fn = file.name
     base = getattr(file, "base", -1)
     length = getattr(file, "length", -1)
 
@@ -28,13 +31,16 @@ def queue(channel, file, name, fadein=0, tight=False):
 def play(channel, file, name, paused=False, fadein=0, tight=False):
 
     channels.add(channel)
-    
+
     real_fn = file.name    
     base = getattr(file, "base", -1)
     length = getattr(file, "length", -1)
 
     android_sound_play(channel, name, real_fn, base, length)
 
+def seek(channel, position):
+   android_sound_seek(channel, position)
+
 def stop(channel):
     android_sound_stop(channel)
 
@@ -70,20 +76,23 @@ def unpause_all():
 def pause_all():
     for i in channels:
         pause(i)
-        
+
 def fadeout(channel, ms):
     stop(channel)
 
 def busy(channel):
     return playing_name(channel) != None
 
 def get_pos(channel):
-    return 0
+    return android_sound_get_pos(channel)
+
+def get_length(channel):
+    return android_sound_get_length(channel)
 
 def set_volume(channel, volume):
     android_sound_set_volume(channel, volume)
     volumes[channel] = volume
-    
+
 def set_secondary_volume(channel, volume):
     android_sound_set_secondary_volume(channel, volume)