Author: dmeyer
Date: Tue Oct 31 17:12:15 2006
New Revision: 1946
Added:
trunk/beacon/src/libpng.c
- copied unchanged from r1944, /trunk/beacon/src/thumbnail/png.c
trunk/beacon/src/server/thumbnailer.py
- copied, changed from r1944, /trunk/beacon/src/thumbnail/server.py
trunk/beacon/src/server/videothumb.py
- copied, changed from r1944, /trunk/beacon/src/thumbnail/video.py
trunk/beacon/src/thumbnail.c
- copied, changed from r1944, /trunk/beacon/src/thumbnail/thumbnail.c
trunk/beacon/src/thumbnail.h
- copied unchanged from r1944, /trunk/beacon/src/thumbnail/thumbnail.h
trunk/beacon/src/thumbnail.py
- copied, changed from r1944, /trunk/beacon/src/thumbnail/thumbnail.py
Removed:
trunk/beacon/src/thumbnail/
Modified:
trunk/beacon/bin/beacon
trunk/beacon/setup.py
Log:
move some files around (part 3)
Modified: trunk/beacon/bin/beacon
==============================================================================
--- trunk/beacon/bin/beacon (original)
+++ trunk/beacon/bin/beacon Tue Oct 31 17:12:15 2006
@@ -288,8 +288,8 @@
kaa.beacon.server.hwmon.server.Server()
# thumbnailer part
- import kaa.beacon.thumbnail.server
- kaa.beacon.thumbnail.server.init()
+ import kaa.beacon.server.thumbnailer
+ kaa.beacon.server.thumbnailer.init()
# set nice level
os.nice(19)
Modified: trunk/beacon/setup.py
==============================================================================
--- trunk/beacon/setup.py (original)
+++ trunk/beacon/setup.py Tue Oct 31 17:12:15 2006
@@ -40,9 +40,9 @@
print 'kaa.base not installed'
sys.exit(1)
-thumb_ext = Extension("kaa.beacon.thumbnail.libthumb",
- ["src/thumbnail/thumbnail.c", "src/thumbnail/png.c" ],
- config='src/thumbnail/config.h')
+thumb_ext = Extension("kaa.beacon._libthumb",
+ ["src/thumbnail.c", "src/libpng.c" ],
+ config='src/config.h')
if not thumb_ext.check_library('imlib2', '1.1.1'):
print 'Imlib2 >= 1.1.1 not found'
Copied: trunk/beacon/src/server/thumbnailer.py (from r1944,
/trunk/beacon/src/thumbnail/server.py)
==============================================================================
--- /trunk/beacon/src/thumbnail/server.py (original)
+++ trunk/beacon/src/server/thumbnailer.py Tue Oct 31 17:12:15 2006
@@ -43,8 +43,8 @@
import kaa.rpc
# kaa.thumb imports
-from libthumb import epeg, png, failed
-from video import VideoThumb
+from kaa.beacon._libthumb import epeg, png, failed
+from videothumb import VideoThumb
# get logging object
log = logging.getLogger('beacon.thumbnail')
Copied: trunk/beacon/src/server/videothumb.py (from r1944,
/trunk/beacon/src/thumbnail/video.py)
==============================================================================
--- /trunk/beacon/src/thumbnail/video.py (original)
+++ trunk/beacon/src/server/videothumb.py Tue Oct 31 17:12:15 2006
@@ -47,7 +47,7 @@
import kaa.imlib2
# kaa.thumb imports
-from libthumb import epeg, png, failed
+from kaa.beacon._libthumb import epeg, png, failed
# get logging object
log = logging.getLogger('beacon.thumbnail')
Copied: trunk/beacon/src/thumbnail.c (from r1944,
/trunk/beacon/src/thumbnail/thumbnail.c)
==============================================================================
--- /trunk/beacon/src/thumbnail/thumbnail.c (original)
+++ trunk/beacon/src/thumbnail.c Tue Oct 31 17:12:15 2006
@@ -255,12 +255,12 @@
}
-void initlibthumb()
+void init_libthumb()
{
PyObject *m;
void **imlib2_api_ptrs;
- m = Py_InitModule("libthumb", 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/beacon/src/thumbnail.py (from r1944,
/trunk/beacon/src/thumbnail/thumbnail.py)
==============================================================================
--- /trunk/beacon/src/thumbnail/thumbnail.py (original)
+++ trunk/beacon/src/thumbnail.py Tue Oct 31 17:12:15 2006
@@ -54,7 +54,7 @@
import kaa.metadata
# kaa.thumb imports
-from libthumb import png
+from _libthumb import png
# get logging object
log = logging.getLogger('beacon.thumb')
@@ -228,3 +228,12 @@
# start time is up, something is wrong here
raise RuntimeError('unable to connect to thumbnail server')
time.sleep(0.01)
+
+
+
+
+support_video = False
+for path in os.environ.get('PATH').split(':'):
+ if os.path.isfile(path + '/mplayer'):
+ support_video = True
+
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
