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

MythTV noreply at mythtv.org
Tue Apr 10 07:43:00 UTC 2012


      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-03-19T07:01:23-07:00
   Push Date:  2012/04/10 00:41:52 -0700
  Repository:  mythtv
      Branch:  devel/mythtv-rec2
New Revision:  5ce95a060883a47eb60aeda2f74b98e44b9536f5
   Changeset:  https://github.com/MythTV/mythtv/commit/5ce95a060

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythtv/libmythtv.pro
	mythtv/libs/libmythupnp/libmythupnp.pro
	mythtv/programs/programs-libs.pro

Added:

   mythtv/html/.gitignore
   mythtv/html/cpsvndir
   mythtv/html/css/jquery-ui.css
   mythtv/html/css/site.css
   mythtv/html/dummy.c
   mythtv/html/html.pro
   mythtv/html/images/favicon.ico
   mythtv/html/images/mythtv.png
   mythtv/html/index.html
   mythtv/html/info.html
   mythtv/html/js/jquery-ui.min.js
   mythtv/html/js/jquery.min.js
   mythtv/libs/libmythservicecontracts/datacontracthelper.h
   mythtv/libs/libmythservicecontracts/datacontracts/connectionInfo.h
   mythtv/libs/libmythservicecontracts/datacontracts/databaseInfo.h
   mythtv/libs/libmythservicecontracts/datacontracts/encoder.h
   mythtv/libs/libmythservicecontracts/datacontracts/encoderList.h
   mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
   mythtv/libs/libmythservicecontracts/datacontracts/programGuide.h
   mythtv/libs/libmythservicecontracts/datacontracts/programList.h
   mythtv/libs/libmythservicecontracts/datacontracts/recording.h
   mythtv/libs/libmythservicecontracts/datacontracts/settingList.h
   mythtv/libs/libmythservicecontracts/datacontracts/stringList.h
   mythtv/libs/libmythservicecontracts/datacontracts/successFail.h
   mythtv/libs/libmythservicecontracts/datacontracts/wolInfo.h
   mythtv/libs/libmythservicecontracts/libmythservicecontracts.pro
   mythtv/libs/libmythservicecontracts/service.cpp
   mythtv/libs/libmythservicecontracts/service.h
   mythtv/libs/libmythservicecontracts/serviceexp.h
   mythtv/libs/libmythservicecontracts/services/contentServices.h
   mythtv/libs/libmythservicecontracts/services/dvrServices.h
   mythtv/libs/libmythservicecontracts/services/guideServices.h
   mythtv/libs/libmythservicecontracts/services/mythServices.h
   mythtv/libs/libmythtv/tv_actions.h
   mythtv/libs/libmythui/mythui_actions.h
   mythtv/libs/libmythui/mythuiactions.h
   mythtv/libs/libmythupnp/htmlserver.cpp
   mythtv/libs/libmythupnp/htmlserver.h
   mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp
   mythtv/libs/libmythupnp/serializers/jsonSerializer.h
   mythtv/libs/libmythupnp/serializers/serializer.cpp
   mythtv/libs/libmythupnp/serializers/serializer.h
   mythtv/libs/libmythupnp/serializers/soapSerializer.h
   mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
   mythtv/libs/libmythupnp/serializers/xmlSerializer.h
   mythtv/libs/libmythupnp/servicehost.cpp
   mythtv/libs/libmythupnp/servicehost.h
   mythtv/libs/libmythupnp/wsdl.cpp
   mythtv/libs/libmythupnp/wsdl.h
   mythtv/programs/mythbackend/internetContent.cpp
   mythtv/programs/mythbackend/internetContent.h
   mythtv/programs/mythbackend/serviceHosts/contentServiceHost.h
   mythtv/programs/mythbackend/serviceHosts/dvrServiceHost.h
   mythtv/programs/mythbackend/serviceHosts/guideServiceHost.h
   mythtv/programs/mythbackend/serviceHosts/mythServiceHost.h
   mythtv/programs/mythbackend/services/content.cpp
   mythtv/programs/mythbackend/services/content.h
   mythtv/programs/mythbackend/services/dvr.cpp
   mythtv/programs/mythbackend/services/dvr.h
   mythtv/programs/mythbackend/services/guide.cpp
   mythtv/programs/mythbackend/services/guide.h
   mythtv/programs/mythbackend/services/myth.cpp
   mythtv/programs/mythbackend/services/myth.h
   mythtv/programs/mythbackend/services/serviceUtil.cpp
   mythtv/programs/mythbackend/services/serviceUtil.h

