let's consider having a fxd OVERLAY_DIR/video/directory/directory.fxd
covering /video/directory/
this fxd contains <cover-img blabla>filename.jpg</cover-img>
in that case freevo expects to see filename.jpg in /video/directory/
I guess it should expect it to be in OVERLAY_DIR/video/directory/
--- src/fxditem.py.old 2004-05-14 02:50:04.000000000 +0200
+++ src/fxditem.py 2004-05-14 02:49:50.000000000 +0200
@@ -124,6 +124,11 @@
if os.path.isdir(d):
f = os.path.join(d, os.path.basename(d) + '.fxd')
if vfs.isfile(f):
+ # if f is in OVERLAY_DIR
+ # (vfs.isfile returns true in that case as well)
+ # then add OVERLAY_DIR to the fxd filename
+ if os.path.isfile(vfs.getoverlay(f)):
+ f = vfs.getoverlay(f)
fxd_files.append(f)
files.remove(d)
could be a crappy fix :)
this one should be better:
--- src/fxditem.py.old 2004-05-14 02:50:04.000000000 +0200
+++ src/fxditem.py 2004-05-14 03:07:45.000000000 +0200
@@ -123,7 +123,11 @@
for d in copy.copy(files):
if os.path.isdir(d):
f = os.path.join(d, os.path.basename(d) + '.fxd')
- if vfs.isfile(f):
+ t=vfs.isfile(f)
+ # if f exists in OVERLAY_DIR then use the OVERLAY path
+ if t == 2:
+ f = vfs.getoverlay(f)
+ if t:
fxd_files.append(f)
files.remove(d)
--- src/util/vfs.py.old 2004-05-14 02:51:09.000000000 +0200
+++ src/util/vfs.py 2004-05-14 03:14:40.000000000 +0200
@@ -139,12 +139,15 @@
def isfile(name):
"""
- return if the given name is a file
+ return 1 if the given name is a file
+ return 2 if the given name is a file in OVERLAY_DIR
"""
if os.path.isfile(name):
- return True
+ return 1
overlay = getoverlay(name)
- return overlay and os.path.isfile(overlay)
+ if overlay and os.path.isfile(overlay):
+ return 2
+ return False
def unlink(name):
but i don't think you're going to like it either :)
--
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
Freevo-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-devel
