Merge lp:~blueyed/ubuntu/lucid/miro/merge-from-sid into lp:ubuntu/lucid/miro

[Daniel Hahler]

[lp:~blueyed/ubuntu/lucid/miro/merge-from-sid]

30. By Daniel Hahler on 2010-04-14

New upstream: 3.0.1-0ubuntu1

=== added file 'ADOPTERS'
--- ADOPTERS	1970-01-01 00:00:00 +0000
+++ ADOPTERS	2010-04-14 21:08:30 +0000
@@ -0,0 +1,245 @@
+Thanks to the following people who have adopted lines of Miro code to help
+support development!  To adopt a line, visit the Miro Adoption Center at:
+http://www.getmiro.com/adopt/
+
+Leonieke Aalders
+Nick Adams
+Hussain Al-Nasser
+Daniel Albuquerque
+Jamie Anderson
+Kathryn Angi
+Derek Ares
+J Avot (10 lines)
+alex axim
+Barbara Ball
+Tony Ballhause
+gilberto banales
+Rajesh Barnabas
+Jeffrey Barribeau
+Mike Beltzner
+Sue Belzer
+Alexander Bethke (2 lines)
+Shawn Biddle
+Lukas Biewald
+Morris Birnbaum
+Clive Blackledge
+david blackman
+Grant Blakely (2 lines)
+Christopher Blizzard
+Jason Bobe
+Adam Booth
+Niels Olof Bouvin
+Paul Brinkkemper
+kim broughton
+Luc Brun
+Dale Bryant
+Craig Buckley
+andreas burger
+Lee Butkiewicz
+Percy Cabello
+Christian Calmeyer
+piero alberto calzolari
+Michael Cardoza
+Robert Carter
+Michael Castleman
+George Chriss
+KATHRYN COLBRESE
+Mary Colvig (2 lines)
+Suzanne Conboy-Hill
+Donald Coury
+Julien CROUZET
+Andrew Davies
+Christopher Davies (2 lines)
+Barnabas Davoti
+Frederik De Bleser
+Josh Deibert (2 lines)
+David Demchuk
+Sam Denison
+Christian Detweiler (2 lines)
+JEAN P DEVRIES
+Aaron Digulla (3 lines)
+valerie donelian
+Robert Doner
+Asa Dotzler
+Charles Douthat
+Janet Dragojevic
+Deirdre Dreslough
+Kevin Driscoll
+Scott Dylewski
+Robert Ebright
+Cassandra Echerd
+Kalmer Eek
+Morten Fahrnholz (2 lines)
+Richard Fenton
+Guillermo Fernandez
+Judith Finn
+David Freer
+Amy Frutin
+Michael Gallagher
+Owen Gallagher
+Enrico Gallesio
+Peter Gasston
+Jeremy  Genaro
+Richard Giraud (5 lines)
+Alroger Luiz Gomes Filho
+Benjamin Goyette
+Sune Graaskov (2 lines)
+Hendrik Grahl
+brett  gronow
+Sibylle Grosjean
+rufo guerreschi (3 lines)
+Beverly Gunter
+fALk Gärtner
+john  haden
+Peter Haight
+Jay Harris
+Robert Harris
+Mark Hartsuyker (2 lines)
+Chris Helbling
+Steffen Hellmich
+Amanda Helman
+Chris Hemmings
+Xavier Hernandez
+Shaun Herrick
+Alexander Holman
+Jens Holze
+Jane Howell
+Anthony Hunt
+William W Hunter Jr
+Odin Hørthe Omdal
+Artur Iralin
+Shafqat Islam
+Joshua Jacobs
+Nathanael T. Jady
+Barbara Jansen
+Dean Jansen (3 lines)
+Joakim Jardenberg
+beverly jones
+Mike Jones
+Jeffrey Joseph
+Stephen Judge
+Will Kahn-Greene
+Sandra Kallmeyer
+Cristie Kamiya
+hayden karel chambers
+Matthew Katz
+Ryan Kelln
+Tommy Kelly
+Declan Kennedy
+Henry Kielarowski
+Virgil King (2 lines)
+Amanda Knutson
+Laust Ladefoged
+Susan M. LaFleur
+Brent Laminack
+Matthew Lancey
+Sheila Marie Lane
+Youcef Laribi
+First Last (11 lines)
+IP managers Leogriff
+Carlos Eduardo Livino
+Brandon Low
+David Luff
+Adam Lynn
+Stefan Magdalinski (5 lines)
+Jonathan Markow
+Manuel Martins (3 lines)
+Marcelino Mata
+Pierre McCann
+Jock McTavish
+Robert Meeks
+Kevin Metz
+Peter  Vestergaard Michaelsen
+Michael Middleton
+Joyce Miletic
+Chad Miller
+Xander Mol
+David Moore
+Tom Moore
+MR DOMINIQUE GUMPELSON MR DOMINIQUE GUMPELSON
+Patrick Mulcahy
+Theron Muller
+JACK MYERS
+Mary Nichols
+Chelsea Novak
+Christian O'Brien
+Kevin O'Brien
+Damon Oehlman
+thomas orieux
+Paul Ortega
+Christian Otkjaer
+Linux Outlaws
+Carolyn Papworth
+Andrew Parfitt
+Heather Parham (6 lines)
+alberto pastori
+Carl Pelletier
+katharine perkins
+Dominic Perry
+greg peterson
+Frank Petrie
+danielle pickett
+John Pickrell
+Christopher Pille
+Jacqueline Plage
+Alex Polvi (2 lines)
+Vidal Postigo
+Debora Prado
+Matthew Quarisa
+William Quiviger
+Douglas Radcliffe
+Mads Rahbek Hougaard
+Joseph Raine
+Stéphane Rangaya
+Chris Reidenouer
+Guillermo Restrepo
+Nick Reville
+Crispino Reyes
+lars riber
+Premasagar Rose
+David Rosen
+Marty Sandler
+Ilari Sani
+Zachary Sarver (2 lines)
+Christopher Savory
+Ivo Schmid
+Rachel Shadoan
+Motek Sherman
+Derek Shields
+Derek Slenk
+Robert Smol
+Rodrigo Starr
+Patrick Stedem
+Ian Sullivan
+James Sutherland
+Stephen and Lucinda Swartz
+Istvan Szenasi
+Carol Tardif
+Ean Thompson
+Richard Thompson
+Aidan Thomson (2 lines)
+Terry  Thorpe (3 lines)
+Alex Torrenegra
+Arthur J Towson
+Dan Trevino
+Ed Triebe
+Troy Truchon (2 lines)
+Audun Vaaler
+Ana Valdes
+Thomas van de Hoef
+Eric Van Haesendonck
+Gerald Vandecar
+Leonard Verwey
+Jacques Vroom
+Daniel Walmsley (2 lines)
+Paul Walsh
+Christopher Webber
+Harald Weiss
+Daniel Wichlacz
+Rainer Wolf
+Christina Xu
+VJ Yetimon
+Deg yong  Yu
+Friedrich Zettl
+Fabricio Zuardi
+per åström

=== removed file 'ADOPTERS'
--- ADOPTERS	2010-02-20 02:34:26 +0000
+++ ADOPTERS	1970-01-01 00:00:00 +0000
@@ -1,247 +0,0 @@
-Thanks to the following people who have adopted lines of Miro code to help
-support development!  To adopt a line, visit the Miro Adoption Center at:
-http://www.getmiro.com/adopt/
-
-Leonieke Aalders
-Nick Adams
-Hussain Al-Nasser
-Daniel Albuquerque
-Muhammad Alli
-Jamie Anderson
-Derek Ares
-J Avot (10 lines)
-alex axim
-ESSAM AZEEBI
-Barbara Ball
-Tony Ballhause
-gilberto banales
-Christine Banks
-Rajesh Barnabas
-Jeffrey Barribeau
-Michael Belanger
-Mike Beltzner
-Sue Belzer
-Alexander Bethke (2 lines)
-Shawn Biddle
-Lukas Biewald
-Morris Birnbaum
-Clive Blackledge
-david blackman
-Grant Blakely (2 lines)
-Christopher Blizzard
-Jason Bobe
-Adam Booth
-Niels Olof Bouvin
-Paul Brinkkemper
-kim broughton
-Luc Brun
-Dale Bryant
-Craig Buckley
-Lee Butkiewicz
-Percy Cabello
-Christian Calmeyer
-piero alberto calzolari
-Michael Cardoza
-Robert Carter
-Michael Castleman
-George Chriss
-KATHRYN COLBRESE
-Mary Colvig (2 lines)
-Suzanne Conboy-Hill
-Donald Coury
-Julien CROUZET
-Andrew Davies
-Christopher Davies (2 lines)
-Barnabas Davoti
-Dennis Day (2 lines)
-Frederik De Bleser
-Josh Deibert (2 lines)
-David Demchuk
-Christian Detweiler (2 lines)
-JEAN P DEVRIES
-valerie donelian
-Robert Doner
-Asa Dotzler
-Charles Douthat
-Janet Dragojevic
-Deirdre Dreslough
-Kevin Driscoll
-Scott Dylewski
-Robert Ebright
-Cassandra Echerd
-Kalmer Eek
-Roland Engelhardt
-Morten Fahrnholz (2 lines)
-Richard Fenton
-Guillermo Fernandez
-Judith Finn
-David Freer
-Michael Gallagher
-Owen Gallagher
-Enrico Gallesio
-Peter Gasston
-Jeremy  Genaro
-Richard Giraud (5 lines)
-Alroger Luiz Gomes Filho
-Benjamin Goyette
-Sune Graaskov (2 lines)
-Hendrik Grahl
-brett  gronow
-Sibylle Grosjean
-rufo guerreschi (3 lines)
-Beverly Gunter
-fALk Gärtner
-john  haden
-Peter Haight
-Jay Harris
-Robert Harris
-Mark Hartsuyker (2 lines)
-Chris Helbling
-Steffen Hellmich
-Amanda Helman
-Chris Hemmings
-Xavier Hernandez
-Shaun Herrick
-Alexander Holman
-Jens Holze
-Jane Howell
-William W Hunter Jr
-Odin Hørthe Omdal
-Artur Iralin
-Shafqat Islam
-Joshua Jacobs
-Nathanael T. Jady
-Barbara Jansen
-Dean Jansen (3 lines)
-Joakim Jardenberg
-beverly jones
-Mike Jones
-Jeffrey Joseph
-Stephen Judge
-Will Kahn-Greene
-Sandra Kallmeyer
-Cristie Kamiya
-hayden karel chambers
-Matthew Katz
-Ryan Kelln
-Tommy Kelly
-Declan Kennedy
-Henry Kielarowski
-Virgil King (2 lines)
-Dennis Kitt
-Amanda Knutson
-Laust Ladefoged
-Susan M. LaFleur
-Brent Laminack
-Matthew Lancey
-Sheila Marie Lane
-Youcef Laribi
-First Last (11 lines)
-IP managers Leogriff
-Carlos Eduardo Livino
-Brandon Low
-David Luff
-Adam Lynn
-Stefan Magdalinski (10 lines)
-Jonathan Markow
-Manuel Martins (3 lines)
-Marcelino Mata
-Pierre McCann
-Ian McMurtrie
-Jock McTavish
-Robert Meeks
-Michael Meiser
-Kevin Metz
-Peter  Vestergaard Michaelsen
-Michael Middleton
-Chad Miller
-Xander Mol
-Henrik Moltke (2 lines)
-Horacio Monteverde (3 lines)
-David Moore
-Tom Moore
-MR DOMINIQUE GUMPELSON MR DOMINIQUE GUMPELSON
-Patrick Mulcahy
-Theron Muller
-JACK MYERS
-Mary Nichols
-Chelsea Novak
-Christian O'Brien
-Kevin O'Brien
-Damon Oehlman
-thomas orieux
-Paul Ortega
-Christian Otkjaer
-Linux Outlaws
-Sean Palladino
-Carolyn Papworth
-Andrew Parfitt
-Heather Parham (6 lines)
-alberto pastori
-Carl Pelletier
-katharine perkins
-Dominic Perry
-Frank Petrie
-danielle pickett
-Christopher Pille
-Jacqueline Plage
-Alex Polvi (2 lines)
-Vidal Postigo
-Debora Prado
-Matthew Quarisa
-William Quiviger
-Douglas Radcliffe
-Mads Rahbek Hougaard
-Joseph Raine
-Stéphane Rangaya
-Chris Reidenouer
-Guillermo Restrepo
-Nick Reville
-Crispino Reyes
-lars riber
-Premasagar Rose
-David Rosen
-Ilari Sani
-Zachary Sarver (2 lines)
-Christopher Savory
-Ivo Schmid
-Peter Schmidt
-Rachel Shadoan
-Motek Sherman
-Derek Shields
-Derek Slenk
-Robert Smol
-Rodrigo Starr
-Patrick Stedem
-James Sutherland
-Stephen and Lucinda Swartz
-Istvan Szenasi
-Carol Tardif
-Ean Thompson
-Richard Thompson
-Aidan Thomson (2 lines)
-Terry  Thorpe (3 lines)
-Alex Torrenegra
-Arthur J Towson
-Dan Trevino
-Ed Triebe
-Troy Truchon (2 lines)
-Audun Vaaler
-Ana Valdes
-Thomas van de Hoef
-Eric Van Haesendonck
-Gerald Vandecar
-Bas Verhoeven
-Leonard Verwey
-Jacques Vroom
-Daniel Walmsley (2 lines)
-Paul Walsh
-Christopher Webber
-Harald Weiss
-Daniel Wichlacz
-Rainer Wolf
-Christina Xu
-VJ Yetimon
-Deg yong  Yu
-Fabricio Zuardi
-per åström

=== modified file 'CREDITS'
--- CREDITS	2009-10-25 00:24:34 +0000
+++ CREDITS	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 
 =======
 CREDITS

=== modified file 'LAYOUT'
--- LAYOUT	2009-10-25 00:24:34 +0000
+++ LAYOUT	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 
 ======
 LAYOUT

=== modified file 'MIRO_ROOT'
--- MIRO_ROOT	2009-03-09 12:46:19 +0000
+++ MIRO_ROOT	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 
 Hi,
 

=== modified file 'README'
--- README	2010-02-20 02:34:26 +0000
+++ README	2010-04-14 21:08:30 +0000
@@ -14,9 +14,9 @@
 It is written primarily in Python and is distributed under the terms
 of the GNU General Public License; see license.txt.
 
-Prebuilt versions are available from::
+Binaries are available from::
 
-   http://www.getmiro.com/downloads/
+   http://www.getmiro.com/
 
 Development information, instructions on how to submit bug reports,
 source code, information on mailing lists, and other

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2009-06-27 13:27:30 +0000
+++ debian/README.Debian	2010-04-14 21:08:30 +0000
@@ -12,28 +12,9 @@
 
  * You can install 'python-psyco' which will likely speed up Miro a bit.
 
- * If you want to redirect the sound output (but not video) to another
-   host via 'esddsp' here's what you have to do:
-
-    - Edit ~/.xine/config to say 'audio.driver:esd' on your localhost.
-
-    - Start an esd server on another (remote) host, e.g.
-      using 'esd -public -tcp'. Make sure you allow connections to your
-      esd server (check firewall settings for port 16001 and your
-      /etc/hosts.allow and /etc/hosts.deny).
-
-    - Now run 'esddsp -s xxx.xxx.xxx.xxx:16001 miro' on localhost, where
-      xxx.xxx.xxx.xxx is the IP address of the host where esd runs.
-      The video will now be displayed on localhost, audio will be redirected
-      to the remote host's esd.
-
- * If you experience segfaults or incorrect colors with Miro and certain
-   X.org drivers, please try 'miro --set xine-driver=xhsm' as a work-around,
-   or, alternatively, use the gstreamer renderer (set it in the "Options"
-   dialog or run 'miro --set renderer=gstreamer'). See
-     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=459069
-     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473310
-   for more information on this issue.
+ * For even further audio/video support you can also install the following:
+
+      $ apt-get install gstreamer0.10-plugins-ugly
 
  * If you experience Miro crashes/segfaults, please install 'gdb' and then
    run 'miro --debug' (which runs Miro in gdb) and try to reproduce the
@@ -41,21 +22,7 @@
    output (type e.g. "bt" on the gdb prompt after the crash).
 
    If needed, please also install additional -dbg packages, e.g.
