Author: duncan
Date: Thu Feb 21 15:48:26 2008
New Revision: 10407

Log:
Consolidating differencies between rel-1 and rel-1-7

Modified:
   branches/rel-1-7/freevo/src/video/commdetectclient.py
   branches/rel-1-7/freevo/src/video/configure.py
   branches/rel-1-7/freevo/src/video/fxdhandler.py
   branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py
   branches/rel-1-7/freevo/src/video/plugins/fxdarchive.py
   branches/rel-1-7/freevo/src/video/plugins/imdb.py
   branches/rel-1-7/freevo/src/video/plugins/moviecovers.py
   branches/rel-1-7/freevo/src/video/plugins/xine.py
   branches/rel-1-7/freevo/src/video/videoitem.py
   branches/rel-1/freevo/src/video/commdetectclient.py
   branches/rel-1/freevo/src/video/configure.py
   branches/rel-1/freevo/src/video/fxdhandler.py
   branches/rel-1/freevo/src/video/plugins/dvdbackup.py
   branches/rel-1/freevo/src/video/plugins/fxdarchive.py
   branches/rel-1/freevo/src/video/plugins/imdb.py
   branches/rel-1/freevo/src/video/plugins/moviecovers.py
   branches/rel-1/freevo/src/video/plugins/xine.py

Modified: branches/rel-1-7/freevo/src/video/commdetectclient.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/commdetectclient.py       (original)
+++ branches/rel-1-7/freevo/src/video/commdetectclient.py       Thu Feb 21 
15:48:26 2008
@@ -1,14 +1,20 @@
 #!/usr/bin/env python
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# commdetectclient.py - A client interface to the commercial detecting server.
+# A client interface to the commercial detecting server.
 # -----------------------------------------------------------------------
+# $Id$
 #
 # Author: Justin Wetherell
-# some parts taken or inspired by Freevo's encodingserver
+#
+# Notes: some parts taken or inspired by Freevo's encodingserver
+# Todo:
 #
 # -----------------------------------------------------------------------
-# Copyright (C) 2004 den_RDC (RVDM)
+# Freevo - A Home Theater PC framework
+# Copyright (C) 2002 Krister Lagerstrom, et al.
+# Please see the file freevo/Docs/CREDITS for a complete list of authors.
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -20,7 +26,8 @@
 # Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # -----------------------------------------------------------------------
 
@@ -72,7 +79,7 @@
 def queueIt(idnr, now=False):
     """
     Insert the current job in the commdetectqueue
-        If now is true, the commdetect queue is automatically started
+    If now is true, the commdetect queue is automatically started
     """
     if not idnr:
         return (False, "CommDetectClient: no idnr")

Modified: branches/rel-1-7/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/configure.py      (original)
+++ branches/rel-1-7/freevo/src/video/configure.py      Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# configure.py - Configure video playing
+# Configure video playing
 # -----------------------------------------------------------------------
 # $Id$
 #
@@ -271,10 +271,9 @@
     next_start = 0
     items = []
 
-    if len(item.possible_players) > 1:
-        items.append(menu.MenuItem(_('Play with alternate player'), 
player_selection_menu, item))
-
     if item.filename or (item.mode in ('dvd', 'vcd') and item.player_rating >= 
20):
+        if len(item.possible_players) > 1:
+            items.append(menu.MenuItem(_('Play with alternate player'), 
player_selection_menu, item))
         if item.info.has_key('audio') and len(item.info['audio']) > 1:
             items.append(menu.MenuItem(_('Audio selection'), 
audio_selection_menu, item))
         if item.info.has_key('subtitles') and len(item.info['subtitles']) >= 1:

Modified: branches/rel-1-7/freevo/src/video/fxdhandler.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/fxdhandler.py     (original)
+++ branches/rel-1-7/freevo/src/video/fxdhandler.py     Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# fxdhandler - handler for <movie> and <disc-set> tags in a fxd file
+# Handler for <movie> and <disc-set> tags in a fxd file
 # -----------------------------------------------------------------------
 # $Id$
 #
