X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=erdslangetjie%2Fdata.py;h=ad42ff3f58e8b25920583922c3a3431427cd5c3c;hb=04a0709a9ccde4965a5bd9c975a6446743e3ad7b;hp=66b66bbca85f2b36de863c60197c6328180030f3;hpb=e9fc58543d2b9f385d0bf245828fdeea1b60c0ae;p=erdslangetjie.git

diff --git a/erdslangetjie/data.py b/erdslangetjie/data.py
index 66b66bb..ad42ff3 100644
--- a/erdslangetjie/data.py
+++ b/erdslangetjie/data.py
@@ -9,19 +9,35 @@ pyglet.resource search path.
 '''
 
 import os
+from kivy.core.image import ImageLoader
+from kivy.core.audio import SoundLoader
 
 data_py = os.path.abspath(os.path.dirname(__file__))
 data_dir = os.path.normpath(os.path.join(data_py, '..', 'data'))
+loader = ImageLoader()
+soundloader = SoundLoader()
+
 
 def filepath(filename):
     '''Determine the path to a file in the data directory.
     '''
+    filename = os.path.join(*filename.split('/'))
     return os.path.join(data_dir, filename)
 
+
 def load(filename, mode='rb'):
     '''Open a file in the data directory.
 
     "mode" is passed as the second arg to open().
     '''
-    return open(os.path.join(data_dir, filename), mode)
+    return open(filepath(filename), mode)
+
+
+def load_image(filename):
+    '''Load an image into a kivy texture. We rely on kivy's caching
+       infrastructure'''
+    return loader.load(filepath(filename))
+
 
+def load_sound(filename):
+    return soundloader.load(filepath(filename))