Author: dmeyer
Date: Sat Mar 11 19:48:56 2006
New Revision: 1275
Added:
trunk/WIP/vfs/src/thumbnail/
trunk/WIP/vfs/src/thumbnail/__init__.py
trunk/WIP/vfs/src/thumbnail/png.c
- copied unchanged from r1274, /trunk/WIP/vfs/src/png.c
trunk/WIP/vfs/src/thumbnail/server.py
- copied, changed from r1274, /trunk/WIP/vfs/src/thumbd.py
trunk/WIP/vfs/src/thumbnail/thumbnail.c
- copied, changed from r1274, /trunk/WIP/vfs/src/thumbnail.c
trunk/WIP/vfs/src/thumbnail/thumbnail.h
- copied unchanged from r1274, /trunk/WIP/vfs/src/thumbnail.h
trunk/WIP/vfs/src/thumbnail/thumbnail.py
- copied, changed from r1274, /trunk/WIP/vfs/src/thumbnail.py
trunk/WIP/vfs/src/thumbnail/video.py
- copied, changed from r1274, /trunk/WIP/vfs/src/videothumb.py
Removed:
trunk/WIP/vfs/src/png.c
trunk/WIP/vfs/src/thumbd.py
trunk/WIP/vfs/src/thumbnail.c
trunk/WIP/vfs/src/thumbnail.h
trunk/WIP/vfs/src/thumbnail.py
trunk/WIP/vfs/src/videothumb.py
Modified:
trunk/WIP/vfs/setup.py
Log:
move thumbnail stuff into extra dir
Modified: trunk/WIP/vfs/setup.py
==============================================================================
--- trunk/WIP/vfs/setup.py (original)
+++ trunk/WIP/vfs/setup.py Sat Mar 11 19:48:56 2006
@@ -40,21 +40,22 @@
print 'kaa.base not installed'
sys.exit(1)
-thumbnailer = Extension("kaa.vfs.thumbnailer", ["src/thumbnail.c", "src/png.c"
],
- config='src/config.h')
+ext = Extension("kaa.vfs.thumbnail.libthumb",
+ ["src/thumbnail/thumbnail.c", "src/thumbnail/png.c" ],
+ config='src/thumbnail/config.h')
-if not thumbnailer.check_library('imlib2', '1.1.1'):
+if not ext.check_library('imlib2', '1.1.1'):
print 'Imlib2 >= 1.1.1 not found'
print 'Download from http://enlightenment.freedesktop.org/'
sys.exit(1)
-if not thumbnailer.check_library('libpng', '1.2.0'):
+if not ext.check_library('libpng', '1.2.0'):
print 'libpng >= 1.2.0 not found'
sys.exit(1)
-if thumbnailer.check_library('epeg', '0.9'):
+if ext.check_library('epeg', '0.9'):
print 'epeg extention enabled'
- thumbnailer.config('#define USE_EPEG')
+ ext.config('#define USE_EPEG')
else:
print 'epeg extention disabled'
@@ -62,5 +63,5 @@
version = '0.1',
description = "Media-oriented VFS",
scripts = [ 'bin/kaa-thumb' ],
- ext_modules = [ thumbnailer ]
+ ext_modules = [ ext ]
)
Added: trunk/WIP/vfs/src/thumbnail/__init__.py
==============================================================================
--- (empty file)
+++ trunk/WIP/vfs/src/thumbnail/__init__.py Sat Mar 11 19:48:56 2006
@@ -0,0 +1 @@
+from thumbnail import Thumbnail, NORMAL, LARGE
Copied: trunk/WIP/vfs/src/thumbnail/server.py (from r1274,
/trunk/WIP/vfs/src/thumbd.py)
==============================================================================
--- /trunk/WIP/vfs/src/thumbd.py (original)
+++ trunk/WIP/vfs/src/thumbnail/server.py Sat Mar 11 19:48:56 2006
@@ -47,8 +47,8 @@
import kaa.imlib2
# kaa.thumb imports
-from thumbnailer import epeg, png, failed
-from videothumb import VideoThumb
+from libthumb import epeg, png, failed
+from video import VideoThumb
class Job(object):
Copied: trunk/WIP/vfs/src/thumbnail/thumbnail.c (from r1274,
/trunk/WIP/vfs/src/thumbnail.c)
==============================================================================
--- /trunk/WIP/vfs/src/thumbnail.c (original)
+++ trunk/WIP/vfs/src/thumbnail/thumbnail.c Sat Mar 11 19:48:56 2006
@@ -235,12 +235,12 @@
}
-void initthumbnailer()
+void initlibthumb()
{
PyObject *m;
void **imlib2_api_ptrs;
- m = Py_InitModule("thumbnailer", thumbnail_methods);
+ m = Py_InitModule("libthumb", thumbnail_methods);
// Import kaa-imlib2's C api
imlib2_api_ptrs = get_module_api("kaa.imlib2._Imlib2");
Copied: trunk/WIP/vfs/src/thumbnail/thumbnail.py (from r1274,
/trunk/WIP/vfs/src/thumbnail.py)
==============================================================================
--- /trunk/WIP/vfs/src/thumbnail.py (original)
+++ trunk/WIP/vfs/src/thumbnail/thumbnail.py Sat Mar 11 19:48:56 2006
@@ -45,7 +45,7 @@
from kaa.notifier import Signal, step
# kaa.thumb imports
-from thumbnailer import png
+from libthumb import png
# get logging object
log = logging.getLogger('thumb')
@@ -157,7 +157,7 @@
# connect to ipc
-_server = os.path.join(os.path.dirname(__file__), 'thumbd.py')
+_server = os.path.join(os.path.dirname(__file__), 'server.py')
_server = ipc.launch(_server, 5, ipc.IPCClient,
'thumb/socket').get_object('thumb')
_client_id = _server.connect(_callback)
Copied: trunk/WIP/vfs/src/thumbnail/video.py (from r1274,
/trunk/WIP/vfs/src/videothumb.py)
==============================================================================
--- /trunk/WIP/vfs/src/videothumb.py (original)
+++ trunk/WIP/vfs/src/thumbnail/video.py Sat Mar 11 19:48:56 2006
@@ -45,7 +45,7 @@
import kaa.imlib2
# kaa.thumb imports
-from thumbnailer import epeg, png, failed
+from libthumb import epeg, png, failed
class VideoThumb(object):
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
