Author: duncan
Date: Fri Feb 1 14:08:18 2008
New Revision: 10316
Log:
[ 1884550 ] Internet radio with mplayer fix
Patch from George Kibardin applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/audio/plugins/mplayer.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/audio/plugins/mplayer.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Fri Feb 1 14:08:18 2008
@@ -13,19 +13,19 @@
svn co svn://svn.freevo.org/freevo/branches/rel-1/freevo freevo-1.x
-== Release 1.7.6 (2008-??-??) ==
+== Release 1.7.6 (2008-02-03) ==
--------------------------------
* New audio MPD plug-in replacement (F#1865008)
* New DirecTV plug-in to send to DirecTV receivers (F#1858775)
* New flickr plug-in to see photo from www.flickr.com (F#1865290)
* New web-server modules to show guidechannel and encoding_web (F#1864652)
- * New wiimote input plug-in (F#1868785)
* New Youtube video plug-in (F#1864496)
* Updated cdbackup plug-in with CD_RIP_FMT to set the encoding format
(F#1857460)
* Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated itv plug-in for youtube video feeds (F#1868425)
* Updated menu osd sounds for more sound events (F#1870321)
+ * Updated mplayer audio plug-in to allow .asx playlists (F#1884550)
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
@@ -69,8 +69,8 @@
* Fixed audiodiskitem not playing a cd when inserted (B#1830000)
* Fixed audioscrobbler killing the auto shutdown feature (F#1831371)
* Fixed evdev for 64bit machines (B#1853790)
- * Fixed helper plugins, not allowing tuples as arguments (B#1832837)
* Fixed geexbox skin TV menu reporting record server status (B#1835256)
+ * Fixed helper plugins, not allowing tuples as arguments (B#1832837)
* Fixed itv plug-in, having "No player for this item found"
(B#1833018,B#1833829)
* Fixed lastfm plug-in path using /tmp to use FREEVO_CACHEDIR (B#1834488)
* Fixed oneclick weather plug-in not handling bad icon data (B#1834275)
Modified: branches/rel-1-7/freevo/src/audio/plugins/mplayer.py
==============================================================================
--- branches/rel-1-7/freevo/src/audio/plugins/mplayer.py (original)
+++ branches/rel-1-7/freevo/src/audio/plugins/mplayer.py Fri Feb 1
14:08:18 2008
@@ -134,12 +134,13 @@
demux = ''
extra_opts = item.mplayer_options
+ ext = str(os.path.splitext(filename))
is_playlist = False
if hasattr(item, 'is_playlist') and item.is_playlist:
is_playlist = True
- if item.network_play and (str(filename).endswith('m3u') or
str(filename).endswith('pls')):
+ if item.network_play and ext in ('.m3u', '.pls', '.asx'):
is_playlist = True
if str(filename).find(".jsp?") >= 0:
@@ -151,8 +152,7 @@
if hasattr(item, 'reconnect') and item.reconnect:
extra_opts += ' -loop 0'
- command = '%s -vo null -ao %s %s %s' % (mpl, config.MPLAYER_AO_DEV,
demux,
- extra_opts)
+ command = '%s -vo null -ao %s %s %s' % (mpl, config.MPLAYER_AO_DEV,
demux, extra_opts)
if command.find('-playlist') > 0:
command = command.replace('-playlist', '')
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Fri Feb 1 14:08:18 2008
@@ -13,24 +13,25 @@
svn co svn://svn.freevo.org/freevo/branches/rel-1/freevo freevo-1.x
-== Release 1.8.0rc2 (2008-01-24) ==
+== Release 1.8.0rc2 (2008-02-03) ==
--------------------------------
* New tv vlc live pause plug-in for DVB (F#1875427)
+ * New wiimote input plug-in (F#1868785)
-== Release 1.7.6 (2008-??-??) ==
+== Release 1.7.6 (2008-02-03) ==
--------------------------------
* New audio MPD plug-in replacement (F#1865008)
* New DirecTV plug-in to send to DirecTV receivers (F#1858775)
* New flickr plug-in to see photo from www.flickr.com (F#1865290)
* New web-server modules to show guidechannel and encoding_web (F#1864652)
- * New wiimote input plug-in (F#1868785)
* New Youtube video plug-in (F#1864496)
* Updated cdbackup plug-in with CD_RIP_FMT to set the encoding format
(F#1857460)
* Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated itv plug-in for youtube video feeds (F#1868425)
* Updated menu osd sounds for more sound events (F#1870321)
+ * Updated mplayer audio plug-in to allow .asx playlists (F#1884550)
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
Modified: branches/rel-1/freevo/src/audio/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/mplayer.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/mplayer.py Fri Feb 1 14:08:18 2008
@@ -134,12 +134,13 @@
demux = ''
extra_opts = item.mplayer_options
+ ext = str(os.path.splitext(filename))
is_playlist = False
if hasattr(item, 'is_playlist') and item.is_playlist:
is_playlist = True
- if item.network_play and (str(filename).endswith('m3u') or
str(filename).endswith('pls')):
+ if item.network_play and ext in ('.m3u', '.pls', '.asx'):
is_playlist = True
if str(filename).find(".jsp?") >= 0:
@@ -151,8 +152,7 @@
if hasattr(item, 'reconnect') and item.reconnect:
extra_opts += ' -loop 0'
- command = '%s -vo null -ao %s %s %s' % (mpl, config.MPLAYER_AO_DEV,
demux,
- extra_opts)
+ command = '%s -vo null -ao %s %s %s' % (mpl, config.MPLAYER_AO_DEV,
demux, extra_opts)
if command.find('-playlist') > 0:
command = command.replace('-playlist', '')
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