@@ -35,22 +35,22 @@
 
 def parse_movie(fxd, node):
     """
-    Callback for VideoItem <movie>
+    Callback for VideoItem <movie>::
 
-    <movie title>
-        <cover-img>file</cover-img>
-        <video mplayer-options>
-            <dvd|vcd|file id name media_id mplayer-options>file</>+
-        <variants>
-            <variant>
-                <part ref mplayer-options>
-                    <subtitle media_id>file</subtitle>
-                    <audio media_id>file</audio>
-                </part>+
-            </variant>+
-        </variants>
-        <info/>
-    </movie>
+        <movie title>
+            <cover-img>file</cover-img>
+            <video mplayer-options>
+                <dvd|vcd|file id name media_id mplayer-options>file</>+
+            <variants>
+                <variant>
+                    <part ref mplayer-options>
+                        <subtitle media_id>file</subtitle>
+                        <audio media_id>file</audio>
+                    </part>+
+                </variant>+
+            </variants>
+            <info/>
+        </movie>
     """
 
     files = []
@@ -226,12 +226,12 @@
                     v.force_player = player
                 if is_playlist:
                     item.is_playlist = True
-                # global <video> mplayer_options
+                # global <movie> mplayer_options
                 if mplayer_options:
                     v.mplayer_options += ' ' + mplayer_options
                 item.subitems.append(v)
 
-    if not item.files:
+    if not hasattr(item, 'files') or not item.files:
         item.files = FileInformation()
     item.files.files     = files
 
@@ -308,3 +308,52 @@
     if fxd.is_skin_fxd:
         item.skin_fxd = fxd.filename
     fxd.getattr(None, 'items', []).append(item)
+
+
+def parse_mplayer_add_option(fxd, node):
+    """
+    """
+    pass
+
+
+def parse_mplayer_options(fxd, node):
+    """
+    Callback for VideoItem <mplayer-options>::
+
+        <freevo>
+          <movie title="Batman: Dead End">
+            <cover-img>foo.jpg</cover-img>
+            <video>
+              <file id="f1">Batman_Dead_End.mpg
+                <mplayer>
+                  <option name="vf" crop="704:272:8:102"/>
+                  <option name="vf" scale="720:576"/>
+                </mplayer>
+              </file>
+            </video>
+          </movie>
+        </freevo>
+
+    @returns: a dictionary of mplayer options
+    """
+    mplayer_options = {}
+    _debug_('parse_mplayer_mplayer_options(fxd=%r, node=%r)' % (fxd, node), 1)
+    item = VideoItem('', fxd.getattr(None, 'parent', None), parse=False)
+    print 'item=%r' % (item.__dict__)
+
+    dirname  = os.path.dirname(fxd.filename)
+
+    print fxd.get_children(node, '*')
+    video_nodes = fxd.get_children(node, 'video')
+    for video_node in fxd.get_children(node, 'video'):
+        for file_node in fxd.get_children(video_node, 'file'):
+            for mplayer_node in fxd.get_children(file_node, 'mplayer'):
+                for option_node in fxd.get_children(mplayer_node, 'option'):
+                    name = option_node.attrs[('', 'name')]
+                    value = option_node.attrs[('', 'value')]
+                    if mplayer_options.has_key(name):
+                        mplayer_options[name].append(value)
+                    else:
+                        mplayer_options[name] = [value]
+    print 'mplayer_options=%r' % (mplayer_options)
+    return mplayer_options

Modified: branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py      (original)
+++ branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py      Thu Feb 21 
15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# dvdbackup.py - Plugin for encoding DVD's with the EncodingServer
+# Plugin for encoding DVD's with the EncodingServer
 # -----------------------------------------------------------------------
 # $Id$
 #

Modified: branches/rel-1-7/freevo/src/video/plugins/fxdarchive.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/fxdarchive.py     (original)
+++ branches/rel-1-7/freevo/src/video/plugins/fxdarchive.py     Thu Feb 21 
15:48:26 2008
@@ -30,7 +30,7 @@
 __version__ = "0.1"
 __copyright__ = "Copyright (c) 2007 Christian Lyra"
 __license__ = "GPL"
