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

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

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-04-08T08:26:56-07:00
   Push Date:  2012/04/10 00:41:52 -0700
  Repository:  mythtv
      Branch:  devel/mythtv-rec2
New Revision:  9d2d753b84671033d95966ec9978d76554df7a62
   Changeset:  https://github.com/MythTV/mythtv/commit/9d2d753b8

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmyth/backendselect.cpp
	mythtv/libs/libmythupnp/libmythupnp.pro
	mythtv/libs/libmythupnp/soapclient.cpp
	mythtv/libs/libmythupnp/soapclient.h
	mythtv/libs/libmythupnp/ssdp.cpp
	mythtv/libs/libmythupnp/ssdp.h
	mythtv/programs/mythbackend/autoexpire.cpp
	mythtv/programs/mythbackend/main_helpers.cpp
	mythtv/programs/mythbackend/main_helpers.h

Added:

   mythtv/html/css/Status.css
   mythtv/html/css/images/ui-bg_flat_30_cccccc_40x100.png
   mythtv/html/css/images/ui-bg_flat_50_5c5c5c_40x100.png
   mythtv/html/css/images/ui-bg_glass_40_ffc73d_1x400.png
   mythtv/html/css/images/ui-bg_hexagon_10_000000_12x10.png
   mythtv/html/css/images/ui-bg_highlight-hard_20_0b6a98_1x100.png
   mythtv/html/css/images/ui-bg_highlight-soft_33_003147_1x100.png
   mythtv/html/css/images/ui-bg_highlight-soft_35_222222_1x100.png
   mythtv/html/css/images/ui-bg_highlight-soft_44_444444_1x100.png
   mythtv/html/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
   mythtv/html/css/images/ui-icons_222222_256x240.png
   mythtv/html/css/images/ui-icons_4b8e0b_256x240.png
   mythtv/html/css/images/ui-icons_a83300_256x240.png
   mythtv/html/css/images/ui-icons_cccccc_256x240.png
   mythtv/html/css/images/ui-icons_ffffff_256x240.png
   mythtv/html/css/menustyle.css
   mythtv/html/css/setup.css
   mythtv/html/images/menu-button-bg.gif
   mythtv/html/js/databaseutil.js
   mythtv/html/js/inspect.js
   mythtv/html/js/jqueryFileTree/images/application.png
   mythtv/html/js/jqueryFileTree/images/code.png
   mythtv/html/js/jqueryFileTree/images/css.png
   mythtv/html/js/jqueryFileTree/images/db.png
   mythtv/html/js/jqueryFileTree/images/directory.png
   mythtv/html/js/jqueryFileTree/images/doc.png
   mythtv/html/js/jqueryFileTree/images/file.png
   mythtv/html/js/jqueryFileTree/images/film.png
   mythtv/html/js/jqueryFileTree/images/flash.png
   mythtv/html/js/jqueryFileTree/images/folder_open.png
   mythtv/html/js/jqueryFileTree/images/html.png
   mythtv/html/js/jqueryFileTree/images/java.png
   mythtv/html/js/jqueryFileTree/images/linux.png
   mythtv/html/js/jqueryFileTree/images/music.png
   mythtv/html/js/jqueryFileTree/images/pdf.png
   mythtv/html/js/jqueryFileTree/images/php.png
   mythtv/html/js/jqueryFileTree/images/picture.png
   mythtv/html/js/jqueryFileTree/images/ppt.png
   mythtv/html/js/jqueryFileTree/images/psd.png
   mythtv/html/js/jqueryFileTree/images/ruby.png
   mythtv/html/js/jqueryFileTree/images/script.png
   mythtv/html/js/jqueryFileTree/images/spinner.gif
   mythtv/html/js/jqueryFileTree/images/txt.png
   mythtv/html/js/jqueryFileTree/images/xls.png
   mythtv/html/js/jqueryFileTree/images/zip.png
   mythtv/html/js/jqueryFileTree/jqueryFileTree.css
   mythtv/html/js/jqueryFileTree/jqueryFileTree.js
   mythtv/html/js/menu.js
   mythtv/html/js/util.qjs
   mythtv/html/menu.qsp
   mythtv/html/misc/database.html
   mythtv/html/misc/message.html
   mythtv/html/misc/overview.qsp
   mythtv/html/misc/placeholder.html
   mythtv/html/misc/wsdl.html
   mythtv/html/samples/js/samples.js
   mythtv/html/samples/recorded.qsp
   mythtv/html/samples/serverside.qsp
   mythtv/html/setup/expert.html
   mythtv/html/setup/general.html
   mythtv/html/setup/jobqueue-backend.html
   mythtv/html/setup/jobqueue-job-editor.html
   mythtv/html/setup/jobqueue-jobs.qsp
   mythtv/html/setup/jobqueue.html
   mythtv/html/setup/js/general.js
   mythtv/html/setup/js/jobqueue.js
   mythtv/html/setup/js/password.js
   mythtv/html/setup/js/setup.js
   mythtv/html/setup/js/storagegroups.js
   mythtv/html/setup/js/wizard.js
   mythtv/html/setup/overview.html
   mythtv/html/setup/password.html
   mythtv/html/setup/storagegroups-add-new.html
   mythtv/html/setup/storagegroups.html
   mythtv/html/setup/systemevents.html
   mythtv/html/setup/wizard-database.html
   mythtv/html/setup/wizard-guide_data.html
   mythtv/html/setup/wizard-media_storage.html
   mythtv/html/setup/wizard-network.qsp
   mythtv/html/setup/wizard-recording_devices.html
   mythtv/html/setup/wizard.html
   mythtv/libs/libmythservicecontracts/datacontracts/storageGroupDir.h
   mythtv/libs/libmythservicecontracts/datacontracts/storageGroupDirList.h
   mythtv/libs/libmythupnp/serverSideScripting.cpp
   mythtv/libs/libmythupnp/serverSideScripting.h
   mythtv/programs/mythbackend/config_backend_database.xml
   mythtv/programs/mythbackend/config_backend_general.xml
   mythtv/programs/mythbackend/httpconfig.cpp
   mythtv/programs/mythbackend/httpconfig.h
   mythtv/programs/mythbackend/mythsettings.cpp
   mythtv/programs/mythbackend/mythsettings.h

