The branch, dharma-pre has been updated
via d124ddf4d4958b81d9c9748506d501467bc909d3 (commit)
from 3fcb486a02fa3567c7121e9fbea0fa7427c357ab (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d124ddf4d4958b81d9c9748506d501467bc909d3
commit d124ddf4d4958b81d9c9748506d501467bc909d3
Author: spiff <[email protected]>
Date: Fri Oct 8 11:59:47 2010 +0200
[plugin.program.multiroomaudio] updated to version 1.1.2
diff --git a/plugin.program.multiroomaudio/addon.xml
b/plugin.program.multiroomaudio/addon.xml
index f4519fe..2c87b30 100644
--- a/plugin.program.multiroomaudio/addon.xml
+++ b/plugin.program.multiroomaudio/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.program.multiroomaudio"
- name="MultiroomAudio" version="1.1.1" provider-name="vortexrotor">
+ name="MultiroomAudio" version="1.1.2" provider-name="vortexrotor">
<requires>
<import addon="xbmc.python" version="1.0"/>
</requires>
@@ -8,7 +8,7 @@
<provides>executable</provides>
</extension>
<extension point="xbmc.addon.metadata">
- <summary lang="en">v1.1.0 - Plugin for Multiroom Streaming Audio and
Video</summary>
+ <summary lang="en">v1.1.2 - Plugin for Multiroom Streaming Audio and
Video</summary>
<description lang="en">Allow syncronized Streaming of Audio and Video from
XBMC</description>
<platform>all</platform>
</extension>
diff --git a/plugin.program.multiroomaudio/changelog.txt
b/plugin.program.multiroomaudio/changelog.txt
index b8b4896..2ef882c 100644
--- a/plugin.program.multiroomaudio/changelog.txt
+++ b/plugin.program.multiroomaudio/changelog.txt
@@ -2,6 +2,17 @@ Up to date Install / Configuration / Usage / Help can be found
@
http://forum.xbmc.org/showthread.php?t=78431
+1.1.2
+- Fixed issue with Shoutcast and other internet streams not playing with
plugin activated
+
+- Fixed DVD not playing issue
+
+- Added Documentation to xbmc-multiroomaudio site. Located at the following
links:
+ Linux:
+
http://xbmc-multiroom-audio-plugin.googlecode.com/files/MAV%20Plugin%20Installation%20for%20Linux_09302010_v1.1.1.pdf
+ Windows:
+
http://xbmc-multiroom-audio-plugin.googlecode.com/files/MAV%20Plugin%20Installation%20for%20Windows7-XP_09302010_v1.1.1.pdf
+
1.1.1
- Streamer IP Input Dialogue - Now set to type "text"
diff --git a/plugin.program.multiroomaudio/default.py
b/plugin.program.multiroomaudio/default.py
index bd631f6..cbc0a84 100644
--- a/plugin.program.multiroomaudio/default.py
+++ b/plugin.program.multiroomaudio/default.py
@@ -12,7 +12,7 @@ __author__ = "teshephe"
__url__ = ""
__svn_url__ = ""
__credits__ = "VortexRotor, XBMC Team, VLC, Author of Launcher Plugin"
-__version__ = "1.1.1"
+__version__ = "1.1.2"
if ( __name__ == "__main__" ):
diff --git a/plugin.program.multiroomaudio/icon.png
b/plugin.program.multiroomaudio/icon.png
index b125bd8..106afc3 100644
Binary files a/plugin.program.multiroomaudio/icon.png and
b/plugin.program.multiroomaudio/icon.png differ
diff --git a/plugin.program.multiroomaudio/readme.txt
b/plugin.program.multiroomaudio/readme.txt
index a26e251..bfef7c9 100644
--- a/plugin.program.multiroomaudio/readme.txt
+++ b/plugin.program.multiroomaudio/readme.txt
@@ -1,4 +1,4 @@
-MultiroomAudio & Video Plugin v1.1.1
+MultiroomAudio & Video Plugin v1.1.2
Author: VortexRotor (teshephe)
Based off of the very fine work of the Launcher Plugin - leo212 (Thanks
Lior!!)
@@ -10,16 +10,17 @@ than one XBMC box in your home.
-The release of Multiroom v1.1.1 plugin includes these New Features:
+The release of Multiroom v1.1.2 plugin includes these New Features:
-- SQL Backend
-- Autoscan and configuration of Sources
-- Background Signalling between Clients and Master (started via autoexec.py)
-- Native XBMC Stop/Play/Pause work with plugin
-- Whats Playing Popup/Notification when listening to Master broadcast on Client
-- Source Auto-Play/Stop from Master of clients
-- Capability to Stream DVD's
-- RTP Streaming now added.
+- Fixed issue with Shoutcast and other internet streams not playing with
plugin activated
+
+- Fixed DVD not playing issue
+
+- Added Install Documentation to xbmc-multiroomaudio site. Located at the
following links:
+ Linux:
+
http://xbmc-multiroom-audio-plugin.googlecode.com/files/MAV%20Plugin%20Installation%20for%20Linux_09302010_v1.1.1.pdf
+ Windows:
+
http://xbmc-multiroom-audio-plugin.googlecode.com/files/MAV%20Plugin%20Installation%20for%20Windows7-XP_09302010_v1.1.1.pdf
@@ -48,81 +49,59 @@ This plugin requires the following:
XBMC 10 (Dharma) or higher
vlc 1.1.4 or higher (do: sudo add-apt-repository ppa:lucid-bleed/ppa && sudo
apt-get update && sudo apt-get install vlc )
For Windows Based machines - some of the scripts utilize powershell v2 - (do:
http://www.microsoft.com/downloads/en/details.aspx?FamilyId=60cb5b6c-6532-45e0-ab0f-a94ae9ababf5&displaylang=en
and dnld the version you require)
---This is to help fully suppress the background processes (Hopefully this is
only a temp requirement)
-
-
-
-INSTALLATION:
-
-Basic Setup:
-1) Install the plugin via Add-ons directory
-
-2) Configure the plugin by selecting the path to you vlc executable
-
-3) Configure the path for the generated pls files (usually /home/<username>
for linux users and C:\Documents and Settings\<username>\My
-Documents respectively for Windows users
-
-4) IP or Multicast Address - You can leave this at the default but if you plan
on having the ability of streaming at one point from any box make sure
-that each box has a different Multicast IP and Port so that their is no
overlap in the broadcast domain. Lets leave it for now at the default of
-224.1.1.152
-
-With this setup you could define a source for each on every box and tune into
what is playing at any given time from anywhere in the house... starting to see
the picture?
-
-5) UDP/TCP Port: As mentioned before, this coincides with the above but lets
leave it for now
-
-6) SAP Name - Put a meaningful name with NO spaces for the SAP name
-
-7) if this is the MASTER, then check the Global Master and Dedicated Streaming
Server.
+--This is to help fully suppress the background processes (Hopefully this is
only a temp requirement) also MAKE SURE that powershell is configured to
execute scripts. Here is a link
+ to show you
how...http://www.tech-recipes.com/rx/2513/powershell_enable_script_support/
-8) If this is the Global Master (Master) select this box.
-9) Again if this is a dedicated Master, then change the Default Video Player
to MR-Video_Stream, leave the Default Audio Player as PAPlayer
+Up to date Install/Configuration/Usage/Help can be found @
-10) The defaults for the rest should be satifactory
+http://forum.xbmc.org/showthread.php?t=78431
-11) Select OK to save the settings.
+Enjoy!
-12) Goto the plugin and select Generate Files
-13) Goto System > System > Audio output > Audio output device and select MAV
Streaming Sink (Linux Only) Audio will be produced via the Loopback
-14) Because this is the initial setup of the plugin a full Restart of your
machine and XBMC is required.
- Note: from here on out, any changes made to the Addon Settings will
require a restart of XBMC only so that new playercorefactory.xml file can
- be re-initialized. IT'S also a good idea to RE-GENERATE FILES everytime
you make a change to the settings.
+Up to date Install / Configuration / Usage / Help can be found @
-Client Specific:
-1) Configure your paths.
+http://forum.xbmc.org/showthread.php?t=78431
-2) Configure the SAP Name of the Client.
+Up to date Install / Configuration / Usage / Help can be found @
-3) Goto Misc Settings and select Auto Start Playing Source if you want this
Client to automatically start playing the Master Source when the master starts
streaming.
- NOTE: If you are already playing any media on the client the Master will
not activate the source on the client.
+http://forum.xbmc.org/showthread.php?t=78431
-4) Select OK to save the Settings
-5) To add a source now is very easy, in the MultiroomAudio plugin via the
Context menu select "Add New AV Source", a dialogue will popup and now select
"Auto Scan". From here it
- will automatically find the Master and any other possible MAV Clients on
the network, provided they were initially configured and restarted. ;-)
+CHANGLOG:
+1.1.2
+- Fixed issue with Shoutcast and other internet streams not playing with
plugin activated
-6) Select Generate Files.... Requires a XBMC restart.
+- Fixed DVD not playing issue
-7) Now that you restarted XBMC Everytime you create a new source a .pls file
is generated and stored in the Multiroom-AV folder. In that folder there are
two subfolders name VIDEO and AUDIO. Now,
- what you should do is go into the Music and the Video sections of XBMC
under "Files" and do "Add source" to add the VIDEO folder to the Video Section
and AUDIO folder
- to Music. When you get to the point where you give the new item a name, for
both instances call it Multiroom-AV and hit OK to save. So, What are we doing
here...? Well,
- by doing this we will have the ability to access the sources via something
like the XBMC Remote for iPhone or http....
+- Added Documentation to xbmc-multiroomaudio site. Located at the following
links:
+ Linux:
+
http://xbmc-multiroom-audio-plugin.googlecode.com/files/MAV%20Plugin%20Installation%20for%20Linux_09302010_v1.1.1.pdf
+ Windows:
+
http://xbmc-multiroom-audio-plugin.googlecode.com/files/MAV%20Plugin%20Installation%20for%20Windows7-XP_09302010_v1.1.1.pdf
+1.1.1
+- Streamer IP Input Dialogue - Now set to type "text"
+- Fixed default port number for http interface from 8081 to 8080. The script
would fail on intialization because it could not establish connection to
+ XBMC http interface.
-Up to date Install/Configuration/Usage/Help can be found @
+1.1.0
+- Added DVD Streaming
-http://forum.xbmc.org/showthread.php?t=78431
+- Support for RTP streaming
-Enjoy!
+- SQL Backend
+- Autoscan and configuration of Sources
+- Background Signalling between Clients and Master via UDP
-Up to date Install / Configuration / Usage / Help can be found @
+- Source Auto-Play
-http://forum.xbmc.org/showthread.php?t=78431
+- Capability to Stream DVD's
1.0.9
VLC version 1.1.4 required (it's a better release anyhow!!! ;-) )
diff --git a/plugin.program.multiroomaudio/resources/icon.png
b/plugin.program.multiroomaudio/resources/icon.png
index b125bd8..106afc3 100644
Binary files a/plugin.program.multiroomaudio/resources/icon.png and
b/plugin.program.multiroomaudio/resources/icon.png differ
diff --git
a/plugin.program.multiroomaudio/resources/lib/multiroomaudio_plugin.py
b/plugin.program.multiroomaudio/resources/lib/multiroomaudio_plugin.py
index 8eab664..8f7afc0 100644
--- a/plugin.program.multiroomaudio/resources/lib/multiroomaudio_plugin.py
+++ b/plugin.program.multiroomaudio/resources/lib/multiroomaudio_plugin.py
@@ -7,7 +7,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# Author: VortexRotor (teshephe)
-# v.1.0.10r1
+# v.1.1.2
"""
Plugin for True "Syncronized" Multiroom Streaming Audio/Video
@@ -751,7 +751,7 @@ class Main:
usock.write(" <playonestackitem>false</playonestackitem>\n")
usock.write(" </player>\n")
usock.write(" </players>\n")
- usock.write(" <rules action=\"overwrite\">\n")
+ usock.write(" <rules action=\"prepend\">\n")
usock.write(" <!-- DVDs -->\n")
if (Addon.getSetting( "strm_dvd" ) == "true"):
usock.write(" <rule name=\"dvd\" dvd=\"true\"
player=\""+default_vp+"\" />\n")
@@ -763,28 +763,10 @@ class Main:
usock.write(" <rule name=\"dvdimage\" dvdimage=\"true\"
player=\"DVDPlayer\" />\n")
usock.write("\n")
usock.write(" <!-- Multiroom AV Plugin will play the pls
files -->\n")
- usock.write(" <rule name=\"rtv\" protocols=\"rtv\"
player=\""+default_vp+"\" />\n")
usock.write(" <rule name=\"pls\" filetypes=\"pls\"
player=\"MR-AV_VPlay\" />\n")
- usock.write(" <rule name=\"pls/udp\"
protocols=\"rtmp|mms|mmsh|udp|http|rtsp|rtp\" player=\"MR-AV_VPlay\" />\n")
- usock.write(" <rule name=\"hdhomerun/myth/\"
protocols=\"hdhomerun|myth|cmyth\" player=\""+default_vp+"\" />\n")
- usock.write(" <rule name=\"lastfm/shout\"
protocols=\"lastfm|shout\" player=\"PAPlayer\" />\n")
+ usock.write(" <rule name=\"pls/udp\" protocols=\"udp|rtp\"
player=\"MR-AV_VPlay\" />\n")
usock.write(" <rule video=\"true\" player=\""+default_vp+"\"
/>\n")
usock.write(" <rule audio=\"true\" player=\""+default_ap+"\"
/>\n")
- usock.write("\n")
- usock.write(" <!-- dvdplayer can play standard rtsp streams
-->\n")
- usock.write(" <rule name=\"rtsp\" protocols=\"rtsp\"
filetypes=\"!(rm|ra)\" player=\""+default_ap+"\" />\n")
- usock.write("\n")
- usock.write(" <!-- Internet streams -->\n")
- usock.write(" <rule name=\"streams\"
internetstream=\"true\">\n")
- usock.write(" <rule name=\"flv/aacp/sdp\"
mimetypes=\"video/x-flv|video-flv|audio/aacp|application/sdp\"
player=\""+default_vp+"\" />\n")
- usock.write(" <rule name=\"mp2\"
mimetypes=\"application/octet-stream\" filetypes=\"mp2\"
player=\""+default_ap+"\" />\n")
- usock.write(" </rule>\n")
- usock.write("\n")
- usock.write(" <!-- Only dvdplayer can handle these normally
-->\n")
- usock.write(" <rule name=\"sdp/asf\" filetypes=\"sdp|asf\"
player=\""+default_vp+"\" />\n")
- usock.write("\n")
- usock.write(" <!-- Pass these to dvdplayer as we do not know
if they are audio or video -->\n")
- usock.write(" <rule name=\"nsv\" filetypes=\"nsv\"
player=\""+default_vp+"\" />\n")
usock.write(" </rules>\n")
usock.write("</playercorefactory>\n")
usock.close()
diff --git a/plugin.program.multiroomaudio/resources/lib/rcvUDP.py
b/plugin.program.multiroomaudio/resources/lib/rcvUDP.py
index dc97da6..6a841c3 100644
--- a/plugin.program.multiroomaudio/resources/lib/rcvUDP.py
+++ b/plugin.program.multiroomaudio/resources/lib/rcvUDP.py
@@ -265,19 +265,24 @@ def _action(msg):
#else:
#xbmc.executebuiltin("Notification(Multiroom Audio,Event
Action: QueuedNext ME,15000,"+DEFAULT_IMG+")")
# MediaChanged Audio eg: <b>MediaChanged:<li>AudioTitle:Wish You Were
Here<li>AudioArtist:Pink Floyd;x.x.x.x;1</b>
+ # For Shoucast Streams
<b>MediaChanged:<li>AudioTitle:1060;x.x.x.x;1</b>
if msg.startswith('<b>MediaChanged:<li>AudioTitle'):
l = msg.lstrip('<b>MediaChanged:<li>AudioTitle:')
r = l.rstrip('</b>')
- parts1 = r.split('<li>AudioArtist:')
- song = (parts1[0])
- m1 = (parts1[1])
- m2 = m1.split(';')
- artist = (m2[0])
- srcip = (m2[1])
- if (srcip == MSTR):
- xbmc.executebuiltin("Notification(Now Playing on "+MSTRNM+",
"+song+" By:"+artist+",15000,"+DEFAULT_IMG+")")
- #else:
- #xbmc.executebuiltin("Notification(Multiroom Audio,Event
Action: Audio Playing ME,15000,"+DEFAULT_IMG+")")
+ if (r.find('<li>AudioArtist:') >= 0 ):
+ parts = r.split('<li>AudioArtist:')
+ song = (parts[0])
+ m1 = (parts[1])
+ m2 = m1.split(';')
+ artist = (m2[0])
+ srcip = (m2[1])
+ if (srcip == MSTR):
+ xbmc.executebuiltin("Notification(Now Playing on
"+MSTRNM+", "+song+" By:"+artist+",15000,"+DEFAULT_IMG+")")
+ #else:
+ #xbmc.executebuiltin("Notification(Multiroom Audio,Event
Action: Audio Playing ME,15000,"+DEFAULT_IMG+")")
+ #else:
+ #xbmc.executebuiltin("Notification(Multiroom Audio,Event
Action: Shoutcast Playing,15000,"+DEFAULT_IMG+")")
+
# MediaChanged Movie eg:
<b>MediaChanged:<li>MovieTitle:21;192.168.100.152;1</b>
if msg.startswith('<b>MediaChanged:<li>MovieTitle'):
l = msg.lstrip('<b>MediaChanged:<li>MovieTitle:')
diff --git a/plugin.program.multiroomaudio/resources/settings.xml
b/plugin.program.multiroomaudio/resources/settings.xml
index e2422a2..8af34ff 100644
--- a/plugin.program.multiroomaudio/resources/settings.xml
+++ b/plugin.program.multiroomaudio/resources/settings.xml
@@ -32,7 +32,7 @@
<category label="30044">
<setting type="lsep" label="30045"/>
<setting type="sep" />
- <setting id="vstrm_type" type="labelenum" label="30054" default="udp"
values="udp|rtp" enable=""/>
+ <setting id="vstrm_type" type="labelenum" label="30054" default="rtp"
values="udp|rtp" enable=""/>
<setting id="vsout_lbl" type="bool" label="30046" default="false"/>
<setting id="video_sout" type="text" label="30058" default=""
enable="eq(-1,true)"/>
<setting id="vshelp" type="text" label="30057" enable="false"/>
@@ -42,7 +42,7 @@
<category label="30048">
<setting type="lsep" label="30049"/>
<setting type="sep" />
- <setting id="astrm_type" type="labelenum" label="30054" default="udp"
values="udp|rtp" enable=""/>
+ <setting id="astrm_type" type="labelenum" label="30054" default="rtp"
values="udp|rtp" enable=""/>
<setting id="asout_lbl" type="bool" label="30046" default="false"/>
<setting id="audio_sout" type="text" label="30058" default=""
enable="eq(-1,true)"/>
<setting id="ashelp" type="text" label="30057" enable="false"/>
-----------------------------------------------------------------------
Summary of changes:
plugin.program.multiroomaudio/addon.xml | 4 +-
plugin.program.multiroomaudio/changelog.txt | 11 ++
plugin.program.multiroomaudio/default.py | 2 +-
plugin.program.multiroomaudio/icon.png | Bin 16892 -> 170717 bytes
plugin.program.multiroomaudio/readme.txt | 103 ++++++++------------
plugin.program.multiroomaudio/resources/icon.png | Bin 16892 -> 170717 bytes
.../resources/lib/multiroomaudio_plugin.py | 24 +----
.../resources/lib/rcvUDP.py | 25 +++--
.../{ => resources/media/images}/icon.png | Bin 16892 -> 16892 bytes
.../resources/settings.xml | 4 +-
10 files changed, 75 insertions(+), 98 deletions(-)
copy plugin.program.multiroomaudio/{ => resources/media/images}/icon.png (100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