-__doc__ = '''This plugins create a entry in the context menu of cd/dvd
+__doc__ = """This plugins create a entry in the context menu of cd/dvd
 to let you copy fxd files from cd/dvd to a configured directory on HD. So you 
can see
 what you have on dvd without the need go from dvd to dvd. the plugin modify 
the fxd
 inserting a media-id attribute, so when you select the fxd file freevo will 
ask you to
@@ -39,7 +39,7 @@
 To activate, put the following lines in local_conf.py:
 plugin.activate('fxdarchive')
 ARCHIVES = '/dir/to/archive'
-'''
+"""
 
 
 import os
@@ -76,8 +76,8 @@
 
 
     def config(self):
-        ''' Defines local configuration variable that can be overridden in 
local_conf.py
-        '''
+        """ Defines local configuration variable that can be overridden in 
local_conf.py
+        """
         return [
             ('ARCHIVES', os.path.join(config.FREEVO_CACHEDIR, 'fxdarchive'), 
'Path to archived fxd directory'),
         ]
@@ -95,10 +95,10 @@
 
 
     def copy_fxd(self, arg=None, menuw=None):
-        '''
+        """
         Find all fxd files inside a given folder, and copy them to the 
configured
         destination folder
-        '''
+        """
         self.item.media.mount()
         box = PopupBox(text=_('Finding and copying FXD files...'))
         box.show()
@@ -145,11 +145,10 @@
 
 
     def fxdparser(self, fxd, node):
-        '''
+        """
         Parse the fxd file, and discover the cover image file,
         also, discover if this is a movie fxd or not
-        '''
-
+        """
         coverimg = fxd.childcontent(node, 'cover-img')
         if coverimg:
             self.coverimg = coverimg
@@ -159,10 +158,10 @@
 
 
     def fxdparsew(self, fxd, node):
-        '''
+        """
         Change a few things inside the fxd file while writing it.
         add <cdrom>/path/ information and media-id attribute
-        '''
+        """
         files = fxd.get_children(node, 'file', 0)
         for file in files:
             fxd.setcdata(file, '%s/%s' % (self.cwd, fxd.gettext(file)))

Modified: branches/rel-1-7/freevo/src/video/plugins/imdb.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/imdb.py   (original)
+++ branches/rel-1-7/freevo/src/video/plugins/imdb.py   Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# imdb.py - Plugin for IMDB support
+# Plug-in for IMDB support
 # -----------------------------------------------------------------------
 # $Id$
 #

Modified: branches/rel-1-7/freevo/src/video/plugins/moviecovers.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/moviecovers.py    (original)
+++ branches/rel-1-7/freevo/src/video/plugins/moviecovers.py    Thu Feb 21 
15:48:26 2008
@@ -1,6 +1,6 @@
-#if 0 /*
+# -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# moviecovers.py - Plugin for MOVIECOVERS support
+# Plugin for MOVIECOVERS support
 # -----------------------------------------------------------------------
 # $Id$
 # Version: 080607_01
@@ -24,8 +24,6 @@
 # Author : S. FABRE for Biboobox, http://www.lahiette.com/biboobox
 #
 # -----------------------------------------------------------------------
-# $Log$
-# -----------------------------------------------------------------------
 # Freevo - A Home Theater PC framework
 # Copyright (C) 2002 Krister Lagerstrom, et al.
 # Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -45,7 +43,6 @@
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # ----------------------------------------------------------------------- */
-#endif
 
 import re
 import socket
@@ -111,8 +108,9 @@
 
     def searchMoviecovers(self, name):
         """name (string), returns id list
+
         Search for name and returns an id list with tuples:
-            (id , name, year, type)"""
+        (id , name, year, type)"""
         # Clean internal variables
         self.initmyself()
         self.moviecovers_id_list = []

Modified: branches/rel-1-7/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/xine.py   (original)
+++ branches/rel-1-7/freevo/src/video/plugins/xine.py   Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# xine.py - the Freevo XINE module for video
+# Freevo XINE module for video
 # -----------------------------------------------------------------------
 # $Id$
 #