Removed:

   mythtv/html/info.html
   mythtv/libs/libmythservicecontracts/datacontracts/stringList.h
   mythtv/libs/libmythservicecontracts/datacontracts/successFail.h
   mythtv/libs/libmythupnp/multicast.cpp

Modified:

   mythplugins/mythnetvision/mythnetvision/nettree.cpp
   mythplugins/mythvideo/mythvideo/scripts/jamu.py
   mythtv/configure
   mythtv/html/css/jquery-ui.css
   mythtv/html/css/site.css
   mythtv/html/html.pro
   mythtv/html/index.html
   mythtv/html/js/jquery-ui.min.js
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/audio/audiooutputwin.cpp
   mythtv/libs/libmyth/audio/volumebase.cpp
   mythtv/libs/libmyth/audio/volumebase.h
   mythtv/libs/libmyth/backendselect.cpp
   mythtv/libs/libmyth/backendselect.h
   mythtv/libs/libmyth/libmyth.pro
   mythtv/libs/libmyth/mediamonitor-darwin.h
   mythtv/libs/libmyth/mediamonitor-unix.h
   mythtv/libs/libmyth/mediamonitor-windows.h
   mythtv/libs/libmyth/mythcontext.cpp
   mythtv/libs/libmyth/mythcontext.h
   mythtv/libs/libmyth/mythmediamonitor.cpp
   mythtv/libs/libmythbase/dbutil.cpp
   mythtv/libs/libmythbase/mythdb.cpp
   mythtv/libs/libmythbase/mythdb.h
   mythtv/libs/libmythbase/mythdbcon.cpp
   mythtv/libs/libmythbase/mythdbcon.h
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/remotefile.cpp
   mythtv/libs/libmythbluray/bdnav/index_parse.c
   mythtv/libs/libmythbluray/bdnav/meta_parse.c
   mythtv/libs/libmythbluray/bdnav/navigation.c
   mythtv/libs/libmythbluray/bdnav/sound_parse.c
   mythtv/libs/libmythbluray/bluray.c
   mythtv/libs/libmythbluray/decoders/graphics_controller.c
   mythtv/libs/libmythbluray/decoders/graphics_processor.c
   mythtv/libs/libmythbluray/decoders/ig_decode.c
   mythtv/libs/libmythbluray/decoders/m2ts_demux.c
   mythtv/libs/libmythbluray/decoders/pg_decode.c
   mythtv/libs/libmythbluray/file/dir_mythiowrapper.c
   mythtv/libs/libmythbluray/file/dir_posix.c
   mythtv/libs/libmythbluray/file/dl_posix.c
   mythtv/libs/libmythbluray/file/file_mythiowrapper.c
   mythtv/libs/libmythbluray/file/file_posix.c
   mythtv/libs/libmythbluray/hdmv/hdmv_vm.c
   mythtv/libs/libmythbluray/hdmv/mobj_parse.c
   mythtv/libs/libmythbluray/register.c
   mythtv/libs/libmythbluray/util/log_control.h
   mythtv/libs/libmythbluray/util/logging.h
   mythtv/libs/libmythbluray/util/mutex.h
   mythtv/libs/libmythmetadata/videoutils.h
   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/wolInfo.h
   mythtv/libs/libmythservicecontracts/libmythservicecontracts.pro
   mythtv/libs/libmythservicecontracts/service.cpp
   mythtv/libs/libmythservicecontracts/service.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/cc708decoder.cpp
   mythtv/libs/libmythtv/datadirect.cpp
   mythtv/libs/libmythtv/dbcheck.cpp
   mythtv/libs/libmythtv/dbcheck.h
   mythtv/libs/libmythtv/dxva2decoder.cpp
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/ocurchannel.cpp
   mythtv/libs/libmythtv/playercontext.cpp
   mythtv/libs/libmythtv/playercontext.h
   mythtv/libs/libmythtv/privatedecoder_crystalhd.cpp
   mythtv/libs/libmythtv/tv_actions.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/tvbrowsehelper.cpp
   mythtv/libs/libmythtv/videodisplayprofile.h
   mythtv/libs/libmythtv/videoout_d3d.cpp
   mythtv/libs/libmythtv/videoout_d3d.h
   mythtv/libs/libmythtv/videoout_opengl.cpp
   mythtv/libs/libmythtv/videoout_opengl.h
   mythtv/libs/libmythtv/videoout_vdpau.cpp
   mythtv/libs/libmythtv/videoout_vdpau.h
   mythtv/libs/libmythtv/videooutbase.cpp
   mythtv/libs/libmythtv/videooutbase.h
   mythtv/libs/libmythtv/visualisations/videovisual.cpp
   mythtv/libs/libmythtv/visualisations/videovisualspectrum.cpp
   mythtv/libs/libmythtv/vsync.cpp
   mythtv/libs/libmythtv/vsync.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythmainwindow.h
   mythtv/libs/libmythui/mythpainter_d3d9.cpp
   mythtv/libs/libmythui/mythrender_base.h
   mythtv/libs/libmythui/mythrender_d3d9.cpp
   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_opengl2.cpp
   mythtv/libs/libmythui/mythrender_opengl2.h
   mythtv/libs/libmythui/mythrender_opengl2es.h
   mythtv/libs/libmythui/mythrender_vdpau.cpp
   mythtv/libs/libmythui/mythrender_vdpau.h
   mythtv/libs/libmythui/mythscreentype.cpp
   mythtv/libs/libmythui/mythuiactions.h
   mythtv/libs/libmythupnp/eventing.cpp
   mythtv/libs/libmythupnp/eventing.h
   mythtv/libs/libmythupnp/htmlserver.cpp
   mythtv/libs/libmythupnp/htmlserver.h
   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/mmulticastsocketdevice.cpp
   mythtv/libs/libmythupnp/mythxmlclient.cpp
   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/soapclient.cpp
   mythtv/libs/libmythupnp/soapclient.h
   mythtv/libs/libmythupnp/ssdp.cpp
   mythtv/libs/libmythupnp/ssdp.h
   mythtv/libs/libmythupnp/ssdpcache.cpp
   mythtv/libs/libmythupnp/ssdpcache.h
   mythtv/libs/libmythupnp/taskqueue.cpp
   mythtv/libs/libmythupnp/taskqueue.h
   mythtv/libs/libmythupnp/threadpool.cpp
   mythtv/libs/libmythupnp/upnp.cpp
   mythtv/libs/libmythupnp/upnp.h
   mythtv/libs/libmythupnp/upnpcds.cpp
   mythtv/libs/libmythupnp/upnpcds.h
   mythtv/libs/libmythupnp/upnpcmgr.cpp
   mythtv/libs/libmythupnp/upnpcmgr.h
   mythtv/libs/libmythupnp/upnpdevice.cpp
   mythtv/libs/libmythupnp/upnpmsrr.cpp
   mythtv/libs/libmythupnp/upnpmsrr.h
   mythtv/libs/libmythupnp/upnptaskcache.h
   mythtv/libs/libmythupnp/upnptasknotify.cpp
   mythtv/libs/libmythupnp/upnptasksearch.cpp
   mythtv/libs/libmythupnp/upnputil.cpp
   mythtv/libs/libmythupnp/wsdl.cpp
   mythtv/libs/libmythupnp/wsdl.h
   mythtv/programs/mythbackend/backendcontext.h
   mythtv/programs/mythbackend/httpstatus.cpp
   mythtv/programs/mythbackend/httpstatus.h
   mythtv/programs/mythbackend/internetContent.cpp
   mythtv/programs/mythbackend/internetContent.h
   mythtv/programs/mythbackend/main.cpp
   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythbackend/main_helpers.h
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mediaserver.cpp
   mythtv/programs/mythbackend/mediaserver.h
   mythtv/programs/mythbackend/mythbackend.pro
   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/upnpcdsmusic.cpp
   mythtv/programs/mythbackend/upnpcdstv.cpp
   mythtv/programs/mythbackend/upnpcdsvideo.cpp
   mythtv/programs/mythcommflag/main.cpp
   mythtv/programs/mythfrontend/customedit.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/mythfrontend/guidegrid.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/mediarenderer.cpp
   mythtv/programs/mythfrontend/mythfexml.cpp
   mythtv/programs/mythfrontend/mythfexml.h
   mythtv/programs/mythfrontend/mythfrontend.pro
   mythtv/programs/mythfrontend/networkcontrol.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/programrecpriority.cpp
   mythtv/programs/mythfrontend/themechooser.cpp
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/bliptv.html
   mythtv/themes/MythCenter-wide/recordings-ui.xml

More information about the mythtv-firehose mailing list