[mythtv-firehose] mythtv branch devel/ceton updated by danielk. v0.26-pre-394-g802c12f
Git Repo Owner
noreply at mythtv.org
Tue Jun 5 15:34:05 UTC 2012
The branch, devel/ceton has been updated on the
mythtv repository by gitolite user danielk.
via 802c12f39ffe2bcfd60fd73fd1e59065ea43037d (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 b217d8baecd39e7b87e6500f06f34fe729129214 (commit)
via 3265013b4ef634a60144392bac2d8f73f95f28f6 (commit)
via c45628d75939337f99eaa8b19c4a7c22f3435dde (commit)
via 5d1dc99ac70aaeb82d41689ddbe7dcc619554c93 (commit)
via 4dc99bc777e0be78487661a40782115f5ef203eb (commit)
from 122f2a3d4ef09042f703549c9e253aed0d4243f5 (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 802c12f39ffe2bcfd60fd73fd1e59065ea43037d
Author: Daniel Thor Kristjansson <danielk at cuymedia.net> at Fri, 18 May 2012 18:17:27 -0400
Committer: Daniel Thor Kristjansson <danielk at cuymedia.net> at Fri, 18 May 2012 18:20:51 -0400
URL: http://code.mythtv.org/cgit/mythtv/commit/?id=802c12f39ffe2bcfd60fd73fd1e59065ea43037d
Merge remote branch 'origin/master' into devel/ceton
Conflicts:
mythtv/libs/libmythtv/libmythtv.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/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/configure | 3 +
mythtv/i18n/mythfrontend_es_es.qm | Bin 651696 -> 647216 bytes
mythtv/i18n/mythfrontend_es_es.ts | 4015 ++++++++++----------
mythtv/libs/libmythbase/mythcommandlineparser.cpp | 2 +-
mythtv/libs/libmythbase/mythcorecontext.cpp | 2 +-
mythtv/libs/libmythbase/mythsocket.cpp | 2 +-
.../libmythtv/{ => AirPlay}/mythairplayserver.cpp | 0
.../libmythtv/{ => AirPlay}/mythairplayserver.h | 0
.../libmythtv/{ => AirPlay}/mythraopconnection.cpp | 0
.../libmythtv/{ => AirPlay}/mythraopconnection.h | 0
.../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 | 39 +-
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 | 4 +-
mythtv/libs/libmythtv/avformatwriter.cpp | 108 +-
mythtv/libs/libmythtv/dbcheck.cpp | 9 +
mythtv/libs/libmythtv/decoderbase.cpp | 4 +-
mythtv/libs/libmythtv/libmythtv.pro | 138 +-
mythtv/libs/libmythtv/osd.cpp | 4 +-
mythtv/libs/libmythtv/osd.h | 3 +-
mythtv/libs/libmythtv/playercontext.cpp | 4 +-
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/subtitlescreen.cpp | 13 +-
mythtv/libs/libmythtv/subtitlescreen.h | 1 +
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/libmythui/mythmainwindow.cpp | 3 +-
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/scheduleeditor.cpp | 28 +-
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 -
78 files changed, 5315 insertions(+), 2740 deletions(-)
create mode 100644 mythplugins/mythmusic/theme/default/images/mm_directory.png
rename mythtv/libs/libmythtv/{ => AirPlay}/mythairplayserver.cpp (100%)
rename mythtv/libs/libmythtv/{ => AirPlay}/mythairplayserver.h (100%)
rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopconnection.cpp (100%)
rename mythtv/libs/libmythtv/{ => AirPlay}/mythraopconnection.h (100%)
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%)
rename mythtv/libs/libmythtv/{ => HLS}/httplivestream.cpp (97%)
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
--
More information about the mythtv-firehose
mailing list