-   python2.5-dbg, python-gtk2-dbg, or xulrunner-1.9-dbg.
-
- * The default Miro renderer in Debian is xine. If you want to switch to
-   gstreamer, you have to install a number of additional packages and switch
-   to gstreamer in the Miro options (and restart Miro). Alternatively,
-   you can start Miro via 'miro --set renderer=gstreamer'.
-
-   You'll need at least the following packages for gstreamer:
-
-      $ apt-get install python-gst0.10 gstreamer0.10-plugins-base \
-        gstreamer0.10-plugins-good gstreamer0.10-x gstreamer0.10-ffmpeg
-
-   For even further audio/video support you can also install the following:
-
-      $ apt-get install gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly
-
- -- Uwe Hermann <[e-mail]>, Tue, 10 Feb 2009 22:57:26 +0100
+   python2.6-dbg, python-gtk2-dbg, or xulrunner-1.9.2-dbg.
+
+ -- Uwe Hermann <[e-mail]>, Sat, 20 Mar 2010 15:29:57 +0100
 

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-21 03:47:01 +0000
+++ debian/changelog	2010-04-14 21:08:30 +0000
@@ -1,3 +1,45 @@
+miro (3.0.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Daniel Hahler <[e-mail]>  Wed, 14 Apr 2010 22:05:05 +0200
+
+miro (3.0-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable (LP: #548389), remaining changes:
+    - 100_catch_keyerror_in_update_items.patch: Catch exception
+      caused by out of bounds array index.
+    - 101_player_undefined_elapsed_time.patch: There are some cases 
+      where the elapsed_time returned is undefined; use a current 
+      time of 0 in this case when fast-forwarding.
+    - debian/control, debian/pyversions, debian/README.Debian:
+      Build with python 2.6 and xulrunner 1.9.2
+  * Dropped 90_miro_boost_py26.patch: does not apply anymore.
+
+ -- Daniel Hahler <[e-mail]>  Tue, 13 Apr 2010 21:21:17 +0200
+
+miro (3.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #575463).
+     + The xine backend was removed upstream, we use gstreamer only now.
+     + Drop (build-)dependency on all Boost packages, no longer used upstream.
+     + debian/patches/20_no_autoupdate.patch: Update.
+     + debian/patches/30_disable_xine_hack.patch: Drop, obsolete.
+     + debian/patches/40_boost_python.patch: Drop, obsolete.
+     + debian/patches/80_xine_default_renderer.patch: Drop, obsolete.
+  * Closing non-reproducible bugs with this release. Please reopen if needed.
+     + "No sound when playing videos" (Closes: #527261).
+     + "Two internal errors on startup" (Closes: #557347).
+     + "Miro "internal error" and odd behavior" (Closes: #574822).
+     + "Miro crashes after starts playing a video" (Closes: #522102).
+  * Standards-Version: 3.8.4 (no changes required).
+  * debian/miro.docs: Add ADOPTERS file.
+  * debian/README.Debian: Drop xine related sections.
+  * debian/rules: Simplified clean target.
+  * debian/copyright: Updates (Boost and libtorrent stuff is gone).
+
+ -- Uwe Hermann <[e-mail]>  Sun, 28 Mar 2010 01:02:12 +0200
+
 miro (2.5.4-1ubuntu2) lucid; urgency=low
 
   * debian/control: Migrate from xulrunner-1.9.1 to xulrunner-1.9.2 

=== modified file 'debian/control'
--- debian/control	2010-02-21 03:47:01 +0000
+++ debian/control	2010-04-14 21:08:30 +0000
@@ -8,22 +8,16 @@
                python2.6,
                python-support (>= 0.6),
                python-pyrex (>= 0.9.6.4),
-               libboost-python-dev,
-               libboost-filesystem-dev,
-               libboost-date-time-dev,
-               libboost-thread-dev,
-               libboost-serialization-dev,
                python-libtorrent (>= 0.14.2),
                libtorrent-rasterbar-dev (>= 0.14.2),
                python-gtk2-dev,
                python-gnome2-extras-dev (>= 2.19.1),
                xulrunner-dev (>= 1.9.2),
-               libxine-dev (>= 1.1.12),
                pkg-config,
                libxv-dev,
                libssl-dev,
                libffi-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.getmiro.com
 
 Package: miro
@@ -38,20 +32,18 @@
          python-glade2,
          python-pysqlite2,
          python-libtorrent (>= 0.14.2),
-         libxine1-x (>= 1.1.12),
-         libxine1-plugins (>= 1.1.12),
+         python-gst0.10 (>= 0.10.0),
+         gstreamer0.10-x (>= 0.10.0),
+         gstreamer0.10-ffmpeg (>= 0.10.0),
+         gstreamer0.10-plugins-base (>= 0.10.0),
+         gstreamer0.10-plugins-good (>= 0.10.0),
+         gstreamer0.10-plugins-bad (>= 0.10.0),
          xulrunner-1.9.2,
-         miro-data (>= 2.5.4)
+         miro-data (>= 3.0-1)
 Recommends: python-psyco [i386 hurd-i386 netbsd-i386 kfreebsd-i386]
 Suggests: ttf-dejavu,
           python-notify,
-          python-gst0.10 (>= 0.10.0),
-          gstreamer0.10-plugins-base (>= 0.10.0),
-          gstreamer0.10-plugins-good (>= 0.10.0),
-          gstreamer0.10-plugins-bad (>= 0.10.0),
-          gstreamer0.10-plugins-ugly (>= 0.10.0),
-          gstreamer0.10-x (>= 0.10.0),
-          gstreamer0.10-ffmpeg (>= 0.10.0)
+          gstreamer0.10-plugins-ugly (>= 0.10.0)
 Conflicts: miro-data (<< 1.2.1)
 Description: GTK+ based RSS video aggregator
  Miro (previously known as Democracy Player) is a platform for Internet

=== modified file 'debian/copyright'
--- debian/copyright	2009-10-25 00:24:34 +0000
+++ debian/copyright	2010-04-14 21:08:30 +0000
@@ -1,7 +1,6 @@
-This package was debianized by Uwe Hermann <[e-mail]> on
-Mon, 12 Jun 2006 13:34:47 +0200
+This work was packaged for Debian by:
 
-The current Debian maintainer is Uwe Hermann <[e-mail]>.
+   Uwe Hermann <[e-mail]> on Mon, 12 Jun 2006 13:34:47 +0200
 
 It was downloaded from:
 
@@ -146,251 +145,10 @@
 Copyright: © 2003 - 2007 Arvid Norberg
 License: BSD-3
 
--------------------------------------------------------------------------------
-
-Files: portable/libtorrent/bindings/python/src/*
-Copyright: © 2006 - 2007 Daniel Wallin
-License: other
-    Boost Software License - Version 1.0 - August 17th, 2003
-
-    Permission is hereby granted, free of charge, to any person or organization
-    obtaining a copy of the software and accompanying documentation covered by
-    this license (the "Software") to use, reproduce, display, distribute,
-    execute, and transmit the Software, and to prepare derivative works of the
-    Software, and to permit third-parties to whom the Software is furnished to
-    do so, all subject to the following:
-
-    The copyright notices in the Software and this entire statement, including
-    the above license grant, this restriction and the following disclaimer,
-    must be included in all copies of the Software, in whole or in part, and
-    all derivative works of the Software, unless such copies or derivative
-    works are solely in the form of machine-executable object code generated by
-    a source language processor.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-    SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-    FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
--------------------------------------------------------------------------------
-
-Files: */python/src/extensions.cpp,
-       */python/src/session.cpp
-Copyright: © 2006 - 2007 Daniel Wallin,
-	   © 2006 - 2007 Arvid Norberg
-License: other
-    Boost Software License - Version 1.0 - August 17th, 2003
-
-    Permission is hereby granted, free of charge, to any person or organization
-    obtaining a copy of the software and accompanying documentation covered by
-    this license (the "Software") to use, reproduce, display, distribute,
-    execute, and transmit the Software, and to prepare derivative works of the
-    Software, and to permit third-parties to whom the Software is furnished to
-    do so, all subject to the following:
-
-    The copyright notices in the Software and this entire statement, including
-    the above license grant, this restriction and the following disclaimer,
-    must be included in all copies of the Software, in whole or in part, and
-    all derivative works of the Software, unless such copies or derivative
-    works are solely in the form of machine-executable object code generated by
-    a source language processor.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-    SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-    FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
--------------------------------------------------------------------------------
-
-Files: */include/libtorrent/alert.hpp,
-       */include/libtorrent/random_sample.hpp,
-       */include/libtorrent/variant_stream.hpp,
-       */include/libtorrent/invariant_check.hpp,
-       */include/libtorrent/kademlia/refresh.hpp,
-       */include/libtorrent/kademlia/find_data.hpp,
-       */include/libtorrent/kademlia/closest_nodes.hpp,
-       */include/libtorrent/kademlia/traversal_algorithm.hpp,
-       */include/libtorrent/kademlia/logging.hpp,
-       */libtorrent/src/alert.cpp,
-       */libtorrent/src/storage.cpp,
-       */libtorrent/src/kademlia/refresh.cpp,
-       */libtorrent/src/kademlia/find_data.hpp,
-       */libtorrent/src/kademlia/closest_nodes.hpp,
-       */libtorrent/src/kademlia/traversal_algorithm.hpp
-Copyright: © 2003 - 2007 Daniel Wallin,
-	   © 2003 - 2007 Arvid Norberg
-License: BSD-3
-
--------------------------------------------------------------------------------
-
-Files: */include/libtorrent/allocate_resources.hpp,
-       */include/libtorrent/aux_/allocate_resources_impl.hpp
-Copyright: © 2003 Magnus Jonsson
-License: BSD-3
-
--------------------------------------------------------------------------------
-
-Files: */include/libtorrent/resource_request.hpp,
-       */include/libtorrent/bt_peer_connection.hpp,
-       */libtorrent/src/allocate_resources.cpp,
-       */libtorrent/src/file_win.cpp,
-       */libtorrent/src/session.cpp,
-       */libtorrent/src/session_impl.cpp
-Copyright: © 2003 - 2007 Magnus Jonsson,
-	   © 2003 - 2007 Arvid Norberg
-License: BSD-3
-
--------------------------------------------------------------------------------
-
-Files: */include/libtorrent/extensions/ut_pex.hpp
-Copyright: © 2006 MassaRoddel
-License: BSD-3
-
--------------------------------------------------------------------------------
-
-Files: */libtorrent/src/ut_pex.hpp
-Copyright: © 2006 MassaRoddel,
-	   © 2006 Arvid Norberg
-License: BSD-3
-
--------------------------------------------------------------------------------
-
-Files: */include/libtorrent/pe_crypto.hpp,
-       */libtorrent/src/pe_crypto.cpp
-Copyright: © 2007 Un Shayam
-License: BSD-3
-
--------------------------------------------------------------------------------
-
-Files: */libtorrent/src/bt_peer_connection.cpp
-Copyright: © 2007 Un Shayam,
-	   © 2003 - 2007 Avrid Norberg
-License: BSD-3
-
--------------------------------------------------------------------------------
-
-Files: */include/libtorrent/utf8.hpp
-Copyright: © 2004 - 2005 Cory Nelson
-License: other
-    This software is provided 'as-is', without any express or implied
-    warranty.  In no event will the authors be held liable for any damages
-    arising from the use of this software.
-
-    Permission is granted to anyone to use this software for any purpose,
-    including commercial applications, and to alter it and redistribute it
-    freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-       claim that you wrote the original software. If you use this software
-       in a product, an acknowledgment in the product documentation would be
-       appreciated but is not required.
-    2. Altered source versions must be plainly marked as such, and must not be
-       misrepresented as being the original software.
-    3. This notice may not be removed or altered from any source distribution.
-
--------------------------------------------------------------------------------
-
-Files: */libtorrent/asio/*,
-       */libtorrent/asio/ssl/context_base.hpp,
-       */libtorrent/asio/ssl/detail/openssl_types.hpp,
-       */libtorrent/asoi/ssl/stream_base.hpp
-Copyright: © 2003 - 2007 Christopher M. Kohlhoff <[e-mail]>
-License: other
-    Boost Software License - Version 1.0 - August 17th, 2003
-
-    Permission is hereby granted, free of charge, to any person or organization
-    obtaining a copy of the software and accompanying documentation covered by
-    this license (the "Software") to use, reproduce, display, distribute,
-    execute, and transmit the Software, and to prepare derivative works of the
-    Software, and to permit third-parties to whom the Software is furnished to
-    do so, all subject to the following:
-
-    The copyright notices in the Software and this entire statement, including
-    the above license grant, this restriction and the following disclaimer,
-    must be included in all copies of the Software, in whole or in part, and
-    all derivative works of the Software, unless such copies or derivative
-    works are solely in the form of machine-executable object code generated by
-    a source language processor.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-    SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-    FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
--------------------------------------------------------------------------------
-
-Files: */libtorrent/asio/ssl/*
-Copyright: © 2003 - 2007 Christopher M. Kohlhoff <[e-mail]>,
-	   © 2005   	 Voipster <[e-mail]>
-License: other
-    Boost Software License - Version 1.0 - August 17th, 2003
-
-    Permission is hereby granted, free of charge, to any person or organization
-    obtaining a copy of the software and accompanying documentation covered by
-    this license (the "Software") to use, reproduce, display, distribute,
-    execute, and transmit the Software, and to prepare derivative works of the
-    Software, and to permit third-parties to whom the Software is furnished to
-    do so, all subject to the following:
-
-    The copyright notices in the Software and this entire statement, including
-    the above license grant, this restriction and the following disclaimer,
-    must be included in all copies of the Software, in whole or in part, and
-    all derivative works of the Software, unless such copies or derivative
-    works are solely in the form of machine-executable object code generated by
-    a source language processor.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-    SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-    FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
--------------------------------------------------------------------------------
-
-Files: */libtorrent/asio/detail/kqueue_reactor.hpp,
-       */libtorrent/asio/detail/kqueue_reactor_fwd.hpp
-Copyright: © 2003 - 2007 Christopher M. Kohlhoff <[e-mail]>,
-	   © 2005   	 Stefan Arentz <[e-mail]>
-License: other
-    Boost Software License - Version 1.0 - August 17th, 2003
-
-    Permission is hereby granted, free of charge, to any person or organization
-    obtaining a copy of the software and accompanying documentation covered by
-    this license (the "Software") to use, reproduce, display, distribute,
-    execute, and transmit the Software, and to prepare derivative works of the
-    Software, and to permit third-parties to whom the Software is furnished to
-    do so, all subject to the following:
-
-    The copyright notices in the Software and this entire statement, including
-    the above license grant, this restriction and the following disclaimer,
-    must be included in all copies of the Software, in whole or in part, and
-    all derivative works of the Software, unless such copies or derivative
-    works are solely in the form of machine-executable object code generated by
-    a source language processor.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-    SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-    FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------
 
 Files: debian/*
-Copyright: © 2006 - 2009 Uwe Hermann <[e-mail]>
+Copyright: © 2006 - 2010 Uwe Hermann <[e-mail]>
 License: PD
    The packaging done by Uwe Hermann <[e-mail]> is hereby
    released as public domain.

=== modified file 'debian/miro.docs'
--- debian/miro.docs	2008-08-18 07:53:05 +0000
+++ debian/miro.docs	2010-04-14 21:08:30 +0000
@@ -1,2 +1,3 @@
 README
 CREDITS
+ADOPTERS

=== modified file 'debian/patches/20_no_autoupdate.patch'
--- debian/patches/20_no_autoupdate.patch	2009-02-11 22:46:45 +0000
+++ debian/patches/20_no_autoupdate.patch	2010-04-14 21:08:30 +0000
@@ -1,8 +1,8 @@
---- portable/startup.py.orig	2009-02-08 21:03:01.000000000 +0100
-+++ portable/startup.py	2009-02-08 21:03:13.000000000 +0100
-@@ -250,7 +250,7 @@
+--- portable/startup.py.orig	2010-03-28 00:44:51.000000000 +0100
++++ portable/startup.py	2010-03-28 00:45:01.000000000 +0100
+@@ -304,7 +304,7 @@
      yield None
-     parse_command_line_args()
+     commandline.startup()
      yield None
 -    autoupdate.check_for_updates()
 +    # autoupdate.check_for_updates()

=== removed file 'debian/patches/30_disable_xine_hack.patch'
--- debian/patches/30_disable_xine_hack.patch	2009-10-25 00:24:34 +0000
+++ debian/patches/30_disable_xine_hack.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# This seems to cause segfaults with newer libxine (?) releases, so disable it.
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512719
-# http://bugzilla.pculture.org/show_bug.cgi?id=11263
-
---- platform/gtk-x11/plat/options.py.orig	2009-07-24 15:11:34.000000000 +0200
-+++ platform/gtk-x11/plat/options.py	2009-07-24 15:11:42.000000000 +0200
-@@ -51,7 +51,7 @@
-                        help="Which renderer to use.  (gstreamer, xine)" )
- 
- USE_XINE_XV_HACK = GTKPref(key="UseXineXVHack",
--                           default=True,
-+                           default=False,
-                            alias="xine-xvhack",
-                            help="Whether or not to use the Xine xv hack.  (true, false)" )
- 

=== removed file 'debian/patches/80_xine_default_renderer.patch'
--- debian/patches/80_xine_default_renderer.patch	2009-10-25 00:24:34 +0000
+++ debian/patches/80_xine_default_renderer.patch	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# For now, keep xine as default renderer and make gstreamer optional.
-# This saves quite some disk space in dependency packages (e.g. for netbooks).
-
---- platform/gtk-x11/plat/options.py.orig	2009-07-24 15:20:37.000000000 +0200
-+++ platform/gtk-x11/plat/options.py	2009-07-24 15:20:43.000000000 +0200
-@@ -46,7 +46,7 @@
-         self.help = help
- 
- USE_RENDERER = GTKPref(key="useRenderer",
--                       default=u"gstreamer",
-+                       default=u"xine",
-                        alias="renderer",
-                        help="Which renderer to use.  (gstreamer, xine)" )
- 

=== removed file 'debian/patches/90_miro_boost_py26.patch'
--- debian/patches/90_miro_boost_py26.patch	2010-01-19 22:42:30 +0000
+++ debian/patches/90_miro_boost_py26.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-diff -Nurp miro-2.5.3/platform/gtk-x11/setup.py miro-2.5.3-working/platform/gtk-x11/setup.py
---- miro-2.5.3/platform/gtk-x11/setup.py	2009-10-14 15:18:23.000000000 -0700
-+++ miro-2.5.3-working/platform/gtk-x11/setup.py	2010-01-15 18:45:13.000000000 -0800
-@@ -303,9 +303,9 @@ all_libs = [mem for mem in all_libs if m
- 
- def mt_or_not(s, all_libs=all_libs):
-     for mem in all_libs:
--        if mem.startswith("lib%s-mt" % s):
--            print "Using %s-mt" % s
--            return "%s-mt" % s
-+        if mem.startswith("lib%s-mt-py26" % s):
-+            print "Using %s-mt-py26" % s
-+            return "%s-mt-py26" % s
-     print "using %s" % s
-     return s
- 

=== modified file 'debian/rules'
--- debian/rules	2009-10-25 00:24:34 +0000
+++ debian/rules	2010-04-14 21:08:30 +0000
@@ -43,20 +43,7 @@
 	rm -rf debian/miro-data/usr/share/miro/resources/testdata
 
 clean::
-	@# TODO: This should probably be done in the upstream source.
-	rm -f portable/database.c
-	rm -f portable/sorts.c
-	rm -f portable/frontends/widgets/gtk/pygtkhacks.c
-	rm -f platform/gtk-x11/plat/frontends/widgets/mozprompt.[ch]
-	rm -f platform/gtk-x11/plat/frontends/widgets/httpobserver.c
-	rm -f platform/gtk-x11/plat/frontends/widgets/windowcreator.cpp
-	rm -f platform/gtk-x11/plat/frontends/widgets/pluginsdir.cpp
-	rm -f platform/gtk-x11/miro.1.gz
-	rm -f platform/gtk-x11/miro.real.1.gz
-	rm -f platform/gtk-x11/xine/xine_extractor
-	rm -f platform/gtk-x11/plat/xlibhelper.c
-	rm -f platform/gtk-x11/xine/xine.c
-	rm -f platform/gtk-x11/miro
+	cd platform/gtk-x11/ && make clean
 
 # For /usr/share/cdbs/1/rules/utils.mk sanity check.
 common-binary-post-install-arch:: list-missing

=== added file 'platform/gtk-x11/Makefile'
--- platform/gtk-x11/Makefile	1970-01-01 00:00:00 +0000
+++ platform/gtk-x11/Makefile	2010-04-14 21:08:30 +0000
@@ -0,0 +1,50 @@
+SHELL = /bin/sh
+
+prefix = /usr
+distdir = dist
+exec_prefix = $(prefix)
+bindir = $(distdir)$(exec_prefix)/bin
+python = $(shell which python)
+python_version = $(shell $(python) -c 'import sys; info=sys.version_info; print "%s.%s" % (info[0], info[1])')
+
+SITE32PATH = $(shell pwd)/dist$(prefix)/lib/python$(python_version)/site-packages/
+SITE64PATH = $(shell pwd)/dist$(prefix)/lib64/python$(python_version)/site-packages/
+MIROPYTHONPATH = $(SITE32PATH):$(SITE64PATH)
+
+.PHONY: build run test pylint
+
+clean:
+	-rm -rf build dist
+	-rm -rf miro.1.gz miro.real.1.gz
+	-rm miro
+	-rm plat/xlibhelper.c 
+	-rm plat/frontends/widgets/httpobserver.c
+	-rm plat/frontends/widgets/mozprompt.h plat/frontends/widgets/mozprompt.c
+	-rm plat/frontends/widgets/pluginsdir.cpp
+	-rm plat/frontends/widgets/windowcreator.cpp
+	-rm ../../portable/frontends/widgets/gtk/pygtkhacks.c
+	-rm -rf tmp
+
+build:
+	$(python) setup.py install --root=./dist --prefix=$(prefix)
+
+run: build
+	MIRO_SHARE_ROOT=dist/$(prefix)/share/ \
+	   MIRO_RESOURCE_ROOT=dist/$(prefix)/share/miro/resources/ \
+	   PATH=dist$(prefix)/bin \
+	   PYTHONPATH=$(MIROPYTHONPATH) \
+	   $(bindir)/miro
+
+test: build
+	MIRO_SHARE_ROOT=dist/$(prefix)/share/ \
+	   MIRO_RESOURCE_ROOT=dist/$(prefix)/share/miro/resources/ \
+	   PATH=dist$(prefix)/bin \
+	   PYTHONPATH=$(MIROPYTHONPATH) \
+	   $(bindir)/miro --unittest
+
+pylint: build
+	# remove .so files that pylint flips out on
+	find dist -name "*.so" | xargs rm
+	rm -rf dist/usr/lib/python2.6/site-packages/miro/test
+	cd dist/$(prefix)/lib/python$(python_version)/site-packages && \
+	   pylint --rcfile ../../../../../pylintrc miro > ../../../../../pylint.output 2>&1

=== modified file 'platform/gtk-x11/README'
--- platform/gtk-x11/README	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/README	2010-04-14 21:08:30 +0000
@@ -3,7 +3,7 @@
 ======
 
 :Author: Will Kahn-Greene <will.guaraldi at pculture dot org>
-:Date: June 1st, 2009
+:Date: January 14, 2010
 
 
 Summary
@@ -51,13 +51,17 @@
 .. Note:: Setting ``HOME`` doesn't work in KDE--it causes other problems.
 
 
-Wiping out preferences
-======================
+Preferences
+===========
 
 Miro stores preferences in gconf.  To wipe out all preferences, do::
 
    gconftool-2 --recursive-unset /apps/miro
 
+To backup your preferences, do::
+
+   gconftool-2 --dump /apps/miro > /tmp/foobar
+
 
 Unittest instructions
 =====================
@@ -89,27 +93,8 @@
 type errors.
 
 
-Problems with xine
-==================
-
-A while back, we had problems with xine and wrote "xine xv hack" code.
-This code helps some platforms and segfaults on others.  Depending on
-your platform, you will want to enable/disable the hack.  This can be
-done in two places.  First, it can be done in setup.py with the
-``USE_XINE_HACK`` option.  Second, if ``USE_XINE_HACK`` was True when
-Miro was compiled, then you can enable/disable the hack through the
-command line with::
-
-   miro --set=xine-xvhack=true
-
-or::
-
-   miro --set=xine-xvhack=False
-
-
 Problems with gstreamer
 =======================
 
 Make sure you have gstreamer plugins installed.  That solves most
 problems.
-

=== removed file 'platform/gtk-x11/clean.sh'
--- platform/gtk-x11/clean.sh	2009-08-09 19:36:11 +0000
+++ platform/gtk-x11/clean.sh	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
-#
-# 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the OpenSSL
-# library.
-#
-# You must obey the GNU General Public License in all respects for all of
-# the code used other than OpenSSL. If you modify file(s) with this
-# exception, you may extend this exception to your version of the file(s),
-# but you are not obligated to do so. If you do not wish to do so, delete
-# this exception statement from your version. If you delete this exception
-# statement from all source files in the program, then also delete it here.
-
-
-# build and dist
-rm -rf build dist
-
-# xine/ stuff
-rm xine/xine_extractor xine/xine.c
-
-# plat/ stuff
-rm plat/xlibhelper.c
-
-# man pages
-rm miro.1.gz miro.real.1.gz
-
-# miro file
-rm miro
-
-# plat/frontends/widgets/
-rm plat/frontends/widgets/httpobserver.c plat/frontends/widgets/mozprompt.h plat/frontends/widgets/mozprompt.c plat/frontends/widgets/pluginsdir.cpp plat/frontends/widgets/windowcreator.cpp
-
-# portable/ stuff
-rm ../../portable/sorts.c
-
-# portable/frontends/widgets/gtk/
-rm ../../portable/frontends/widgets/gtk/pygtkhacks.c

=== added directory 'platform/gtk-x11/icons'
=== removed directory 'platform/gtk-x11/icons'
=== added directory 'platform/gtk-x11/icons/hicolor'
=== removed directory 'platform/gtk-x11/icons/hicolor'
=== added directory 'platform/gtk-x11/icons/hicolor/128x128'
=== removed directory 'platform/gtk-x11/icons/hicolor/128x128'
=== added directory 'platform/gtk-x11/icons/hicolor/128x128/apps'
=== removed directory 'platform/gtk-x11/icons/hicolor/128x128/apps'
=== added file 'platform/gtk-x11/icons/hicolor/128x128/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/128x128/apps/miro.png	1970-01-01 00:00:00 +0000 and platform/gtk-x11/icons/hicolor/128x128/apps/miro.png	2010-04-14 21:08:30 +0000 differ
=== removed file 'platform/gtk-x11/icons/hicolor/128x128/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/128x128/apps/miro.png	2009-08-09 19:36:11 +0000 and platform/gtk-x11/icons/hicolor/128x128/apps/miro.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'platform/gtk-x11/icons/hicolor/24x24'
=== removed directory 'platform/gtk-x11/icons/hicolor/24x24'
=== added directory 'platform/gtk-x11/icons/hicolor/24x24/apps'
=== removed directory 'platform/gtk-x11/icons/hicolor/24x24/apps'
=== added file 'platform/gtk-x11/icons/hicolor/24x24/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/24x24/apps/miro.png	1970-01-01 00:00:00 +0000 and platform/gtk-x11/icons/hicolor/24x24/apps/miro.png	2010-04-14 21:08:30 +0000 differ
=== removed file 'platform/gtk-x11/icons/hicolor/24x24/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/24x24/apps/miro.png	2009-08-09 19:36:11 +0000 and platform/gtk-x11/icons/hicolor/24x24/apps/miro.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'platform/gtk-x11/icons/hicolor/48x48'
=== removed directory 'platform/gtk-x11/icons/hicolor/48x48'
=== added directory 'platform/gtk-x11/icons/hicolor/48x48/apps'
=== removed directory 'platform/gtk-x11/icons/hicolor/48x48/apps'
=== added file 'platform/gtk-x11/icons/hicolor/48x48/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/48x48/apps/miro.png	1970-01-01 00:00:00 +0000 and platform/gtk-x11/icons/hicolor/48x48/apps/miro.png	2010-04-14 21:08:30 +0000 differ
=== removed file 'platform/gtk-x11/icons/hicolor/48x48/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/48x48/apps/miro.png	2009-08-09 19:36:11 +0000 and platform/gtk-x11/icons/hicolor/48x48/apps/miro.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'platform/gtk-x11/icons/hicolor/72x72'
=== removed directory 'platform/gtk-x11/icons/hicolor/72x72'
=== added directory 'platform/gtk-x11/icons/hicolor/72x72/apps'
=== removed directory 'platform/gtk-x11/icons/hicolor/72x72/apps'
=== added file 'platform/gtk-x11/icons/hicolor/72x72/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/72x72/apps/miro.png	1970-01-01 00:00:00 +0000 and platform/gtk-x11/icons/hicolor/72x72/apps/miro.png	2010-04-14 21:08:30 +0000 differ
=== removed file 'platform/gtk-x11/icons/hicolor/72x72/apps/miro.png'
Binary files platform/gtk-x11/icons/hicolor/72x72/apps/miro.png	2009-08-09 19:36:11 +0000 and platform/gtk-x11/icons/hicolor/72x72/apps/miro.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'platform/gtk-x11/miro.1'
--- platform/gtk-x11/miro.1	2009-03-09 12:46:19 +0000
+++ platform/gtk-x11/miro.1	2010-04-14 21:08:30 +0000
@@ -1,9 +1,9 @@
-.TH MIRO 1 "February 11, 2009"
+.TH MIRO 1 "January 14, 2010"
 .SH NAME
 miro \- a GTK+ based RSS video aggregator and player
 .SH SYNOPSIS
 .B miro
-.RB [ OPTIONS ]
+.RB [ OPTIONS ] [ FILES ]
 .SH DESCRIPTION
 .B "Miro"
 is a platform for Internet television and video.  An intuitive interface
@@ -12,6 +12,10 @@
 Please read
 .B "miro \-\-help"
 for a list of all available Miro command line options.
+.SH FILES
+You can launch Miro with one or more file names and urls for items
+to add to the Miro database, items to download and add to the Miro 
+database, and feeds to subscribe to.
 .SH HELP
 Forums and other help are available at http://getmiro.com/ .
 .SH BUGS

=== modified file 'platform/gtk-x11/miro.real'
--- platform/gtk-x11/miro.real	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/miro.real	2010-04-14 21:08:30 +0000
@@ -2,7 +2,7 @@
 # -*- mode: python -*-
 
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -73,7 +73,7 @@
                  dest="set_prefs",
                  metavar="<PREF>",
                  nargs=1,
-                 help="Sets a preference and saves the new value for future Miro runs.  Example: miro --set renderer=xine")
+                 help="Sets a preference and saves the new value for future Miro runs.  Example: miro --set renderer=gstreamer")
 parser.set_defaults(set_prefs=[])
 parser.add_option_group(group)
 
@@ -109,6 +109,9 @@
 from miro.plat import options
 options.gconf_name = parsed_options.gconf_name
 
+from miro.plat import utils
+utils.initialize_locale()
+
 from miro import gtcache
 gtcache.init()
 
@@ -121,15 +124,15 @@
     sys.modules['feedparser'] = miro.feedparser
     sys.modules['storedatabase'] = miro.storedatabase
 
-
 from miro import config
-from miro import plat
 from miro import prefs
 from miro import commandline
 
 if '--unittest' in sys.argv:
     # handle this outside optparse, because unittest has its own option set
     sys.argv.remove('--unittest')
+    import logging
+    logging.basicConfig(level=logging.CRITICAL)
     import unittest
     from miro import test
     unittest.main(module=test)
@@ -198,8 +201,6 @@
     return p, val
 
 def startapp():
-    plat.utils.initializeLocale()
-
     # Create miro directories in the user's home
     support_dir = config.get(prefs.SUPPORT_DIRECTORY)
     if not os.path.exists(support_dir):
@@ -266,16 +267,15 @@
         try:
             onetime.OneTime()
             startapp()
-        except onetime.NameExistsException:
-            # This onetime.NameExistsException is either dbus.NameExistsException
-            # or an exception we created ourselves.  Change it to
-            # dbus.NameExistsException when we get rid of code that allows Miro to
-            # run on platforms with the older dbus-python bindings.
+        except dbus.NameExistsException:
             bus = dbus.SessionBus()
-            proxy_obj = bus.get_object('org.participatoryculture.dtv.onetime', '/org/participatoryculture/dtv/OneTime')
-            iface = dbus.Interface(proxy_obj, 'org.participatoryculture.dtv.OneTimeIface')
-            for i in xrange(len(args)):
-                args[i] = args[i].decode('latin1')
+            proxy_obj = bus.get_object(
+                'org.participatoryculture.dtv.onetime',
+                '/org/participatoryculture/dtv/OneTime')
+            iface = dbus.Interface(
+                proxy_obj, 'org.participatoryculture.dtv.OneTimeIFace')
+            for i, arg in enumerate(args):
+                args[i] = arg.decode('latin1')
             dbusargs = dbus.Array(args, signature="s")
 
             try:

=== modified file 'platform/gtk-x11/plat/__init__.py'
--- platform/gtk-x11/plat/__init__.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/__init__.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/config.py'
--- platform/gtk-x11/plat/config.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/config.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/__init__.py'
--- platform/gtk-x11/plat/frontends/__init__.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/frontends/__init__.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/MiroPluginsDir.cc'
--- platform/gtk-x11/plat/frontends/widgets/MiroPluginsDir.cc	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/MiroPluginsDir.cc	2010-04-14 21:08:30 +0000
@@ -1,6 +1,6 @@
 /*
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/MiroPluginsDir.h'
--- platform/gtk-x11/plat/frontends/widgets/MiroPluginsDir.h	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/MiroPluginsDir.h	2010-04-14 21:08:30 +0000
@@ -1,6 +1,6 @@
 /*
  * Miro - an RSS based video player application
- * Copyright (C) 2005-2009 Participatory Culture Foundation
+ * Copyright (C) 2005-2010 Participatory Culture Foundation
 
  * 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/MiroWindowCreator.cc'
--- platform/gtk-x11/plat/frontends/widgets/MiroWindowCreator.cc	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/MiroWindowCreator.cc	2010-04-14 21:08:30 +0000
@@ -1,6 +1,6 @@
 /*
  * Miro - an RSS based video player application
- * Copyright (C) 2005-2009 Participatory Culture Foundation
+ * Copyright (C) 2005-2010 Participatory Culture Foundation
  *
  * 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/MiroWindowCreator.h'
--- platform/gtk-x11/plat/frontends/widgets/MiroWindowCreator.h	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/MiroWindowCreator.h	2010-04-14 21:08:30 +0000
@@ -1,6 +1,6 @@
 /*
  * Miro - an RSS based video player application
- * Copyright (C) 2005-2009 Participatory Culture Foundation
+ * Copyright (C) 2005-2010 Participatory Culture Foundation
  *
  * 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/PromptService.cc'
--- platform/gtk-x11/plat/frontends/widgets/PromptService.cc	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/PromptService.cc	2010-04-14 21:08:30 +0000
@@ -1,6 +1,6 @@
 /*
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/PromptService.h'
--- platform/gtk-x11/plat/frontends/widgets/PromptService.h	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/PromptService.h	2010-04-14 21:08:30 +0000
@@ -1,6 +1,6 @@
 /*
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/__init__.py'
--- platform/gtk-x11/plat/frontends/widgets/__init__.py	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/__init__.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/application.py'
--- platform/gtk-x11/plat/frontends/widgets/application.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/frontends/widgets/application.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -51,6 +51,7 @@
 from miro.plat.config import gconf_lock
 from miro.frontends.widgets.gtk import trayicon
 from miro.plat import resources
+from miro.plat.frontends.widgets import mediakeys
 
 from miro.frontends.widgets.gtk.widgetset import Rect
 
@@ -112,6 +113,7 @@
         langs = [(l, os.environ.get(l)) for l in langs if os.environ.get(l)]
         logging.info("Language:          %s", langs)
         renderers.init_renderer()
+        self.mediakeyhandler = mediakeys.get_media_key_handler()
         gtk.main()
         app.controller.on_shutdown()
 

=== modified file 'platform/gtk-x11/plat/frontends/widgets/httpobserver.pyx'
--- platform/gtk-x11/plat/frontends/widgets/httpobserver.pyx	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/httpobserver.pyx	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== added file 'platform/gtk-x11/plat/frontends/widgets/mediakeys.py'
--- platform/gtk-x11/plat/frontends/widgets/mediakeys.py	1970-01-01 00:00:00 +0000
+++ platform/gtk-x11/plat/frontends/widgets/mediakeys.py	2010-04-14 21:08:30 +0000
@@ -0,0 +1,61 @@
+# Miro - an RSS based video player application
+# Copyright (C) 2010 Participatory Culture Foundation
+#
+# 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
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the OpenSSL
+# library.
+#
+# You must obey the GNU General Public License in all respects for all of
+# the code used other than OpenSSL. If you modify file(s) with this
+# exception, you may extend this exception to your version of the file(s),
+# but you are not obligated to do so. If you do not wish to do so, delete
+# this exception statement from your version. If you delete this exception
+# statement from all source files in the program, then also delete it here.
+
+import logging
+import dbus
+
+from miro import app
+
+class MediaKeyHandler(object):
+    def __init__(self):
+        self.bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
+        self.bus_object = self.bus.get_object(
+            'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/MediaKeys')
+
+        self.bus_object.GrabMediaPlayerKeys(
+            "Miro", 0, dbus_interface='org.gnome.SettingsDaemon.MediaKeys')
+
+        self.bus_object.connect_to_signal(
+            'MediaPlayerKeyPressed', self.handle_mediakey)
+
+    def handle_mediakey(self, *mmkeys):
+        for key in mmkeys:
+            if key == "Play":
+                app.widgetapp.on_play_clicked()
+            elif key == "Stop":
+                app.widgetapp.on_stop_clicked()
+            elif key == "Next":
+                app.widgetapp.on_forward_clicked()
+            elif key == "Previous":
+                app.widgetapp.on_previous_clicked()
+
+def get_media_key_handler():
+    try:
+        return MediaKeyHandler()
+    except dbus.DBusException:
+        logging.debug("cannot load MediaKeyHandler")

=== modified file 'platform/gtk-x11/plat/frontends/widgets/mozprompt.pyx'
--- platform/gtk-x11/plat/frontends/widgets/mozprompt.pyx	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/mozprompt.pyx	2010-04-14 21:08:30 +0000
@@ -1,3 +1,31 @@
+# Miro - an RSS based video player application
+# Copyright (C) 2005-2010 Participatory Culture Foundation
+#
+# 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
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the OpenSSL
+# library.
+#
+# You must obey the GNU General Public License in all respects for all of
+# the code used other than OpenSSL. If you modify file(s) with this
+# exception, you may extend this exception to your version of the file(s),
+# but you are not obligated to do so. If you do not wish to do so, delete
+# this exception statement from your version. If you delete this exception
+# statement from all source files in the program, then also delete it here.
+
 import logging
 
 cdef extern from "nsError.h":

=== modified file 'platform/gtk-x11/plat/frontends/widgets/pluginsdir.pyx' (properties changed: +x to -x)
--- platform/gtk-x11/plat/frontends/widgets/pluginsdir.pyx	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/pluginsdir.pyx	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/prefpanelset.py'
--- platform/gtk-x11/plat/frontends/widgets/prefpanelset.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/frontends/widgets/prefpanelset.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -38,6 +38,7 @@
 from miro.frontends.widgets.widgetutil import align_left
 from miro.frontends.widgets.prefpanel import attach_boolean, attach_radio, attach_combo
 
+from miro.plat import renderers
 from miro.plat import options 
 
 from miro import config, prefs
@@ -66,13 +67,15 @@
     grid.end_line(spacing=12)
 
     rbg = widgetset.RadioButtonGroup()
-    gstreamer_radio = widgetset.RadioButton("gstreamer", rbg)
-    xine_radio = widgetset.RadioButton("xine", rbg)
-    attach_radio([(gstreamer_radio, "gstreamer"), (xine_radio, "xine")],
-                 options.USE_RENDERER)
+    radio_map = {}
+    for mem in renderers.get_renderer_list():
+        radio_map[mem] = widgetset.RadioButton(mem, rbg)
+
+    buttons = [(v, k) for k, v in radio_map.items()]
+    attach_radio(buttons, options.USE_RENDERER)
 
     grid.pack_label(_("Video renderer:"), grid.ALIGN_RIGHT)
-    grid.pack(dialogwidgets.radio_button_list(gstreamer_radio, xine_radio))
+    grid.pack(dialogwidgets.radio_button_list(*radio_map.values()))
 
     grid.end_line(spacing=12)
 
@@ -84,4 +87,5 @@
     if panel_name == "general":
         return _general_panel()
     elif panel_name == "playback":
-        return _playback_panel()
+        if len(renderers.get_renderer_list()) > 1:
+            return _playback_panel()

=== modified file 'platform/gtk-x11/plat/frontends/widgets/threads.py'
--- platform/gtk-x11/plat/frontends/widgets/threads.py	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/threads.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/timer.py'
--- platform/gtk-x11/plat/frontends/widgets/timer.py	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/timer.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/widgetset.py'
--- platform/gtk-x11/plat/frontends/widgets/widgetset.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/frontends/widgets/widgetset.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/frontends/widgets/windowcreator.pyx' (properties changed: +x to -x)
--- platform/gtk-x11/plat/frontends/widgets/windowcreator.pyx	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/frontends/widgets/windowcreator.pyx	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/idletime.py'
--- platform/gtk-x11/plat/idletime.py	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/idletime.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/mozsetup.py'
--- platform/gtk-x11/plat/mozsetup.py	2009-06-26 21:29:54 +0000
+++ platform/gtk-x11/plat/mozsetup.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/onetime.py'
--- platform/gtk-x11/plat/onetime.py	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/onetime.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -28,122 +28,32 @@
 
 import dbus
 import dbus.service
+import dbus.glib
+from dbus.service import BusName
 
 from miro import messages
 
-if getattr(dbus, 'version', (0, 0, 0)) >= (0, 41, 0):
-    import dbus.glib
-
-# We do this crazy stuff so that Miro can run on platforms that have the
-# older dbus-python bindings.  Dapper uses (0, 51, 0).  I think once we
-# stop supporting Dapper, we can rip this whole section out.
-# This section was re-written so that it doesn't trigger the dbus-python
-# deprecation warning and is localized so we can just delete it and
-# move on with our lives when the time comes. - willkahn-greene10-29-2007
-
-# (0, 80, 0) is the first version that has do_not_queue
-if getattr(dbus, 'version', (0, 0, 0)) >= (0, 80, 0):
-    BusName = dbus.service.BusName
-    NameExistsException = dbus.NameExistsException
-
-else:
-    import dbus.dbus_bindings
-
-    class NameExistsException(dbus.DBusException):
-        pass
-
-    # these are in the dbus spec, so they're not going to change.
-    REQUEST_NAME_REPLY_PRIMARY_OWNER = 1
-    REQUEST_NAME_REPLY_IN_QUEUE = 2
-    REQUEST_NAME_REPLY_EXISTS = 3
-    REQUEST_NAME_REPLY_ALREADY_OWNER = 4
-    NAME_FLAG_DO_NOT_QUEUE = 4
-
-    class BusNameFlags(object):
-        """A base class for exporting your own Named Services across the Bus
-        """
-        def __new__(cls, name, bus=None, flags=0, do_not_queue=False):
-            if do_not_queue:
-                flags = flags | NAME_FLAG_DO_NOT_QUEUE
-
-            # get default bus
-            if bus == None:
-                bus = dbus.Bus()
-
-            # otherwise register the name
-            conn = bus.get_connection()
-            retval = dbus.dbus_bindings.bus_request_name(conn, name, flags)
-
-            # TODO: more intelligent tracking of bus name states?
-            if retval == REQUEST_NAME_REPLY_PRIMARY_OWNER:
-                pass
-            elif retval == REQUEST_NAME_REPLY_IN_QUEUE:
-                # queueing can happen by default, maybe we should
-                # track this better or let the user know if they're
-                # queued or not?
-                pass
-            elif retval == REQUEST_NAME_REPLY_EXISTS:
-                raise NameExistsException(name)
-            elif retval == REQUEST_NAME_REPLY_ALREADY_OWNER:
-                # if this is a shared bus which is being used by someone
-                # else in this process, this can happen legitimately
-                pass
-            else:
-                raise RuntimeError('requesting bus name %s returned unexpected value %s' % (name, retval))
-
-            # and create the object
-            bus_name = object.__new__(cls)
-            bus_name._bus = bus
-            bus_name._name = name
-            bus_name._conn = conn
-
-            return bus_name
-
-        # do nothing because this is called whether or not the bus name
-        # object was retrieved from the cache or created new
-        def __init__(self, *args, **keywords):
-            pass
-
-        # we can delete the low-level name here because these objects
-        # are guaranteed to exist only once for each bus name
-        def __del__(self):
-            dbus.dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
-
-        def get_bus(self):
-            """Get the Bus this Service is on"""
-            return self._bus
-
-        def get_name(self):
-            """Get the name of this service"""
-            return self._name
-
-        def get_connection(self):
-            """Get the connection for this service"""
-            return self._conn
-
-        def __repr__(self):
-            return '<dbus.service.BusName %s on %r at %#x>' % (self._name, self._bus, id(self))
-        __str__ = __repr__
-
-    BusName = BusNameFlags
-
 class OneTime(dbus.service.Object):
-    """This makes sure we've only got one instance of Miro running at any given
-    time.
+    """This makes sure we've only got one instance of Miro running at
+    any given time.
     """
     def __init__(self):
         bus = dbus.SessionBus()
-        bus_name = BusName('org.participatoryculture.dtv.onetime', bus=bus, do_not_queue=True)
-        dbus.service.Object.__init__(self, bus_name=bus_name,
-                object_path='/org/participatoryculture/dtv/OneTime')
+        bus_name = BusName('org.participatoryculture.dtv.onetime',
+                           bus=bus, do_not_queue=True)
+        dbus.service.Object.__init__(
+            self, bus_name=bus_name,
+            object_path='/org/participatoryculture/dtv/OneTime')
 
-    @dbus.service.method('org.participatoryculture.dtv.OneTimeIface')
+    @dbus.service.method(
+        dbus_interface='org.participatoryculture.dtv.OneTimeIFace',
+        in_signature='as')
     def handle_args(self, args):
         from miro import singleclick
         from miro import eventloop
-        for i in xrange(len(args)):
-            args[i] = args[i].encode('latin1')
-            if args[i].startswith('file://'):
-                args[i] = args[i][len('file://'):]
+        for i, arg in enumerate(args):
+            args[i] = arg.encode('latin1')
+            if arg.startswith('file://'):
+                args[i] = arg[len('file://'):]
 
         messages.OpenIndividualFiles(args).send_to_backend()

=== modified file 'platform/gtk-x11/plat/options.py'
--- platform/gtk-x11/plat/options.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/options.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -48,17 +48,7 @@
 USE_RENDERER = GTKPref(key="useRenderer",
                        default=u"gstreamer",
                        alias="renderer",
-                       help="Which renderer to use.  (gstreamer, xine)" )
-
-USE_XINE_XV_HACK = GTKPref(key="UseXineXVHack",
-                           default=True,
-                           alias="xine-xvhack",
-                           help="Whether or not to use the Xine xv hack.  (true, false)" )
-
-XINE_DRIVER = GTKPref(key="DefaultXineDriver",
-                      default="xv",
-                      alias="xine-driver",
-                      help="Which Xine driver to use for video.  (auto, xv, xshm)" )
+                       help="Which renderer to use.  (gstreamer, ...)" )
 
 GSTREAMER_IMAGESINK = GTKPref(key="DefaultGstreamerImagesink",
                               default="gconfvideosink",

=== modified file 'platform/gtk-x11/plat/renderers/__init__.py'
--- platform/gtk-x11/plat/renderers/__init__.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/renderers/__init__.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -30,11 +30,21 @@
 
 import logging
 import traceback
+import os
+import os.path
 
 from miro import app
 from miro import config
 from miro.plat import options
 
+def get_renderer_list():
+    d = os.path.dirname(__file__)
+    contents = os.listdir(d)
+    # FIXME - this sucks.  switch this to use extensions.
+    contents = [m for m in contents if m.endswith("renderer.py")]
+    contents = [m[:-11] for m in contents]
+    return contents
+
 def set_renderer(modname):
     """Attempt to set the video renderer."""
 
@@ -47,7 +57,7 @@
         app.movie_data_program_info = module.movie_data_program_info
         app.get_item_type = module.get_item_type
         logging.info("set_renderer: successfully loaded %s", modname)
-    except:
+    except StandardError:
         logging.info("set_renderer: couldn't load %s: %s", modname,
                 traceback.format_exc())
         raise
@@ -66,14 +76,14 @@
     try:
         set_renderer("%srenderer" % r)
         return
-    except:
+    except StandardError:
         logging.exception("init_renderer: error detected...  trying to use gstreamerrenderer")
 
     try:
         # try to add the gstreamer renderer if the preferences aren't right
         set_renderer("gstreamerrenderer")
         return
-    except:
+    except StandardError:
         logging.exception("init_renderer: no valid renderer has been loaded")
     app.audio_renderer = None
     app.video_renderer = None

=== modified file 'platform/gtk-x11/plat/renderers/gst_extractor.py'
--- platform/gtk-x11/plat/renderers/gst_extractor.py	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/renderers/gst_extractor.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -39,7 +39,6 @@
 
 class Extractor:
     def __init__(self, filename, thumbnail_filename, callback):
-#        print "__init__(%s, %s, %s)" % (filename, thumbnail_filename, callback)
         self.thumbnail_filename = thumbnail_filename
         self.filename = filename
         self.callback = callback
@@ -50,95 +49,157 @@
         self.duration = -1
         self.buffer_probes = {}
         self.audio_only = False
-
-        self.pipeline = gst.parse_launch('filesrc location="%s" ! decodebin ! ffmpegcolorspace ! video/x-raw-rgb,depth=24,bpp=24 ! fakesink signal-handoffs=True' % (filename,))
-
-        for sink in self.pipeline.sinks():
+        self.saw_video_tag = self.saw_audio_tag = False
+
+        self.pipeline = gst.element_factory_make('playbin')
+        self.videosink = gst.element_factory_make("fakesink", "videosink")
+        self.pipeline.set_property("video-sink", self.videosink)
+        self.audiosink = gst.element_factory_make("fakesink", "audiosink")
+        self.pipeline.set_property("audio-sink", self.audiosink)
+
+        self.thumbnail_pipeline = None
+
+        self.bus = self.pipeline.get_bus()
+        self.bus.add_signal_watch()
+        self.watch_id = self.bus.connect("message", self.on_bus_message)
+
+        self.pipeline.set_property("uri", "file://%s" % filename)
+        self.pipeline.set_state(gst.STATE_PAUSED)
+
+    def on_bus_message(self, bus, message):
+        if message.src == self.pipeline:
+            if message.type == gst.MESSAGE_STATE_CHANGED:
+                prev, new, pending = message.parse_state_changed()
+                if new == gst.STATE_PAUSED:
+                    gobject.idle_add(self.paused_reached)
+
+            elif message.type == gst.MESSAGE_ERROR:
+                gobject.idle_add(self.error_occurred)
+
+        elif message.src == self.thumbnail_pipeline:
+            if message.type == gst.MESSAGE_STATE_CHANGED:
+                prev, new, pending = message.parse_state_changed()
+                if new == gst.STATE_PAUSED:
+                    seek_result = self.thumbnail_pipeline.seek(
+                        1.0, gst.FORMAT_TIME,
+                        gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE,
+                        gst.SEEK_TYPE_SET, self.duration / 2,
+                        gst.SEEK_TYPE_NONE, 0)
+                    if not seek_result:
+                        self.disconnect()
+                        self.done()
+
+            elif message.type == gst.MESSAGE_ERROR:
+                gobject.idle_add(self.error_occurred)
+
+    def done(self):
+        if self.saw_video_tag:
+            media_type = 'video'
+        elif self.saw_audio_tag:
+            media_type = 'audio'
+        else:
+            media_type = 'other'
+        self.callback(self.duration, self.success, media_type)
+
+    def get_duration(self, pipeline, attempts=0):
+        if attempts == 5:
+            return 0
+        try:
+            return pipeline.query_duration(gst.FORMAT_TIME)[0]
+        except gst.QueryError:
+            return self.get_duration(pipeline, attempts + 1)
+
+    def paused_reached(self):
+        self.saw_video_tag = False
+        self.saw_audio_tag = False
+
+        if not self.first_pause:
+            return False
+
+        self.first_pause = True
+        current_video = self.pipeline.get_property("current-video")
+        current_audio = self.pipeline.get_property("current-audio")
+
+        if current_video == 0:
+            self.saw_video_tag = True
+        if current_audio == 0:
+            self.saw_audio_tag = True
+
+        if self.saw_video_tag == False and self.saw_audio_tag == True:
+            self.audio_only = True
+            self.duration = self.get_duration(self.pipeline)
+            self.success = True
+            self.disconnect()
+            self.done()
+            return False
+
+        if self.saw_video_tag == False and self.saw_audio_tag == False:
+            self.audio_only = False
+            self.disconnect()
+            self.done()
+            return False
+
+        self.duration = self.get_duration(self.pipeline)
+        self.grabit = True
+        self.buffer_probes = {}
+
+        self.thumbnail_pipeline = gst.parse_launch(
+            'filesrc location="%s" ! decodebin ! '
+            'ffmpegcolorspace ! video/x-raw-rgb,depth=24,bpp=24 ! '
+            'fakesink signal-handoffs=True' % self.filename)
+
+        for sink in self.thumbnail_pipeline.sinks():
             name = sink.get_name()
             factoryname = sink.get_factory().get_name()
             if factoryname == "fakesink":
                 pad = sink.get_pad("sink")
-                self.buffer_probes[name] = pad.add_buffer_probe(self.buffer_probe_handler, name)
-
-        self.bus = self.pipeline.get_bus()
-        self.bus.add_signal_watch()
-        self.watch_id = self.bus.connect("message", self.on_bus_message)
-
-        self.pipeline.set_state(gst.STATE_PAUSED)
-
-    def start_audio_only(self):
-        self.audio_only = True
-
-        self.pipeline = gst.parse_launch('filesrc location="%s" ! decodebin ! fakesink' % (self.filename,))
-
-        self.bus = self.pipeline.get_bus()
-        self.bus.add_signal_watch()
-        self.watch_id = self.bus.connect("message", self.on_bus_message)
-
-        self.pipeline.set_state(gst.STATE_PAUSED)
-            
-    def done (self):
-#        print "done()"
-        self.callback(self.duration, self.success)
-
-    def paused_reached(self):
-#        print "paused_reached()"
-        if self.audio_only:
-            self.duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]
-            self.success = True
-            self.disconnect()
-            self.done()
-        if self.first_pause:
-            self.duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]
-            self.grabit = True
-            seek_result = self.pipeline.seek(1.0,
-                    gst.FORMAT_TIME,
-                    gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE,
-                    gst.SEEK_TYPE_SET,
-                    self.duration / 2,
-                    gst.SEEK_TYPE_NONE, 0)
-            if not seek_result:
-                self.disconnect()
-                self.done()
-        self.first_pause = False
+                self.buffer_probes[name] = pad.add_buffer_probe(
+                    self.buffer_probe_handler, name)
+
+        self.thumbnail_bus = self.thumbnail_pipeline.get_bus()
+        self.thumbnail_bus.add_signal_watch()
+        self.thumbnail_watch_id = self.thumbnail_bus.connect(
+            "message", self.on_bus_message)
+
+        self.thumbnail_pipeline.set_state(gst.STATE_PAUSED)
+
         return False
 
     def error_occurred(self):
         self.disconnect()
-        if self.audio_only:
-            self.done()
-        else:
-            self.start_audio_only()
+        self.done()
         return False
 
-    def on_bus_message(self, bus, message):
-        if message.src == self.pipeline:
-            if message.type == gst.MESSAGE_STATE_CHANGED:
-                prev, new, pending = message.parse_state_changed()
-                if new == gst.STATE_PAUSED:
-                    gobject.idle_add(self.paused_reached)
-        if message.type == gst.MESSAGE_ERROR:
-            gobject.idle_add(self.error_occurred)
-
     def buffer_probe_handler_real(self, pad, buff, name):
-        """Capture buffers as gdk_pixbufs when told to."""
-        if self.grabit:
+        """Capture buffers as gdk_pixbufs when told to.
+        """
+        try:
             caps = buff.caps
-            if caps is not None:
-                filters = caps[0]
-                self.width = filters["width"]
-                self.height = filters["height"]
-            timecode = self.pipeline.query_position(gst.FORMAT_TIME)[0]
-            pixbuf = gtk.gdk.pixbuf_new_from_data(buff.data, gtk.gdk.COLORSPACE_RGB, False, 8, self.width, self.height, self.width * 3)
+            if caps is None:
+                self.success = False
+                self.disconnect()
+                self.done()
+                return False
+
+            filters = caps[0]
+            width = filters["width"]
+            height = filters["height"]
+            timecode = self.thumbnail_pipeline.query_position(gst.FORMAT_TIME)[0]
+            pixbuf = gtk.gdk.pixbuf_new_from_data(
+                buff.data, gtk.gdk.COLORSPACE_RGB, False, 8,
+                width, height, width * 3)
             pixbuf.save(self.thumbnail_filename, "png")
             del pixbuf
             self.success = True
             self.disconnect()
             self.done()
+        except gst.QueryError:
+            pass
         return False
 
     def buffer_probe_handler(self, pad, buff, name):
-        gobject.idle_add(lambda: self.buffer_probe_handler_real(pad, buff, name))
+        gobject.idle_add(
+            lambda: self.buffer_probe_handler_real(pad, buff, name))
         return True
 
     def disconnect(self):
@@ -153,11 +214,27 @@
                         pad.remove_buffer_probe(self.buffer_probes[name])
                         del self.buffer_probes[name]
             self.pipeline = None
+
         if self.bus is not None:
             self.bus.disconnect(self.watch_id)
             self.bus = None
 
-def handle_result(duration, success):
+def make_verbose():
+    import logging
+    logging.basicConfig(level=logging.INFO)
+    def wrap_func(func):
+        def _wrap_func(*args, **kwargs):
+            logging.info("calling %s (%s) (%s)",
+                         func.__name__, repr(args), repr(kwargs))
+            return func(*args, **kwargs)
+        return _wrap_func
+
+    for mem in dir(Extractor):
+        fun = Extractor.__dict__[mem]
+        if callable(fun):
+            Extractor.__dict__[mem] = wrap_func(fun)
+
+def handle_result(duration, success, media_type):
     if duration != -1:
         print "Miro-Movie-Data-Length: %s" % (duration / 1000000)
     else:
@@ -166,8 +243,21 @@
         print "Miro-Movie-Data-Thumbnail: Success"
     else:
         print "Miro-Movie-Data-Thumbnail: Failure"
+    print "Miro-Movie-Data-Type: %s" % media_type
     sys.exit(0)
 
-extractor = Extractor(sys.argv[1], sys.argv[2], handle_result)
-gtk.gdk.threads_init()
-gtk.main()
+def main(argv):
+    if len(argv) < 3:
+        print "Syntax: gst_extractor.py <filename> <thumbnail>"
+        sys.exit(1)
+
+    if "--verbose" in argv:
+        make_verbose()
+        argv.remove("--verbose")
+
+    extractor = Extractor(argv[1], argv[2], handle_result)
+    gtk.gdk.threads_init()
+    gtk.main()
+
+if __name__ == "__main__":
+    main(sys.argv)

=== modified file 'platform/gtk-x11/plat/renderers/gstreamerrenderer.py'
--- platform/gtk-x11/plat/renderers/gstreamerrenderer.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/renderers/gstreamerrenderer.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -29,8 +29,8 @@
 import sys
 import logging
 import os
-import time
 import thread
+import shutil
 from threading import Event
 
 import pygst
@@ -39,11 +39,16 @@
 import gst.interfaces
 import gtk
 
+# not sure why this isn't in the gst module, but it's easy to define
+GST_PLAY_FLAG_TEXT          = (1 << 2)
+
 from miro import app
 from miro import config
 from miro import prefs
-from miro.download_utils import nextFreeFilename
+from miro.util import gather_subtitle_files, copy_subtitle_file
+from miro.gtcache import gettext as _
 from miro.plat import options
+from miro import iso_639
 
 from miro.frontends.widgets.gtk.threads import call_on_ui_thread
 
@@ -120,69 +125,104 @@
         self.rate = 1.0
         self.select_callbacks = None
 
-        self.playbin = gst.element_factory_make("playbin", "player")
-        self.bus = self.playbin.get_bus()
-        self.bus.add_signal_watch()
-        self.bus.enable_sync_message_emission()
-
-        self.bus.connect("message::eos", self.on_bus_message)
-        self.bus.connect("message::state-changed", self.on_bus_message)
-        self.bus.connect("message::error", self.on_bus_message)
-
         audiosink = config.get(options.GSTREAMER_AUDIOSINK)
         try:
-            self.audiosink = gst.element_factory_make(audiosink, "sink")
+            self.audiosink = gst.element_factory_make(audiosink, "audiosink")
 
         except gst.ElementNotFoundError:
-            logging.info("gstreamerrenderer: ElementNotFoundError '%s'" % audiosink)
+            logging.info("gstreamerrenderer: ElementNotFoundError '%s'",
+                         audiosink)
             audiosink = "autoaudiosink"
-            self.audiosink = gst.element_factory_make(audiosink, "sink")
+            self.audiosink = gst.element_factory_make(audiosink, "audiosink")
 
         except Exception, e:
             logging.info("gstreamerrenderer: Exception thrown '%s'" % e)
             logging.exception("sink exception")
             audiosink = "alsasink"
-            self.audiosink = gst.element_factory_make(alsasink, "sink")
+            self.audiosink = gst.element_factory_make(audiosink, "audiosink")
 
         logging.info("GStreamer audiosink: %s", audiosink)
+
+        self.supports_subtitles = True
+        self.playbin = None
+        self.bus = None
+        self.watch_ids = []
+
+    def build_playbin(self):
+        self.playbin = gst.element_factory_make("playbin2", "player")
+        self.bus = self.playbin.get_bus()
+        self.bus.add_signal_watch()
+        self.bus.enable_sync_message_emission()
+
+        self.watch_ids.append(self.bus.connect("message", self.on_bus_message))
         self.playbin.set_property("audio-sink", self.audiosink)
 
+    def destroy_playbin(self):
+        if self.playbin is None:
+            return
+        for watch_id in self.watch_ids:
+            self.bus.disconnect(watch_id)
+        self.watch_ids = []
+        self.bus = None
+        self.playbin = None
+
     def on_bus_message(self, bus, message):
         """receives message posted on the GstBus"""
+        if message.src is not self.playbin:
+            return
+
         if message.type == gst.MESSAGE_ERROR:
+            err, debug = message.parse_error()
             if self.select_callbacks is not None:
                 self.select_callbacks[1]()
                 self.select_callbacks = None
+                logging.error("on_bus_message: gstreamer error: %s", err)
             else:
                 err, debug = message.parse_error()
                 logging.error("on_bus_message: gstreamer error: %s", err)
         elif message.type == gst.MESSAGE_STATE_CHANGED:
             prev, new, pending = message.parse_state_changed()
-            if (message.src is self.playbin and new == gst.STATE_PAUSED and 
-                    self.select_callbacks is not None):
+            if ((new == gst.STATE_PAUSED
+                 and self.select_callbacks is not None)):
                 self.select_callbacks[0]()
                 self.select_callbacks = None
+                self.finish_select_file()
         elif message.type == gst.MESSAGE_EOS:
             app.playback_manager.on_movie_finished()
 
-    def select_file(self, filename, callback, errback):
+    def select_file(self, iteminfo, callback, errback, sub_filename=""):
         """starts playing the specified file"""
         self.stop()
+        self.destroy_playbin()
+        self.build_playbin()
+        self.enabled_track = None
+
+        self.iteminfo = iteminfo
+
         self.select_callbacks = (callback, errback)
-        self.playbin.set_property("uri", "file://%s" % filename)
+        self.playbin.set_property("uri", "file://%s" % iteminfo.video_path)
+        if sub_filename:
+            self.playbin.set_property("suburi", "file://%s" % sub_filename)
+        else:
+            self.playbin.set_property("suburi", None)
         self.playbin.set_state(gst.STATE_PAUSED)
 
-    def get_current_time(self):
+    def finish_select_file(self):
+        pass
+
+    def get_current_time(self, attempt=0):
+        # query_position fails periodically, so this attempts it 5 times
+        # and if after that it fails, then we return 0.
+        if attempt == 5:
+            return 0
         try:
-            position, format = self.playbin.query_position(gst.FORMAT_TIME)
+            position, fmt = self.playbin.query_position(gst.FORMAT_TIME)
             return to_seconds(position)
-        except Exception, e:
-            logging.warn("get_current_time: caught exception: %s" % e)
-            return None
+        except gst.QueryError, qe:
+            logging.warn("get_current_time: caught exception: %s" % qe)
+            return self.get_current_time(attempt + 1)
 
     def _seek(self, seconds):
-        # FIXME - switch to self.playbin.seek_simple ?
-        #              self.player.seek_simple(self.time_format, gst.SEEK_FLAG_FLUSH, seek_ns)
         event = gst.event_new_seek(1.0,
                                    gst.FORMAT_TIME,
                                    gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE,
@@ -192,30 +232,36 @@
         if not result:
             logging.error("seek failed")
 
-    def _on_state_changed(self, bus, message, seconds):
-        if self.playbin.get_state(0)[1] in (gst.STATE_PAUSED, gst.STATE_PLAYING):
+    def _set_current_time_actual(self, bus, message, seconds):
+        if self.playbin.get_state(0)[1] in (gst.STATE_PAUSED,
+                                            gst.STATE_PLAYING):
             self._seek(seconds)
-            self.bus.disconnect(self._on_state_changed_id)
+            self.bus.disconnect(self._set_current_time_actual_id)
 
     def set_current_time(self, seconds):
         # only want to kick these off when PAUSED or PLAYING
-        if self.playbin.get_state(0)[1] not in (gst.STATE_PAUSED, gst.STATE_PLAYING):
-            self._on_state_changed_id = self.bus.connect("message::state-changed",
-                                                         self._on_state_changed, seconds)
+        if self.playbin.get_state(0)[1] not in (gst.STATE_PAUSED,
+                                                gst.STATE_PLAYING):
+            self._set_current_time_actual_id = self.bus.connect(
+                "message::state-changed",
+                self._set_current_time_actual,
+                seconds)
             return
 
         self._seek(seconds)
 
     def get_duration(self):
         try:
-            duration, format = self.playbin.query_duration(gst.FORMAT_TIME)
+            duration, fmt = self.playbin.query_duration(gst.FORMAT_TIME)
             return to_seconds(duration)
-        except Exception, e:
-            logging.warn("get_duration: caught exception: %s" % e)
+        except gst.QueryError, qe:
+            logging.warn("get_duration: caught exception: %s" % qe)
             return None
 
     def reset(self):
-        self.playbin.set_state(gst.STATE_NULL)
+        if self.playbin:
+            self.playbin.set_state(gst.STATE_NULL)
+            self.destroy_playbin()
 
     def set_volume(self, level):
         self.playbin.set_property("volume", level)
@@ -227,7 +273,9 @@
         self.playbin.set_state(gst.STATE_PAUSED)
 
     def stop(self):
-        self.playbin.set_state(gst.STATE_NULL)
+        if self.playbin:
+            self.playbin.set_state(gst.STATE_NULL)
+            self.destroy_playbin()
 
     def get_rate(self):
         return 256
@@ -238,46 +286,62 @@
         self.rate = rate
         position = self.playbin.query_position(gst.FORMAT_TIME, None)[0]
         if rate >= 0:
-            self.playbin.seek(rate, 
-                gst.FORMAT_TIME, 
-                gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_KEY_UNIT,
-                gst.SEEK_TYPE_SET,
-                position + (rate * gst.SECOND),
-                gst.SEEK_TYPE_SET, 
-                -1)
+            self.playbin.seek(rate,
+                              gst.FORMAT_TIME,
+                              gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_KEY_UNIT,
+                              gst.SEEK_TYPE_SET,
+                              position + (rate * gst.SECOND),
+                              gst.SEEK_TYPE_SET,
+                              -1)
         else:
             self.playbin.seek(rate,
-                gst.FORMAT_TIME, 
-                gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_KEY_UNIT,
-                gst.SEEK_TYPE_SET, 
-                0,
-                gst.SEEK_TYPE_SET,
-                position + (rate * gst.SECOND))
+                              gst.FORMAT_TIME,
+                              gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_KEY_UNIT,
+                              gst.SEEK_TYPE_SET,
+                              0,
+                              gst.SEEK_TYPE_SET,
+                              position + (rate * gst.SECOND))
+
+class AudioRenderer(Renderer):
+    pass
 
 class VideoRenderer(Renderer):
     def __init__(self):
         Renderer.__init__(self)
-        logging.info("GStreamer version: %s", gst.version_string())
-
-        self.bus.connect('sync-message::element', self.on_sync_message)
 
         videosink = config.get(options.GSTREAMER_IMAGESINK)
         try:
-            self.sink = gst.element_factory_make(videosink, "sink")
+            self.videosink = gst.element_factory_make(videosink, "videosink")
 
         except gst.ElementNotFoundError:
-            logging.info("gstreamerrenderer: ElementNotFoundError '%s'" % videosink)
-            videosink = "ximagesink"
-            self.sink = gst.element_factory_make(videosink, "sink")
+            logging.info("gstreamerrenderer: ElementNotFoundError '%s'",
+                         videosink)
+            videosink = "xvimagesink"
+            self.videosink = gst.element_factory_make(videosink, "videosink")
 
         except Exception, e:
             logging.info("gstreamerrenderer: Exception thrown '%s'" % e)
             logging.exception("sink exception")
             videosink = "ximagesink"
-            self.sink = gst.element_factory_make(videosink, "sink")
+            self.videosink = gst.element_factory_make(videosink, "videosink")
 
         logging.info("GStreamer videosink: %s", videosink)
-        self.playbin.set_property("video-sink", self.sink)
+        self.textsink = gst.element_factory_make("textoverlay", "textsink")
+
+    def build_playbin(self):
+        Renderer.build_playbin(self)
+        self.watch_ids.append(self.bus.connect('sync-message::element', self.on_sync_message))
+        self.playbin.set_property("video-sink", self.videosink)
+        try:
+            self.playbin.set_property("text-sink", self.textsink)
+        except TypeError:
+            logging.warning("this platform has an old version of playbin2--no subtitle support.")
+            self.supports_subtitles = False
+
+    def select_file(self, filename, callback, errback, sub_filename=""):
+        Renderer.select_file(self, filename, callback, errback, sub_filename)
+        if sub_filename != "" and self.supports_subtitles:
+            self.pick_subtitle_track = 0
 
     def on_sync_message(self, bus, message):
         if message.structure is None:
@@ -296,11 +360,12 @@
         self.gc.foreground = gtk.gdk.color_parse("black")
 
     def on_destroy(self, widget):
-        self.playbin.set_state(gst.STATE_NULL)
+        if self.playbin:
+            self.playbin.set_state(gst.STATE_NULL)
 
     def on_expose(self, widget, event):
-        if self.sink and hasattr(self.sink, "expose"):
-            self.sink.expose()
+        if self.videosink and hasattr(self.videosink, "expose"):
+            self.videosink.expose()
         else:
             # if we had an image to show, we could do so here...  that image
             # would show for audio-only items.
@@ -319,11 +384,157 @@
         """Handle when the video window exits fullscreen mode."""
         logging.debug("haven't implemented exit_fullscreen method yet!")
 
-class AudioRenderer(Renderer):
-    pass
- 
+    def finish_select_file(self):
+        Renderer.finish_select_file(self)
+        if hasattr(self, "pick_subtitle_track") and self.supports_subtitles:
+            flags = self.playbin.get_property('flags')
+            self.playbin.set_properties(flags=flags | GST_PLAY_FLAG_TEXT,
+                                        current_text=0)
+            del self.__dict__["pick_subtitle_track"]
+            return
+
+        if config.get(prefs.ENABLE_SUBTITLES) and self.supports_subtitles:
+            default_track = self.get_enabled_subtitle_track()
+            if default_track is None:
+                tracks = self.get_subtitle_tracks()
+                if len(tracks) > 0:
+                    self.enable_subtitle_track(0)
+
+    def _get_subtitle_track_name(self, index):
+        """Returns the language for the track at the specified index.
+        """
+        if not self.supports_subtitles:
+            return None
+        tag_list = self.playbin.emit("get-text-tags", index)
+        lang = None
+        if tag_list is not None and gst.TAG_LANGUAGE_CODE in tag_list:
+            code = tag_list[gst.TAG_LANGUAGE_CODE]
+            lang = iso_639.find(code)
+        if lang is None:
+            return None
+        else:
+            return lang['name']
+
+    def _get_subtitle_file_name(self, filename):
+        """Returns the language for the file at the specified
+        filename.
+        """
+        if not self.supports_subtitles:
+            return None
+        basename, ext = os.path.splitext(filename)
+        movie_file, code = os.path.splitext(basename)
+
+        # if the filename is like "foo.srt" and "srt", then there
+        # is no language code, so we return None
+        if not code:
+            return None
+
+        # remove . in the code so we end up with what's probably
+        # a two or three letter language code
+        if "." in code:
+            code = code.replace(".", "")
+
+        lang = iso_639.find(code)
+        if lang is None:
+            return None
+        else:
+            return lang['name']
+
+    def get_subtitles(self):
+        """Returns a dict of index -> (language, filename) for available
+        tracks.
+        """
+        if not self.playbin or not self.supports_subtitles:
+            return {}
+
+        tracks = {}
+
+        for track_index in range(self.playbin.get_property("n-text")):
+            track_name = self._get_subtitle_track_name(track_index)
+            if track_name is None:
+                track_name = _("Track %(tracknumber)d",
+                               {"tracknumber": track_index})
+            tracks[track_index] = (track_name, None)
+
+        files = gather_subtitle_files(self.iteminfo.video_path)
+
+        external_track_id = 100
+        for i, mem in enumerate(files):
+            track_name = self._get_subtitle_file_name(mem)
+            if track_name is None:
+                track_name = _("Subtitle file %(tracknumber)d",
+                               {"tracknumber": i})
+            tracks[external_track_id + i] = (track_name, mem)
+
+        return tracks
+
+    def get_subtitle_tracks(self):
+        """Returns a 2-tuple of (index, language) for available
+        tracks.
+        """
+        if not self.supports_subtitles:
+            return []
+        tracks = [(index, filename)
+                  for index, (filename, language) in self.get_subtitles().items()]
+        return tracks
+
+    def get_enabled_subtitle_track(self):
+        if not self.supports_subtitles:
+            return None
+        if self.enabled_track is not None:
+            return self.enabled_track
+        return self.playbin.get_property("current-text")
+
+    def enable_subtitle_track(self, track_index):
+        if not self.supports_subtitles:
+            return
+        tracks = self.get_subtitles()
+        if tracks.get(track_index) is None:
+            return
+
+        language, filename = tracks[track_index]
+
+        if filename is not None:
+            # file-based subtitle tracks have to get selected as files
+            # first, then enable_subtitle_track gets called again with
+            # the new track_index
+            pos = self.get_current_time()
+
+            # note: select_success needs to mirror what playback
+            # manager does
+            def select_success():
+                self.set_current_time(pos)
+                self.play()
+
+            self.select_subtitle_file(self.iteminfo, filename, select_success)
+            self.enabled_track = track_index
+            return
+        flags = self.playbin.get_property('flags')
+        self.playbin.set_properties(flags=flags | GST_PLAY_FLAG_TEXT,
+                                    current_text=track_index)
+
+    def disable_subtitles(self):
+        if not self.supports_subtitles:
+            return
+        flags = self.playbin.get_property('flags')
+        self.playbin.set_property('flags', flags & ~GST_PLAY_FLAG_TEXT)
+
+    def select_subtitle_file(self, iteminfo, sub_path,
+                             handle_successful_select):
+        if not self.supports_subtitles:
+            return
+        def handle_ok():
+            handle_successful_select()
+        def handle_err():
+            app.playback_manager.stop()
+        filenames = [filename for lang, filename in self.get_subtitles().values()]
+        if sub_path not in filenames:
+            sub_path = copy_subtitle_file(sub_path, iteminfo.video_path)
+        self.select_file(iteminfo, handle_ok, handle_err, sub_path)
+
 def movie_data_program_info(movie_path, thumbnail_path):
-    extractor_path = os.path.join(os.path.split(__file__)[0], "gst_extractor.py")
+    extractor_path = os.path.join(os.path.split(__file__)[0],
+                                  "gst_extractor.py")
     return ((sys.executable, extractor_path, movie_path, thumbnail_path), None)
 
 def get_item_type(item_info, success_callback, error_callback):

=== removed file 'platform/gtk-x11/plat/renderers/xinerenderer.py'
--- platform/gtk-x11/plat/renderers/xinerenderer.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/renderers/xinerenderer.py	1970-01-01 00:00:00 +0000
@@ -1,268 +0,0 @@
-# Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
-#
-# 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the OpenSSL
-# library.
-#
-# You must obey the GNU General Public License in all respects for all of
-# the code used other than OpenSSL. If you modify file(s) with this
-# exception, you may extend this exception to your version of the file(s),
-# but you are not obligated to do so. If you do not wish to do so, delete
-# this exception statement from your version. If you delete this exception
-# statement from all source files in the program, then also delete it here.
-
-import os.path
-import logging
-
-import gtk
-import gobject
-
-from miro import app
-from miro import config
-from miro import xine
-from miro.plat import options
-from miro.plat import resources
-from miro.plat.frontends.widgets import threads
-
-class Sniffer:
-    def __init__(self):
-        self.xine = xine.Xine()
-        self.xine.setup_sniffer()
-
-    def get_item_type(self, filename):
-        return self.xine.get_type(filename)
-
-class Renderer:
-    def __init__(self):
-        logging.info("Xine version:      %s", xine.getXineVersion())
-        self.xine = xine.Xine()
-        self._playing = False
-        self._volume = 0
-        self.xine.set_eos_callback(self.on_eos)
-
-    def on_eos(self):
-        # on_eos gets called by one of the xine threads, so we want to switch
-        # to the ui thread to do things.
-        threads.call_on_ui_thread(app.playback_manager.on_movie_finished)
-
-    def select_file(self, filename, success_callback, error_callback):
-        logging.error("Not implemented.")
-
-    def get_progress(self):
-        try:
-            pos, length = self.xine.get_position_and_length()
-        except (SystemExit, KeyboardInterrupt):
-            raise
-        except:
-            logging.warn("get_current_time: caught exception: %s" % e)
-            return None
-
-    def get_current_time(self):
-        try:
-            pos, length = self.xine.get_position_and_length()
-            return pos / 1000.0
-        except Exception, e:
-            logging.warn("get_current_time: caught exception: %s" % e)
-            return None
-
-    def set_current_time(self, seconds):
-        self.seek(seconds)
-
-    def seek(self, seconds):
-        # this is really funky.  what's going on here is that xine-lib doesn't
-        # provide a way to seek while paused.  if you seek, then it induces
-        # playing, but that's not what we want.
-        # so we do this sneaky thing where if we're paused, we shut the volume
-        # off, seek, pause, and turn the volume back on.  that allows us to
-        # seek, remain paused, and doesn't cause a hiccup in sound.
-
-        if self._playing:
-            self.xine.seek(int(seconds * 1000))
-
-        else:
-            self._playing = True
-            self.xine.set_volume(0)
-            self.xine.seek(int(seconds * 1000))
-            self.pause()
-            self.set_volume(self._volume)
-
-    def get_duration(self):
-        try:
-            pos, length = self.xine.get_position_and_length()
-            return length / 1000.0
-        except (SystemExit, KeyboardInterrupt):
-            raise
-        except:
-            logging.exception("get_duration: caught exception")
-
-    def set_volume(self, level):
-        self._volume = level
-        self.xine.set_volume(int(level * 100))
-
-    def play(self):
-        self.xine.play()
-        self._playing = True
-
-    def pause(self):
-        if self._playing:
-            self.xine.pause()
-            self._playing = False
-
-    stop = pause
-    reset = pause
-
-    def get_rate(self):
-        logging.warn("get_rate not implemented for xine")
-
-    def set_rate(self, rate):
-        logging.warn("set_rate not implemented for xine")
-
-class VideoRenderer(Renderer):
-    def __init__(self):
-        Renderer.__init__(self)
-        self.driver = config.get(options.XINE_DRIVER)
-        logging.info("Xine video driver: %s", self.driver)
-
-    def set_widget(self, widget):
-        widget.connect("destroy", self.on_destroy)
-        widget.connect("configure-event", self.on_configure_event)
-        widget.connect("expose-event", self.on_expose_event)
-        self.widget = widget
-
-        # flush gdk output to ensure that the window we're passing to xine has
-        # been created
-        gtk.gdk.flush()
-        displayName = gtk.gdk.display_get_default().get_name()
-        self.xine.attach(displayName,
-                         widget.persistent_window.xid,
-                         self.driver,
-                         int(options.shouldSyncX),
-                         int(config.get(options.USE_XINE_XV_HACK)))
-        self.gc = widget.persistent_window.new_gc()
-        self.gc.foreground = gtk.gdk.color_parse("black")
-
-    def on_destroy(self, widget):
-        self.xine.detach()
-
-    def on_configure_event(self, widget, event):
-        self.xine.set_area(event.x, event.y, event.width, event.height)
-
-    def on_expose_event(self, widget, event):
-        # if we wanted to draw an image for audio-only items, this is where
-        # we'd do it.
-        widget.window.draw_rectangle(self.gc,
-                                     True,
-                                     0, 0,
-                                     widget.allocation.width,
-                                     widget.allocation.height)
-        self.xine.got_expose_event(event.area.x, event.area.y, event.area.width,
-                event.area.height)
-
-    def go_fullscreen(self):
-        """Handle when the video window goes fullscreen."""
-        # Sometimes xine doesn't seem to handle the expose events properly and
-        # only thinks part of the window is exposed.  To work around this we
-        # send it a couple of fake expose events for the entire window, after
-        # a short time delay.
-
-        def fullscreen_expose_workaround():
-            try:
-                _, _, width, height, _ = self.widget.window.get_geometry()
-                self.xine.got_expose_event(0, 0, width, height)
-            except (SystemExit, KeyboardInterrupt):
-                raise
-            except:
-                return True
-            return False
-
-        gobject.timeout_add(500, fullscreen_expose_workaround)
-        gobject.timeout_add(1000, fullscreen_expose_workaround)
-
-    def exit_fullscreen(self):
-        """Handle when the video window exits fullscreen mode."""
-        # nothing to do here
-        pass
-
-    def select_file(self, filename, success_callback, error_callback):
-        self._filename = filename
-        if self.xine.select_file(filename):
-            gobject.idle_add(success_callback)
-            def expose_workaround():
-                try:
-                    _, _, width, height, _ = self.widget.window.get_geometry()
-                    self.xine.got_expose_event(0, 0, width, height)
-                except (SystemExit, KeyboardInterrupt):
-                    raise
-                except:
-                    return True
-                return False
-
-            gobject.timeout_add(500, expose_workaround)
-            self.seek(0)
-        else:
-            gobject.idle_add(error_callback)
-
-class AudioRenderer(Renderer):
-    def __init__(self):
-        Renderer.__init__(self)
-        self._attached = False
-
-    def attach(self):
-        if self._attached:
-            self.detach()
-        self.xine.attach("", 0, "none", 0, 0)
-        self._attached = True
-
-    def detach(self):
-        self.xine.detach()
-        self._attached = False
-
-    def select_file(self, filename, success_callback, error_callback):
-        if not self._attached:
-            self.attach()
-
-        self._filename = filename
-        if self.xine.select_file(filename):
-            gobject.idle_add(success_callback)
-            self.seek(0)
-        else:
-            gobject.idle_add(error_callback)
-
-    def on_eos(self):
-        Renderer.on_eos(self)
-
-def movie_data_program_info(movie_path, thumbnail_path):
-    if os.path.exists(resources.path('../../../lib/miro/xine_extractor')):
-        path = resources.path('../../../lib/miro/xine_extractor')
-        return ((path, movie_path, thumbnail_path), None)
-    else:
-        logging.error("xine_extractor cannot be found.")
-        raise NotImplementedError()
-
-_SNIFFER = Sniffer()
-
-def get_item_type(item_info, success_callback, error_callback):
-    item_type = _SNIFFER.get_item_type(item_info.video_path)
-    if item_type == -1:
-        error_callback()
-    elif item_type == 0:
-        success_callback("video")
-    elif item_type == 1:
-        success_callback("audio")
-    else:
-        success_callback("unplayable")

=== modified file 'platform/gtk-x11/plat/resources.py'
--- platform/gtk-x11/plat/resources.py	2010-02-20 02:34:26 +0000
+++ platform/gtk-x11/plat/resources.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/screensaver.py'
--- platform/gtk-x11/plat/screensaver.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/screensaver.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/upgrade.py'
--- platform/gtk-x11/plat/upgrade.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/upgrade.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== modified file 'platform/gtk-x11/plat/utils.py'
--- platform/gtk-x11/plat/utils.py	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/plat/utils.py	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -39,7 +39,8 @@
 import urllib
 import sys
 import time
-from miro.util import returnsUnicode, returnsBinary, checkU, checkB, call_command
+from miro.util import (returns_unicode, returns_binary, check_u, check_b,
+                       call_command)
 import miro
 from miro.plat import options
 
@@ -49,10 +50,8 @@
 # very easy.
 from os.path import samefile
 
-
 # this is used in portable/gtcache.py
-localeInitialized = True
-
+_locale_initialized = False
 
 def get_available_bytes_for_movies():
     """Helper method used to get the free space on the disk where downloaded
@@ -92,10 +91,13 @@
         print "ui function called from thread %s" % threading.currentThread()
         traceback.print_stack()
 
+def locale_initialized():
+    return _locale_initialized
 
-# gettext understands *NIX locales, so we don't have to do anything
-def initializeLocale():
-    pass
+def initialize_locale():
+    # gettext understands *NIX locales, so we don't have to do anything
+    global _locale_initialized
+    _locale_initialized = True
 
 def setup_logging(inDownloader=False):
     if inDownloader:
@@ -121,13 +123,13 @@
         logging.getLogger('').addHandler(rotater)
         rotater.doRollover()
 
-@returnsBinary
+@returns_binary
 def utf8_to_filename(filename):
     if not isinstance(filename, str):
         raise ValueError("filename is not a str")
     return filename
 
-@returnsBinary
+@returns_binary
 def unicodeToFilename(filename, path=None):
     """Takes in a unicode string representation of a filename (NOT a file
     path) and creates a valid byte representation of it attempting to preserve
@@ -136,9 +138,9 @@
     Note: This is not guaranteed to give the same results every time it is run,
     nor is it guaranteed to reverse the results of filenameToUnicode.
     """
-    @returnsUnicode
+    @returns_unicode
     def shortenFilename(filename):
-        checkU(filename)
+        check_u(filename)
         first, last = os.path.splitext(filename)
 
         if first:
@@ -146,9 +148,9 @@
 
         return unicode(last[:-1])
 
-    checkU(filename)
+    check_u(filename)
     if path:
-        checkB(path)
+        check_b(path)
     else:
         path = os.getcwd()
 
@@ -175,7 +177,7 @@
 
     return new_filename
 
-@returnsUnicode
+@returns_unicode
 def filenameToUnicode(filename, path=None):
     """Given a filename in raw bytes, return the unicode representation
 
@@ -183,8 +185,8 @@
     not is it guaranteed to reverse the results of unicodeToFilename.
     """
     if path:
-        checkB(path)
-    checkB(filename)
+        check_b(path)
+    check_b(filename)
     try:
         return filename.decode(locale.getpreferredencoding())
     except (SystemExit, KeyboardInterrupt):
@@ -192,59 +194,31 @@
     except:
         return filename.decode('ascii', 'replace')
 
-# Takes filename given by the OS and turn it into a FilenameType
-def osFilenameToFilenameType(filename):
-    return FilenameType(filename)
-
-# Takes an array of filenames given by the OS and turn them into a FilenameTypes
-def osFilenamesToFilenameTypes(filenames):
-    return [osFilenameToFilenameType(filename) for filename in filenames]
-
-# Takes a FilenameType and turn it into something the OS accepts.
-def filenameTypeToOSFilename(filename):
-    return filename
-
-@returnsUnicode
-def makeURLSafe(s, safe='/'):
+@returns_unicode
+def make_url_safe(s, safe='/'):
     """Takes in a byte string or a unicode string and does the right thing
     to make a URL
     """
     if isinstance(s, str):
         # quote the byte string
         return urllib.quote(s, safe=safe).decode('ascii')
-    else:
-        try:
-            return urllib.quote(s.encode(locale.getpreferredencoding()), safe=safe).decode('ascii')
-        except (SystemExit, KeyboardInterrupt):
-            raise
-        except:
-            return s.decode('ascii', 'replace')
-
-@returnsBinary
-def unmakeURLSafe(s):
-    """Undoes makeURLSafe (assuming it was passed a filenameType)
+
+    try:
+        return urllib.quote(s.encode(locale.getpreferredencoding()), safe=safe).decode('ascii')
+    except (SystemExit, KeyboardInterrupt):
+        raise
+    except:
+        return s.decode('ascii', 'replace')
+
+@returns_binary
+def unmake_url_safe(s):
+    """Undoes make_url_safe (assuming it was passed a filenameType)
     """
     # unquote the byte string
-    checkU(s)
+    check_u(s)
     return urllib.unquote(s.encode('ascii'))
 
-_convert_path_cache = None
-
-@returnsBinary
-def findConvert():
-    global _convert_path_cache
-
-    if _convert_path_cache != None:
-        return _convert_path_cache
-
-    search_path = os.environ.get('PATH', os.defpath)
-    for d in search_path.split(os.pathsep):
-        convert_path = os.path.join(d, 'convert')
-        if os.path.exists(convert_path):
-            _convert_path_cache = convert_path
-    return _convert_path_cache
-
-def pidIsRunning(pid):
+def pid_is_running(pid):
     if pid is None:
         return False
     try:
@@ -253,15 +227,15 @@
     except OSError, err:
         return err.errno == errno.EPERM
 
-def killProcess(pid):
+def kill_process(pid):
     if pid is None:
         return
-    if pidIsRunning(pid):
+    if pid_is_running(pid):
         try:
             os.kill(pid, signal.SIGTERM)
             for i in xrange(100):
                 time.sleep(.01)
-                if not pidIsRunning(pid):
+                if not pid_is_running(pid):
                     return
             os.kill(pid, signal.SIGKILL)
         except (SystemExit, KeyboardInterrupt):
@@ -269,10 +243,10 @@
         except:
             logging.exception("error killing download daemon")
 
-def launchDownloadDaemon(oldpid, env):
+def launch_download_daemon(oldpid, env):
     # Use UNIX style kill
-    if oldpid is not None and pidIsRunning(oldpid):
-        killProcess(oldpid)
+    if oldpid is not None and pid_is_running(oldpid):
+        kill_process(oldpid)
 
     environ = os.environ.copy()
     environ['MIRO_FRONTEND'] = options.frontend

=== modified file 'platform/gtk-x11/plat/xlibhelper.pyx'
--- platform/gtk-x11/plat/xlibhelper.pyx	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/plat/xlibhelper.pyx	2010-04-14 21:08:30 +0000
@@ -1,5 +1,5 @@
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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

=== added file 'platform/gtk-x11/pylintrc'
--- platform/gtk-x11/pylintrc	1970-01-01 00:00:00 +0000
+++ platform/gtk-x11/pylintrc	2010-04-14 21:08:30 +0000
@@ -0,0 +1,304 @@
+# lint Python modules using external checkers.
+# 
+# This is the main checker controling the other ones and the reports
+# generation. It is itself both a raw checker and an astng checker in order
+# to:
+# * handle message activation / deactivation at the module level
+# * handle some basic but necessary stats'data (number of classes, methods...)
+# 
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Profiled execution.
+profile=no
+
+# Add <file or directory> to the black list. It should be a base name, not a
+# path. You may set this option multiple times.
+#ignore=.svn
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Set the cache size for astng objects.
+cache-size=5000
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable only checker(s) with the given id(s). This option conflict with the
+# disable-checker option
+#enable-checker=
+
+# Enable all checker(s) except those with the given id(s). This option conflict
+# with the disable-checker option
+disable-checker=imports
+
+# Enable all messages in the listed categories.
+#enable-msg-cat=
+
+# Disable all messages in the listed categories.
+#disable-msg-cat=
+
+# Enable the message(s) with the given id(s).
+#enable-msg=
+
+# Disable the message(s) with the given id(s).
+# see http://pylint-messages.wikidot.com/all-codes for codes
+# C0111: Missing docstring
+# C0302: Too many lines in module (%s)
+disable-msg=C0302,C0111,R0801
+
+
+[REPORTS]
+
+# set the output format. Available formats are text, parseable, colorized and
+# html
+output-format=text
+
+# Include message's id in output
+include-ids=yes
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells wether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note).You have access to the variables errors warning, statement which
+# respectivly contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (R0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (R0004).
+comment=no
+
+# Enable the report(s) with the given id(s).
+#enable-report=
+
+# Disable the report(s) with the given id(s).
+#disable-report=
+
+
+# checks for
+# * unused variables / imports
+# * undefined variables
+# * redefinition of variable from builtins or from an outer scope
+# * use of variable before assigment
+# 
+[VARIABLES]
+
+# Tells wether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching names used for dummy variables (i.e. not used).
+dummy-variables-rgx=_|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+# try to find bugs in the code using type inference
+# 
+[TYPECHECK]
+
+# Tells wether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# When zope mode is activated, consider the acquired-members option to ignore
+# access to some undefined attributes.
+zope=no
+
+# List of members which are usually get through zope's acquisition mecanism and
+# so shouldn't trigger E0201 when accessed (need zope=yes to be considered).
+acquired-members=REQUEST,acl_users,aq_parent
+
+
+# checks for :
+# * doc strings
+# * modules / classes / functions / methods / arguments / variables name
+# * number of arguments, local variables, branchs, returns and statements in
+# functions, methods
+# * required module attributes
+# * dangerous default values as arguments
+# * redefinition of function / method / class
+# * uses of the global statement
+# 
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# Regular expression which should only match functions or classes name which do
+# not require a docstring
+no-docstring-rgx=__.*__
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([A-Z_][A-Z1-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,f,fp,fn,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=apply,input
+
+
+# checks for sign of poor/misdesign:
+# * number of methods, attributes, local variables...
+# * size, complexity of functions, methods
+# 
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=12
+
+# Maximum number of locals for function / method body
+max-locals=30
+
+# Maximum number of return / yield for function / method body
+max-returns=12
+
+# Maximum number of branch for function / method body
+max-branchs=30
+
+# Maximum number of statements in function / method body
+max-statements=60
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=20
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=0
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+# checks for
+# * external modules dependencies
+# * relative / wildcard imports
+# * cyclic imports
+# * uses of deprecated modules
+# 
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report R0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report R0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report R0402 must
+# not be disabled)
+int-import-graph=
+
+
+# checks for :
+# * methods without self as first argument
+# * overridden methods signature
+# * access only to existant members via self
+# * attributes not defined in the __init__ method
+# * supported interfaces implementation
+# * unreachable code
+# 
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+
+# checks for similarities and duplicated code. This computation may be
+# memory / CPU intensive, so you should disable it if you experiments some
+# problems.
+# 
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=10
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+
+# checks for:
+# * warning notes in the code like FIXME, XXX
+# * PEP 263: source code with non ascii character but no encoding declaration
+# 
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+# checks for :
+# * unauthorized constructions
+# * strict indentation
+# * line length
+# * use of <> instead of !=
+# 
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module
+max-module-lines=10000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '

=== modified file 'platform/gtk-x11/run.sh'
--- platform/gtk-x11/run.sh	2009-12-13 17:59:01 +0000
+++ platform/gtk-x11/run.sh	2010-04-14 21:08:30 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -29,7 +29,7 @@
 # statement from all source files in the program, then also delete it here.
 
 PYTHON=`which python`
-PYTHON_VERSION=`python -c 'import sys; info=sys.version_info; print "%s.%s" % (info[0], info[1])'`
+PYTHON_VERSION=`${PYTHON} -c 'import sys; info=sys.version_info; print "%s.%s" % (info[0], info[1])'`
 PREFIX=/usr
 export MIRO_SHARE_ROOT=dist/$PREFIX/share/
 export MIRO_RESOURCE_ROOT=dist/$PREFIX/share/miro/resources/

=== modified file 'platform/gtk-x11/setup.py' (properties changed: +x to -x)
--- platform/gtk-x11/setup.py	2010-02-20 02:34:26 +0000
+++ platform/gtk-x11/setup.py	2010-04-14 21:08:30 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
+# Copyright (C) 2005-2010 Participatory Culture Foundation
 #
 # 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
@@ -32,16 +32,6 @@
 ## Paths and configuration                                                   ##
 ###############################################################################
 
-# The xine hack helps older systems.  See bug #7132.
-#
-# If this hack is enabled and Miro crashes at the end of playback when
-# the xine renderer is used, then try disabling the hack.
-#
-# As of Miro 2.0, there is a command-line option to enable/disable the 
-# hack.
-USE_XINE_HACK = False
-
-
 # The following properties allow you to explicitly set xulrunner paths and
 # library names in the case that Miro guesses them wrong for your system.
 # When setting these, you must make sure that:
@@ -116,16 +106,24 @@
 GTKMOZEMBED_LIB = None
 XULRUNNER_19 = None
 
-# The name of the boost python library.  Used for building extensions.
-# If this is set to None, setup.py will divine the right lib to use.
-# It should probably be either "boost_python" or "boost_python-mt".
-BOOST_LIB = None
-
 
 ###############################################################################
 ## End of configuration. No user-serviceable parts inside                    ##
 ###############################################################################
 
+import sys
+
+# verify we have required bits for compiling Miro
+
+try:
+    from Pyrex.Compiler import Version
+    if Version.version.split(".") < ["0", "9", "6", "4"]:
+        print "Pyrex 0.9.6.4 or greater required.  You have version %s." % Version.version
+        sys.exit(1)
+except ImportError:
+    print "Pyrex not found.  Please install Pyrex."
+    sys.exit(1)
+
 from distutils.cmd import Command
 from distutils.core import setup
 from distutils.extension import Extension
@@ -139,7 +137,6 @@
 import pwd
 import subprocess
 import platform
-import sys
 import re
 import time
 import shutil
@@ -166,22 +163,18 @@
         root_try = os.path.abspath(os.path.join(root_try, '..'))
     return root_dir
 
-def is_x64():
-    return platform.machine() == "x86_64" or platform.machine() == "amd64"
-
 root_dir = get_root_dir()
 portable_dir = os.path.join(root_dir, 'portable')
 portable_frontend_dir = os.path.join(portable_dir, 'frontends')
 portable_xpcom_dir = os.path.join(portable_frontend_dir, 'widgets', 'gtk',
-        'xpcom')
+                                  'xpcom')
 dl_daemon_dir = os.path.join(portable_dir, 'dl_daemon')
 test_dir = os.path.join(portable_dir, 'test')
 resource_dir = os.path.join(root_dir, 'resources')
 platform_dir = os.path.join(root_dir, 'platform', 'gtk-x11')
 platform_package_dir = os.path.join(platform_dir, 'plat')
 platform_widgets_dir = os.path.join(platform_package_dir, 'frontends',
-        'widgets')
-xine_dir = os.path.join(platform_dir, 'xine')
+                                    'widgets')
 
 # insert the root_dir to the beginning of sys.path so that we can
 # pick up portable and other packages
@@ -243,7 +236,6 @@
     """Wait for a command and return its output.  Check for common errors and
     raise an exception if one of these occurs.
     """
-
     p = subprocess.Popen(cmd, shell=True, close_fds=True,
                          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = p.communicate()
@@ -294,31 +286,13 @@
 
     return options_dict
 
-all_libs = []
-if os.path.exists(os.path.join(sysconfig.PREFIX, "lib")):
-    all_libs.extend(os.listdir(os.path.join(sysconfig.PREFIX, "lib")))
-if os.path.exists(os.path.join(sysconfig.PREFIX, "lib64")):
-    all_libs.extend(os.listdir(os.path.join(sysconfig.PREFIX, "lib64")))
-all_libs = [mem for mem in all_libs if mem.startswith("libboost")]
-
-def mt_or_not(s, all_libs=all_libs):
-    for mem in all_libs:
-        if mem.startswith("lib%s-mt" % s):
-            print "Using %s-mt" % s
-            return "%s-mt" % s
-    print "using %s" % s
-    return s
-
-if BOOST_LIB is None:
-    BOOST_LIB = mt_or_not("boost_python")
-else:
-    print "Using %s" % BOOST_LIB
-
-def compile_xine_extractor():
-    rv = os.system("gcc %s -o %s `pkg-config --libs --cflags gdk-pixbuf-2.0 glib-2.0 libxine`" %
-                   (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
-    if rv != 0:
-        raise RuntimeError("xine_extractor compilation failed.  Possibly missing libxine, gdk-pixbuf-2.0, or glib-2.0.")
+def package_exists(package_name):
+    """
+    Return True if the package is present in the system.  False otherwise.
+    The check is made with pkg-config.
+    """
+    # pkg-config returns 0 if the package is present
+    return subprocess.call(['pkg-config', '--exists', package_name]) == 0
 
 def generate_miro(xpcom_path):
     # build a miro script that wraps the miro.real script with an LD_LIBRARY_PATH
@@ -361,90 +335,8 @@
     f.close()
 
 
-#### The fasttypes extension ####
-fasttypes_ext = \
-    Extension("miro.fasttypes",
-        sources = [os.path.join(portable_dir, 'fasttypes.cpp')],
-        libraries = [BOOST_LIB],
-    )
-
-
-##### The libtorrent extension ####
-def fetch_sources(portable_dir):
-    sources = []
-    for root, dirs, files in os.walk(os.path.join(portable_dir, 'libtorrent')):
-        if '.svn' in dirs:
-            dirs.remove('.svn')
-        for file in files:
-            if file.endswith('.cpp') or file.endswith('.c'):
-                sources.append(os.path.join(root, file))
-    return sources
-
-def get_libtorrent_extension(portable_dir):
-    libtorrent_installed = False
-    try:
-        ret = parse_pkg_config("pkg-config", "libtorrent-rasterbar")
-        import libtorrent
-        libtorrent_installed = True
-        print "libtorrent-rasterbar (0.13 or later) and python bindings are installed--using system version."
-        return None
-    except RuntimeError:
-        print "libtorrent-rasterbar not installed on this system."
-    except ImportError:
-        print "python bindings for libtorrent-rasterbar not installed on this system"
-
-    include_dirs = [os.path.join(portable_dir, x) for x in
-                            ['libtorrent/include', 'libtorrent/include/libtorrent']]
-
-    extra_compile_args = ["-Wno-missing-braces",
-                          "-D_FILE_OFFSET_BITS=64",
-                          "-DHAVE___INCLUDE_LIBTORRENT_ASIO_HPP=1",
-                          "-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
-                          "-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
-                          "-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1",
-                          "-DNDEBUG=1", "-O2"]
-
-    if is_x64():
-        extra_compile_args.append("-DAMD64")
-
-    libraries = ['z', 'pthread', 'ssl']
-
-    # get mt or non-mt versions of the boost libraries
-    libraries += [mt_or_not("boost_python"),
-                  mt_or_not("boost_filesystem"),
-                  mt_or_not("boost_date_time"),
-                  mt_or_not("boost_thread")]
-
-    config_vars = sysconfig.get_config_vars()
-    if "CFLAGS" in config_vars and "-Wstrict-prototypes" in config_vars["CFLAGS"]:
-        config_vars["CFLAGS"] = config_vars["CFLAGS"].replace("-Wstrict-prototypes", " ")
-
-    if "OPT" in config_vars and "-Wstrict-prototypes" in config_vars["OPT"]:
-        config_vars["OPT"] = config_vars["OPT"].replace("-Wstrict-prototypes", " ")
-
-    sources = fetch_sources(portable_dir)
-
-    # versions of libtorrent prior to 0.14 have this file which we don't want to
-    # compile or use
-    if os.path.exists(os.path.join(portable_dir, "libtorrent", "src", "file_win.cpp")):
-        sources.remove(os.path.join(portable_dir, "libtorrent", "src", "file_win.cpp"))
-
-    return Extension("miro.libtorrent",
-                     include_dirs=include_dirs,
-                     libraries=libraries,
-                     extra_compile_args=extra_compile_args,
-                     sources=sources)
-
-libtorrent_ext = get_libtorrent_extension(portable_dir)
-
-
 #### MozillaBrowser Extension ####
 def get_mozilla_stuff():
-    try:
-        packages = get_command_output("pkg-config --list-all")
-    except RuntimeError, error:
-        sys.exit("Package config error:\n%s" % (error,))
-
     if XPCOM_LIB and GTKMOZEMBED_LIB and XULRUNNER_19 != None:
         print "\nUsing XPCOM_LIB, GTKMOZEMBED_LIB and XULRUNNER_19 values...."
         xulrunner19 = XULRUNNER_19
@@ -454,29 +346,31 @@
     else:
         print "\nTrying to figure out xpcom_lib, gtkmozembed_lib, and xulrunner_19 values...."
         xulrunner19 = False
-        if re.search("^libxul", packages, re.MULTILINE):
+        if package_exists('libxul'):
             xulrunner19 = True
             xpcom_lib = 'libxul'
             gtkmozembed_lib = 'libxul'
 
-        elif re.search("^xulrunner-xpcom", packages, re.MULTILINE):
+        elif package_exists('xulrunner-xpcom'):
             xpcom_lib = 'xulrunner-xpcom'
             gtkmozembed_lib = 'xulrunner-gtkmozembed'
 
-        elif re.search("^seamonkey-xpcom", packages, re.MULTILINE):
+        elif package_exists('seamonkey-xpcom'):
             xpcom_lib = 'seamonkey-xpcom'
             gtkmozembed_lib = 'seamonkey-gtkmozembed'
 
-        elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
+        elif package_exists('mozilla-xpcom'):
             xpcom_lib = 'mozilla-xpcom'
             gtkmozembed_lib = 'mozilla-gtkmozembed'
 
-        elif re.search("^firefox-xpcom", packages, re.MULTILINE):
+        elif package_exists('firefox-xpcom'):
             xpcom_lib = 'firefox-xpcom'
             gtkmozembed_lib = 'firefox-gtkmozembed'
 
         else:
-            sys.exit("Can't find libxul, xulrunner-xpcom, seamonkey-xpcom, mozilla-xpcom or firefox-xpcom")
+            print "Can't find libxul, xulrunner-xpcom, seamonkey-xpcom, mozilla-xpcom or firefox-xpcom"
+            print "One of these is required."
+            sys.exit(1)
 
     print "using xpcom_lib: ", repr(xpcom_lib)
     print "using gtkmozembed_lib: ", repr(gtkmozembed_lib)
@@ -613,28 +507,6 @@
     )
 
 
-#### Xine Extension ####
-xine_options = parse_pkg_config('pkg-config',
-        'libxine pygtk-2.0 gtk+-2.0 glib-2.0 gthread-2.0')
-
-# If you get XINE crashes, uncommenting this might fix it. It's
-# necessary on Debian Etch and Ubuntu Feisty right now.
-#
-# We have a horrible workaround for buggy X drivers in xine_impl.c
-# controlled by this variable
-if USE_XINE_HACK:
-    print "Using the Xine driver hack. If you experience trouble playing video,\n   try setting USE_XINE_HACK to False in setup.py."
-    if xine_options.has_key('define_macros'):
-        xine_options['define_macros'].append(('INCLUDE_XINE_DRIVER_HACK', '1'))
-    else:
-        xine_options['define_macros'] = [('INCLUDE_XINE_DRIVER_HACK', '1')]
-
-xine_ext = Extension('miro.xine', [
-                         os.path.join(xine_dir, 'xine.pyx'),
-                         os.path.join(xine_dir, 'xine_impl.c'),],
-                     **xine_options)
-
-
 #### Build the data_files list ####
 def listfiles(path):
     return [f for f in glob(os.path.join(path, '*')) if os.path.isfile(f)]
@@ -673,15 +545,12 @@
      [os.path.join(platform_dir, 'miro.1.gz')]),
     ('/usr/share/man/man1',
      [os.path.join(platform_dir, 'miro.real.1.gz')]),
-    ('/usr/lib/miro/',
-     [os.path.join(platform_dir, 'xine/xine_extractor')]),
 ]
 
 
 # if we're not doing "python setup.py clean", then we can do a bunch of things
 # that have file-related side-effects
 if not "clean" in sys.argv:
-    compile_xine_extractor()
     generate_miro(xpcom_runtime_path)
     # gzip the man page
     os.system ("gzip -9 < %s > %s" % (os.path.join(platform_dir, 'miro.1'), os.path.join(platform_dir, 'miro.1.gz')))
@@ -840,17 +709,12 @@
             shutil.rmtree('./dist/')
 
 ext_modules = []
-ext_modules.append(fasttypes_ext)
-ext_modules.append(xine_ext)
 ext_modules.append(xlib_ext)
-if libtorrent_ext:
-    ext_modules.append(libtorrent_ext)
 ext_modules.append(pygtkhacks_ext)
 ext_modules.append(mozprompt_ext)
 ext_modules.append(httpobserver_ext)
 ext_modules.append(windowcreator_ext)
 ext_modules.append(pluginsdir_ext)
-ext_modules.append(Extension("miro.sorts", [os.path.join(portable_dir, 'sorts.pyx')]))
 
 #### Run setup ####
 setup(name='miro',

=== removed directory 'platform/gtk-x11/xine'
=== removed file 'platform/gtk-x11/xine/xine.pyx'
--- platform/gtk-x11/xine/xine.pyx	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/xine/xine.pyx	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-# Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
-#
-# 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the OpenSSL
-# library.
-#
-# You must obey the GNU General Public License in all respects for all of
-# the code used other than OpenSSL. If you modify file(s) with this
-# exception, you may extend this exception to your version of the file(s),
-# but you are not obligated to do so. If you do not wish to do so, delete
-# this exception statement from your version. If you delete this exception
-# statement from all source files in the program, then also delete it here.
-
-##############################################################################
-# Xine module.  
-#
-# Contains the Xine class which is used to control libxine.
-# Code in here is basically just a wrapper for the functions in xine_impl.c.
-# See that file if you want to know what's going on under the hood
-#
-##############################################################################
-
-cdef extern from "X11/Xlib.h":
-    ctypedef unsigned long Drawable
-
-cdef extern from "Python.h":
-    ctypedef int PyGILState_STATE
-    PyGILState_STATE PyGILState_Ensure()
-    void PyGILState_Release(PyGILState_STATE)
-    ctypedef struct PyThreadState
-    ctypedef struct PyObject
-    void Py_DECREF(PyObject*)
-    void Py_INCREF(PyObject*)
-    PyObject* PyObject_CallMethod(PyObject *o, char *method, char* format, ...)
-    void PyErr_Print()
-
-cdef extern from "xine.h":
-    ctypedef struct xine_event_t:
-        int type
-    ctypedef void (*xine_event_listener_cb_t) (void *user_data,
-            xine_event_t *event)
-    enum dummy:
-        XINE_EVENT_UI_PLAYBACK_FINISHED
-
-cdef extern from "xine_impl.h":
-    ctypedef struct _Xine
-
-    _Xine* xineCreate(xine_event_listener_cb_t event_callback, 
-            void* event_callback_data)
-    void xineDestroy(_Xine* xine)
-    void xineAttach(_Xine* xine, char* displayName, Drawable d, char *driver, int sync, int use_xv_hack)
-    void xineSetArea(_Xine* xine, int xpos, int ypos, int width, int height)
-    void xineDetach(_Xine* xine)
-    void xineSetupSniffer(_Xine* xine)
-    int xineGetType(_Xine* xine, char* filename)
-    int xineSelectFile(_Xine* xine, char* filename)
-    void xineSetPlaying(_Xine* xine, int isPlaying)
-    void xineSetViz(_Xine* xine, char *viz)
-    void xineSetVolume(_Xine* xine, int volume)
-    int xineGetVolume(_Xine* xine)
-    void xineGotExposeEvent(_Xine* xine, int x, int y, int width, int height)
-    void xineSeek(_Xine* xine, int position)
-    int xineGetPosLength(_Xine* xine, int* position, int* length)
-    char* xineVersion()
-
-def getXineVersion():
-    return xineVersion()
-
-class CantQueryPositionLength(Exception):
-    pass
-
-cdef class Xine:
-    # Wrapper for the Xine class
-    cdef _Xine* xine
-    cdef object eosCallback
-
-    def __new__(self):
-        self.xine = xineCreate(on_xine_event, <void*>self)
-        self.eosCallback = None
-    def __dealloc__(self):
-        xineDestroy(self.xine)
-    def attach(self, char* displayName, int drawable, char *driver, sync, use_xv_hack):
-        xineAttach(self.xine, displayName, drawable, driver, sync, use_xv_hack)
-    def detach(self):
-        xineDetach(self.xine)
-    def setup_sniffer(self):
-        xineSetupSniffer(self.xine)
-    def set_area(self, int xpos, int ypos, int width, int height):
-        xineSetArea(self.xine, xpos, ypos, width, height)
-    def get_type(self, char* filename):
-        return xineGetType(self.xine, filename)
-    def select_file(self, char* filename):
-        return xineSelectFile(self.xine, filename)
-    def play(self):
-        xineSetPlaying(self.xine, 1)
-    def pause(self):
-        xineSetPlaying(self.xine, 0)
-    def set_viz(self, viz):
-        xineSetViz(self.xine, viz)
-    def set_volume(self, volume):
-        volume = min(max(volume, 0), 100)
-        xineSetVolume(self.xine, volume)
-    def get_volume(self):
-        return xineGetVolume(self.xine)
-    def got_expose_event(self, int x, int y, int width, int height):
-        xineGotExposeEvent(self.xine, x, y, width, height)
-    def seek(self, int position):
-        xineSeek(self.xine, position)
-    def set_eos_callback(self, callback):
-        """Set the callback invoke when xine reaches the end of its stream.
-        Pass in None to clear the callback
-
-        NOTE: this callback will be invoked outside of the gtk main thread,
-        use gobject.idle_add if you need to use any gtk methods.
-        """
-        self.eosCallback = callback
-    def on_eos_event(self):
-        if self.eosCallback:
-            self.eosCallback()
-    def get_position_and_length(self):
-        """Try to query the current stream position and stream length.  If
-        Xine doesn't know the values yet we throw a CantQueryPositionLength
-        Exception.
-        """
-        cdef int position, length
-        if xineGetPosLength(self.xine, &position, &length) == 0:
-            raise CantQueryPositionLength
-        else:
-            return position, length
-
-cdef void on_xine_event(void* data, xine_event_t* event):
-    cdef PyObject* self
-    cdef PyGILState_STATE gil
-    cdef PyObject* result
-
-    if event.type == XINE_EVENT_UI_PLAYBACK_FINISHED:
-        self = <PyObject*>data
-        gil = PyGILState_Ensure()
-        Py_INCREF(self)
-        result = PyObject_CallMethod(self, "on_eos_event", "", NULL)
-        if(result == NULL):
-            PyErr_Print()
-        else:
-            Py_DECREF(result)
-        Py_DECREF(self)
-        PyGILState_Release(gil)

=== removed file 'platform/gtk-x11/xine/xine_extractor.c'
--- platform/gtk-x11/xine/xine_extractor.c	2009-02-11 01:32:44 +0000
+++ platform/gtk-x11/xine/xine_extractor.c	1970-01-01 00:00:00 +0000
@@ -1,224 +0,0 @@
-/*
-# Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
-#
-# 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the OpenSSL
-# library.
-#
-# You must obey the GNU General Public License in all respects for all of
-# the code used other than OpenSSL. If you modify file(s) with this
-# exception, you may extend this exception to your version of the file(s),
-# but you are not obligated to do so. If you do not wish to do so, delete
-# this exception statement from your version. If you delete this exception
-# statement from all source files in the program, then also delete it here.
-*/
-
-#define XINE_ENABLE_EXPERIMENTAL_FEATURES 1
-#include <xine.h>
-#include <xine/video_out.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib.h>
-
-typedef struct {
-  xine_t* xine;
-  xine_stream_t* stream;
-  xine_video_port_t* videoPort;
-  xine_audio_port_t* audioPort;
-} _Xine;
-
-static int Y_table[256];
-static int RCr_table[256];
-static int GCr_table[256];
-static int GCb_table[256];
-static int BCb_table[256];
-static int tables_initialized = 0;
-
-static void build_tables() {
-  int i;
-  if (tables_initialized)
-    return;
-  for (i = 0; i < 256; i++) {
-    Y_table[i] = (i - 16) * 255 * 256 / 219;
-    RCr_table[i] = (i - 128) * 127 * 256 * 1.402 / 112;
-    GCr_table[i] = (i - 128) * 127 * 256 * -.714 / 112;
-    GCb_table[i] = (i - 128) * 127 * 256 * -.344 / 112;
-    BCb_table[i] = (i - 128) * 127 * 256 * 1.772 / 112;
-  }
-  tables_initialized = 1;
-}
-
-static void _make_new_data_mine(_Xine* xine) {
-    xine->videoPort = xine_open_video_driver(xine->xine, "none", XINE_VISUAL_TYPE_NONE, NULL);
-    xine->audioPort = xine_open_audio_driver(xine->xine, "none", NULL);
-    xine->stream = xine_stream_new(xine->xine, xine->audioPort, xine->videoPort);
-}
-
-static void xineDataMineClose(_Xine *xine)
-{
-  xine_close(xine->stream);
-  xine_dispose(xine->stream);
-  xine_close_audio_driver(xine->xine, xine->audioPort);
-  xine_close_video_driver(xine->xine, xine->videoPort);
-  /*    _make_new_data_mine(xine);*/
-}
-
-static int xineDataMineFilename(_Xine* xine, const char* filename)
-{
-  int rv;
-  rv = xine_open(xine->stream, filename);
-  return rv;
-}
-
-/* duration is in ms */
-static int xineFileDuration(_Xine* xine)
-{
-    int rv;
-    int duration;
-    int dummy, dummy2;
-    rv = xine_get_pos_length(xine->stream, &dummy, &dummy2, &duration);
-    if (rv == 0)
-      return -1;
-    return duration;
-}
-
-static unsigned char normalize(int val) {
-  if (val < 0)
-    val = 0;
-  if (val > (255 << 8))
-    val = 255 << 8;
-  val = val + 127;
-  val = val >> 8;
-  return val;
-}
-
-static int xineFileScreenshot(_Xine *xine, int position, const char *screenshot)
-{
-    int rv;
-    xine_video_frame_t frame;
-    int i, j;
-    int CbOffset;
-    int CrOffset;
-    unsigned char *out_data;
-    GdkPixbuf *pixbuf;
-    xine_video_port_t *video_out;
-
-    if (!xine_get_stream_info (xine->stream, XINE_STREAM_INFO_HAS_VIDEO))
-      return 0;
-    rv = xine_play(xine->stream, 0, position);
-    if (rv == 0)
-      return 0;
-    video_out = xine->videoPort;
-    if (video_out->get_property (video_out, VO_PROP_NUM_STREAMS) == 0) {
-        return 1;
-    }
-    rv = xine_get_next_video_frame (video_out, &frame);
-    if (rv == 0)
-      return 0;
-    if (frame.colorspace != XINE_IMGFMT_YV12 &&
-	frame.colorspace != XINE_IMGFMT_YUY2) {
-      xine_free_video_frame (video_out, &frame);
-      return 0;
-    }
-    build_tables();
-    out_data = g_malloc (frame.width * frame.height * 3);
-    switch (frame.colorspace) {
-    case XINE_IMGFMT_YV12:
-      CrOffset = frame.width * frame.height;
-      CbOffset = frame.width * frame.height + (frame.width / 2) * (frame.height / 2);
-      for (j = 0; j < frame.height; j++) {
-	for (i = 0; i < frame.width; i++) {
-	  int pixel = j * frame.width + i;
-	  int subpixel = (j / 2) * (frame.width / 2) + (i / 2);
-	  int Y = Y_table[frame.data[pixel]];
-	  out_data[pixel * 3] =
-	    normalize(Y +
-		      RCr_table[frame.data[CrOffset + subpixel]]);
-	  out_data[pixel * 3 + 1] =
-	    normalize(Y +
-		      GCr_table[frame.data[CrOffset + subpixel]] +
-		      GCb_table[frame.data[CbOffset + subpixel]]);
-	  out_data[pixel * 3 + 2] =
-	    normalize(Y +
-		      BCb_table[frame.data[CbOffset + subpixel]]);
-	}
-      }
-      break;
-
-    case XINE_IMGFMT_YUY2:
-      CrOffset = 3;
-      CbOffset = 1;
-      for (j = 0; j < frame.height; j++) {
-	for (i = 0; i < frame.width; i++) {
-	  int pixel = j * frame.width + i;
-	  int subpixel = (j * frame.width + i) / 2 * 4;
-	  int Y = Y_table[frame.data[pixel * 2]];
-	  out_data[pixel * 3] =
-	    normalize(Y +
-		      RCr_table[frame.data[CrOffset + subpixel]]);
-	  out_data[pixel * 3 + 1] =
-	    normalize(Y +
-		      GCr_table[frame.data[CrOffset + subpixel]] +
-		      GCb_table[frame.data[CbOffset + subpixel]]);
-	  out_data[pixel * 3 + 2] =
-	    normalize(Y +
-		      BCb_table[frame.data[CbOffset + subpixel]]);
-	}
-      }
-      break;
-    }
-    pixbuf = gdk_pixbuf_new_from_data (out_data, GDK_COLORSPACE_RGB, 0,
-				       8, frame.width, frame.height, frame.width * 3,
-				       NULL, NULL);
-    gdk_pixbuf_save (pixbuf, screenshot, "png", NULL, NULL);
-    gdk_pixbuf_unref (pixbuf);
-    g_free (out_data);
-    xine_free_video_frame (xine->videoPort, &frame);
-    return 1;
-}
-
-int main(int argc, char *argv[])
-{
-  char *filename;
-  char *screenshot_filename;
-  int rv;
-  int duration = -1;
-  _Xine *xine;
-  if (argc != 3) {
-    return 0;
-  }
-  g_type_init();
-  filename = argv[1];
-  screenshot_filename = argv[2];
-
-  xine = (_Xine*)g_malloc(sizeof(_Xine));
-  xine->xine = xine_new();
-  xine_init(xine->xine);
-  _make_new_data_mine(xine);
-
-  rv = xineDataMineFilename(xine, filename);
-  if (rv != 0) {
-    duration = xineFileDuration(xine);
-    if (duration == -1)
-      rv = 0;
-    else
-      rv = xineFileScreenshot(xine, duration / 2, screenshot_filename);
-  }
-  printf ("Miro-Movie-Data-Length: %d\n", duration);
-  printf ("Miro-Movie-Data-Thumbnail: %s\n", rv ? "Success" : "Failure");
-  return 0;
-}

=== removed file 'platform/gtk-x11/xine/xine_impl.c'
--- platform/gtk-x11/xine/xine_impl.c	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/xine/xine_impl.c	1970-01-01 00:00:00 +0000
@@ -1,490 +0,0 @@
-/*
-# Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
-#
-# 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the OpenSSL
-# library.
-#
-# You must obey the GNU General Public License in all respects for all of
-# the code used other than OpenSSL. If you modify file(s) with this
-# exception, you may extend this exception to your version of the file(s),
-# but you are not obligated to do so. If you do not wish to do so, delete
-# this exception statement from your version. If you delete this exception
-# statement from all source files in the program, then also delete it here.
-*/
-
-/*************************************************************************
- * xine_impl.c
- *
- * Implementations for the Xine class's methods.
- *
- * Almost all the work for the Xine class gets done in xine_impl.c.  xine.pyx
- * then wraps the functions.  This keeps xine.pyx from overflowing with "cdef
- * extern ..." statements
- *
- **************************************************************************/
-
-#include "Python.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "xine_impl.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#ifdef INCLUDE_XINE_DRIVER_HACK
-static int miro_using_xv_driver_hack = 0;
-#endif
-
-const char *viz_available (_Xine* xine, const char *viz)
-{
-  int j;
-  for (j = 0; xine->viz_available[j]; j++) {
-    if (!strcmp(viz, xine->viz_available[j])) {
-      return xine->viz_available[j];
-    }
-  }
-  return NULL;
-}
-
-const char *const pref_viz[] = {
-  "goom",
-  "oscope",
-  "fftscope",
-  "fftgraph",
-  NULL
-};
-
-#ifdef INCLUDE_XINE_DRIVER_HACK
-static void miro_xine_list_recycle_elem(xine_list_t *list,  xine_list_elem_t *elem) {
-  elem->next = list->free_elem_list;
-  elem->prev = NULL;
-
-  list->free_elem_list = elem;
-  list->free_elem_list_size++;
-}
-
-
-void miro_xine_list_remove(xine_list_t *list, xine_list_iterator_t position) {
-  xine_list_elem_t *elem = (xine_list_elem_t*)position;
-
-  if (elem) {
-    xine_list_elem_t *prev = elem->prev;
-    xine_list_elem_t *next = elem->next;
-
-    if (prev)
-      prev->next = next;
-    else
-      list->elem_list_front = next;
-
-    if (next)
-      next->prev = prev;
-    else
-      list->elem_list_back = prev;
-
-    miro_xine_list_recycle_elem(list, elem);
-    list->elem_list_size--;
-  }
-}
-
-xine_list_iterator_t miro_xine_list_front(xine_list_t *list) {
-  return list->elem_list_front;
-}
-#endif
-
-_Xine* xineCreate(xine_event_listener_cb_t event_callback, 
-        void* event_callback_data)
-{
-    _Xine* xine;
-    int i;
-    /*    const char *const *video_plugins;*/
-
-    xine = (_Xine*)malloc(sizeof(_Xine));
-    if(xine == NULL) return NULL;
-    xine->xine = xine_new();
-    xine_init(xine->xine);
-    xine->attached = 0;
-    xine->frameInfo.lock = g_mutex_new();
-    xine->frameInfo.xpos = 0;
-    xine->frameInfo.ypos = 0;
-    xine->frameInfo.width = 0;
-    xine->frameInfo.height = 0;
-    xine->event_callback = event_callback;
-    xine->event_callback_data = event_callback_data;
-    xine->viz_available = xine_list_post_plugins_typed (xine->xine, XINE_POST_TYPE_AUDIO_VISUALIZATION);
-    xine->viz_name = NULL;
-    for (i = 0; pref_viz[i]; i++) {
-      const char *viz = viz_available(xine, pref_viz[i]);
-      if (viz) {
-	xine->viz_name = viz;
-	break;
-      }
-    }
-    if (!xine->viz_name) {
-      xine->viz_name = xine->viz_available [0];
-    }
-    xine->viz = NULL;
-
-    return xine;
-}
-
-void xineDestroy(_Xine* xine)
-{
-    if(xine->attached) {
-        xineDetach(xine);
-    }
-    xine_exit(xine->xine);
-    g_mutex_free(xine->frameInfo.lock);
-    free(xine);
-}
-
-static void destSizeCallback(void *data, int video_width, int video_height, 
-        double video_pixel_aspect, int *dest_width, int *dest_height, double
-        *dest_pixel_aspect)  
-{
-    _Xine* xine = (_Xine*)data;
-    /* Should take video_pixel_aspect into account here... */
-    g_mutex_lock(xine->frameInfo.lock);
-    *dest_width = xine->frameInfo.width;
-    *dest_height = xine->frameInfo.height;
-    g_mutex_unlock(xine->frameInfo.lock);
-    *dest_pixel_aspect = xine->screenPixelAspect;
-}
-
-static void frameOutputCallback(void *data, int video_width, 
-        int video_height, double video_pixel_aspect, int *dest_x, int *dest_y,
-        int *dest_width, int *dest_height, double *dest_pixel_aspect, int
-        *win_x, int *win_y)
-{
-    _Xine* xine = (_Xine*)data;
-    *dest_x            = 0;
-    *dest_y            = 0;
-    g_mutex_lock(xine->frameInfo.lock);
-    *win_x             = xine->frameInfo.xpos;
-    *win_y             = xine->frameInfo.ypos;
-    *dest_width        = xine->frameInfo.width;
-    *dest_height       = xine->frameInfo.height;
-    g_mutex_unlock(xine->frameInfo.lock);
-    *dest_pixel_aspect = xine->screenPixelAspect;
-}
-
-void _xineSwitchToViz(_Xine* xine)
-{
-  const char *const *inputs;
-  xine_post_out_t *source;
-  xine_post_in_t *sink;
-  xine_audio_port_t *audios[] = { xine->audioPort, NULL };
-  xine_video_port_t *videos[] = { xine->videoPort, NULL };
-
-  if (xine->viz || !xine->viz_name)
-    return;
-
-  xine->viz = xine_post_init (xine->xine, xine->viz_name, 1, audios, videos);
-  if (xine->viz) {
-    inputs = xine_post_list_inputs(xine->viz);
-    source = xine_get_audio_source (xine->stream);
-    sink = xine_post_input(xine->viz, inputs[0]);
-    xine_post_wire (source, sink);
-  }
-}
-
-void _xineSwitchToNormal(_Xine* xine)
-{
-  xine_post_out_t *source;
-
-  if (!xine->viz)
-    return;
-
-  source = xine_get_video_source (xine->stream);
-  xine_post_wire_video_port(source, xine->videoPort);
-
-  source = xine_get_audio_source (xine->stream);
-  xine_post_wire_audio_port(source, xine->audioPort);
-
-  xine_post_dispose (xine->xine, xine->viz);
-  xine->viz = NULL;
-}
-
-/**
- * If you want to attach for a video player, pass in the display name,
- * drawable, driver, sync and use_xv_hack.
- *
- * If you want to attach for an audio player with no video stuff,
- * pass in an empty display name, 0 for the drawable, "none" for
- * the driver, and 0 for sync and use_xv_hack.
- *
- * The xineAttach code only sets up the video portions if d != 0.
- */
-void xineAttach(_Xine* xine, const char* displayName, Drawable d,
-		const char *driver, int sync, int use_xv_hack)
-{
-    x11_visual_t vis;
-    double screenWidth, screenHeight;
-
-    if(xine->attached) {
-        xineDetach(xine);
-    }
-
-    xine->drawable = d;
-    if (d != 0) {
-      /* Store drawable info in the */
-
-      xine->display = XOpenDisplay(displayName);
-      XSynchronize(xine->display, sync);
-
-      xine->screen = XDefaultScreen(xine->display);
-      screenWidth = (DisplayWidth(xine->display, xine->screen) * 1000 /
-                     DisplayWidthMM(xine->display, xine->screen));
-      screenHeight = (DisplayHeight(xine->display, xine->screen) * 1000 /
-                      DisplayHeightMM(xine->display, xine->screen));
-      xine->screenPixelAspect = screenHeight / screenWidth;
-
-      /* filling in the xine visual struct */
-      vis.display = xine->display;
-      vis.screen = xine->screen;
-      vis.d = d;
-      vis.dest_size_cb = destSizeCallback;
-      vis.frame_output_cb = frameOutputCallback;
-      vis.user_data = xine;
-    }
-
-    // FIXME - should check xine to see what the driver options are
-    // and cycle through them if the specified one doesn't work.
-
-    /* opening xine output ports */
-    // try to use char *driver for video, default to "auto" if NULL
-    if (!driver) {
-      printf("xine_impl.c: no driver passed in, using auto\n");
-      driver = "auto";
-    }
-
-    if (d != 0) {
-      printf("xine_impl.c: trying driver %s\n", driver);
-
-      xine->videoPort = xine_open_video_driver(xine->xine, driver,
-                                               XINE_VISUAL_TYPE_X11, (void *)&vis);
-
-      if (!xine->videoPort) {
-        printf("xine_impl.c: driver failed--trying auto\n");
-        xine->videoPort = xine_open_video_driver(xine->xine, "auto",
-                                                 XINE_VISUAL_TYPE_X11, (void *)&vis);
-      }
-
-#ifdef INCLUDE_XINE_DRIVER_HACK
-    // by default, don't use the hack
-    miro_using_xv_driver_hack = 0;
-    if (xine->videoPort) {
-      // if we're using the hack and the driver is "xv", then
-      // we turn the hack on.
-      if (use_xv_hack && !strncmp("xv", driver, 3)) {
-        miro_using_xv_driver_hack = 1;
-      }
-    }
-#endif
-    } else {
-      xine->videoPort = xine_open_video_driver(xine->xine, driver,
-                                               XINE_VISUAL_TYPE_NONE, NULL);
-    }
-
-    xine->audioPort = xine_open_audio_driver(xine->xine, "auto", NULL);
-
-    /* open a xine stream connected to these ports */
-    xine->stream = xine_stream_new(xine->xine, xine->audioPort, 
-            xine->videoPort);
-    /* hook our event handler into the streams events */
-    xine->eventQueue = xine_event_new_queue(xine->stream);
-    xine_event_create_listener_thread(xine->eventQueue,
-            xine->event_callback, xine->event_callback_data);
-
-    if (d != 0) {
-      xine_port_send_gui_data(xine->videoPort, XINE_GUI_SEND_DRAWABLE_CHANGED,
-                              (void *)d);
-      xine_port_send_gui_data(xine->videoPort, XINE_GUI_SEND_VIDEOWIN_VISIBLE,
-                              (void *) 1);
-    }
-
-    xine->attached = 1;
-    _xineSwitchToNormal (xine);
-}
-
-void xineDetach(_Xine* xine)
-{
-    xine_event_queue_t* eventQueue;
-#ifdef INCLUDE_XINE_DRIVER_HACK
-    xv_driver_t* driver;
-    xine_list_iterator_t ite;
-#endif
-
-    if(!xine->attached) return;
-
-    if (xine->drawable != 0) {
-#ifdef INCLUDE_XINE_DRIVER_HACK
-    // HACK ALERT!  For some reason, setting the XV port attributes
-    //causes problems with certain xine-lib/X11 combinations this
-    //caused #7132
-
-    if (miro_using_xv_driver_hack) {
-
-      driver = (xv_driver_t*)xine->videoPort->driver;
-  
-      while ((ite = miro_xine_list_front(driver->port_attributes)) != NULL) {
-        miro_xine_list_remove (driver->port_attributes, ite);
-      }
-    }
-#endif
-    }
-    xine_close(xine->stream);
-    xine_dispose(xine->stream);
-    xine_close_audio_driver(xine->xine, xine->audioPort);
-    xine_close_video_driver(xine->xine, xine->videoPort);
-    if (xine->drawable != 0) {
-      XCloseDisplay(xine->display);
-    }
-    xine->attached = 0;
-
-    /* Save this so that no one accesses xine twice at once. */
-    eventQueue = xine->eventQueue;
-    /* Allow threads, since xine_event_dispose_queue joins on the queue thread. */
-    Py_BEGIN_ALLOW_THREADS    
-    xine_event_dispose_queue(eventQueue);
-    Py_END_ALLOW_THREADS    
-}
-
-/**
- * Sets up this xine instance as a sniffer.
- */
-void xineSetupSniffer(_Xine* xine)
-{
-  xine->videoPort = xine_open_video_driver(xine->xine, "auto",
-                                           XINE_VISUAL_TYPE_NONE, NULL);
-  xine->audioPort = xine_open_audio_driver(xine->xine, "none", NULL);
-  xine->stream = xine_stream_new(xine->xine, xine->audioPort, xine->videoPort);
-}
-
-void xineSetArea(_Xine* xine, int xpos, int ypos, int width, int height)
-{
-    g_mutex_lock(xine->frameInfo.lock);
-    xine->frameInfo.xpos = xpos;
-    xine->frameInfo.ypos = ypos;
-    xine->frameInfo.width = width;
-    xine->frameInfo.height = height;
-    g_mutex_unlock(xine->frameInfo.lock);
-}
-
-int xineGetType(_Xine* xine, const char* filename)
-{
-  xine_close(xine->stream);
-  if (!xine_open(xine->stream, filename)) {
-    return -1;
-  }
-  if (xine_get_stream_info(xine->stream, XINE_STREAM_INFO_HAS_VIDEO)) {
-    return 0;
-  }
-  if (xine_get_stream_info(xine->stream, XINE_STREAM_INFO_HAS_AUDIO)) {
-    return 1;
-  }
-  return 2;
-}
-
-int xineSelectFile(_Xine* xine, const char* filename)
-{
-    if(!xine->attached) return;
-    xine_close(xine->stream);
-    if (!xine_open(xine->stream, filename)) {
-        return 0;
-    }
-    if (xine_get_stream_info (xine->stream, XINE_STREAM_INFO_HAS_VIDEO)) {
-      _xineSwitchToNormal(xine);
-    } else {
-      _xineSwitchToViz(xine);
-    }
-    return 1;
-}
-
-void xineSeek(_Xine* xine, int position)
-{
-    if(!xine->attached) return;
-    xine_play(xine->stream, 0, position);
-}
-
-void xineSetPlaying(_Xine* xine, int isPlaying)
-{
-    if(!xine->attached) return;
-    if(isPlaying) {
-        xine_set_param(xine->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
-    } else {
-        xine_set_param(xine->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
-    }
-}
-
-void xineSetViz (_Xine* xine, const char *viz)
-{
-  if (!strcmp(viz, "none") || viz[0] == 0) {
-    xine->viz_name = NULL;
-  } else {
-    viz = viz_available (xine, viz);
-    if (viz)
-      xine->viz_name = viz;
-    else
-      xine->viz_name = xine->viz_available [0];
-  }
-}
-
-void xineSetVolume(_Xine* xine, int volume)
-{
-    if(!xine->attached) return;
-    xine_set_param(xine->stream, XINE_PARAM_AUDIO_AMP_LEVEL, volume);
-}
-
-int xineGetVolume(_Xine* xine)
-{
-    if(!xine->attached) return 0;
-    return xine_get_param(xine->stream, XINE_PARAM_AUDIO_AMP_LEVEL);
-}
-
-void xineGotExposeEvent(_Xine* xine, int x, int y, int width, int height)
-{
-    XExposeEvent expose;
-
-    if(!xine->attached) return;
-    /* set as much of the XExposeEvent as we can.  Some fields like serial
-     * won't be filled in, but this doesn't cause problems in practice.  Totem
-     * doesn't fill in anything, so our method can't be too bad. */
-    memset(&expose, 0, sizeof(XExposeEvent));
-    expose.x = x;
-    expose.y = y;
-    expose.width = width;
-    expose.height = height;
-    expose.display = xine->display;
-    expose.window = xine->drawable;
-    xine_port_send_gui_data(xine->videoPort, XINE_GUI_SEND_EXPOSE_EVENT,
-            &expose);
-}
-
-int xineGetPosLength(_Xine* xine, int* position, int* length)
-{
-    int dummy;
-    if(!xine->attached) {
-        return 0; // This should cause an exception to be raised upstream
-    }
-    return xine_get_pos_length(xine->stream, &dummy, position, length);
-}
-
-char *xineVersion()
-{
-    return xine_get_version_string();
-}

=== removed file 'platform/gtk-x11/xine/xine_impl.h'
--- platform/gtk-x11/xine/xine_impl.h	2009-10-25 00:24:34 +0000
+++ platform/gtk-x11/xine/xine_impl.h	1970-01-01 00:00:00 +0000
@@ -1,273 +0,0 @@
-/*
-# Miro - an RSS based video player application
-# Copyright (C) 2005-2009 Participatory Culture Foundation
-#
-# 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the OpenSSL
-# library.
-#
-# You must obey the GNU General Public License in all respects for all of
-# the code used other than OpenSSL. If you modify file(s) with this
-# exception, you may extend this exception to your version of the file(s),
-# but you are not obligated to do so. If you do not wish to do so, delete
-# this exception statement from your version. If you delete this exception
-# statement from all source files in the program, then also delete it here.
-*/
-
-/**************************************************************************
- * xine_impl.h
- *
- * Implementations for the Xine class's methods.
- *
- * Almost all the work for the Xine class gets done in xine_impl.c.  xine.pyx
- * then wraps the functions.  This keeps xine.pyx from overflowing with "cdef
- * extern ..." statements
- *
- **************************************************************************/
-
-#include <glib.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/Xvlib.h>
-#include <X11/Xutil.h>
-
-#define XINE_ENABLE_EXPERIMENTAL_FEATURES 1
-#include <xine/video_out.h>
-#include <xine/configfile.h>
-#include <xine/vo_scale.h>
-#include <xine/alphablend.h>
-
-// Taken from XINE headers
-#ifdef INCLUDE_XINE_DRIVER_HACK
-typedef struct xine_list_chunk_s xine_list_chunk_t;
-typedef struct xine_list_s xine_list_t;
-typedef void* xine_list_iterator_t;
-typedef struct xine_list_elem_s xine_list_elem_t;
-
-struct xine_list_chunk_s {
-  xine_list_chunk_t *next_chunk;            /* singly linked list of chunks */
-
-  xine_list_elem_t *elem_array;             /* the allocated elements */
-  int chunk_size;                          /* element count in the chunk */
-  int current_elem_id;                     /* next free elem in the chunk */
-};
-
-struct xine_list_s {
-  /* list of chunks */
-  xine_list_chunk_t *chunk_list;
-  size_t            chunk_list_size;
-  xine_list_chunk_t *last_chunk;
-
-  /* list elements */
-  xine_list_elem_t  *elem_list_front;
-  xine_list_elem_t  *elem_list_back;
-  size_t            elem_list_size;
-