[mythtv-firehose] mythtv/mythtv-rec2 commit: b026525b6 by Daniel Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-20T13:00:50-07:00
   Push Date:  2011/07/20 13:02:13 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  b026525b6f2f75ef48328d96a6f9aa8fee7fa6fc
   Changeset:  https://github.com/MythTV/mythtv/commit/b026525b6

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythtv/channelbase.cpp
	mythtv/programs/mythbackend/mainserver.h

Added:

   mythplugins/mythmusic/theme/default/images/mm_albums.png
   mythplugins/mythmusic/theme/default/images/mm_artists.png
   mythplugins/mythmusic/theme/default/images/mm_genres.png
   mythplugins/mythmusic/theme/default/images/mm_music_tag.png
   mythplugins/mythmusic/theme/default/images/mm_playlists.png
   mythplugins/mythmusic/theme/default/images/mm_ratings.png
   mythplugins/mythmusic/theme/default/images/mm_smartplaylists.png
   mythplugins/mythmusic/theme/default/images/mm_years.png
   mythtv/libs/libmythtv/mythccextractorplayer.cpp
   mythtv/libs/libmythtv/mythccextractorplayer.h
   mythtv/libs/libmythtv/teletextextractorreader.cpp
   mythtv/libs/libmythtv/teletextextractorreader.h
   mythtv/programs/mythccextractor/.gitignore
   mythtv/programs/mythccextractor/commandlineparser.cpp
   mythtv/programs/mythccextractor/commandlineparser.h
   mythtv/programs/mythccextractor/main.cpp
   mythtv/programs/mythccextractor/mythccextractor.pro

