[mythtv-commits] mythtv branch devel/scheduler updated by gigem. v0.28-pre-2500-g9af372c

Git Repo Owner noreply at mythtv.org
Sat Jan 17 06:26:36 UTC 2015


The branch, devel/scheduler has been updated on the
mythtv repository by gitolite user gigem.
       via  9af372ce58c4e2965cd90c67792f3315e309902d (commit)
       via  e1f8c89b7c3583984bb4ec065028db6c0c2a5376 (commit)
       via  ba7d47145a047a1d469a4eaa0a1e0c18ce2bdf79 (commit)
       via  b75bbbc57faf293ec0c7d5147567752a25e49986 (commit)
       via  2f9ea65268b9cff3968d5c9919337d61870e17d9 (commit)
       via  3e8bd6bf460913d3705e945f3bd5d409d1c3c257 (commit)
       via  27b61b08f9282a6df119101becccdf4a350dc2e6 (commit)
       via  fd866cb15ad69a915008ef77db5a0978e4447d09 (commit)
       via  aed7687942f5b5912f7463f6b83e63f67a45768b (commit)
       via  d6d11234feefb2be5e861613e4381fdb1da75a04 (commit)
       via  3720faaca6d67ce99a03b31068d4cee7b54d88f6 (commit)
       via  c8a6b95da93dcf133b546ec2ae73bcac24a27acf (commit)
       via  8ddeb5089ec1615363231c8ed2671a81c99b9fdc (commit)
       via  9db5e6e1a79ca45904f7b1ae3ddf70cf06ecac11 (commit)
       via  82e0ca80616ffe1ba354082d96ca0e7a4e12af93 (commit)
       via  22736f994a9562f21e575d2a058253f76b42b63a (commit)
       via  93f4b96128c454aac728301282259df6734eb771 (commit)
       via  94b7147ab9039fadd29bf9823490bb14f880c13c (commit)
       via  9a9ee2e3e5878bbfa7d1c7954e631f73ad490af7 (commit)
       via  fa6660bfc9e63ac4c52be1e1e622aa1c73595132 (commit)
       via  4812cccf4ef5232a5b2ee0a7205cecf7af51b8ee (commit)
       via  070774cc63e364b9b588e27a96adc3ae34a829a3 (commit)
       via  4e16cb2fd73ec8c4b81934e680c61cc2efae99e3 (commit)
       via  2ad4fa6a6fa15eb3bdc66badb6c6eefa3603512e (commit)
       via  c37b2a477af7b6b78511c61daf290cf975a54954 (commit)
       via  69485919e846f6270c9d7a1c48e8b2a8feba191f (commit)
       via  9192fab1265fbd8a2066b52eabd882294f001994 (commit)
       via  01e57c4ceda94aa2da557eda35912096e188b8e3 (commit)
       via  84619a0c3c2e043a61317836362bd0e31ae989c4 (commit)
       via  f43255d8d9b75f60605473d2d1a6d799ed8babf0 (commit)
       via  eaaff946adc58058b2e8d93160ad1d34f596387f (commit)
       via  3ae65c3b6969c1eb8cacdfd77179d4f20f840386 (commit)
       via  d947e91eedf73a43dde79446b87e0095e54bf628 (commit)
       via  b8b9a1edb255b14cedfc73349d19a529cc658ce8 (commit)
       via  4b4c996f46e70075afd0441e22c60b35c6906b67 (commit)
       via  a923d8f1ed1b65bef9c2ea64792ba2cd5e1435fd (commit)
       via  c4ebf6a743ac35d4909d961cbf2aad595496967b (commit)
       via  35f2820b359c7ccc854452451357cab72de1df22 (commit)
       via  4216e0056f4464bf3dc6fa30c8e29406ff9fc784 (commit)
       via  abe56d4fa01d0b67f3103c218f1705d7668a91a0 (commit)
       via  0b79be63280bc87f439c0c012512381db05efe03 (commit)
       via  0810a9eff09f100db2a4f1aa1aedfe9a54c63790 (commit)
       via  7c435b8864f829591193a98e99eecdf890505cee (commit)
       via  f619e3481ecbe2909d36d611bb9132fa06b7ecb1 (commit)
       via  b0f4371620c6a144ba91d0db57a1baa6d488476b (commit)
       via  d9fe81d934403c0a10ddd9eb4180cd30f7db1e3f (commit)
       via  27f74647b1a341171de8d044c45032736a03fb08 (commit)
       via  5b386a00bf31034fa1cbda535fddd6de7c317866 (commit)
       via  f063b19facd153c2b2844e9643d570b9466b4b6f (commit)
       via  4bc1a9df19b06c5a39f27b0b4f3e40473a6d9af4 (commit)
       via  7819bedd7966718c7e3c0783e1017e793f964dec (commit)
       via  369589dbe02fbc9cb77b02d781ff02319b1e1906 (commit)
       via  bc19a5cf3b32c619bc33d43820e0f584a03ea44d (commit)
       via  83cea27a781a702e32b02ebee2311f8bc8f6f657 (commit)
       via  16e390f3754aeb0c11b09133688d7cb51f5d40b1 (commit)
       via  0bb7977ae19364e587da905e7700957790d8c51d (commit)
       via  79a40adbd71d4cfc440450d8e53986f56ec8af00 (commit)
       via  f9ccdebb9acddfe66706c43051a1dbd045fe9e56 (commit)
       via  1553e77c9f96ffc8140184d4865e35e29004ba22 (commit)
       via  520a1d146201a2d5b36863d68b9e27aaa42221f4 (commit)
       via  3016a7beb0056fb4fa4666cfa2f3a6dc4d055e09 (commit)
       via  c10cacfbdb32a6e0e006662110e7e469788b9aaa (commit)
       via  206aea9823b9fdd202af8f1164a0fb900a26de5f (commit)
       via  7088e46c17a74171f6cf7e3900068c471fe77002 (commit)
       via  3461b407b0dd0f4188108395709eb129ec32e652 (commit)
       via  255ecdac33170fa6b5afdfe5a681590540818a6e (commit)
       via  78a827b8fdbf0d4fab4525a8007c2c8c7deb4cc1 (commit)
       via  c94e826520a7499e9e2c1877b9a4192a2ee14eda (commit)
       via  bebbdbe5d144fa938666ec112461c4296cd7dcff (commit)
       via  a20f6f134856b3e378e4098a9a07307c04230df6 (commit)
       via  cec7dc9a125251e8ab9af6e34e19817472788f3a (commit)
       via  8e6678a00f81fffcd8a3bf71947066db1fffbd30 (commit)
       via  b3a03c4f5a5dd4caedc914f68f2b0f6c4034a013 (commit)
       via  2ab60e37c0c84243ca73fea6f0dd03c114633883 (commit)
       via  0f7d7ff0660a12022b76cdb8d6d6bceda032f540 (commit)
       via  02e92a265c1e9825bb58806156fbf31bd740515a (commit)
       via  eb69cb1ec1a0afda2902a940122f3390abe1bab2 (commit)
       via  c12af87629629295975fdb1ede28072ad2fc1247 (commit)
       via  d0b4a314008a51b4348913cd07c90006507838ba (commit)
       via  d20c163ee82c38f9d8fe4652b7a811af61925de7 (commit)
       via  031d2f1e8c06440966807fea26ff0553f3ea3de3 (commit)
       via  e5d21834443a1c3769be36b5b2ecce62f60b8274 (commit)
       via  d3f5031e08c0a9e0fa783310afa4d293bacf6ce0 (commit)
       via  d777342610280819c7c59816b258cebc9f7ca2f1 (commit)
       via  54886df43b82ab5e4c2e2ef2c1be4d66d467d8f9 (commit)
       via  5cd97d7fd999e4d8575a51a55b97d65c3093a754 (commit)
       via  6204ce0df320b42df80284846ba3447906e4cac3 (commit)
       via  3c11b9b7223721d1d1008cdcf1eb0e85a69350ef (commit)
       via  596b3f5049907bcdbe52b07603c67472fb22b77a (commit)
       via  13de778ec2205c1ab631dd3cb7fd6b924065110a (commit)
       via  7503b4333de26c8ff53e8848a4a1f2ee8d37b928 (commit)
       via  7c26cd6d185b71a6fab2540d502d0c8302c4d67d (commit)
       via  376955a091dbf69f7cc233fa1bf3255401e80367 (commit)
       via  864d985786a6f0f0fe2b93b4539c12ee2b0e09e2 (commit)
       via  46dbe1df127e3f7208ecf04b0919d5860c203ab0 (commit)
       via  736ff8cb7225ff580ffdbbec53c984a3b61df1c6 (commit)
       via  178a82ca3f49b069cce85cd18912b21b19bfe043 (commit)
       via  b89b764e1de47ae0b471cadd0c74d5709cc3ef76 (commit)
       via  a397b94ffb5cf201aef4fdd9ccd2b28780713bed (commit)
       via  be72636b9e34b1b9fb032a1da578a742d562d0b9 (commit)
       via  e42e1d8351703798e3dc08cb01597577794bab32 (commit)
       via  fdaf14dd4cf1430a2798277e48afcd0246bb0887 (commit)
       via  6ba87f7019a85e3c00e82f01369996bfed00aa6b (commit)
       via  bbbe802b3c41478bedc751ef8bd7bc7c3b44c06f (commit)
       via  81353f8ab029a79686cf0dbb3dd269889fb167c0 (commit)
       via  d4e651c618a8a980ba49cb74bfc8957a4a77ffc4 (commit)
       via  acdc9f86988379b842f56b89089f4e8d029dec37 (commit)
       via  6a6e167128d8ddf95467e0ec7e78199e7e2515f2 (commit)
       via  5b6de10b96412f35cc1ff60a68023f41aebaa356 (commit)
       via  2da59647f3ba247468a547a0fd9bfcc257e51618 (commit)
       via  2f2261d6e3bb78f029dbb38e4746314d6ca0a2b6 (commit)
       via  6750b358ec33c09bd651507ed57eb993ae5e5a39 (commit)
       via  eb0e5050a4af098b9c9dd392c324e1993b2c590e (commit)
       via  4e5ce7fe25faf3df617b4f633b0e6c58afa34912 (commit)
       via  6b478aca954a328dd0e2b9e613662c4450ec3a83 (commit)
       via  5273d4364c96bfc5fd4fc651160e01334a90a343 (commit)
       via  068047a5b43fffda91b08f3c0f6fb2651d9e3a85 (commit)
       via  d58f3c7931ad8e277b72f29d89eee5fabc77deb0 (commit)
       via  889662cab77efbc33fabb7ca57e7ff751907a98b (commit)
       via  3f81908ca0584791036c7f857fd6002889672aa2 (commit)
       via  56a8877b3d87474836847bd1cf4af4d94db4de14 (commit)
       via  e04fe4105435096efebc60ecb9f1be9011a77914 (commit)
       via  ef71f25b615488f13d40ce27614494f2bad95620 (commit)
       via  6721aef569f49bf92d15bab9bd85197daa445739 (commit)
       via  8e7be9a9f72456bbe749704343dbf64665429d3e (commit)
       via  ea1f065ef1a5201c4c4f8d9a9832e292898ce4ba (commit)
       via  7c8b18c1f88d3f6ac2b765a134ea05f5935024f4 (commit)
       via  77bd5ad929e5ae4ae7cf23638dcc7f8b5ab07b75 (commit)
       via  dd5710c3b21768d9a41f31cb2d56118983fddef1 (commit)
       via  f9f8fe7e9ac9f76bf79be00523ea18d76207d071 (commit)
       via  92c73773d1bb5226bcfe42d230a067f0a3a8697f (commit)
       via  3601cad99317ac643bcf1fcf3d77bd9fc2f036cf (commit)
       via  61f9ac9a8d7f6eb5cf1fac74376245e8b82e42f1 (commit)
       via  f54d2672f224ba24224c8edd12fb0318797b3425 (commit)
       via  0bf91f1af368f3aff75d8f1af505c33b4f57052a (commit)
       via  ee30fe0b9ac17ace00d876fa85dbcbf18e08c56e (commit)
       via  a669bc9f4f59f9a043a0c09a29b961dc4d4f67bf (commit)
       via  dc3e54332b25bb4b8eef953b871842a44a088a4b (commit)
       via  622bb6b79c28ac2b03f1ab64a7de10ff0be1327a (commit)
       via  b3f1f0fb287564184373166e1026a01216d5cbc0 (commit)
       via  327f5fa9e83e59098822d96bbd92a0e6dc504715 (commit)
       via  e4d1f7e56743bfa26f0fe1a2e5be62ab1f5c6667 (commit)
       via  f0ec2d24c3ec76961f90fd6e545433e292c9fc20 (commit)
       via  0b1036998a647c5faeef0db088cbe7fe7c8b1fd1 (commit)
       via  31164a6d685d048d155eb53f60fcb78547b3bf36 (commit)
       via  b327d14b9238f0a1532178c9f7219acee8bba2c9 (commit)
       via  10ff830a55a59bc41a0b67a4e02010600ec3f3ae (commit)
       via  1830246f428dc0237125a21a3a90970ac93a0172 (commit)
       via  bfad0d3095a181bf39c94063f52958dea8d1d9ff (commit)
       via  e84260c0dbfaf466772ca9f4b1bd0aee63434745 (commit)
       via  dc8f929a2c08f1c72b0a82f8addf88bdf0c354a5 (commit)
       via  4f971fbe10d4165ccb7f35bd099d5b8799574725 (commit)
       via  c7384b48433621637fe2dbc2f53d2223794f6807 (commit)
       via  69bb0f87c2a8e229a7788ce592a0ec2a526a8aec (commit)
       via  66d06b76d7c9c7f882cfebdd428d93fd58b545e3 (commit)
       via  984e453a53d962e2e6fbfed3177e4f61d5f9f8ed (commit)
       via  c298851d46b5585ed53c1d2fab701e4f6efb64c3 (commit)
       via  e7360544d7be4e050f962d47c5d06bffa6fd6f4b (commit)
       via  028b3510f94aa3ca95e11295b547fb3e48be929d (commit)
       via  e40c4d27e50d86c080524300e559c19d8c4fd66d (commit)
       via  b60994afbe6f4faf479b712facaf86087ed9831b (commit)
       via  f406aad5fcc666db5aca1af8867193261170239b (commit)
       via  dc2c6f415eaf877851811e73c84c1d91fcc05c1d (commit)
       via  54a8baaa0599876d7ee547f8dc349aa58f70425b (commit)
       via  6fa4c658724c27c2c61c89bba416982a777ac3c7 (commit)
       via  9cdfdc191dc9f50ce1d79c5daa5cdbb6de3b3853 (commit)
       via  af26c0b8333b58b4334b8aa9d0aade0e3ff7c65c (commit)
       via  913608713135939f7f2ab2b10e1cc7d420d73730 (commit)
       via  264df67812f819a06d3aa806a8baf79316575486 (commit)
       via  b8e32ffaaba7e95637d6a25b5cfa5a21a3ceb89a (commit)
       via  7817b55789462dca3e6d1a4ee0f6e1606ad77677 (commit)
      from  69fc1333fd0fcb97448d9afc0c191e027079db5e (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 9af372ce58c4e2965cd90c67792f3315e309902d
Author:    David Engel <dengel at mythtv.org> at Sat, 17 Jan 2015 00:25:28 -0600
Committer: David Engel <dengel at mythtv.org> at Sat, 17 Jan 2015 00:25:28 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9af372ce58c4e2965cd90c67792f3315e309902d

Update the ABI version.



commit e1f8c89b7c3583984bb4ec065028db6c0c2a5376
Author:    David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:06:54 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:19 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e1f8c89b7c3583984bb4ec065028db6c0c2a5376

Change the default card Sched/LiveTVOrder to 1.
The current input configuration code can't easily mimic the old
behavior of using cardid as the default.  It will be changed back
eventually, but for now, use 1 instead of 0 as the default.  It's easy
to forget to change when configuring a new card and leaving it at 0
causes the card to be ignored.
changes. Lines starting # with '#' will be ignored, and an empty
message aborts the commit.  # On branch inputs # Changes to be
committed: # modified: bindings/perl/MythTV.pm # modified:
bindings/python/MythTV/static.py # modified:
libs/libmythbase/mythversion.h # modified: libs/libmythtv/cardutil.cpp
bindings/perl/MYMETA.json #



commit ba7d47145a047a1d469a4eaa0a1e0c18ce2bdf79
Author:    David Engel <dengel at mythtv.org> at Thu, 15 Jan 2015 15:52:06 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:19 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ba7d47145a047a1d469a4eaa0a1e0c18ce2bdf79

Update and re-enable editing of video sources.



commit b75bbbc57faf293ec0c7d5147567752a25e49986
Author:    David Engel <dengel at mythtv.org> at Thu, 15 Jan 2015 15:13:16 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:19 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b75bbbc57faf293ec0c7d5147567752a25e49986

Update and re-enable editing of card inputs.
Fix editing of card inputs after the merge of the capturecard and
cardinput tables.  The inputgroups that can be configured here are now
known as "User" inputgroups.  These allow the user to define input
relationships that cannot be automatically determined.

Similarly with the capture card editing, strange things can happen
when multiple inputs are configured with the same device and
inputname.  Don't do that until a better design can be implemented.



commit 2f9ea65268b9cff3968d5c9919337d61870e17d9
Author:    David Engel <dengel at mythtv.org> at Thu, 8 Jan 2015 14:26:11 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:19 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2f9ea65268b9cff3968d5c9919337d61870e17d9

Update and re-enable editing of capture cards.
Fix editing of capture cards after the merge of the capturecard and
cardinput tables.  A "Device" inputgroup is now automatically created
for each unique hostname/videodevice.  This is now how virtual tuner
and multiple input cards are tied together -- cards using the same
device are automatically assigned to the same inputgroup.

Note, it turns out that there were several existing bugs that show up
when the type or videodevice of an existing card is changed.  This
change does not do much to address this problem, so don't do that.  It
will hopefully get addressed some time in the future, probably when
the editing of inputs is merged with card editing.



commit 3e8bd6bf460913d3705e945f3bd5d409d1c3c257
Author:    David Engel <dengel at mythtv.org> at Wed, 31 Dec 2014 11:43:07 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:19 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3e8bd6bf460913d3705e945f3bd5d409d1c3c257

Replace uses of cardinput table with capturecard table.
Move the contents of the cardinput table to the capturecard table and
update all database queries accordingly.  cardid is now synonymous
with cardinputid.  There are many, many, many places in the code where
the logic now makes little to no sense.  For the most part, those have
been left unchanged and will be addressed later.



commit 27b61b08f9282a6df119101becccdf4a350dc2e6
Author:    David Engel <dengel at mythtv.org> at Tue, 30 Dec 2014 00:53:18 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:19 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=27b61b08f9282a6df119101becccdf4a350dc2e6

Slightly simplify conflict list calculation in Scheduler.
Cards can no longer have multiple inputs, so there is no need to
consider that case anymore.



commit fd866cb15ad69a915008ef77db5a0978e4447d09
Author:    David Engel <dengel at mythtv.org> at Mon, 29 Dec 2014 22:27:11 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:19 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fd866cb15ad69a915008ef77db5a0978e4447d09

Split multi-input cards and renumber inputs to match cards.
For each second or higher input on a card, create a new card with the
same information and attach the input to the new card.  After this, a
card can have at most one configured input.  Next, renumber the inputs
such that the inputid is equal to the cardid.  Finally, automatically
create an inputgroup for each unique host/device and attach each
card/input to the appropriate inputgroup.

Note that this change subtly introduces the concept of device and user
inputgroups.  The former are automatically managed when cards are
edited and supports conflict detection for cards using the same
device.  The latter are for the user to specify cross-device
relationships that cannot be automatically detected.  This commit only
contains the minimum changes needed to implement the input splitting
and renumbering.  The rest will come later when card/input editging is
re-enabled.



commit aed7687942f5b5912f7463f6b83e63f67a45768b
Author:    David Engel <dengel at mythtv.org> at Mon, 29 Dec 2014 14:11:44 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:18 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=aed7687942f5b5912f7463f6b83e63f67a45768b

Temporarily disable editing of cards, inputs and sources.
This is in preparation for merging cards and inputs.  Doing so allows
the succeeding changes to be done in smaller, logical steps without
breaking core functionality.  The latter could be important if this
series of changes are part of a git bisect.  Keeping the edit
funcionality active would require making a lot of related changes
altogether in one, very large commit.



commit d6d11234feefb2be5e861613e4381fdb1da75a04
Author:    David Engel <dengel at mythtv.org> at Mon, 29 Dec 2014 13:57:21 -0600
Committer: David Engel <dengel at mythtv.org> at Fri, 16 Jan 2015 16:19:18 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d6d11234feefb2be5e861613e4381fdb1da75a04

Split performActualUpdate() into two parts.
Move the running of a series of queries to new function called
performUpdateSeries().  This allows that part to be re-used.



-----------------------------------------------------------------------

Summary of changes:
 mythplugins/mytharchive/i18n/mytharchive_es_es.ts  |   24 +-
 mythplugins/mytharchive/mytharchivehelper/main.cpp |    2 +-
 .../mythbrowser/mythbrowser/bookmarkeditor.cpp     |   39 +-
 mythplugins/mythgallery/i18n/mythgallery_es_es.qm  |  Bin 25808 -> 27011 bytes
 mythplugins/mythgallery/i18n/mythgallery_es_es.ts  |  232 +-
 mythplugins/mythmusic/i18n/mythmusic_es_es.qm      |  Bin 70432 -> 72045 bytes
 mythplugins/mythmusic/i18n/mythmusic_es_es.ts      |  802 ++--
 mythplugins/mythmusic/mythmusic/main.cpp           |   12 +-
 .../mythmusic/theme/default-wide/stream-ui.xml     |   12 +-
 .../mythnetvision/i18n/mythnetvision_es_es.qm      |  Bin 15219 -> 14097 bytes
 .../mythnetvision/i18n/mythnetvision_es_es.ts      |  182 +-
 .../mythzoneminder/i18n/mythzoneminder_es_es.ts    |    6 +-
 .../mythzoneminder/alarmnotifythread.cpp           |   70 +
 .../mythzoneminder/alarmnotifythread.h             |   32 +
 mythplugins/mythzoneminder/mythzoneminder/main.cpp |   35 +-
 .../mythzoneminder/mythzoneminder.pro              |    5 +-
 .../mythzoneminder/mythzoneminder/zmclient.cpp     |  231 +-
 .../mythzoneminder/mythzoneminder/zmclient.h       |   27 +-
 .../mythzoneminder/mythzoneminder/zmconsole.cpp    |   89 +-
 .../mythzoneminder/mythzoneminder/zmconsole.h      |    3 +-
 .../mythzoneminder/mythzoneminder/zmdefines.h      |   17 +-
 .../mythzoneminder/mythzoneminder/zmliveplayer.cpp |  158 +-
 .../mythzoneminder/mythzoneminder/zmliveplayer.h   |   12 +-
 .../mythzoneminder/mythzoneminder/zmminiplayer.cpp |  146 +
 .../mythzoneminder/mythzoneminder/zmminiplayer.h   |   35 +
 .../theme/default-wide/zoneminder-ui.xml           |   65 +-
 .../mythzoneminder/theme/default/zoneminder-ui.xml |   75 +-
 mythtv/AUTHORS                                     |    3 +
 mythtv/README                                      |    3 +-
 mythtv/bindings/perl/MythTV.pm                     |    2 +-
 mythtv/bindings/python/MythTV/methodheap.py        |    2 +-
 mythtv/bindings/python/MythTV/static.py            |    2 +-
 mythtv/external/libmythdvdnav/libmythdvdnav.pro    |   17 +
 mythtv/html/misc/js/overview.js                    |   35 +
 mythtv/html/misc/overview.qsp                      |    5 +-
 mythtv/html/robots.txt                             |    3 +
 mythtv/html/tv/css/guide.css                       |    7 +
 mythtv/html/tv/css/recordings.css                  |    7 +
 mythtv/html/tv/guide.qsp                           |    2 +-
 mythtv/html/tv/recordings.qsp                      |    7 +-
 mythtv/i18n/mythfrontend_es_es.qm                  |  Bin 735659 -> 742675 bytes
 mythtv/i18n/mythfrontend_es_es.ts                  | 5855 ++++++++++----------
 mythtv/libs/libmyth/libmyth.pro                    |    5 +
 mythtv/libs/libmyth/programinfo.cpp                |   35 +-
 mythtv/libs/libmyth/programtypes.cpp               |    1 +
 mythtv/libs/libmyth/rssparse.cpp                   |    8 +-
 mythtv/libs/libmythbase/mythdownloadmanager.cpp    |    3 +
 mythtv/libs/libmythbase/mythsingledownload.cpp     |   35 +-
 mythtv/libs/libmythbase/mythsingledownload.h       |    3 +-
 mythtv/libs/libmythbase/mythversion.h              |    4 +-
 mythtv/libs/libmythfreemheg/Engine.cpp             |    4 +
 mythtv/libs/libmythfreemheg/ParseNode.cpp          |   36 +
 mythtv/libs/libmythfreemheg/ParseNode.h            |    2 +
 mythtv/libs/libmythfreemheg/Programs.cpp           |    7 +
 mythtv/libs/libmythfreemheg/Stream.cpp             |    2 +-
 mythtv/libs/libmythfreemheg/Text.cpp               |    2 +
 mythtv/libs/libmythmetadata/imagemetadata.cpp      |   12 +-
 mythtv/libs/libmythmetadata/imagemetadata.h        |    3 +-
 mythtv/libs/libmythmetadata/imagescanthread.cpp    |    6 +-
 .../libs/libmythmetadata/imagethumbgenthread.cpp   |  108 +-
 mythtv/libs/libmythmetadata/imagethumbgenthread.h  |    8 +-
 mythtv/libs/libmythmetadata/imageutils.cpp         |   40 +-
 mythtv/libs/libmythmetadata/libmythmetadata.pro    |   17 +
 mythtv/libs/libmythmetadata/videometadata.cpp      |    5 +-
 .../services/contentServices.h                     |    9 -
 .../services/imageServices.h                       |   15 +-
 mythtv/libs/libmythtv/avformatdecoder.cpp          |    8 +-
 mythtv/libs/libmythtv/cardutil.cpp                 |  566 +--
 mythtv/libs/libmythtv/cardutil.h                   |   10 +-
 mythtv/libs/libmythtv/channelinfo.cpp              |    3 +-
 .../libs/libmythtv/channelscan/channelscan_sm.cpp  |    2 +-
 .../libmythtv/channelscan/inputselectorsetting.cpp |    9 +-
 mythtv/libs/libmythtv/channelsettings.cpp          |    5 +-
 mythtv/libs/libmythtv/channelutil.cpp              |   51 +-
 mythtv/libs/libmythtv/datadirect.cpp               |    4 +-
 mythtv/libs/libmythtv/dbcheck.cpp                  |  247 +-
 mythtv/libs/libmythtv/diseqcsettings.cpp           |    6 +-
 mythtv/libs/libmythtv/eitfixup.cpp                 |   14 +-
 mythtv/libs/libmythtv/eitscanner.cpp               |    9 +-
 mythtv/libs/libmythtv/inputgroupmap.cpp            |    2 +-
 mythtv/libs/libmythtv/interactivetv.cpp            |    4 +-
 mythtv/libs/libmythtv/interactivetv.h              |    2 +-
 mythtv/libs/libmythtv/libmythtv.pro                |    8 +-
 mythtv/libs/libmythtv/mhegic.cpp                   |   38 +-
 mythtv/libs/libmythtv/mhegic.h                     |    3 +-
 mythtv/libs/libmythtv/mhi.cpp                      |   61 +-
 mythtv/libs/libmythtv/mhi.h                        |    5 +-
 mythtv/libs/libmythtv/mpeg/dvbdescriptors.h        |   26 +-
 mythtv/libs/libmythtv/mpeg/mpegdescriptors.cpp     |   17 +-
 mythtv/libs/libmythtv/mpeg/mpegdescriptors.h       |   41 +
 mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp      |   14 +-
 mythtv/libs/libmythtv/mpeg/mpegtables.cpp          |    1 +
 mythtv/libs/libmythtv/mythplayer.cpp               |   43 +-
 mythtv/libs/libmythtv/mythplayer.h                 |    3 +-
 mythtv/libs/libmythtv/netstream.cpp                |  101 +-
 mythtv/libs/libmythtv/netstream.h                  |   15 +-
 .../libs/libmythtv/recorders/ExternalRecorder.cpp  |    1 +
 .../libmythtv/recorders/ExternalStreamHandler.cpp  |  115 +-
 .../libmythtv/recorders/ExternalStreamHandler.h    |    1 +
 mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp  |    4 +-
 mythtv/libs/libmythtv/recorders/channelbase.cpp    |   32 +-
 mythtv/libs/libmythtv/recorders/dtvrecorder.cpp    |    7 +-
 mythtv/libs/libmythtv/recorders/dvbchannel.cpp     |    6 +-
 .../libs/libmythtv/recorders/firewirerecorder.cpp  |   29 +-
 .../libs/libmythtv/recorders/hlsstreamhandler.cpp  |   36 +-
 mythtv/libs/libmythtv/recorders/hlsstreamhandler.h |    6 +-
 .../libs/libmythtv/recorders/iptvstreamhandler.cpp |   36 +-
 .../libs/libmythtv/recorders/iptvstreamhandler.h   |    6 +-
 mythtv/libs/libmythtv/recorders/v4lchannel.cpp     |   14 +-
 mythtv/libs/libmythtv/remoteencoder.cpp            |    7 +-
 mythtv/libs/libmythtv/ringbuffer.cpp               |   11 +-
 mythtv/libs/libmythtv/sourceutil.cpp               |   28 +-
 .../test/test_mpegtables/test_mpegtables.cpp       |  231 +
 .../test/test_mpegtables/test_mpegtables.h         |  211 +-
 mythtv/libs/libmythtv/transporteditor.cpp          |    7 +-
 mythtv/libs/libmythtv/tv_rec.cpp                   |   87 +-
 mythtv/libs/libmythtv/videooutbase.cpp             |   13 +-
 mythtv/libs/libmythtv/videooutwindow.cpp           |   28 +-
 mythtv/libs/libmythtv/videosource.cpp              |  182 +-
 mythtv/libs/libmythtv/videosource.h                |    5 +-
 mythtv/libs/libmythui/mythnotificationcenter.cpp   |    4 +-
 mythtv/libs/libmythui/mythrender_base.h            |    3 +-
 mythtv/libs/libmythui/mythrender_vdpau.cpp         |    2 +
 mythtv/libs/libmythui/myththemebase.cpp            |    6 +-
 mythtv/libs/libmythui/myththemedmenu.cpp           |   15 +
 mythtv/libs/libmythui/myththemedmenu.h             |    1 +
 mythtv/libs/libmythui/mythuibuttonlist.cpp         |   28 +-
 mythtv/libs/libmythui/mythuibuttonlist.h           |    4 +
 mythtv/libs/libmythui/mythuihelper.cpp             |   84 +-
 mythtv/libs/libmythui/mythuihelper.h               |    2 +-
 mythtv/libs/libmythui/mythuiimage.cpp              |  124 +-
 mythtv/libs/libmythui/mythuiimage.h                |    5 +
 mythtv/libs/libmythui/mythuitext.cpp               |    2 +-
 mythtv/libs/libmythui/themeinfo.cpp                |    5 +
 mythtv/libs/libmythui/themeinfo.h                  |    2 +
 mythtv/libs/libmythupnp/eventing.cpp               |   14 +-
 mythtv/libs/libmythupnp/htmlserver.cpp             |   43 +-
 mythtv/libs/libmythupnp/htmlserver.h               |    1 -
 mythtv/libs/libmythupnp/httprequest.cpp            |   43 +-
 mythtv/libs/libmythupnp/httprequest.h              |    7 +-
 mythtv/libs/libmythupnp/httpserver.cpp             |    5 +-
 mythtv/libs/libmythupnp/ssdp.cpp                   |   32 +-
 mythtv/libs/libmythupnp/upnpcds.cpp                |   12 +-
 mythtv/libs/libmythupnp/upnpcds.h                  |   20 +-
 mythtv/locales/de_at.xml                           |   37 +
 mythtv/programs/mythbackend/backendhousekeeper.cpp |    6 +-
 mythtv/programs/mythbackend/main_helpers.cpp       |    4 +-
 mythtv/programs/mythbackend/mainserver.cpp         |  453 ++-
 mythtv/programs/mythbackend/mainserver.h           |    7 +
 mythtv/programs/mythbackend/scheduler.cpp          |   77 +-
 mythtv/programs/mythbackend/scheduler.h            |    2 +-
 .../serviceHosts/channelIconServiceHost.h          |   59 +
 mythtv/programs/mythbackend/services/capture.cpp   |    3 +-
 .../programs/mythbackend/services/channelicon.cpp  |  130 +
 mythtv/programs/mythbackend/services/channelicon.h |   96 +
 mythtv/programs/mythbackend/services/content.cpp   |   93 +-
 mythtv/programs/mythbackend/services/content.h     |    7 -
 mythtv/programs/mythbackend/services/guide.cpp     |   10 +-
 mythtv/programs/mythbackend/services/image.cpp     |  250 +-
 mythtv/programs/mythbackend/services/image.h       |   57 +-
 mythtv/programs/mythbackend/upnpcdsmusic.cpp       |   10 +-
 mythtv/programs/mythbackend/upnpcdstv.cpp          |   17 +-
 mythtv/programs/mythbackend/upnpcdsvideo.cpp       |    6 +-
 .../mythfilerecorder/commandlineparser.cpp         |    5 +-
 .../programs/mythfilerecorder/mythfilerecorder.cpp |   57 +-
 .../programs/mythfilerecorder/mythfilerecorder.h   |   12 +-
 mythtv/programs/mythfilldatabase/channeldata.cpp   |    5 +-
 mythtv/programs/mythfilldatabase/xmltvparser.cpp   |   19 +-
 .../programs/mythfrontend/channelrecpriority.cpp   |    3 +-
 mythtv/programs/mythfrontend/customedit.cpp        |    7 +-
 mythtv/programs/mythfrontend/customedit.h          |    2 +
 mythtv/programs/mythfrontend/custompriority.cpp    |   10 +-
 .../mythfrontend/gallerydatabasehelper.cpp         |  165 +-
 .../programs/mythfrontend/gallerydatabasehelper.h  |   15 +-
 mythtv/programs/mythfrontend/galleryfilehelper.cpp |  372 +--
 mythtv/programs/mythfrontend/galleryfilehelper.h   |   24 +-
 mythtv/programs/mythfrontend/galleryview.cpp       |  222 +-
 mythtv/programs/mythfrontend/galleryview.h         |   16 +-
 mythtv/programs/mythfrontend/galleryviewhelper.cpp |  164 +-
 mythtv/programs/mythfrontend/galleryviewhelper.h   |    2 +-
 mythtv/programs/mythfrontend/gallerywidget.cpp     |   77 +-
 mythtv/programs/mythfrontend/gallerywidget.h       |    2 +-
 mythtv/programs/mythfrontend/guidegrid.cpp         |   28 +-
 mythtv/programs/mythfrontend/networkcontrol.cpp    |  235 +
 mythtv/programs/mythfrontend/networkcontrol.h      |    4 +
 .../programs/mythfrontend/programrecpriority.cpp   |   69 +-
 mythtv/programs/mythfrontend/statusbox.cpp         |    6 +-
 mythtv/programs/mythtranscode/mpeg2fix.cpp         |   20 +-
 mythtv/programs/mythtv-setup/checksetup.cpp        |    2 +-
 mythtv/programs/mythtv-setup/importicons.cpp       |    6 +-
 mythtv/programs/mythtv-setup/setup.xml             |    4 +-
 .../distros/mythtv_data/data_mythtv.py             |    4 +-
 mythtv/themes/MythCenter-wide/appear-ui.xml        |    4 +-
 mythtv/themes/MythCenter-wide/base.xml             |   10 -
 mythtv/themes/MythCenter-wide/browser-ui.xml       |   13 +-
 mythtv/themes/MythCenter-wide/notification-ui.xml  |    2 -
 mythtv/themes/MythCenter-wide/osd.xml              |    5 +
 mythtv/themes/MythCenter-wide/zoneminder-ui.xml    |   65 +-
 mythtv/themes/MythCenter/base.xml                  |  177 +-
 mythtv/themes/MythCenter/browser-ui.xml            |   20 +-
 mythtv/themes/MythCenter/notification-ui.xml       |    2 -
 mythtv/themes/MythCenter/recordings-ui.xml         |  113 +-
 mythtv/themes/MythCenter/themeinfo.xml             |    2 +-
 mythtv/themes/default-wide/appear-ui.xml           |    4 +-
 mythtv/themes/default-wide/base.xml                |   12 +-
 mythtv/themes/default-wide/image-ui.xml            |   40 +-
 mythtv/themes/default/appear-ui.xml                |    4 +-
 mythtv/themes/default/image-ui.xml                 |  592 ++
 mythtv/themes/default/keyboard/ar_ui.xml           |  430 --
 mythtv/themes/default/keyboard/da_ui.xml           |  382 --
 mythtv/themes/default/keyboard/de_ui.xml           |  404 --
 mythtv/themes/default/keyboard/el.xml              |  270 +
 mythtv/themes/default/keyboard/en_gb_ui.xml        |  398 --
 mythtv/themes/default/keyboard/en_us_ui.xml        |  410 --
 mythtv/themes/default/keyboard/es_ui.xml           |  404 --
 mythtv/themes/default/keyboard/fr_ch_ui.xml        |  404 --
 mythtv/themes/default/keyboard/fr_ui.xml           |  404 --
 mythtv/themes/default/keyboard/he_ui.xml           |  410 --
 mythtv/themes/default/keyboard/it_ui.xml           |  404 --
 mythtv/themes/default/keyboard/nb_ui.xml           |  382 --
 mythtv/themes/default/keyboard/ru_ui.xml           |  410 --
 mythtv/themes/default/keyboard/sv_ui.xml           |  382 --
 mythtv/themes/default/notification-ui.xml          |    2 -
 mythtv/themes/mythuitheme.xsd                      |   28 +
 themestringstool/.gitignore                        |    3 +
 225 files changed, 9229 insertions(+), 11760 deletions(-)
 create mode 100644 mythplugins/mythzoneminder/mythzoneminder/alarmnotifythread.cpp
 create mode 100644 mythplugins/mythzoneminder/mythzoneminder/alarmnotifythread.h
 create mode 100644 mythplugins/mythzoneminder/mythzoneminder/zmminiplayer.cpp
 create mode 100644 mythplugins/mythzoneminder/mythzoneminder/zmminiplayer.h
 create mode 100644 mythtv/html/misc/js/overview.js
 create mode 100644 mythtv/html/robots.txt
 create mode 100644 mythtv/locales/de_at.xml
 create mode 100644 mythtv/programs/mythbackend/serviceHosts/channelIconServiceHost.h
 create mode 100644 mythtv/programs/mythbackend/services/channelicon.cpp
 create mode 100644 mythtv/programs/mythbackend/services/channelicon.h
 create mode 100644 mythtv/themes/default/image-ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/ar_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/da_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/de_ui.xml
 create mode 100644 mythtv/themes/default/keyboard/el.xml
 delete mode 100644 mythtv/themes/default/keyboard/en_gb_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/en_us_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/es_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/fr_ch_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/fr_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/he_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/it_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/nb_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/ru_ui.xml
 delete mode 100644 mythtv/themes/default/keyboard/sv_ui.xml
 create mode 100644 themestringstool/.gitignore

-- 



More information about the mythtv-commits mailing list