Removed:

   mythtv/programs/mythbackend/mythxml.cpp
   mythtv/programs/mythbackend/mythxml.h

Modified:

   mythplugins/configure
   mythplugins/mythmusic/mythmusic/cddecoder.h
   mythplugins/mythmusic/mythmusic/goom/goom_core.c
   mythplugins/mythmusic/mythmusic/visualize.cpp
   mythplugins/mythmusic/mythmusic/visualize.h
   mythplugins/mythnetvision/mythnetvision/netcommon.cpp
   mythplugins/mythnetvision/mythnetvision/nettree.cpp
   mythplugins/mythnetvision/mythnetvision/nettree.h
   mythplugins/mythweather/mythweather/scripts/ca_envcan/ENVCANParser.pm
   mythplugins/programs-libs.pro
   mythtv/Makefile
   mythtv/bindings/perl/MythTV.pm
   mythtv/bindings/php/MythBackend.php
   mythtv/bindings/python/MythTV/connections.py
   mythtv/bindings/python/MythTV/dataheap.py
   mythtv/bindings/python/MythTV/methodheap.py
   mythtv/bindings/python/MythTV/mythproto.py
   mythtv/bindings/python/MythTV/static.py
   mythtv/bindings/python/MythTV/utility.py
   mythtv/contrib/maintenance/flush_deleted_recgroup.pl
   mythtv/contrib/user_jobs/mythlink.pl
   mythtv/docs/doxygen-architecture-document.cpp
   mythtv/libs/libmyth/audio/audiooutputalsa.cpp
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/mythcommandlineparser.cpp
   mythtv/libs/libmyth/mythcontext.cpp
   mythtv/libs/libmyth/netgrabbermanager.cpp
   mythtv/libs/libmyth/output.h
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmyth/programinfo.h
   mythtv/libs/libmyth/remoteutil.cpp
   mythtv/libs/libmyth/remoteutil.h
   mythtv/libs/libmythbase/compat.h
   mythtv/libs/libmythbase/httpcomms.cpp
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/remotefile.cpp
   mythtv/libs/libmythbase/util.cpp
   mythtv/libs/libmythfreemheg/Engine.cpp
   mythtv/libs/libmythmetadata/libmythmetadata.pro
   mythtv/libs/libmythmetadata/videometadata.cpp
   mythtv/libs/libmythmetadata/videoutils.cpp
   mythtv/libs/libmythmetadata/videoutils.h
   mythtv/libs/libmythtv/audioplayer.cpp
   mythtv/libs/libmythtv/audioplayer.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoder.h
   mythtv/libs/libmythtv/avformatdecoderbd.cpp
   mythtv/libs/libmythtv/avformatdecoderbd.h
   mythtv/libs/libmythtv/avformatdecoderdvd.cpp
   mythtv/libs/libmythtv/avformatdecoderdvd.h
   mythtv/libs/libmythtv/bdringbuffer.h
   mythtv/libs/libmythtv/bswap.h
   mythtv/libs/libmythtv/decoderbase.cpp
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/dvbcam.h
   mythtv/libs/libmythtv/dvdringbuffer.h
   mythtv/libs/libmythtv/dxva2decoder.cpp
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/linuxfirewiredevice.cpp
   mythtv/libs/libmythtv/mpeg/mpegtables.cpp
   mythtv/libs/libmythtv/mythdvdplayer.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/openglvideo.cpp
   mythtv/libs/libmythtv/privatedecoder_vda.cpp
   mythtv/libs/libmythtv/privatedecoder_vda.h
   mythtv/libs/libmythtv/ringbuffer.h
   mythtv/libs/libmythtv/signalmonitor.h
   mythtv/libs/libmythtv/streamingringbuffer.h
   mythtv/libs/libmythtv/tv.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/videoout_d3d.cpp
   mythtv/libs/libmythtv/videoout_opengl.cpp
   mythtv/libs/libmythtv/videoout_quartz.cpp
   mythtv/libs/libmythtv/videoout_vdpau.cpp
   mythtv/libs/libmythtv/videoout_xv.cpp
   mythtv/libs/libmythtv/videoout_xv.h
   mythtv/libs/libmythtv/videooutbase.cpp
   mythtv/libs/libmythui/DisplayResOSX.cpp
   mythtv/libs/libmythui/libmythui.pro
   mythtv/libs/libmythui/mythgenerictree.cpp
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythmainwindow.h
   mythtv/libs/libmythui/mythpainter.cpp
   mythtv/libs/libmythui/mythpainter.h
   mythtv/libs/libmythui/mythpainter_d3d9.cpp
   mythtv/libs/libmythui/mythpainter_d3d9.h
   mythtv/libs/libmythui/mythpainter_ogl.cpp
   mythtv/libs/libmythui/mythpainter_ogl.h
   mythtv/libs/libmythui/mythpainter_qimage.cpp
   mythtv/libs/libmythui/mythpainter_qimage.h
   mythtv/libs/libmythui/mythpainter_qt.cpp
   mythtv/libs/libmythui/mythpainter_qt.h
   mythtv/libs/libmythui/mythpainter_vdpau.cpp
   mythtv/libs/libmythui/mythpainter_vdpau.h
   mythtv/libs/libmythui/mythpainter_yuva.cpp
   mythtv/libs/libmythui/mythpainter_yuva.h
   mythtv/libs/libmythui/mythrender_d3d9.h
   mythtv/libs/libmythui/mythrender_opengl.cpp
   mythtv/libs/libmythui/mythrender_opengl.h
   mythtv/libs/libmythui/mythrender_opengl1.cpp
   mythtv/libs/libmythui/mythrender_opengl1.h
   mythtv/libs/libmythui/mythrender_opengl2.cpp
   mythtv/libs/libmythui/mythrender_opengl2.h
   mythtv/libs/libmythui/mythrender_vdpau.cpp
   mythtv/libs/libmythui/mythrender_vdpau.h
   mythtv/libs/libmythui/myththemedmenu.cpp
   mythtv/libs/libmythui/mythuifilebrowser.cpp
   mythtv/libs/libmythui/mythuiguidegrid.cpp
   mythtv/libs/libmythui/mythuiguidegrid.h
   mythtv/libs/libmythui/mythuishape.cpp
   mythtv/libs/libmythui/mythuishape.h
   mythtv/libs/libmythui/mythuitype.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/util-osx-cocoa.mm
   mythtv/libs/libmythui/xmlparsebase.cpp
   mythtv/libs/libmythupnp/httprequest.cpp
   mythtv/libs/libmythupnp/httprequest.h
   mythtv/libs/libmythupnp/httpserver.cpp
   mythtv/libs/libmythupnp/httpserver.h
   mythtv/libs/libmythupnp/libmythupnp.pro
   mythtv/libs/libmythupnp/ssdp.cpp
   mythtv/libs/libs.pro
   mythtv/programs/mythavtest/main.cpp
   mythtv/programs/mythbackend/httpstatus.cpp
   mythtv/programs/mythbackend/httpstatus.h
   mythtv/programs/mythbackend/main.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mediaserver.cpp
   mythtv/programs/mythbackend/mythbackend.pro
   mythtv/programs/mythcommflag/main.cpp
   mythtv/programs/mythfilldatabase/main.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/mediarenderer.cpp
   mythtv/programs/mythfrontend/mythfexml.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/programinfocache.cpp
   mythtv/programs/mythjobqueue/main.cpp
   mythtv/programs/mythlcdserver/main.cpp
   mythtv/programs/mythmessage/main.cpp
   mythtv/programs/mythpreviewgen/main.cpp
   mythtv/programs/mythshutdown/main.cpp
   mythtv/programs/mythtranscode/main.cpp
   mythtv/programs/mythtv-setup/main.cpp
   mythtv/programs/mythwelcome/main.cpp
   mythtv/programs/programs-libs.pro
   mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py
   mythtv/themes/MythCenter-wide/schedule-ui.xml
   mythtv/themes/MythCenter-wide/settings-ui.xml
   mythtv/themes/MythCenter/schedule-ui.xml
   mythtv/themes/Terra/schedule-ui.xml
   mythtv/themes/default-wide/schedule-ui.xml
   mythtv/themes/default/recordings-ui.xml
   mythtv/themes/default/schedule-ui.xml



More information about the mythtv-firehose mailing list