Modified: branches/rel-1-7/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/videoitem.py      (original)
+++ branches/rel-1-7/freevo/src/video/videoitem.py      Thu Feb 21 15:48:26 2008
@@ -320,31 +320,42 @@
 
         if self.url.startswith('dvd://') and self.url[-1] == '/':
             if self.player_rating >= 20:
-                items = [ (self.play, _('Play DVD')),
-                          (self.dvd_vcd_title_menu, _('DVD title list')) ]
+                items = [
+                    (self.play, _('Play DVD')),
+                    (self.dvd_vcd_title_menu, _('DVD title list'))
+                ]
             else:
-                items = [ (self.dvd_vcd_title_menu, _('DVD title list')),
-                          (self.play, _('Play default track')) ]
+                items = [
+                    (self.dvd_vcd_title_menu, _('DVD title list')),
+                    (self.play, _('Play default track'))
+                ]
 
         elif self.url == 'vcd://':
             if self.player_rating >= 20:
-                items = [ (self.play, _('Play VCD')),
-                          (self.dvd_vcd_title_menu, _('VCD title list')) ]
+                items = [
+                    (self.play, _('Play VCD')),
+                    (self.dvd_vcd_title_menu, _('VCD title list'))
+                ]
             else:
-                items = [ (self.dvd_vcd_title_menu, _('VCD title list')),
-                          (self.play, _('Play default track')) ]
+                items = [
+                    (self.dvd_vcd_title_menu, _('VCD title list')),
+                    (self.play, _('Play default track'))
+                ]
+
+        elif self.url.startswith('youtube:'):
+            popup=PopupBox('Resolving YouTube video URL....')
+            popup.show()
+            if hasattr(config,'YOUTUBE_USER'):
+                cmdline='youtube-dl -g -u '+config.YOUTUBE_USER+' -p 
'+config.YOUTUBE_PASSWORD+' '
+            else:
+                cmdline='youtube-dl -g '
+            pipe=os.popen(cmdline+self.url[8:])
+            self.url=pipe.readline()
+            pipe.close()
+            popup.hide()
+            items = [ (self.play, _('Play')) ]
+
         else:
-            if self.url.startswith('youtube:'):
-                popup=PopupBox('Resolving YouTube video URL....')
-                popup.show()
-                if hasattr(config,'YOUTUBE_USER'):
-                    cmdline='youtube-dl -g -u '+config.YOUTUBE_USER+' -p 
'+config.YOUTUBE_PASSWORD+' '
-                else:
-                    cmdline='youtube-dl -g '
-                pipe=os.popen(cmdline+self.url[8:])
-                self.url=pipe.readline()
-                pipe.close()
-                popup.hide()
             items = [ (self.play, _('Play')) ]
 
         items.append((self.show_details, _('Full description')))
@@ -357,8 +368,7 @@
         if self.variants and len(self.variants) > 1:
             items = [ (self.show_variants, _('Show variants')) ] + items
 
-        if self.mode == 'file' and not self.variants and \
-               (not self.image or not self.image.endswith('raw')):
+        if self.mode == 'file' and not self.variants and (not self.image or 
not self.image.endswith('raw')):
             items.append((self.create_thumbnail, _('Create Thumbnail'), 
'create_thumbnail'))
 
         return items
@@ -404,17 +414,16 @@
 
     def set_next_available_subitem(self):
         """
-        select the next available subitem. Loops on each subitem and checks if
-        the needed media is really there.
-        If the media is there, sets self.current_subitem to the given subitem
-        and returns 1.
-        If no media has been found, we set self.current_subitem to None.
-          If the search for the next available subitem did start from the
-            beginning of the list, then we consider that no media at all was
-            available for any subitem: we return 0.
-          If the search for the next available subitem did not start from the
-            beginning of the list, then we consider that at least one media
-            had been found in the past: we return 1.
+        select the next available subitem. Loops on each subitem and checks if 
the
+        needed media is really there.  If the media is there, sets 
self.current_subitem
+        to the given subitem and returns 1.
+
+        If no media has been found, we set self.current_subitem to None.  If 
the search
+        for the next available subitem did start from the beginning of the 
list, then
+        we consider that no media at all was available for any subitem: we 
return 0.
+        If the search for the next available subitem did not start from the 
beginning
+        of the list, then we consider that at least one media had been found 
in the
+        past: we return 1.
         """
         if hasattr(self, 'conf_select_this_item'):
             # XXX bad hack, clean me up

