Author: duncan
Date: Mon Oct 22 22:58:15 2007
New Revision: 10030
Log:
Merged changes from rel-1
Updated the "merge to rel 1[7]" scripts
Modified:
branches/rel-1-7/freevo/src/helpers/imdb.py
branches/rel-1-7/freevo/src/util/videothumb.py
branches/rel-1/freevo/mergetorel1
branches/rel-1/freevo/mergetorel17
Modified: branches/rel-1-7/freevo/src/helpers/imdb.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/imdb.py (original)
+++ branches/rel-1-7/freevo/src/helpers/imdb.py Mon Oct 22 22:58:15 2007
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# imdbp.py - IMDB helper script to generate fxd files
+# IMDB helper script to generate fxd files
# -----------------------------------------------------------------------
# $Id$
#
@@ -45,17 +45,17 @@
from random import Random
def usage():
- print 'imdb.py -s string: search imdb for string'
+ print 'freevo imdb -s string: search imdb for string'
print
- print 'imdb.py -g filename: guess imdb for possible filename match'
+ print 'freevo imdb -g filename: guess imdb for possible filename match'
print
- print 'imdb.py [--rom-drive=/path/to/device] nr output files'
- print ' Generate output.fxd for the movie.'
+ print 'freevo imdb [--rom-drive=/path/to/device] num <output> <files>'
+ print ' Generate <output>.fxd for the movie.'
print ' Files is a list of files that belongs to this movie.'
print ' Use [dvd|vcd] to add the whole disc or use [dvd|vcd][title]'
print ' to add a special DVD or VCD title to the list of files'
print
- print 'imdb.py [--rom-drive=/path/to/device] -a fxd-file file'
+ print 'freevo imdb [--rom-drive=/path/to/device] -a <fxd-file> <file>'
print ' add file to fxd-file.fxd'
print
print 'If no rom-drive is given and one is required, /dev/cdrom is assumed'
Modified: branches/rel-1-7/freevo/src/util/videothumb.py
==============================================================================
--- branches/rel-1-7/freevo/src/util/videothumb.py (original)
+++ branches/rel-1-7/freevo/src/util/videothumb.py Mon Oct 22 22:58:15 2007
@@ -37,6 +37,7 @@
from stat import *
import kaa.metadata as mmpython
import config
+import util
def snapshot(videofile, imagefile=None, pos=None, update=True, popup=None):
"""
@@ -44,7 +45,6 @@
"""
import popen3
import kaa.imlib2 as Image
- import util
import vfs
import gui.PopupBox
import osd
Modified: branches/rel-1/freevo/mergetorel1
==============================================================================
--- branches/rel-1/freevo/mergetorel1 (original)
+++ branches/rel-1/freevo/mergetorel1 Mon Oct 22 22:58:15 2007
@@ -1,5 +1,5 @@
#!/bin/bash
-last=10020
+last=10029
LAST=${1:-${last}}
cd /sources/svn/freevo-1/rel-1
Modified: branches/rel-1/freevo/mergetorel17
==============================================================================
--- branches/rel-1/freevo/mergetorel17 (original)
+++ branches/rel-1/freevo/mergetorel17 Mon Oct 22 22:58:15 2007
@@ -1,5 +1,5 @@
#!/bin/bash
-last=10020
+last=10029
LAST=${1:-${last}}
cd /sources/svn/freevo-1/rel-1-7
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