Modified:

   mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
   mythplugins/mythmusic/mythmusic/cddecoder.cpp
   mythplugins/mythmusic/mythmusic/cdrip.cpp
   mythplugins/mythmusic/mythmusic/cdrip.h
   mythplugins/mythmusic/mythmusic/editmetadata.cpp
   mythplugins/mythmusic/mythmusic/editmetadata.h
   mythplugins/mythmusic/mythmusic/importmusic.cpp
   mythplugins/mythmusic/mythmusic/importmusic.h
   mythplugins/mythmusic/mythmusic/main.cpp
   mythplugins/mythmusic/mythmusic/metadata.cpp
   mythplugins/mythmusic/mythmusic/metadata.h
   mythplugins/mythmusic/mythmusic/metaio.h
   mythplugins/mythmusic/mythmusic/metaioid3.cpp
   mythplugins/mythmusic/mythmusic/metaioid3.h
   mythplugins/mythmusic/mythmusic/musiccommon.cpp
   mythplugins/mythmusic/mythmusic/musiccommon.h
   mythplugins/mythmusic/mythmusic/musicplayer.cpp
   mythplugins/mythmusic/mythmusic/mythmusic.pro
   mythplugins/mythmusic/mythmusic/playbackbox.cpp
   mythplugins/mythmusic/mythmusic/playbackbox.h
   mythplugins/mythmusic/theme/default-wide/music-ui.xml
   mythplugins/mythmusic/theme/default/music-ui.xml
   mythplugins/mythmusic/theme/theme.pro
   mythtv/bindings/python/MythTV/__init__.py
   mythtv/bindings/python/MythTV/dataheap.py
   mythtv/bindings/python/MythTV/methodheap.py
   mythtv/bindings/python/MythTV/system.py
   mythtv/contrib/development/MythXMLTest/MythXML.html
   mythtv/libs/libmyth/backendselect.cpp
   mythtv/libs/libmyth/managedlist.cpp
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmyth/programtypes.cpp
   mythtv/libs/libmyth/programtypes.h
   mythtv/libs/libmyth/rssparse.cpp
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/mythlogging.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/util.cpp
   mythtv/libs/libmythbase/util.h
   mythtv/libs/libmythbluray/bluray.c
   mythtv/libs/libmythbluray/bluray.h
   mythtv/libs/libmythbluray/decoders/graphics_controller.c
   mythtv/libs/libmythbluray/decoders/overlay.h
   mythtv/libs/libmythmetadata/metadatacommon.cpp
   mythtv/libs/libmythmetadata/metadatacommon.h
   mythtv/libs/libmythmetadata/metadatadownload.cpp
   mythtv/libs/libmythmetadata/metadatadownload.h
   mythtv/libs/libmythmetadata/metadatafactory.cpp
   mythtv/libs/libmythmetadata/metadatafactory.h
   mythtv/libs/libmythmetadata/metadataimagedownload.cpp
   mythtv/libs/libmythmetadata/metadataimagedownload.h
   mythtv/libs/libmythmetadata/metadataimagehelper.cpp
   mythtv/libs/libmythmetadata/mythuimetadataresults.cpp
   mythtv/libs/libmythmetadata/videometadata.cpp
   mythtv/libs/libmythmetadata/videoscan.cpp
   mythtv/libs/libmythmetadata/videoscan.h
   mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
   mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoder.h
   mythtv/libs/libmythtv/cc608reader.cpp
   mythtv/libs/libmythtv/cc608reader.h
   mythtv/libs/libmythtv/cc708window.h
   mythtv/libs/libmythtv/channelbase.cpp
   mythtv/libs/libmythtv/channelbase.h
   mythtv/libs/libmythtv/dbchannelinfo.cpp
   mythtv/libs/libmythtv/dbchannelinfo.h
   mythtv/libs/libmythtv/decoderbase.cpp
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/mpegrecorder.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/recordingrule.cpp
   mythtv/libs/libmythtv/teletextreader.cpp
   mythtv/libs/libmythtv/teletextreader.h
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythui/myththemedmenu.h
   mythtv/libs/libmythui/mythudplistener.cpp
   mythtv/libs/libmythui/mythuiguidegrid.cpp
   mythtv/libs/libmythui/mythuiguidegrid.h
   mythtv/libs/libmythupnp/httprequest.cpp
   mythtv/libs/libmythupnp/upnpdevice.cpp
   mythtv/libs/libmythupnp/upnpdevice.h
   mythtv/libs/libmythupnp/upnptasknotify.cpp
   mythtv/libs/libmythupnp/upnptasksearch.cpp
   mythtv/programs/mythbackend/commandlineparser.cpp
   mythtv/programs/mythbackend/config_backend_general.xml
   mythtv/programs/mythbackend/httpstatus.cpp
   mythtv/programs/mythbackend/main.cpp
   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mainserver.h
   mythtv/programs/mythbackend/mediaserver.cpp
   mythtv/programs/mythcommflag/main.cpp
   mythtv/programs/mythfrontend/editvideometadata.cpp
   mythtv/programs/mythfrontend/grabbersettings.cpp
   mythtv/programs/mythfrontend/guidegrid.cpp
   mythtv/programs/mythfrontend/guidegrid.h
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/manualschedule.cpp
   mythtv/programs/mythfrontend/manualschedule.h
   mythtv/programs/mythfrontend/mediarenderer.cpp
   mythtv/programs/mythfrontend/networkcontrol.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/playbackbox.h
   mythtv/programs/mythfrontend/progfind.cpp
   mythtv/programs/mythfrontend/progfind.h
   mythtv/programs/mythfrontend/proglist.cpp
   mythtv/programs/mythfrontend/proglist.h
   mythtv/programs/mythfrontend/proglist_helpers.cpp
   mythtv/programs/mythfrontend/programrecpriority.cpp
   mythtv/programs/mythfrontend/programrecpriority.h
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/statusbox.cpp
   mythtv/programs/mythfrontend/statusbox.h
   mythtv/programs/mythfrontend/videolist.cpp
   mythtv/programs/mythfrontend/viewscheduled.cpp
   mythtv/programs/mythfrontend/viewscheduled.h
   mythtv/programs/mythfrontend/viewschedulediff.cpp
   mythtv/programs/mythfrontend/viewschedulediff.h
   mythtv/programs/mythjobqueue/mythjobqueue.pro
   mythtv/programs/mythlcdserver/lcdserver.cpp
   mythtv/programs/mythmetadatalookup/lookup.cpp
   mythtv/programs/mythshutdown/main.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/programs/mythtv-setup/backendsettings.cpp
   mythtv/programs/programs.pro
   mythtv/themes/MythCenter-wide/schedule-ui.xml
   mythtv/themes/Terra/recordings-ui.xml
   mythtv/themes/Terra/schedule-ui.xml
   mythtv/themes/Terra/themeinfo.xml
   mythtv/themes/default-wide/config-ui.xml
   mythtv/themes/default/config-ui.xml