Modified: branches/rel-1/freevo/src/video/commdetectclient.py
==============================================================================
--- branches/rel-1/freevo/src/video/commdetectclient.py (original)
+++ branches/rel-1/freevo/src/video/commdetectclient.py Thu Feb 21 15:48:26 2008
@@ -1,14 +1,20 @@
 #!/usr/bin/env python
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# commdetectclient.py - A client interface to the commercial detecting server.
+# A client interface to the commercial detecting server.
 # -----------------------------------------------------------------------
+# $Id$
 #
 # Author: Justin Wetherell
-# some parts taken or inspired by Freevo's encodingserver
+#
+# Notes: some parts taken or inspired by Freevo's encodingserver
+# Todo:
 #
 # -----------------------------------------------------------------------
-# Copyright (C) 2004 den_RDC (RVDM)
+# Freevo - A Home Theater PC framework
+# Copyright (C) 2002 Krister Lagerstrom, et al.
+# Please see the file freevo/Docs/CREDITS for a complete list of authors.
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -20,7 +26,8 @@
 # Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # -----------------------------------------------------------------------
 

Modified: branches/rel-1/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1/freevo/src/video/configure.py        (original)
+++ branches/rel-1/freevo/src/video/configure.py        Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# configure.py - Configure video playing
+# Configure video playing
 # -----------------------------------------------------------------------
 # $Id$
 #

Modified: branches/rel-1/freevo/src/video/fxdhandler.py
==============================================================================
--- branches/rel-1/freevo/src/video/fxdhandler.py       (original)
+++ branches/rel-1/freevo/src/video/fxdhandler.py       Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# fxdhandler - handler for <movie> and <disc-set> tags in a fxd file
+# Handler for <movie> and <disc-set> tags in a fxd file
 # -----------------------------------------------------------------------
 # $Id$
 #
@@ -226,12 +226,12 @@
                     v.force_player = player
                 if is_playlist:
                     item.is_playlist = True
-                # global <video> mplayer_options
+                # global <movie> mplayer_options
                 if mplayer_options:
                     v.mplayer_options += ' ' + mplayer_options
                 item.subitems.append(v)
 
-    if not item.files:
+    if not hasattr(item, 'files') or not item.files:
         item.files = FileInformation()
     item.files.files     = files
 
@@ -308,3 +308,52 @@
     if fxd.is_skin_fxd:
         item.skin_fxd = fxd.filename
     fxd.getattr(None, 'items', []).append(item)
+
+
+def parse_mplayer_add_option(fxd, node):
+    """
+    """
+    pass
+
+
+def parse_mplayer_options(fxd, node):
+    """
+    Callback for VideoItem <mplayer-options>::
+
+        <freevo>
+          <movie title="Batman: Dead End">
+            <cover-img>foo.jpg</cover-img>
+            <video>
+              <file id="f1">Batman_Dead_End.mpg
+                <mplayer>
+                  <option name="vf" crop="704:272:8:102"/>
+                  <option name="vf" scale="720:576"/>
+                </mplayer>
+              </file>
+            </video>
+          </movie>
+        </freevo>
+
+    @returns: a dictionary of mplayer options
+    """
+    mplayer_options = {}
+    _debug_('parse_mplayer_mplayer_options(fxd=%r, node=%r)' % (fxd, node), 1)
+    item = VideoItem('', fxd.getattr(None, 'parent', None), parse=False)
+    print 'item=%r' % (item.__dict__)
+
+    dirname  = os.path.dirname(fxd.filename)
+
+    print fxd.get_children(node, '*')
+    video_nodes = fxd.get_children(node, 'video')
+    for video_node in fxd.get_children(node, 'video'):
+        for file_node in fxd.get_children(video_node, 'file'):
+            for mplayer_node in fxd.get_children(file_node, 'mplayer'):
+                for option_node in fxd.get_children(mplayer_node, 'option'):
+                    name = option_node.attrs[('', 'name')]
+                    value = option_node.attrs[('', 'value')]
+                    if mplayer_options.has_key(name):
+                        mplayer_options[name].append(value)
+                    else:
+                        mplayer_options[name] = [value]
+    print 'mplayer_options=%r' % (mplayer_options)
+    return mplayer_options

