[mythtv-commits] mythtv branch master updated by stuartm. v0.26-pre-798-gab33b88

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  ab33b8866927ca4288c60c84fafecb0090e1bfe7 (commit)
       via  d5137aa7677001d1f76acb9ef0b58b3b5b4b9dc1 (commit)
       via  cdde562f332ee3b074da1a176b02365cefa1c8ec (commit)
      from  a32d5e31ad2833c6e55f3161732faa7fe2f00cfc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab33b8866927ca4288c60c84fafecb0090e1bfe7
Author:    Paul Harrison <pharrison at mythtv.org> at Sat, 16 Jun 2012 15:33:09 +0100
Committer: Stuart Morgan <smorgan at mythtv.org> at Fri, 6 Jul 2012 23:13:29 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ab33b8866927ca4288c60c84fafecb0090e1bfe7

MythMusic: Add some menu items for the new radio stream playback (cherry picked from commit 33ae837c8cffb8cf8495cc85d060767d586c6078)
Signed-off-by: Stuart Morgan <smorgan at mythtv.org>



commit d5137aa7677001d1f76acb9ef0b58b3b5b4b9dc1
Author:    Stuart Morgan <smorgan at mythtv.org> at Fri, 6 Jul 2012 23:04:58 +0100
Committer: Stuart Morgan <smorgan at mythtv.org> at Fri, 6 Jul 2012 23:04:58 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d5137aa7677001d1f76acb9ef0b58b3b5b4b9dc1

Hunk missed from mythmusic streaming merge.



commit cdde562f332ee3b074da1a176b02365cefa1c8ec
Author:    Paul Harrison <pharrison at mythtv.org> at Sat, 16 Jun 2012 13:48:45 +0100
Committer: Stuart Morgan <smorgan at mythtv.org> at Fri, 6 Jul 2012 23:01:52 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=cdde562f332ee3b074da1a176b02365cefa1c8ec

MythMusic: Add ice/shoutcast radio stream playback (cherry picked from commit 92681341499885f162db33acf0479e3ec1fa02bd)
Conflicts:

	mythplugins/mythmusic/mythmusic/metadata.cpp
	mythplugins/mythmusic/mythmusic/metadata.h
	mythplugins/mythmusic/mythmusic/musicplayer.h

Signed-off-by: Stuart Morgan <smorgan at mythtv.org>



-----------------------------------------------------------------------

Summary of changes:
 mythplugins/mythmusic/mythmusic/dbcheck.cpp        |   25 +-
 mythplugins/mythmusic/mythmusic/decoderhandler.cpp |  156 +-
 mythplugins/mythmusic/mythmusic/decoderhandler.h   |   24 +-
 mythplugins/mythmusic/mythmusic/importmusic.cpp    |    1 -
 mythplugins/mythmusic/mythmusic/main.cpp           |   35 +-
 mythplugins/mythmusic/mythmusic/metadata.cpp       |  238 +-
 mythplugins/mythmusic/mythmusic/metadata.h         |   63 +-
 mythplugins/mythmusic/mythmusic/musiccommon.cpp    |  266 +-
 mythplugins/mythmusic/mythmusic/musiccommon.h      |    5 +-
 mythplugins/mythmusic/mythmusic/musicplayer.cpp    |  158 +-
 mythplugins/mythmusic/mythmusic/musicplayer.h      |   28 +-
 mythplugins/mythmusic/mythmusic/mythmusic.pro      |    4 +-
 mythplugins/mythmusic/mythmusic/playlist.cpp       |   49 +-
 .../mythmusic/mythmusic/playlistcontainer.cpp      |    3 +
 mythplugins/mythmusic/mythmusic/shoutcast.cpp      |   91 +-
 mythplugins/mythmusic/mythmusic/shoutcast.h        |    6 +
 mythplugins/mythmusic/mythmusic/streams.xml        | 6283 ++++++++++++++++++++
 mythplugins/mythmusic/mythmusic/streamview.cpp     |  900 +++
 mythplugins/mythmusic/mythmusic/streamview.h       |  116 +
 mythplugins/mythmusic/mythmusic/visualizerview.cpp |    3 +-
 .../mythmusic/theme/default-wide/stream-ui.xml     |  440 ++
 mythplugins/mythmusic/theme/menus/musicmenu.xml    |    8 +-
 mythplugins/mythmusic/theme/theme.pro              |    5 +-
 mythtv/themes/defaultmenu/library.xml              |    8 +
 mythtv/themes/mediacentermenu/mainmenu.xml         |    8 +
 25 files changed, 8627 insertions(+), 296 deletions(-)
 create mode 100644 mythplugins/mythmusic/mythmusic/streams.xml
 create mode 100644 mythplugins/mythmusic/mythmusic/streamview.cpp
 create mode 100644 mythplugins/mythmusic/mythmusic/streamview.h
 create mode 100644 mythplugins/mythmusic/theme/default-wide/stream-ui.xml

--