Author: duncan Date: Sun Oct 29 15:37:06 2006 New Revision: 8509 Modified: branches/rel-1/freevo/ChangeLog branches/rel-1/freevo/src/audio/plugins/detach.py branches/rel-1/freevo/src/util/fxdimdb.py
Log: Merged changes from rel-1-6 Modified: branches/rel-1/freevo/ChangeLog ============================================================================== --- branches/rel-1/freevo/ChangeLog (original) +++ branches/rel-1/freevo/ChangeLog Sun Oct 29 15:37:06 2006 @@ -3,13 +3,14 @@ $Id$ -Note ----- +Notes +----- Items marked (X#nnnnnnn) have a tracker item see: X is the category and #nnnnnnn is the tracker number. (B)ugs http://sourceforge.net/tracker/?group_id=46652&atid=446895 (F)eature requests http://sourceforge.net/tracker/?group_id=46652&atid=446898 + Release 1.7.0 (2006-12-15): --------------------------- @@ -20,6 +21,14 @@ * Updated DEBUGGING, IP, PORT, UID and GUI based on helper name (F#1580628) * Updated helper convert_config (F#1578183) + +Release 1.6.1 (2006-??-??): +--------------------------- + + * Fixed detached music player when the plug-in mplayervis is enabled (B#1582048) + * Fixed IMDB parser, the title should not work (B#1586579) + + Release 1.6.0 (2006-10-31): --------------------------- @@ -77,6 +86,7 @@ * Removed MPlayer and Xine version checks (B#1566373,B#1574273) * Removed -OO option from install (B#1565076) + Release 1.5.3 (2005-01-23): --------------------------- * Update to new IMDb website Modified: branches/rel-1/freevo/src/audio/plugins/detach.py ============================================================================== --- branches/rel-1/freevo/src/audio/plugins/detach.py (original) +++ branches/rel-1/freevo/src/audio/plugins/detach.py Sun Oct 29 15:37:06 2006 @@ -1,4 +1,3 @@ -#if 0 /* # ----------------------------------------------------------------------- # detach.py - Detach plugin for the audio player # ----------------------------------------------------------------------- @@ -27,7 +26,6 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # ----------------------------------------------------------------------- -#endif import config @@ -55,6 +53,14 @@ gui = audio.player.get() # hide the player and show the menu + mpav = plugin.getbyname( 'audio.mpav' ) + if mpav: + mpav.stop_mpav() + + mplvis = plugin.getbyname( 'audio.mplayervis' ) + if mplvis: + mplvis.stop_visual() + gui.hide() gui.menuw.show() @@ -88,6 +94,7 @@ if gui: gui.player.eventhandler(Event('STOP')) + def items(self, parent): gui = audio.player.get() if gui and gui.player.is_playing(): @@ -108,3 +115,11 @@ # hide the menu and show the player menuw.hide() gui.show() + mpav = plugin.getbyname( 'audio.mpav' ) + if mpav: + mpav.start_mpav() + + mplvis = plugin.getbyname( 'audio.mplayervis' ) + if mplvis: + mplvis.stop_visual() + mplvis.start_visual() Modified: branches/rel-1/freevo/src/util/fxdimdb.py ============================================================================== --- branches/rel-1/freevo/src/util/fxdimdb.py (original) +++ branches/rel-1/freevo/src/util/fxdimdb.py Sun Oct 29 15:37:06 2006 @@ -51,7 +51,7 @@ import config import util -from kaa.metadata.disc.discinfo import cdrom_disc_id +from mmpython.disc.discinfo import cdrom_disc_id #Constants freevo_version = '1.3.4' @@ -604,8 +604,12 @@ Returns tuple of (title, info(dict), image_urls)""" dvd = 0 - - regexp_title = re.compile('.*STRONG CLASS="title">(.*?)<', re.I) + + # This is split across two lines, as the code is regexp and should be an XML parser + # this has made it far more difficult to repair. using the page title _SHOULD_ work + # - Karl Lattimer + #regexp_title = re.compile('.*STRONG CLASS="title">(.*?)<', re.I) + regexp_title = re.compile('<title>(.*?) \(.*\)</title>', re.I) regexp_year = re.compile('.*<A HREF="/Sections/Years/.*?([0-9]*)<', re.I) regexp_genre = re.compile('.*href="/Sections/Genres(.*)$', re.I) regexp_tagline = re.compile('.*<B CLASS="ch">Tagline.*?</B>(.*?)<', re.I) ------------------------------------------------------------------------- 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
