[mythtv-commits] mythtv branch devel/logging-zeromq updated by beirdo. v0.26-pre-355-g4c47e80
Git Repo Owner
noreply at mythtv.org
Sat May 19 04:28:50 UTC 2012
The branch, devel/logging-zeromq has been updated on the
mythtv repository by gitolite user beirdo.
via 4c47e80a33764e8cf778649719d1dff9a9dda2f1 (commit)
via 95e61820158b608ae5f0c33ab3838b66ab24105f (commit)
via c85ed06d244eaf02b29771d5122166e3d8ef19be (commit)
via 02f546356385dfbc6c72191080b3f3fa6d8b3311 (commit)
via fae8d9f10d5190eb466f4d582efaf8c82f9b0dca (commit)
via acc4cd4bc2cf4f320b56d8ecdfaf737af047bbfe (commit)
via 9217878910b1f3373127cac3864e2b64cd87a0c8 (commit)
via b6dc2b223a33ac71ed6acf4b71e9975334fe42db (commit)
via 9bc18c866747a11ca649d8dbe9097e66268f8e03 (commit)
via fa9edd607d0025bdebd29cac5c26e0909e50a1e4 (commit)
via e7e6492d88ea5d54b8ab0967784300f1c3c4365a (commit)
via e3699a64544819f55876618197ac7bc32eeebf40 (commit)
via 8c48b71821267f6b1c1374ad07911a6b9cced2c0 (commit)
via 4a7845ee2f54bb238aeea4fcf708fddf03a4af51 (commit)
via 253e963efb7eec8d450511feb18c204ce9ee8c3d (commit)
via 3e3c502d811cb1764054bc04487cd2af06005140 (commit)
via dad31ccd85de9d372031016cb48bfa227d678f5f (commit)
via 5d6b2c4b37668432e014cf432ba3cba0f3001c50 (commit)
via ac6d8e19b71f782619f8e7ed251d2ff4cb642bd7 (commit)
via e2ef040aff50b6fddcdef0084883f7ee1b8f5e37 (commit)
via 099b6cce03f0ba3709b20070bec520d80bf44c6f (commit)
via 0a4eb5fa5905504250b07433c7f3568da35ed14a (commit)
via 0089f7d6b2cd706ad1f91c6df74b8a7047c16b41 (commit)
via 76ed2bc95e6993a06f86bac08890b83c6542a2c5 (commit)
via 0a6818f3d6a6c9f45eebdabc732c48a42c3cfca3 (commit)
via 5c7a41fdc4e3e020de5a03db96cb7b60a218f571 (commit)
via c3774a8ced5533208055f77b8fbcb07bbd9577fb (commit)
via a46e9be739912896e757defdd17749da397bbf22 (commit)
via b1b0e62ecdf4efca75cf68fbe8ca27065320e5d4 (commit)
via 87eb63451aef35e8c5e0dbca07a2b64a24ea2c0f (commit)
via cfbbed0534809d5f766b1a9f1ae8ea196c96e3b6 (commit)
via 7aebf8caa18f22fdc7ccf48d6b0130deb6e175ca (commit)
via 8a279eb1d6032804f72aca7722f363992749e905 (commit)
via abfced82a94d2644d1c4df3e332458e947092329 (commit)
via e464d29d35a5116d9f03b071b0175b8d63fd898f (commit)
via 9a24a2168dea1c6e06708bc2535ae47d13836e13 (commit)
via 68b53a6b9006a00979bb667ec43b5ead0c5748ea (commit)
via bd262f72415df3dfd3dd234add375d9984b38e7b (commit)
via 1b5a7a97eeea424a5f357db5543dea1aba548ada (commit)
via eba3a5b786e549e8882f0869eb69a35bd05185be (commit)
via 4762bb7b1cf12115313194f4be333bb7734da7ed (commit)
via 922a9caa85a82d09958466fe7c1ac8509e33a421 (commit)
via 7f18de069aa60b0a8aae2d1f11285da61bdab107 (commit)
via fe8e17d01e6cc06b4888d75c0fd70e65ec6ea9f3 (commit)
via da86aeb60a4b97763993c4279b018a3f06a4121d (commit)
via 653a236f5598a64f3d8c643fd8ad1912bca0dd3d (commit)
via 3bade0784d4f0cd1f8f643613a2db45969637982 (commit)
via 3df350e2befb0e8e88a989a34be6fa120ed938fa (commit)
via 4ade93e9fdb93321d0270595c4a4413ac24a259c (commit)
via ceeab1f5c65639a197639bae76bfed4d1becb9f5 (commit)
via 0a9ac9bd1cd6b39115b8071f2207778712a8ff47 (commit)
via 4a86d419cb0b4ca828e104448e37e032fe9c403e (commit)
via 1725f1b75794303fc88da2589ee924529dea703d (commit)
via 7d88cef362eb91644eb5905fc7f3108d3a5b90f1 (commit)
via 64410be28bd031d0979fb4197a4c73344bd697ab (commit)
via 53c22345d7f00ad93924150a253c0d1bb0519f17 (commit)
via 46bcb72d3d0ac7698d7a9f60dda7c4ade89f7a87 (commit)
via 943bfe92e9cdbd3d9d264a124927ef914aad0304 (commit)
via 97bbc951660d840b8212945adebd9fc44c23a673 (commit)
via 4b72e8ffd031698ecae7d434c44c2188f7475cd8 (commit)
via 805cac52a07bb20933e9598f8c081aa4013ba788 (commit)
via a68210ce582791ba3847196f5c8b6b98d63390e4 (commit)
via b989db66ce8382c654306277d480e8fdfec58dd2 (commit)
via 812fcf711ab21cd0f1d6c5898d1a01b94492b0f8 (commit)
via 3b62c77e78054c5b94864fb8c3db4fd8a53e8f81 (commit)
via 77d006bfd1d05092fbeafe1297a63e707f8b4291 (commit)
via 9893c61c99b4fc7b29ff39df970c28278f3aa1d8 (commit)
via 84b6d938b1df78f8232f06fda6af30d0dbf43e2a (commit)
via 61495330be35d472527570dcc68617dba135e748 (commit)
via fb90f73c588aebd47c5ebe4c47fed5f4aa16e21b (commit)
via 1c48a367a1cd5039b17519a6ae6867ad44822feb (commit)
via 491a033e2aae9170207b3ea25bd2101bd14cf6cf (commit)
via 45ff0a42e379172f76df74c5fc00ed29ad39dbe2 (commit)
via 579fdcf74672ac647b4b972dac5e8e4aa14f641b (commit)
via ea65b58e8dfa1f0ef2bf40d7668e3bef70605437 (commit)
via bd7d93e031e82b2221a743a38d7c895aff1596b2 (commit)
via 114baec094e299ed09b4f6606a38eb17d6fe76ed (commit)
via d6ed45762790976e406a7bec1bd1e85385edf598 (commit)
via 40243c935e27260dbb280fed353f34dd5d07df35 (commit)
via 0008f60a1d80a9f11751eb576edc8e5cab782c26 (commit)
via f04d226f4c9598c622d8416936f0e9fb45ef5b59 (commit)
via d2b2eaaf6da46fc7dd300fbba83b9870cdea0542 (commit)
via b217d8baecd39e7b87e6500f06f34fe729129214 (commit)
via 3265013b4ef634a60144392bac2d8f73f95f28f6 (commit)
via c45628d75939337f99eaa8b19c4a7c22f3435dde (commit)
via 5d1dc99ac70aaeb82d41689ddbe7dcc619554c93 (commit)
via 4dc99bc777e0be78487661a40782115f5ef203eb (commit)
from 4215d753a4d356f0b8e5f25bf5368046fa2c9795 (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 4c47e80a33764e8cf778649719d1dff9a9dda2f1
Author: Gavin Hurlbut <ghurlbut at mythtv.org> at Fri, 18 May 2012 21:28:37 -0700
Committer: Gavin Hurlbut <ghurlbut at mythtv.org> at Fri, 18 May 2012 21:28:37 -0700
URL: http://code.mythtv.org/cgit/mythtv/commit/?id=4c47e80a33764e8cf778649719d1dff9a9dda2f1
Merge branch 'master' into devel/logging-zeromq
Conflicts:
mythtv/libs/libmythbase/libmythbase.pro
-----------------------------------------------------------------------
Summary of changes:
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 6 +-
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 102 +-
mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 5 +
mythplugins/mythmusic/mythmusic/dbcheck.cpp | 76 +-
mythplugins/mythmusic/mythmusic/main.cpp | 22 +-
mythplugins/mythmusic/mythmusic/metadata.cpp | 2 +-
mythplugins/mythmusic/mythmusic/musiccommon.cpp | 62 +-
mythplugins/mythmusic/mythmusic/musiccommon.h | 2 +-
.../mythmusic/mythmusic/playlisteditorview.cpp | 110 +-
.../mythmusic/theme/default-wide/music-base.xml | 7 +
.../theme/default/images/mm_directory.png | Bin 0 -> 35035 bytes
mythplugins/mythmusic/theme/default/music-base.xml | 7 +
.../mythnetvision/i18n/mythnetvision_es_es.ts | 56 +-
mythtv/bindings/python/MythTV/altdict.py | 2 +-
mythtv/bindings/python/MythTV/dataheap.py | 4 +-
mythtv/configure | 44 +-
mythtv/external/FFmpeg/libavcodec/dsputil.h | 2 +-
mythtv/html/dummy.c | 2 +-
mythtv/i18n/mythfrontend_es_es.qm | Bin 651696 -> 647216 bytes
mythtv/i18n/mythfrontend_es_es.ts | 4015 ++++++++++----------
.../libmyth/audio/audiooutputdigitalencoder.cpp | 46 +-
mythtv/libs/libmyth/audio/audiooutpututil.cpp | 12 +-
mythtv/libs/libmyth/audio/eldutils.cpp | 13 +-
mythtv/libs/libmyth/audio/spdifencoder.cpp | 13 +-
mythtv/libs/libmyth/programinfo.cpp | 12 +-
mythtv/libs/libmyth/schemawizard.cpp | 72 +-
mythtv/libs/libmyth/schemawizard.h | 33 +-
mythtv/libs/libmythbase/bswap.h | 43 +
mythtv/libs/libmythbase/dbutil.cpp | 37 +-
mythtv/libs/libmythbase/dbutil.h | 5 +-
mythtv/libs/libmythbase/libmythbase.pro | 4 +-
mythtv/libs/libmythbase/mythcommandlineparser.cpp | 2 +-
mythtv/libs/libmythbase/mythcorecontext.cpp | 2 +-
mythtv/libs/libmythbase/mythsocket.cpp | 2 +-
mythtv/libs/libmythbase/mythversion.h | 2 +-
mythtv/libs/libmythbase/serverpool.cpp | 2 +-
mythtv/libs/libmythfreesurround/freesurround.cpp | 2 +-
.../libs/libmythtv/AirPlay/mythairplayserver.cpp | 840 ++++
.../libmythtv/{ => AirPlay}/mythairplayserver.h | 0
.../libs/libmythtv/AirPlay/mythraopconnection.cpp | 1557 ++++++++
mythtv/libs/libmythtv/AirPlay/mythraopconnection.h | 177 +
.../libmythtv/{ => AirPlay}/mythraopdevice.cpp | 0
.../libs/libmythtv/{ => AirPlay}/mythraopdevice.h | 0
.../libmythtv/{ => Bluray}/avformatdecoderbd.cpp | 0
.../libmythtv/{ => Bluray}/avformatdecoderbd.h | 0
.../libmythtv/{ => Bluray}/bdoverlayscreen.cpp | 0
.../libs/libmythtv/{ => Bluray}/bdoverlayscreen.h | 0
.../libs/libmythtv/{ => Bluray}/bdringbuffer.cpp | 0
mythtv/libs/libmythtv/{ => Bluray}/bdringbuffer.h | 0
.../libs/libmythtv/{ => Bluray}/mythbdplayer.cpp | 0
mythtv/libs/libmythtv/{ => Bluray}/mythbdplayer.h | 0
.../libmythtv/{ => DVD}/avformatdecoderdvd.cpp | 0
.../libs/libmythtv/{ => DVD}/avformatdecoderdvd.h | 0
mythtv/libs/libmythtv/{ => DVD}/dvdringbuffer.cpp | 0
mythtv/libs/libmythtv/{ => DVD}/dvdringbuffer.h | 0
mythtv/libs/libmythtv/{ => DVD}/mythdvdplayer.cpp | 0
mythtv/libs/libmythtv/{ => DVD}/mythdvdplayer.h | 0
mythtv/libs/libmythtv/HLS/httplivestream.cpp | 989 +++++
mythtv/libs/libmythtv/{ => HLS}/httplivestream.h | 0
mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp | 2591 +++++++++++++
mythtv/libs/libmythtv/HLS/httplivestreambuffer.h | 116 +
mythtv/libs/libmythtv/avformatdecoder.cpp | 110 +-
mythtv/libs/libmythtv/avformatdecoder.h | 3 +-
mythtv/libs/libmythtv/avformatwriter.cpp | 108 +-
mythtv/libs/libmythtv/bswap.h | 29 -
mythtv/libs/libmythtv/dbcheck.cpp | 117 +-
mythtv/libs/libmythtv/decoderbase.cpp | 4 +-
mythtv/libs/libmythtv/eitscanner.cpp | 3 +-
mythtv/libs/libmythtv/httplivestream.cpp | 988 -----
mythtv/libs/libmythtv/jobqueue.cpp | 1 +
mythtv/libs/libmythtv/libmythtv.pro | 140 +-
mythtv/libs/libmythtv/mythairplayserver.cpp | 835 ----
mythtv/libs/libmythtv/mythraopconnection.cpp | 1556 --------
mythtv/libs/libmythtv/mythraopconnection.h | 174 -
mythtv/libs/libmythtv/osd.cpp | 4 +-
mythtv/libs/libmythtv/osd.h | 3 +-
mythtv/libs/libmythtv/playercontext.cpp | 4 +-
mythtv/libs/libmythtv/privatedecoder_vda.cpp | 60 +-
mythtv/libs/libmythtv/recorderbase.cpp | 7 +-
mythtv/libs/libmythtv/recordingrule.cpp | 10 +-
mythtv/libs/libmythtv/ringbuffer.cpp | 14 +-
mythtv/libs/libmythtv/ringbuffer.h | 1 +
mythtv/libs/libmythtv/streamingringbuffer.cpp | 11 +-
mythtv/libs/libmythtv/subtitlescreen.cpp | 15 +-
mythtv/libs/libmythtv/subtitlescreen.h | 3 +-
mythtv/libs/libmythtv/tv_actions.h | 1 +
mythtv/libs/libmythtv/tv_play.cpp | 72 +-
mythtv/libs/libmythtv/tv_play.h | 8 +-
mythtv/libs/libmythtv/videodbcheck.cpp | 3 -
mythtv/libs/libmythtv/videoout_xv.cpp | 2 +-
mythtv/libs/libmythtv/videooutbase.cpp | 6 +-
mythtv/libs/libmythui/jsmenu.cpp | 6 +-
mythtv/libs/libmythui/mythgenerictree.cpp | 3 +
mythtv/libs/libmythui/mythmainwindow.cpp | 7 +-
mythtv/libs/libmythui/mythuibuttonlist.cpp | 27 +-
mythtv/libs/libmythui/mythuiimage.cpp | 2 +-
mythtv/libs/libmythui/mythuistatetype.cpp | 2 +-
mythtv/libs/libmythui/mythuitext.cpp | 31 +-
mythtv/libs/libmythui/mythuitextedit.cpp | 2 +-
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 3 +-
mythtv/libs/libmythupnp/configuration.cpp | 1 +
mythtv/programs/mythbackend/services/content.cpp | 2 +-
mythtv/programs/mythfilldatabase/xmltvparser.cpp | 27 +-
mythtv/programs/mythfrontend/globalsettings.cpp | 11 -
mythtv/programs/mythfrontend/main.cpp | 9 +-
mythtv/programs/mythfrontend/playbackbox.cpp | 1 +
mythtv/programs/mythfrontend/scheduleeditor.cpp | 28 +-
mythtv/programs/mythmetadatalookup/lookup.cpp | 14 +-
mythtv/programs/mythmetadatalookup/main.cpp | 2 +-
mythtv/programs/mythshutdown/commandlineparser.cpp | 7 +-
mythtv/programs/mythtranscode/transcode.cpp | 5 +-
.../scripts/database/mythconverg_backup.pl | 12 +-
.../scripts/database/mythconverg_restore.pl | 12 +-
mythtv/themes/MythCenter-wide/base.xml | 146 -
.../themes/MythCenter-wide/keyboard/keyboard.xml | 14 -
mythtv/themes/MythCenter-wide/music-base.xml | 6 +
mythtv/themes/MythCenter-wide/music-ui.xml | 106 +-
mythtv/themes/MythCenter-wide/mythburn-ui.xml | 14 -
mythtv/themes/MythCenter-wide/recordings-ui.xml | 14 -
mythtv/themes/MythCenter-wide/schedule-ui.xml | 70 -
mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 14 -
mythtv/themes/default/osd_subtitle.xml | 2 +-
122 files changed, 9288 insertions(+), 6702 deletions(-)
create mode 100644 mythplugins/mythmusic/theme/default/images/mm_directory.png
create mode 100644 mythtv/libs/libmythbase/bswap.h
create mode 100644 mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp
rename mythtv/libs/libmythtv/{ => AirPlay}/mythairplayserver.h (100%)
create mode 100644 mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp
create mode 100644 mythtv/libs/libmythtv/AirPlay/mythraopconnection.h
rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopdevice.cpp (100%)
rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopdevice.h (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/avformatdecoderbd.cpp (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/avformatdecoderbd.h (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/bdoverlayscreen.cpp (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/bdoverlayscreen.h (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/bdringbuffer.cpp (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/bdringbuffer.h (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/mythbdplayer.cpp (100%)
rename mythtv/libs/libmythtv/{ => Bluray}/mythbdplayer.h (100%)
rename mythtv/libs/libmythtv/{ => DVD}/avformatdecoderdvd.cpp (100%)
rename mythtv/libs/libmythtv/{ => DVD}/avformatdecoderdvd.h (100%)
rename mythtv/libs/libmythtv/{ => DVD}/dvdringbuffer.cpp (100%)
rename mythtv/libs/libmythtv/{ => DVD}/dvdringbuffer.h (100%)
rename mythtv/libs/libmythtv/{ => DVD}/mythdvdplayer.cpp (100%)
rename mythtv/libs/libmythtv/{ => DVD}/mythdvdplayer.h (100%)
create mode 100644 mythtv/libs/libmythtv/HLS/httplivestream.cpp
rename mythtv/libs/libmythtv/{ => HLS}/httplivestream.h (100%)
create mode 100644 mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
create mode 100644 mythtv/libs/libmythtv/HLS/httplivestreambuffer.h
delete mode 100644 mythtv/libs/libmythtv/bswap.h
delete mode 100644 mythtv/libs/libmythtv/httplivestream.cpp
delete mode 100644 mythtv/libs/libmythtv/mythairplayserver.cpp
delete mode 100644 mythtv/libs/libmythtv/mythraopconnection.cpp
delete mode 100644 mythtv/libs/libmythtv/mythraopconnection.h
--
More information about the mythtv-commits
mailing list