Author: dmeyer
Date: Wed Nov 1 16:26:45 2006
New Revision: 1954
Modified:
trunk/beacon/src/libthumb.c
trunk/beacon/src/server/parser.py
trunk/beacon/src/thumbnail.py
Log:
small cleanup
Modified: trunk/beacon/src/libthumb.c
==============================================================================
--- trunk/beacon/src/libthumb.c (original)
+++ trunk/beacon/src/libthumb.c Wed Nov 1 16:26:45 2006
@@ -259,7 +259,7 @@
}
-void init_libthumb()
+void init_libthumb(void)
{
PyObject *m;
void **imlib2_api_ptrs;
Modified: trunk/beacon/src/server/parser.py
==============================================================================
--- trunk/beacon/src/server/parser.py (original)
+++ trunk/beacon/src/server/parser.py Wed Nov 1 16:26:45 2006
@@ -44,7 +44,7 @@
import kaa.imlib2
# kaa.beacon imports
-import kaa.beacon.thumbnail as thumbnail
+from kaa.beacon import thumbnail
from kaa.beacon.utils import get_title
# get logging object
@@ -204,7 +204,7 @@
break
if type == 'video' and not attributes.get('image') and \
- thumbnail.support_video:
+ thumbnail.SUPPORT_VIDEO:
attributes['image'] = item.filename
if metadata.get('thumbnail') and not \
Modified: trunk/beacon/src/thumbnail.py
==============================================================================
--- trunk/beacon/src/thumbnail.py (original)
+++ trunk/beacon/src/thumbnail.py Wed Nov 1 16:26:45 2006
@@ -29,7 +29,7 @@
#
# -----------------------------------------------------------------------------
-__all__ = [ 'Thumbnail', 'NORMAL', 'LARGE', 'connect', 'stop' ]
+__all__ = [ 'Thumbnail', 'NORMAL', 'LARGE', 'SUPPORT_VIDEO', 'connect' ]
NORMAL = 'normal'
LARGE = 'large'
@@ -62,6 +62,11 @@
# sizes for the thumbnails
SIZE = { NORMAL: (128, 128), LARGE: (256, 256) }
+SUPPORT_VIDEO = False
+for path in os.environ.get('PATH').split(':'):
+ if os.path.isfile(path + '/mplayer'):
+ SUPPORT_VIDEO = True
+
class Job(object):
all = []
@@ -73,7 +78,6 @@
self.signal = kaa.notifier.Signal()
Job.all.append(self)
-
_client = None
class Thumbnail(object):
@@ -232,8 +236,3 @@
-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