Modified: branches/rel-1/freevo/src/video/plugins/dvdbackup.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/dvdbackup.py        (original)
+++ branches/rel-1/freevo/src/video/plugins/dvdbackup.py        Thu Feb 21 
15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# dvdbackup.py - Plugin for encoding DVD's with the EncodingServer
+# Plugin for encoding DVD's with the EncodingServer
 # -----------------------------------------------------------------------
 # $Id$
 #
@@ -83,6 +83,7 @@
                 return [ (self.encoding_profile_menu, _('Backup this dvd 
title...')) ]
         return []
 
+
     def encoding_profile_menu(self, menuw=None, arg=None):
         if config.DVD_BACKUP_MENU:
             menu_items = []
@@ -107,6 +108,7 @@
         encoding_menu = menu.Menu(_('Choose your encoding profile'), 
menu_items)
         menuw.pushmenu(encoding_menu)
 
+
     def create_job(self, menuw=None, arg=None):
         '''
         '''
@@ -196,7 +198,6 @@
         #menuw.delete_menu()
 
 
-
     def error(self, text=""):
         AlertBox(width=400, height=200, text="ERROR: %s" % text).show()
 

Modified: branches/rel-1/freevo/src/video/plugins/fxdarchive.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/fxdarchive.py       (original)
+++ branches/rel-1/freevo/src/video/plugins/fxdarchive.py       Thu Feb 21 
15:48:26 2008
@@ -149,7 +149,6 @@
         Parse the fxd file, and discover the cover image file,
         also, discover if this is a movie fxd or not
         """
-
         coverimg = fxd.childcontent(node, 'cover-img')
         if coverimg:
             self.coverimg = coverimg

Modified: branches/rel-1/freevo/src/video/plugins/imdb.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/imdb.py     (original)
+++ branches/rel-1/freevo/src/video/plugins/imdb.py     Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# imdb.py - Plugin for IMDB support
+# Plug-in for IMDB support
 # -----------------------------------------------------------------------
 # $Id$
 #

Modified: branches/rel-1/freevo/src/video/plugins/moviecovers.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/moviecovers.py      (original)
+++ branches/rel-1/freevo/src/video/plugins/moviecovers.py      Thu Feb 21 
15:48:26 2008
@@ -1,6 +1,6 @@
-#if 0 /*
+# -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# moviecovers.py - Plugin for MOVIECOVERS support
+# Plugin for MOVIECOVERS support
 # -----------------------------------------------------------------------
 # $Id$
 # Version: 080607_01
@@ -24,8 +24,6 @@
 # Author : S. FABRE for Biboobox, http://www.lahiette.com/biboobox
 #
 # -----------------------------------------------------------------------
-# $Log$
-# -----------------------------------------------------------------------
 # Freevo - A Home Theater PC framework
 # Copyright (C) 2002 Krister Lagerstrom, et al.
 # Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -45,7 +43,6 @@
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # ----------------------------------------------------------------------- */
-#endif
 
 import re
 import socket

Modified: branches/rel-1/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/xine.py     (original)
+++ branches/rel-1/freevo/src/video/plugins/xine.py     Thu Feb 21 15:48:26 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# xine.py - the Freevo XINE module for video
+# Freevo XINE module for video
 # -----------------------------------------------------------------------
 # $Id$
 #

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to