Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32434 Modified Files: mythtv-0.27-fixes.patch mythtv.spec Log Message: * Wed May 7 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-7 - Update to latest fixes, v0.27-222-g583f448. mythtv-0.27-fixes.patch: b/mythplugins/configure | 18 b/mythplugins/mytharchive/i18n/mytharchive_sv.qm |binary b/mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 b/mythplugins/mytharchive/mytharchive/archiveutil.cpp | 4 b/mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 b/mythplugins/mytharchive/mythburn/scripts/mythburn.py | 19 b/mythplugins/mythbrowser/i18n/mythbrowser_sv.qm |binary b/mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 b/mythplugins/mythgallery/i18n/mythgallery_sv.qm |binary b/mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 b/mythplugins/mythgame/i18n/mythgame_sv.qm |binary b/mythplugins/mythgame/i18n/mythgame_sv.ts | 136 b/mythplugins/mythmusic/i18n/mythmusic_sv.qm |binary b/mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9 b/mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34 b/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 b/mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 b/mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 b/mythplugins/mythmusic/mythmusic/musicplayer.cpp | 101 b/mythplugins/mythmusic/mythmusic/musicplayer.h | 4 b/mythplugins/mythmusic/mythmusic/playersettings.cpp | 1 b/mythplugins/mythmusic/mythmusic/playlist.cpp | 2 b/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp | 19 b/mythplugins/mythmusic/mythmusic/searchview.cpp | 15 b/mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 4 b/mythplugins/mythmusic/mythmusic/streamview.cpp | 7 b/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp | 4 b/mythplugins/mythnetvision/i18n/mythnetvision_sv.qm |binary b/mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro | 5 b/mythplugins/mythnews/i18n/mythnews_sv.qm |binary b/mythplugins/mythnews/i18n/mythnews_sv.ts | 76 b/mythplugins/mythweather/i18n/mythweather_sv.qm |binary b/mythplugins/mythweather/i18n/mythweather_sv.ts | 62 b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.qm |binary b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.ts | 183 b/mythplugins/mythzoneminder/mythzmserver/main.cpp | 13 b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 655 b/mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101 b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp | 25 b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp | 8 b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.h | 2 b/mythplugins/mythzoneminder/mythzoneminder/zmdefines.h | 11 b/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp | 64 b/mythplugins/mythzoneminder/mythzoneminder/zmevents.h | 1 b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64 b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp | 21 b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.h | 3 b/mythplugins/mythzoneminder/theme/default-wide/zoneminder-ui.xml | 244 b/mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml | 203 b/mythtv/bindings/python/MythTV/dataheap.py | 1 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/MythTV/wikiscripts/wikiscripts.py | 2 b/mythtv/bindings/python/scripts/mythpython | 4 b/mythtv/bindings/python/setup.py | 6 b/mythtv/bindings/python/tmdb3/README | 86 b/mythtv/bindings/python/tmdb3/scripts/populate_locale.py | 5 b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1 b/mythtv/bindings/python/tmdb3/setup.py | 15 b/mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3 b/mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40 b/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30 b/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54 b/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18 b/mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24 b/mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26 b/mythtv/bindings/python/tmdb3/tmdb3/request.py | 59 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90 b/mythtv/bindings/python/tmdb3/tmdb3/util.py | 201 b/mythtv/configure | 18 b/mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 b/mythtv/external/FFmpeg/libavformat/mpeg.c | 10 b/mythtv/i18n/mythfrontend_sv.qm |binary b/mythtv/i18n/mythfrontend_sv.ts |28897 +++++----- b/mythtv/libs/libmyth/libmyth.pro | 6 b/mythtv/libs/libmyth/mythconfiggroups.cpp | 1 b/mythtv/libs/libmyth/mythconfiggroups.h | 2 b/mythtv/libs/libmyth/programinfo.cpp | 295 b/mythtv/libs/libmyth/programinfo.h | 17 b/mythtv/libs/libmyth/programtypes.h | 2 b/mythtv/libs/libmyth/remoteutil.h | 2 b/mythtv/libs/libmythbase/bonjourregister.cpp | 40 b/mythtv/libs/libmythbase/bonjourregister.h | 4 b/mythtv/libs/libmythbase/housekeeper.cpp | 22 b/mythtv/libs/libmythbase/housekeeper.h | 2 b/mythtv/libs/libmythbase/libmythbase.pro | 6 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 b/mythtv/libs/libmythbase/mythcorecontext.cpp | 138 b/mythtv/libs/libmythbase/mythcorecontext.h | 4 b/mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 b/mythtv/libs/libmythbase/mythmiscutil.h | 1 b/mythtv/libs/libmythbase/mythsingledownload.cpp | 86 b/mythtv/libs/libmythbase/mythsingledownload.h | 49 b/mythtv/libs/libmythbase/mythsocket.cpp | 12 b/mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 b/mythtv/libs/libmythbase/mythsystemlegacy.h | 1 b/mythtv/libs/libmythbase/mythtimer.cpp | 2 b/mythtv/libs/libmythbase/mythtimezone.cpp | 1 b/mythtv/libs/libmythbase/mythversion.h | 2 b/mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 b/mythtv/libs/libmythbase/threadedfilewriter.h | 1 b/mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 b/mythtv/libs/libmythmetadata/metadatacommon.cpp | 29 b/mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 b/mythtv/libs/libmythmetadata/metaio.cpp | 8 b/mythtv/libs/libmythmetadata/metaio.h | 2 b/mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 b/mythtv/libs/libmythmetadata/metaioid3.cpp | 15 b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp | 151 b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.h | 25 b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 b/mythtv/libs/libmythtv/cardutil.cpp | 22 b/mythtv/libs/libmythtv/cardutil.h | 8 b/mythtv/libs/libmythtv/dbcheck.cpp | 6 b/mythtv/libs/libmythtv/eitcache.cpp | 60 b/mythtv/libs/libmythtv/eitcache.h | 2 b/mythtv/libs/libmythtv/fileringbuffer.cpp | 53 b/mythtv/libs/libmythtv/libmythtv.pro | 15 b/mythtv/libs/libmythtv/livetvchain.cpp | 230 b/mythtv/libs/libmythtv/livetvchain.h | 9 b/mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 6 b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 b/mythtv/libs/libmythtv/mythplayer.cpp | 97 b/mythtv/libs/libmythtv/mythplayer.h | 4 b/mythtv/libs/libmythtv/previewgenerator.cpp | 6 b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140 b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392 b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162 b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70 b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55 b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193 b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103 b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103 b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38 b/mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12 b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.cpp | 96 b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 b/mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 b/mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 b/mythtv/libs/libmythtv/recorders/iptvchannel.h | 20 b/mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17 b/mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h | 3 b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp | 28 b/mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4 b/mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 b/mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 b/mythtv/libs/libmythtv/recorders/streamhandler.h | 1 b/mythtv/libs/libmythtv/recordinginfo.cpp | 143 b/mythtv/libs/libmythtv/ringbuffer.cpp | 82 b/mythtv/libs/libmythtv/tv_play.cpp | 86 b/mythtv/libs/libmythtv/tv_play.h | 1 b/mythtv/libs/libmythtv/tv_rec.cpp | 69 b/mythtv/libs/libmythtv/tv_rec.h | 1 b/mythtv/libs/libmythtv/tvremoteutil.cpp | 2 b/mythtv/libs/libmythtv/videooutbase.cpp | 2 b/mythtv/libs/libmythtv/videosource.cpp | 2 b/mythtv/libs/libmythtv/vsync.cpp | 8 b/mythtv/libs/libmythui/AppleRemote.cpp | 10 b/mythtv/libs/libmythui/mythgesture.cpp | 1 b/mythtv/libs/libmythui/mythmainwindow.cpp | 57 b/mythtv/libs/libmythui/mythnotificationcenter.cpp | 1 b/mythtv/libs/libmythui/mythpainter.cpp | 1 b/mythtv/libs/libmythui/mythrender_opengl.cpp | 2 b/mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 b/mythtv/libs/libmythupnp/httprequest.cpp | 3 b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 b/mythtv/libs/libmythupnp/upnpcds.cpp | 28 b/mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 b/mythtv/programs/mythbackend/backendhousekeeper.h | 1 b/mythtv/programs/mythbackend/encoderlink.cpp | 117 b/mythtv/programs/mythbackend/encoderlink.h | 9 b/mythtv/programs/mythbackend/main.cpp | 13 b/mythtv/programs/mythbackend/mainserver.cpp | 47 b/mythtv/programs/mythbackend/mainserver.h | 2 b/mythtv/programs/mythbackend/playbacksock.cpp | 6 b/mythtv/programs/mythbackend/playbacksock.h | 3 b/mythtv/programs/mythbackend/scheduler.cpp | 79 b/mythtv/programs/mythbackend/services/dvr.cpp | 2 b/mythtv/programs/mythbackend/services/guide.cpp | 61 b/mythtv/programs/mythbackend/services/serviceUtil.cpp | 6 b/mythtv/programs/mythcommflag/main.cpp | 6 b/mythtv/programs/mythfilldatabase/filldata.cpp | 81 b/mythtv/programs/mythfilldatabase/filldata.h | 7 b/mythtv/programs/mythfilldatabase/main.cpp | 12 b/mythtv/programs/mythfilldatabase/xmltvparser.cpp | 8 b/mythtv/programs/mythfrontend/globalsettings.cpp | 26 b/mythtv/programs/mythfrontend/grabbersettings.cpp | 3 b/mythtv/programs/mythfrontend/guidegrid.cpp | 450 b/mythtv/programs/mythfrontend/guidegrid.h | 50 b/mythtv/programs/mythfrontend/main.cpp | 17 b/mythtv/programs/mythfrontend/scheduleeditor.cpp | 18 b/mythtv/programs/mythfrontend/videolist.cpp | 7 b/mythtv/programs/mythfrontend/viewscheduled.cpp | 4 b/mythtv/programs/mythtranscode/commandlineparser.cpp | 3 b/mythtv/programs/mythtranscode/main.cpp | 3 b/mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 b/mythtv/programs/mythtranscode/transcode.cpp | 7 b/mythtv/programs/mythtv-setup/importicons.cpp | 107 b/mythtv/programs/mythtv-setup/importicons.h | 1 b/mythtv/programs/mythutil/commandlineparser.cpp | 35 b/mythtv/programs/mythutil/markuputils.cpp | 157 b/mythtv/programs/mythutil/mythutil.cpp | 6 b/mythtv/programs/mythwelcome/welcomedialog.cpp | 30 b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 15 b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 30 b/mythtv/settings.pro | 1 b/mythtv/themes/MythCenter-wide/music-base.xml | 2 b/mythtv/themes/MythCenter-wide/notification-ui.xml | 2 b/mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 b/mythtv/themes/MythCenter/notification-ui.xml | 2 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 mythtv/bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 227 files changed, 26390 insertions(+), 19606 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 mythtv-0.27-fixes.patch Index: mythtv-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-20/mythtv-0.27-fixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythtv-0.27-fixes.patch 11 Mar 2014 11:18:54 -0000 1.4 +++ mythtv-0.27-fixes.patch 14 May 2014 19:42:24 -0000 1.5 @@ -17,12 +17,14 @@ mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 +- mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 +- mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 +- - mythplugins/mythmusic/mythmusic/musicplayer.cpp | 94 +- - mythplugins/mythmusic/mythmusic/musicplayer.h | 3 +- + mythplugins/mythmusic/mythmusic/musicplayer.cpp | 101 +- + mythplugins/mythmusic/mythmusic/musicplayer.h | 4 +- + mythplugins/mythmusic/mythmusic/playersettings.cpp | 1 + mythplugins/mythmusic/mythmusic/playlist.cpp | 2 +- - .../mythmusic/mythmusic/playlisteditorview.cpp | 16 +- + .../mythmusic/mythmusic/playlisteditorview.cpp | 19 +- mythplugins/mythmusic/mythmusic/searchview.cpp | 15 +- mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 +- + mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 4 +- mythplugins/mythmusic/mythmusic/streamview.cpp | 7 +- .../mythmusic/mythmusic/visualizationsettings.cpp | 4 +- mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes @@ -56,6 +58,7 @@ mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 - .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 - + .../python/MythTV/wikiscripts/wikiscripts.py | 2 +- mythtv/bindings/python/scripts/mythpython | 4 +- mythtv/bindings/python/setup.py | 6 +- mythtv/bindings/python/tmdb3/README | 86 +- @@ -80,10 +83,14 @@ mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- mythtv/libs/libmyth/libmyth.pro | 6 +- - mythtv/libs/libmyth/programinfo.cpp | 283 +- + mythtv/libs/libmyth/mythconfiggroups.cpp | 1 - + mythtv/libs/libmyth/mythconfiggroups.h | 2 +- + mythtv/libs/libmyth/programinfo.cpp | 295 +- mythtv/libs/libmyth/programinfo.h | 17 + mythtv/libs/libmyth/programtypes.h | 2 +- mythtv/libs/libmyth/remoteutil.h | 2 + + mythtv/libs/libmythbase/bonjourregister.cpp | 40 + + mythtv/libs/libmythbase/bonjourregister.h | 4 + mythtv/libs/libmythbase/housekeeper.cpp | 22 +- mythtv/libs/libmythbase/housekeeper.h | 2 + mythtv/libs/libmythbase/libmythbase.pro | 6 +- @@ -103,23 +110,26 @@ mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 +- mythtv/libs/libmythbase/threadedfilewriter.h | 1 + mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 + - mythtv/libs/libmythmetadata/metadatacommon.cpp | 23 +- + mythtv/libs/libmythmetadata/metadatacommon.cpp | 29 +- mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 +- mythtv/libs/libmythmetadata/metaio.cpp | 8 + mythtv/libs/libmythmetadata/metaio.h | 2 + mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 - mythtv/libs/libmythmetadata/metaioid3.cpp | 15 +- - .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 +- + .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 151 +- + mythtv/libs/libmythtv/AirPlay/mythairplayserver.h | 25 +- mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +- mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 +- mythtv/libs/libmythtv/cardutil.cpp | 22 + mythtv/libs/libmythtv/cardutil.h | 8 + mythtv/libs/libmythtv/dbcheck.cpp | 6 +- + mythtv/libs/libmythtv/eitcache.cpp | 60 +- + mythtv/libs/libmythtv/eitcache.h | 2 + mythtv/libs/libmythtv/fileringbuffer.cpp | 53 +- - mythtv/libs/libmythtv/libmythtv.pro | 14 + + mythtv/libs/libmythtv/libmythtv.pro | 15 +- mythtv/libs/libmythtv/livetvchain.cpp | 230 +- mythtv/libs/libmythtv/livetvchain.h | 9 +- - mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2 +- + mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 6 +- mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 +- mythtv/libs/libmythtv/mythplayer.cpp | 97 +- mythtv/libs/libmythtv/mythplayer.h | 4 + @@ -154,7 +164,7 @@ mythtv/libs/libmythtv/recorders/streamhandler.h | 1 + mythtv/libs/libmythtv/recordinginfo.cpp | 143 +- mythtv/libs/libmythtv/ringbuffer.cpp | 82 +- - mythtv/libs/libmythtv/tv_play.cpp | 84 +- + mythtv/libs/libmythtv/tv_play.cpp | 86 +- mythtv/libs/libmythtv/tv_play.h | 1 + mythtv/libs/libmythtv/tv_rec.cpp | 69 +- mythtv/libs/libmythtv/tv_rec.h | 1 + @@ -162,13 +172,21 @@ mythtv/libs/libmythtv/videooutbase.cpp | 2 +- mythtv/libs/libmythtv/videosource.cpp | 2 +- mythtv/libs/libmythtv/vsync.cpp | 8 +- + mythtv/libs/libmythui/AppleRemote.cpp | 10 + mythtv/libs/libmythui/mythgesture.cpp | 1 + + mythtv/libs/libmythui/mythmainwindow.cpp | 57 +- + mythtv/libs/libmythui/mythnotificationcenter.cpp | 1 + mythtv/libs/libmythui/mythpainter.cpp | 1 + + mythtv/libs/libmythui/mythrender_opengl.cpp | 2 + mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 +- mythtv/libs/libmythupnp/httprequest.cpp | 3 +- mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 + + mythtv/libs/libmythupnp/upnpcds.cpp | 28 +- mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 +- mythtv/programs/mythbackend/backendhousekeeper.h | 1 + + mythtv/programs/mythbackend/encoderlink.cpp | 117 +- + mythtv/programs/mythbackend/encoderlink.h | 9 +- + mythtv/programs/mythbackend/main.cpp | 13 + mythtv/programs/mythbackend/mainserver.cpp | 47 +- mythtv/programs/mythbackend/mainserver.h | 2 +- mythtv/programs/mythbackend/playbacksock.cpp | 6 +- @@ -181,12 +199,16 @@ mythtv/programs/mythfilldatabase/filldata.cpp | 81 +- mythtv/programs/mythfilldatabase/filldata.h | 7 +- mythtv/programs/mythfilldatabase/main.cpp | 12 +- + mythtv/programs/mythfilldatabase/xmltvparser.cpp | 8 +- + mythtv/programs/mythfrontend/globalsettings.cpp | 26 +- mythtv/programs/mythfrontend/grabbersettings.cpp | 3 +- mythtv/programs/mythfrontend/guidegrid.cpp | 450 +- mythtv/programs/mythfrontend/guidegrid.h | 50 +- + mythtv/programs/mythfrontend/main.cpp | 17 +- mythtv/programs/mythfrontend/scheduleeditor.cpp | 18 +- mythtv/programs/mythfrontend/videolist.cpp | 7 +- mythtv/programs/mythfrontend/viewscheduled.cpp | 4 +- + .../programs/mythtranscode/commandlineparser.cpp | 3 +- mythtv/programs/mythtranscode/main.cpp | 3 +- mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 + mythtv/programs/mythtranscode/transcode.cpp | 7 +- @@ -198,11 +220,13 @@ mythtv/programs/mythwelcome/welcomedialog.cpp | 30 +- .../distros/mythtv_data/data_mythtv.py | 15 +- mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 - - mythtv/programs/scripts/metadata/Movie/tmdb3.py | 33 +- + mythtv/programs/scripts/metadata/Movie/tmdb3.py | 30 +- + mythtv/settings.pro | 1 - + mythtv/themes/MythCenter-wide/music-base.xml | 2 + mythtv/themes/MythCenter-wide/notification-ui.xml | 2 +- mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 +- mythtv/themes/MythCenter/notification-ui.xml | 2 +- - 204 files changed, 25919 insertions(+), 19472 deletions(-) + 228 files changed, 26390 insertions(+), 19606 deletions(-) diff --git a/mythplugins/configure b/mythplugins/configure index bda1fbc..b9086ba 100755 @@ -8844,7 +8868,7 @@ { m_currentTrack = x; diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp -index 5a0e414..2f23efb 100644 +index 5a0e414..3fa93a2 100644 --- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp +++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp @@ -57,7 +57,6 @@ MusicPlayer::MusicPlayer(QObject *parent) @@ -8855,7 +8879,16 @@ m_currentTrack = -1; m_currentTime = 0; -@@ -408,7 +407,7 @@ void MusicPlayer::next(void) +@@ -224,6 +223,8 @@ void MusicPlayer::loadSettings(void ) + QString resumestring = gCoreContext->GetSetting("ResumeMode", "off"); + if (resumestring.toLower() == "off") + m_resumeMode = RESUME_OFF; ++ else if (resumestring.toLower() == "first") ++ m_resumeMode = RESUME_FIRST; + else if (resumestring.toLower() == "track") + m_resumeMode = RESUME_TRACK; + else +@@ -408,7 +409,7 @@ void MusicPlayer::next(void) { int currentTrack = m_currentTrack; @@ -8864,7 +8897,7 @@ return; if (m_oneshotMetadata) -@@ -419,7 +418,7 @@ void MusicPlayer::next(void) +@@ -419,7 +420,7 @@ void MusicPlayer::next(void) else currentTrack++; @@ -8873,7 +8906,7 @@ { if (m_repeatMode == REPEAT_ALL) { -@@ -445,7 +444,7 @@ void MusicPlayer::previous(void) +@@ -445,7 +446,7 @@ void MusicPlayer::previous(void) { int currentTrack = m_currentTrack; @@ -8882,7 +8915,7 @@ return; if (m_oneshotMetadata) -@@ -474,7 +473,7 @@ void MusicPlayer::previous(void) +@@ -474,7 +475,7 @@ void MusicPlayer::previous(void) void MusicPlayer::nextAuto(void) { @@ -8891,7 +8924,7 @@ [...1847 lines suppressed...] ++ { + LOG(VB_GENERAL, LOG_ERR, QString("edit #%1").arg(i) + " rejected"); +- +- InitLabel(i); +- needs_save = true; ++ } ++ else ++ { ++ InitLabel(i); ++ needs_save = true; ++ } + } + else if (cmd.startsWith("del")) + { +@@ -1099,11 +1103,15 @@ void PlaybackProfileConfig::pressed(QString cmd) + PlaybackProfileItemConfig itemcfg(item); + + if (itemcfg.exec() != kDialogCodeAccepted) ++ { + LOG(VB_GENERAL, LOG_ERR, "addentry rejected"); +- +- items.push_back(item); +- InitUI(); +- needs_save = true; ++ } ++ else ++ { ++ items.push_back(item); ++ InitUI(); ++ needs_save = true; ++ } + } + + repaint(); +@@ -1335,6 +1343,10 @@ void PlaybackProfileConfigs::btnPress(QString cmd) + removeTarget(name); + VideoDisplayProfile::DeleteProfileGroup( + name, gCoreContext->GetHostName()); ++ // This would be better done in TriggeredConfigurationGroup::removeTarget ++ // however, as removeTarget is used elsewhere, limit the changes to this ++ // case only ++ grouptrigger->setValue(grouptrigger->getSelectionLabel()); + } + } + diff --git a/mythtv/programs/mythfrontend/grabbersettings.cpp b/mythtv/programs/mythfrontend/grabbersettings.cpp index 1d526cc..146c32f 100644 --- a/mythtv/programs/mythfrontend/grabbersettings.cpp @@ -65523,6 +67017,66 @@ int m_changrpid; ChannelGroupList m_changrplist; +diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp +index 5204303..f416a99 100644 +--- a/mythtv/programs/mythfrontend/main.cpp ++++ b/mythtv/programs/mythfrontend/main.cpp +@@ -2,6 +2,7 @@ + #include <fcntl.h> + #include <signal.h> + #include <cerrno> ++#include <stdlib.h> + + #include <iostream> + using namespace std; +@@ -16,6 +17,9 @@ using namespace std; + #include <QWidget> + #include <QApplication> + #include <QTimer> ++#ifdef Q_OS_MAC ++#include <QProcessEnvironment> ++#endif + + #include "previewgeneratorqueue.h" + #include "referencecounter.h" +@@ -795,7 +799,7 @@ static void TVMenuCallback(void *data, QString &selection) + (void)data; + QString sel = selection.toLower(); + +- if (sel.startsWith("settings ")) ++ if (sel.startsWith("settings ") || sel == "video_settings_general") + { + GetMythUI()->AddCurrentLocation("Setup"); + gCoreContext->ActivateSettingsCache(false); +@@ -1485,6 +1489,15 @@ int main(int argc, char **argv) + new QApplication(argc, argv); + QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHFRONTEND); + ++#ifdef Q_OS_MAC ++ QString path = QCoreApplication::applicationDirPath(); ++ setenv("PYTHONPATH", ++ QString("%1/../Resources/lib/python2.6/site-packages:%2") ++ .arg(path) ++ .arg(QProcessEnvironment::systemEnvironment().value("PYTHONPATH")) ++ .toUtf8().constData(), 1); ++#endif ++ + #ifndef _WIN32 + QList<int> signallist; + signallist << SIGINT << SIGTERM << SIGSEGV << SIGABRT << SIGBUS << SIGFPE +@@ -1636,11 +1649,11 @@ int main(int argc, char **argv) + #ifdef USING_AIRPLAY + if (gCoreContext->GetNumSetting("AirPlayEnabled", true)) + { ++ MythRAOPDevice::Create(); + if (!gCoreContext->GetNumSetting("AirPlayAudioOnly", false)) + { + MythAirplayServer::Create(); + } +- MythRAOPDevice::Create(); + } + #endif + diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp index d8013b7..725c12c 100644 --- a/mythtv/programs/mythfrontend/scheduleeditor.cpp @@ -65596,6 +67150,20 @@ (m_showAll || recstatus <= rsWillRecord || recstatus == rsDontRecord || +diff --git a/mythtv/programs/mythtranscode/commandlineparser.cpp b/mythtv/programs/mythtranscode/commandlineparser.cpp +index 70d313b..4528341 100644 +--- a/mythtv/programs/mythtranscode/commandlineparser.cpp ++++ b/mythtv/programs/mythtranscode/commandlineparser.cpp +@@ -57,7 +57,8 @@ void MythTranscodeCommandLineParser::LoadArguments(void) + ->SetRequires("fifodir"); + + add(QStringList( QStringList() << "-l" << "--honorcutlist" ), "usecutlist", +- "", "Specifies whether to use the cutlist.", ++ "", "Specifies whether to use the cutlist. " ++ "(Takes an optional cutlist as argument when used with -i)", + "Specifies whether transcode should honor the cutlist and " + "remove the marked off commercials. Optionally takes a " + "a cutlist as an argument when used with --infile.") diff --git a/mythtv/programs/mythtranscode/main.cpp b/mythtv/programs/mythtranscode/main.cpp index 8993042..de5c2e9 100644 --- a/mythtv/programs/mythtranscode/main.cpp @@ -66993,7 +68561,7 @@ -if __name__ == '__main__': - main() diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py -index 9e4edcb..5374ab1 100755 +index 9e4edcb..0b5cbff 100755 --- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py +++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py @@ -11,7 +11,7 @@ @@ -67044,7 +68612,7 @@ continue m = VideoMetadata() -@@ -254,7 +267,19 @@ def main(): +@@ -254,7 +267,16 @@ def main(): MythTV.tmdb3.request.DEBUG = True set_cache(engine='null') else: @@ -67058,13 +68626,42 @@ + sys.exit(1) + confdir = os.path.join(confdir, '.mythtv') + confpath = os.path.join(confdir, 'pytmdb3.cache') -+ if not os.access(confpath, os.F_OK|os.W_OK|os.R_OK): -+ print "Unable to access cache file: "+confpath -+ sys.exit(1) + set_cache(engine='file', filename=confpath) if opts.language: set_locale(language=opts.language, fallthrough=True) +diff --git a/mythtv/settings.pro b/mythtv/settings.pro +index ae47ca6..4a68831 100644 +--- a/mythtv/settings.pro ++++ b/mythtv/settings.pro +@@ -158,7 +158,6 @@ QMAKE_LIBDIR_OPENGL = + } + EXTRA_LIBS = $$EXTRALIBS + +-EXTRA_LIBS += $$FREETYPE_LIBS + EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS + + EXTRA_LIBS += $$LOCAL_LIBDIR_OGL +diff --git a/mythtv/themes/MythCenter-wide/music-base.xml b/mythtv/themes/MythCenter-wide/music-base.xml +index fab0157..ee46aee 100644 +--- a/mythtv/themes/MythCenter-wide/music-base.xml ++++ b/mythtv/themes/MythCenter-wide/music-base.xml +@@ -759,6 +759,7 @@ + </group> + + <group name="baseplayliststatusgroup"> ++ <area>0,0,1280,60</area> + <textarea name="playlistposition" from="basetextarea"> + <area>40,0,170,30</area> + <font>basesmall</font> +@@ -785,6 +786,7 @@ + </group> + + <group name="basesmallinfopanel"> ++ <area>0,0,1260,50</area> + <shape name="trackinfo_background" from="basebackground"> + <area>15,0,1250,50</area> + <fill color="#000000" alpha="50" /> diff --git a/mythtv/themes/MythCenter-wide/notification-ui.xml b/mythtv/themes/MythCenter-wide/notification-ui.xml index 5afeab6..49b60af 100644 --- a/mythtv/themes/MythCenter-wide/notification-ui.xml Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-20/mythtv.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- mythtv.spec 11 Mar 2014 11:18:54 -0000 1.136 +++ mythtv.spec 14 May 2014 19:42:24 -0000 1.137 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27-178-g6b14852 +%define vers_string v0.27-222-g583f448 %define branch fixes/0.27 # Git revision and branch ID @@ -79,7 +79,7 @@ %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 5%{?dist} +Release: 7%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -143,6 +143,8 @@ # http://code.mythtv.org/trac/ticket/11338 # Offset required for 0.27, patch was for 0.26.1 Patch2: mythtv-0.27-libcec2.patch +# Patch to fix ffmpeg build for arm. +Patch3: mythtv-0.27-ffmpeg.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -222,8 +224,6 @@ BuildRequires: gsm-devel BuildRequires: lame-devel BuildRequires: libdca-devel -BuildRequires: libdvdnav-devel -BuildRequires: libdvdread-devel >= 0.9.4 BuildRequires: libcdio-devel libcdio-paranoia-devel # nb: libdvdcss will be dynamically loaded if installed #BuildRequires: libfame-devel >= 0.9.0 @@ -844,6 +844,7 @@ %patch0 -p1 -b .mythtv %patch1 -p1 -b .types_h %patch2 -p1 -b .libcec2 +%patch3 -p1 -b .ffmpeg # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -901,21 +902,9 @@ --libdir-name=%{_lib} \ --mandir=%{_mandir} \ --disable-mythlogserver \ - --enable-pthreads \ --enable-ffmpeg-pthreads \ --enable-joystick-menu \ - --enable-audio-alsa \ - --enable-audio-oss \ - --enable-audio-jack \ - --enable-libfftw3 \ - --enable-x11 --x11-path=%{_includedir} \ - --enable-xv \ - --enable-opengl-video \ - --enable-xrandr \ - --enable-lirc \ - --enable-ivtv \ - --enable-firewire \ - --enable-dvb \ + --x11-path=%{_includedir} \ --enable-libmp3lame \ --enable-libtheora --enable-libvorbis \ --enable-libx264 \ @@ -946,8 +935,8 @@ --extra-cflags="%{optflags} -maltivec -fomit-frame-pointer" \ --extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer" \ %else - --extra-cflags="%{optflags} -fomit-frame-pointer" \ - --extra-cxxflags="%{optflags} -fomit-frame-pointer" \ + --extra-cflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \ + --extra-cxxflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \ %endif %ifarch %{ix86} --cpu=i686 --tune=i686 --enable-mmx \ @@ -1472,6 +1461,12 @@ %changelog +* Wed May 7 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-7 +- Update to latest fixes, v0.27-222-g583f448. + +* Sat Mar 22 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 0.27-6 +- Rebuilt for x264 and add BR: bzip2-devel + * Tue Mar 11 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-5 - Update to latest fixes v0.27-178-g6b14852. - Rebuild for x264.