Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14695 Added Files: mythtv-0.27-fixes.patch mythtv-0.27-libcec2.patch Log Message: Add updated patches to cvs. mythtv-0.27-fixes.patch: 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/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 | 4 b/mythplugins/mythnetvision/i18n/mythnetvision_sv.qm |binary b/mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 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 | 14 b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 25 b/mythplugins/mythzoneminder/mythzmserver/zmserver.h | 3 b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp | 2 b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp | 21 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/setup.py | 6 b/mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 b/mythtv/i18n/mythfrontend_sv.qm |binary b/mythtv/i18n/mythfrontend_sv.ts |28897 ++++++----- b/mythtv/libs/libmyth/programinfo.cpp | 272 b/mythtv/libs/libmyth/programinfo.h | 17 b/mythtv/libs/libmythbase/housekeeper.cpp | 19 b/mythtv/libs/libmythbase/housekeeper.h | 2 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 b/mythtv/libs/libmythbase/mythsocket.cpp | 12 b/mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 b/mythtv/libs/libmythbase/mythversion.h | 2 b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 b/mythtv/libs/libmythtv/cardutil.cpp | 22 b/mythtv/libs/libmythtv/cardutil.h | 1 b/mythtv/libs/libmythtv/mythplayer.cpp | 19 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/importrecorder.cpp | 2 b/mythtv/libs/libmythtv/recordinginfo.cpp | 143 b/mythtv/libs/libmythtv/tv_play.cpp | 8 b/mythtv/libs/libmythtv/tvremoteutil.cpp | 2 b/mythtv/libs/libmythtv/videosource.cpp | 2 b/mythtv/libs/libmythupnp/httprequest.cpp | 3 b/mythtv/programs/mythbackend/backendhousekeeper.cpp | 50 b/mythtv/programs/mythbackend/backendhousekeeper.h | 1 b/mythtv/programs/mythbackend/mainserver.cpp | 30 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 | 73 b/mythtv/programs/mythbackend/services/guide.cpp | 36 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/mythutil/commandlineparser.cpp | 35 b/mythtv/programs/mythutil/markuputils.cpp | 157 b/mythtv/programs/mythutil/mythutil.cpp | 6 b/mythtv/themes/MythCenter-wide/notification-ui.xml | 2 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 76 files changed, 19550 insertions(+), 17981 deletions(-) --- NEW FILE mythtv-0.27-fixes.patch --- mythplugins/mytharchive/i18n/mytharchive_sv.qm | Bin 34033 -> 35218 bytes mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +- .../mytharchive/mytharchive/archiveutil.cpp | 4 +- mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 +- mythplugins/mythbrowser/i18n/mythbrowser_sv.qm | Bin 7139 -> 7616 bytes mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 +- mythplugins/mythgallery/i18n/mythgallery_sv.qm | Bin 18827 -> 24405 bytes mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 +- mythplugins/mythgame/i18n/mythgame_sv.qm | Bin 16378 -> 16696 bytes mythplugins/mythgame/i18n/mythgame_sv.ts | 136 +- mythplugins/mythmusic/i18n/mythmusic_sv.qm | Bin 60650 -> 61545 bytes mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 +- mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 4 +- mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 +- mythplugins/mythnews/i18n/mythnews_sv.qm | Bin 4604 -> 4965 bytes mythplugins/mythnews/i18n/mythnews_sv.ts | 76 +- mythplugins/mythweather/i18n/mythweather_sv.qm | Bin 22243 -> 23197 bytes mythplugins/mythweather/i18n/mythweather_sv.ts | 62 +- .../mythzoneminder/i18n/mythzoneminder_sv.qm | Bin 7032 -> 7267 bytes .../mythzoneminder/i18n/mythzoneminder_sv.ts | 183 +- mythplugins/mythzoneminder/mythzmserver/main.cpp | 14 +- .../mythzoneminder/mythzmserver/zmserver.cpp | 25 +- mythplugins/mythzoneminder/mythzmserver/zmserver.h | 3 +- .../mythzoneminder/mythzoneminder/zmclient.cpp | 2 +- .../mythzoneminder/mythzoneminder/zmliveplayer.cpp | 21 +- mythtv/bindings/python/MythTV/system.py | 11 +- .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 - .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 - mythtv/bindings/python/MythTV/tmdb/__init__.py | 0 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 - mythtv/bindings/python/setup.py | 6 +- mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +- mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- mythtv/libs/libmyth/programinfo.cpp | 272 +- mythtv/libs/libmyth/programinfo.h | 17 + mythtv/libs/libmythbase/housekeeper.cpp | 19 +- mythtv/libs/libmythbase/housekeeper.h | 2 + mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +- mythtv/libs/libmythbase/mythsocket.cpp | 12 + mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +- mythtv/libs/libmythbase/mythversion.h | 2 +- .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 +- mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +- mythtv/libs/libmythtv/cardutil.cpp | 22 + mythtv/libs/libmythtv/cardutil.h | 1 + mythtv/libs/libmythtv/mythplayer.cpp | 19 +- mythtv/libs/libmythtv/mythplayer.h | 4 + mythtv/libs/libmythtv/previewgenerator.cpp | 6 +- mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +- mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +- mythtv/libs/libmythtv/recordinginfo.cpp | 143 +- mythtv/libs/libmythtv/tv_play.cpp | 8 +- mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +- mythtv/libs/libmythtv/videosource.cpp | 2 +- mythtv/libs/libmythupnp/httprequest.cpp | 3 +- mythtv/programs/mythbackend/backendhousekeeper.cpp | 50 +- mythtv/programs/mythbackend/backendhousekeeper.h | 1 + mythtv/programs/mythbackend/mainserver.cpp | 30 +- mythtv/programs/mythbackend/mainserver.h | 2 +- mythtv/programs/mythbackend/playbacksock.cpp | 6 +- mythtv/programs/mythbackend/playbacksock.h | 3 - mythtv/programs/mythbackend/scheduler.cpp | 73 +- mythtv/programs/mythbackend/services/guide.cpp | 36 +- mythtv/programs/mythcommflag/main.cpp | 6 +- mythtv/programs/mythfilldatabase/filldata.cpp | 81 +- mythtv/programs/mythfilldatabase/filldata.h | 7 +- mythtv/programs/mythfilldatabase/main.cpp | 12 +- mythtv/programs/mythutil/commandlineparser.cpp | 35 +- mythtv/programs/mythutil/markuputils.cpp | 157 +- mythtv/programs/mythutil/mythutil.cpp | 6 + mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 - mythtv/themes/MythCenter-wide/notification-ui.xml | 2 +- mythtv/themes/MythCenter/notification-ui.xml | 2 +- 77 files changed, 19550 insertions(+), 17981 deletions(-) diff --git a/mythplugins/mytharchive/i18n/mytharchive_sv.qm b/mythplugins/mytharchive/i18n/mytharchive_sv.qm index fd29269..a6c7157 100644 Binary files a/mythplugins/mytharchive/i18n/mytharchive_sv.qm and b/mythplugins/mytharchive/i18n/mytharchive_sv.qm differ diff --git a/mythplugins/mytharchive/i18n/mytharchive_sv.ts b/mythplugins/mytharchive/i18n/mytharchive_sv.ts index c3c042c..b551fa0 100644 --- a/mythplugins/mytharchive/i18n/mytharchive_sv.ts +++ b/mythplugins/mytharchive/i18n/mytharchive_sv.ts @@ -2,6 +2,36 @@ <!DOCTYPE TS> <TS version="2.0" language="sv_SE"> <context> + <name>(ArchiveUtils)</name> + <message> + <location filename="../mytharchive/archiveutil.cpp" line="80"/> + <source>Cannot find the MythArchive work directory. +Have you set the correct path in the settings?</source> + <translation>Kan inte hitta arbetskatalog för MythArchive. +Har du ställt in rätt sökväg i inställningarna?</translation> + </message> +</context> +<context> + <name>(MythArchiveMain)</name> + <message> + <location filename="../mytharchive/main.cpp" line="93"/> + <source>Found a lock file but the owning process isn&apos;t running! +Removing stale lock file.</source> + <translation>Hittade en låsfil, men processen som äger den körs inte! +Tar bort föråldrad låsfil.</translation> + </message> + <message> + <location filename="../mytharchive/main.cpp" line="212"/> + <source>Last run did not create a playable DVD.</source> + <translation>Senaste körningen skapade inte en spelbar DVD.</translation> + </message> + <message> + <location filename="../mytharchive/main.cpp" line="219"/> + <source>Last run failed to create a DVD.</source> + <translation>Senaste körningen misslyckades att skapa en DVD.</translation> + </message> +</context> +<context> <name>ArchiveFileSelector</name> <message> <location filename="../mytharchive/importnative.cpp" line="212"/> @@ -15,705 +45,729 @@ </message> </context> <context> - <name>BurnThemeUI</name> - <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="5"/> - <source>Has an intro and contains a main menu with 4 recordings per page. Does not have a chapter selection submenu.</source> - <translation>Har ett intro och innehåller en huvudmeny med fyra inspelningar per sida. Har ingen undermeny för val av kapitel.</translation> - </message> + <name>ArchiveSettings</name> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="6"/> - <source>Has an intro and contains a summary main menu with 10 recordings per page. Does not have a chapter selection submenu, recording titles, dates or category.</source> - <translation>Har ett intro och innehåller en huvudmeny med tio inspelningr per sida. Har ingen undermeny för val av kapitel, inspelningstitel, datum eller kategori.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="20"/> + <source>MythArchive Temp Directory</source> + <translation>Tillfällig katalog för MythArchive</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="7"/> - <source>Has an intro and contains a main menu with 6 recordings per page. Does not have a scene selection submenu.</source> - <translation>Har ett intro och innehåller en huvdmeny med sex inspelningar per sida. Har inte någon undermeny för val scener.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="23"/> + <source>Location where MythArchive should create its temporary work files. LOTS of free space required here.</source> + <translation>Plats där MythArchive ska skapa tillfälliga arbetsfiler. MYCKET ledigt utrymme krävs här.</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="8"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval. Visar en sida med programdetaljer innan varje inspelning.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="33"/> + <source>MythArchive Share Directory</source> + <translation>Delad katalog för MythArchive</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="9"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording. Uses animated thumb images.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval. Visar en sida med programdetaljer innan varje inspelning. Använder animerade miniatyrbilder.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="36"/> + <source>Location where MythArchive stores its scripts, intro movies and theme files</source> + <translation>Platsen där MythArchive lagrar sina skript, intro-filmer och temafiler</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="10"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="46"/> + <source>Video format</source> + <translation>Videoformat</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="11"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. All the thumb images are animated.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval. Alla miniatyrbilder är animerade.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="51"/> + <source>Video format for DVD recordings, PAL or NTSC.</source> + <translation>Videoformat för DVD-inspelningar, PAL eller NTSC.</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="12"/> - <source>Creates an auto play DVD with no menus. Shows an intro movie then for each title shows a details page followed by the video in sequence.</source> - <translation>Skapar en DVD utan menyer som startar automatiskt. Visar en introfilm och därefter visas för varje titel en sida med detaljer följt av filmen.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="60"/> + <source>File Selector Filter</source> + <translation>Filvalsfilter</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="13"/> - <source>Creates an auto play DVD with no menus and no intro.</source> - <translation>Skapar en DVD som startar automatiskt och är utan menyer och introfilm.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="63"/> + <source>The file name filter to use in the file selector.</source> + <translation>Filnamnsfilter att använda i filväljaren.</translation> </message> -</context> [...54169 lines suppressed...] - return - sys.stdout.write(u'%s:%s\n' % (u'Name', data[u'name'])) - keys = sorted(data.keys()) - images = {} - for key in keys: - if key == u'name': - continue - if key in ['also_known_as', 'filmography', 'images' ]: - if key == 'images': - images = {} - for k in data[key].keys(): - images[k] = u'' - if key == 'also_known_as': - alias = u'' - for k in data[key]: - alias+=u'%s|' % k.replace(u'|', u' ') - if alias: - sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), alias[:-1])) - continue - for k in data[key]: - if key == 'filmography': - kys = sorted(k.keys()) - filmography = u'' - for c in kys: - if c == u'name': - continue - filmography+=u'%s:%s|' % (self.camelcase(c.replace(u'|', u' ')), k[c].replace(u'|', u' ')) - if filmography: - sys.stdout.write(u'%s:%s|%s\n' % (self.camelcase(key), k[u'name'].replace(u'|', u' '), filmography[:-1])) - elif key == 'images': - sys.stdout.write(u'%s:%s\n' % (self.camelcase(k), data[key][k])) - else: - sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), data[key])) - # end peopleData() - - def hashData(self, hash_value): - '''Get Movie data by Hash value and display "key:value" pairs to stdout - ''' - try: - self.displayMovieData(self.config['moviedb'].searchHash(hash_value)) - except TmdbMovieOrPersonNotFound, msg: - #sys.stderr.write(u"%s\n" % msg) - return - except TmdHttpError, msg: - sys.stderr.write(self.error_messages['TmdHttpError'] % msg) - sys.exit(1) - except TmdXmlError, msg: - sys.stderr.write(self.error_messages['TmdXmlError'] % msg) - sys.exit(1) - except TmdBaseError, msg: - sys.stderr.write(self.error_messages['TmdBaseError'] % msg) - sys.exit(1) - except TmdbUiAbort, msg: - sys.stderr.write(self.error_messages['TmdbUiAbort'] % msg) - sys.exit(1) - except Exception, e: - sys.stderr.write(u"! Error: Unknown error during a Hash value Movie information display for (%s)\nError(%s)\n" % (hash_value, e)) - sys.exit(1) - # end hashData() - -# end Class moviedbQueries() - - -def main(): - """Gets movie details using an IMDB# and a TMDB# OR get People information using a name - """ - # themoviedb.org api key given by Travis Bell for Mythtv - apikey = "c27cb71cff5bd76e1a7a009380562c62" - - parser = OptionParser(usage=u"%prog usage: tmdb -hdruviomMPFBDS [parameters]\n <series name or 'series and season number' or 'series and season number and episode number'>\n\nFor details on using tmdb with Mythvideo see the tmdb wiki page at:\nhttp://www.mythtv.org/wiki/tmdb.py") - - parser.add_option( "-d", "--debug", action="store_true", default=False, dest="debug", - help=u"Show debugging info") - parser.add_option( "-r", "--raw", action="store_true",default=False, dest="raw", - help=u"Dump raw data only") - parser.add_option( "-u", "--usage", action="store_true", default=False, dest="usage", - help=u"Display examples for executing the tmdb script") - parser.add_option( "-v", "--version", action="store_true", default=False, dest="version", - help=u"Display version and author") - parser.add_option( "-i", "--interactive", action="store_true", default=False, dest="interactive", - help=u"Interaction mode (allows selection of a specific Movie or Person)") - parser.add_option( "-l", "--language", metavar="LANGUAGE", default=u'en', dest="language", - help=u"Select data that matches the specified language fall back to english if nothing found (e.g. 'es' Español, 'de' Deutsch ... etc)") - parser.add_option( "-a", "--area", metavar="COUNTRY", default=False, dest="country", - help=u"Select certificate data that matches the specified country (e.g. 'de' Germany, 'gb' UK ... etc)") - parser.add_option( "-M", "--movielist", action="store_true", default=False, dest="movielist", - help=u"Get matching Movie list") - parser.add_option( "-D", "--moviedata", action="store_true", default=False, dest="moviedata", - help=u"Get Movie metadata including graphic URLs") - parser.add_option( "-H", "--moviehash", action="store_true", default=False, dest="moviehash", - help=u"Get Movie metadata including graphic URLs using a Hash value.\nSee: http://api.themoviedb.org/2.1/methods/Hash.getInfo") - parser.add_option( "-P", "--peoplelist", action="store_true", default=False, dest="peoplelist", - help=u"Get matching People list") - parser.add_option( "-I", "--peopleinfo", action="store_true", default=False, dest="peopleinfo", - help=u"Get A Person's metadata including graphic URLs") - parser.add_option( "-t", action="store_true", default=False, dest="test", - help=u"Test for the availability of runtime dependencies") - - opts, args = parser.parse_args() - - # Test mode, if we've made it here, everything is ok - if opts.test: - print "Everything appears to be in order" - sys.exit(0) - - # Make all command line arguments unicode utf8 - for index in range(len(args)): - args[index] = unicode(args[index], 'utf8') - - if opts.debug: - sys.stdout.write("\nopts: %s\n" % opts) - sys.stdout.write("\nargs: %s\n\n" % args) - - # Process version command line requests - if opts.version: - version = etree.XML(u'<grabber></grabber>') - etree.SubElement(version, "name").text = __title__ - etree.SubElement(version, "author").text = __author__ - etree.SubElement(version, "thumbnail").text = 'tmdb.png' - etree.SubElement(version, "command").text = 'tmdb.py' - etree.SubElement(version, "type").text = 'movie' - etree.SubElement(version, "description").text = 'Search and metadata downloads for themoviedb.org' - etree.SubElement(version, "version").text = __version__ - sys.stdout.write(etree.tostring(version, encoding='UTF-8', pretty_print=True)) - sys.exit(0) - - # Process usage command line requests - if opts.usage: - sys.stdout.write(__usage_examples__) - sys.exit(0) - - if not len(args) == 1: - sys.stderr.write("! Error: There must be one value for any option. Your options are (%s)\n" % (args)) - sys.exit(1) - - if args[0] == u'': - sys.stderr.write("! Error: There must be a non-empty argument, yours is empty.\n") - sys.exit(1) - - - passedLanguage = opts.language - if (opts.language and opts.country): - passedLanguage = opts.language + "-" + opts.country - - Queries = moviedbQueries(apikey, - mythtv = True, - interactive = opts.interactive, - select_first = False, - debug = opts.debug, - custom_ui = None, - language = passedLanguage, - search_all_languages = False,) - - # Display in XML format - # See: http://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format - Queries.config['moviedb'].xml = True - - # Process requested option - if opts.movielist: # Movie Search -M - Queries.movieSearch(args[0]) - elif opts.moviedata: # Movie metadata -D - Queries.movieData(args[0]) - elif opts.peoplelist: # People Search -P - Queries.peopleSearch(args[0]) - elif opts.peopleinfo: # Person metadata -I - Queries.peopleData(args[0]) - elif opts.moviehash: # Movie metadata using a hash value -H - Queries.hashData(args[0]) - - sys.exit(0) -# end main() - -if __name__ == '__main__': - main() 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 +++ b/mythtv/themes/MythCenter-wide/notification-ui.xml @@ -262,7 +262,7 @@ <preserveaspect>true</preserveaspect> </imagetype> - <shape name="textbackground"> + <shape name="textbackground" depends="description|description_noprogress|extra|title|origin"> <area>85,100%-260,-85,-55</area> <fill color="#000000" alpha="100" /> </shape> diff --git a/mythtv/themes/MythCenter/notification-ui.xml b/mythtv/themes/MythCenter/notification-ui.xml index 95699af..a92c5ad 100644 --- a/mythtv/themes/MythCenter/notification-ui.xml +++ b/mythtv/themes/MythCenter/notification-ui.xml @@ -262,7 +262,7 @@ <preserveaspect>true</preserveaspect> </imagetype> - <shape name="textbackground"> + <shape name="textbackground" depends="description|description_noprogress|extra|title|origin"> <area>85,100%-260,-85,-55</area> <fill color="#000000" alpha="100" /> </shape> mythtv-0.27-libcec2.patch: configure | 4 configure.orig | 6500 ++++++++++++++++++++++++++++++++++++++++++ libs/libmythui/cecadapter.cpp | 265 + libs/libmythui/cecadapter.h | 1 4 files changed, 6704 insertions(+), 66 deletions(-) --- NEW FILE mythtv-0.27-libcec2.patch --- diff -Naur mythtv-0.27.orig/mythtv/configure mythtv-0.27/mythtv/configure --- mythtv-0.27.orig/mythtv/configure 2013-10-30 14:48:35.095484881 -0500 +++ mythtv-0.27/mythtv/configure 2013-10-30 14:48:50.182157901 -0500 @@ -5472,10 +5472,12 @@ using namespace CEC; #include <libcec/cecloader.h> int main(void) { + if (CEC_LIB_VERSION_MAJOR == 2) + return 1; if (CEC_LIB_VERSION_MAJOR < 1 || (CEC_LIB_VERSION_MAJOR == 1 && CEC_LIB_VERSION_MINOR < 5)) return 0; - return (long) LibCecInit; + return 1; } EOF fi diff -Naur mythtv-0.27.orig/mythtv/configure.orig mythtv-0.27/mythtv/configure.orig --- mythtv-0.27.orig/mythtv/configure.orig 1969-12-31 18:00:00.000000000 -0600 +++ mythtv-0.27/mythtv/configure.orig 2013-10-30 14:48:35.095484881 -0500 @@ -0,0 +1,6500 @@ +#!/bin/sh +# +# MythTV configure script, based on the FFmpeg configure script +# +# Copyright (c) 2000-2002 Fabrice Bellard +# Copyright (c) 2005-2008 Diego Biurrun +# Copyright (c) 2005-2008 Mans Rullgard +# + +# Prevent locale nonsense from breaking basic text processing. +LC_ALL=C +export LC_ALL + +# make sure we are running under a compatible shell +# try to make this part work with most shells + +try_exec(){ + echo "Trying shell $1" + type "$1" > /dev/null 2>&1 && exec "$@" +} + +unset foo +(: ${foo%%bar}) 2> /dev/null +E1="$?" + +(: ${foo?}) 2> /dev/null +E2="$?" + +if test "$E1" != 0 || test "$E2" = 0; then + echo "Broken shell detected. Trying alternatives." + export FF_CONF_EXEC + if test "0$FF_CONF_EXEC" -lt 1; then + FF_CONF_EXEC=1 + try_exec bash "$0" "$@" + fi + if test "0$FF_CONF_EXEC" -lt 2; then + FF_CONF_EXEC=2 + try_exec ksh "$0" "$@" + fi + if test "0$FF_CONF_EXEC" -lt 3; then + FF_CONF_EXEC=3 + try_exec /usr/xpg4/bin/sh "$0" "$@" + fi + echo "No compatible shell script interpreter found." + echo "This configure script requires a POSIX-compatible shell" + echo "such as bash or ksh." + echo "THIS IS NOT A BUG IN FFMPEG, DO NOT REPORT IT AS SUCH." + echo "Instead, install a working POSIX-compatible shell." + echo "Disabling this configure test will create a broken MythTV." + if test "$BASH_VERSION" = '2.04.0(1)-release'; then + echo "This bash version ($BASH_VERSION) is broken on your platform." + echo "Upgrade to a later version if available." + fi + exit 1 +fi + +test -d /usr/xpg4/bin && PATH=/usr/xpg4/bin:$PATH + +show_help(){ + cat <<EOF +Usage: configure [options] +Options: [defaults in brackets after descriptions] + +Standard options: + --help print this message + --previous use previous configure parameters if possible + --compile-type=CTYPE one of release, profile, debug [$compile_type] + NOTE: profile is for sampling profilers + --prefix=PREFIX install in PREFIX [$prefix] + --runprefix=PREFIX prefix to be used at runtime (e.g. .. or /myth/latest) + --libdir-name=LIBNAME search/install libraries in PREFIX/LIBNAME [$libdir_name] + --disable-ccache disable compiler cache (ccache) + --disable-distcc disable distributed compilation (distcc) + +Advanced options (experts only): + --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix] + --enable-cross-compile assume a cross-compiler is used + --sysroot=PATH root of cross-build tree + --sysinclude=PATH location of cross-build system headers + --cc=CC use C compiler CC [$cc_default] + --cxx=CXX use C++ compiler CXX [$cxx_default] + --ld=LD use linker LD + --qmake=QMAKE use specified qmake [$qmake_default] + --qmakespecs=PATH use specified mkspecs + --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS] + --extra-cxxflags=ECXFLAGS add ECXXFLAGS to list of flags for C++ compile + --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS] + --disable-symbol-visibility disables symbol visibility options + --arch=ARCH select architecture [$arch] + --tune=CPU tune instruction usage for a particular CPU [$tune] + --cpu=CPU select the minimum required CPU (affects + instruction selection, may crash on older CPUs) + --disable-altivec disable AltiVec optimizations + --disable-amd3dnow disable 3DNow! optimizations + --disable-amd3dnowext disable 3DNow! extended optimizations + --disable-mmx disable MMX optimizations + --disable-mmx2 disable MMX2 optimizations + --disable-sse disable SSE optimizations + --disable-ssse3 disable SSSE3 optimizations + --disable-avx disable AVX optimizations + --disable-yasm disable use of yasm assembler + --enable-pic build position-independent code + --enable-proc-opt enable processor specific compilation + + --disable-audio-oss disable OSS audio support + --disable-audio-alsa disable ALSA audio support + --disable-audio-jack disable JACK audio support + --disable-audio-pulseoutput disable PulseAudio audio output support + --enable-valgrind disables timeouts for valgrind memory debugging + --disable-lirc disable lirc support (Infrared Remotes) + --disable-joystick-menu disable joystick menu + --disable-libcec disable libCEC device support + --libcec-path=HDRLOC location of directory containing + 'libcec/cec.h', not the directory + with 'cec.h' [$libcec_path_default] + --firewire-sdk specify location for mac FireWire SDK [mac only] + --disable-firewire disable support for FireWire cable boxes + --disable-hdhomerun disable support for HDHomeRun boxes + --disable-ceton disable support for Ceton cards + --disable-v4l2 disable Video4Linux support + --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support + --disable-hdpvr disable HD-PVR support + --disable-dvb disable DVB support + --dvb-path=HDRLOC location of directory containing + 'linux/dvb/frontend.h', not the + directory with frontend.h [$dvb_path_default] + --disable-asi disable support for ASI recorder + --disable-x11 disable X11 support + --x11-path=X11LOC location of X11 include files [$x11_path_default] + --disable-xrandr disable X11 resolution switching + --disable-xv disable XVideo (X11 video output accel.) + --disable-vdpau disable NVidia VDPAU hardware acceleration. + --disable-crystalhd disable Broadcom CrystalHD hardware decoder support + --disable-vaapi disable VAAPI hardware accelerated video decoding + --disable-dxva2 disable hardware accelerated decoding on windows + --disable-opengl-video disable OpenGL based video display + --disable-quartz-video disable Mac OS X CoreVideo based video display + --disable-libass disable libass SSA/ASS subtitle support + + --enable-mac-bundle produce standalone OS X apps (e.g. mythfrontend.app) + + --disable-libxml2 disable libxml2 support (disc metadata) + --libxml2-path=HDRLOC location of directory containing + 'libxml/parser.h', not the + directory with parser.h [$libxml2_path_default] + --disable-libdns-sd disable DNS Service Discovery (Bonjour/Zeroconf/Avahi) + --disable-libcrypto disable use of the OpenSSL cryptographic library + + --with-bindings=LIST install the bindings specified in the + comma-separated list + Supported bindings: perl, python, php + comma-separated list + --python=PATH Force a specific python executable to use [$python_default] + --perl-config-opts=OPTS Additional options to pass when generating + Makefile.perl for building Perl bindings. + --disable-mythlogserver Do not use mythlogserver logging daemon facility + +External codec library options (used for mythffmpeg and streaming transcode): + --enable-libmp3lame enable MP3 encoding via libmp3lame [no] + --enable-libfaac enable AAC encoding via libfaac [no] + --enable-libx264 enable H.264 encoding via x264 [no] + --enable-libvpx enable VP8 encoding via libvpx [no] + --enable-libxvid enable Xvid encoding via xvidcore, + native MPEG-4/Xvid encoder exists [no] + --enable-sdl enable Simple DirectMedia Layer (required for ffplay) +EOF + +#following is ffmpeg's configure help text +<<EOF +Help options: + --help print this message + --list-decoders show all available decoders + --list-encoders show all available encoders + --list-hwaccels show all available hardware accelerators + --list-demuxers show all available demuxers + --list-muxers show all available muxers + --list-parsers show all available parsers + --list-protocols show all available protocols [...6562 lines suppressed...] adapter->Close(); - LogMessages(); UnloadLibCec(adapter); LOG(VB_GENERAL, LOG_INFO, LOC + "Closing down CEC."); @@ -219,14 +314,12 @@ adapter = NULL; } - void LogMessages(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int LogMessages(void *, const cec_log_message &message) + #else + static int LogMessages(void *, const cec_log_message message) + #endif { - if (!adapter || !valid) - return; - - cec_log_message message; - while (adapter->GetNextLogMessage(&message)) - { QString msg(message.message); int lvl = LOG_UNKNOWN; switch (message.level) @@ -237,19 +330,15 @@ case CEC_LOG_DEBUG: lvl = LOG_DEBUG; break; } LOG(VB_GENERAL, lvl, LOC + QString("%1").arg(msg)); - } + return 0; } - void HandleCommands(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleCommands(void * /*cbParam*/, const cec_command &command) + #else + static int HandleCommands(void * /*cbParam*/, const cec_command command) + #endif { - if (!adapter || !valid) - return; - - LogMessages(); - - cec_command command; - while (adapter->GetNextCommand(&command)) - { LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Command %1 from '%2' (%3) - destination '%4' (%5)") .arg(command.opcode) @@ -260,27 +349,76 @@ switch (command.opcode) { - // TODO + // TODO handle CEC commands. default: break; } + return 0; + } + + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration &config) + #else + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration config) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + "Adapter configuration changed."); + return 1; + } + + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter & /*param*/) + #else + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter /*param*/) + #endif + { + switch (type) // TODO Handle alerts. + { + case CEC_ALERT_CONNECTION_LOST: + LOG(VB_GENERAL, LOG_ERR, LOC + "Connection lost - TODO: need to handle this!"); + break; + default: + LOG(VB_GENERAL, LOG_ERR, LOC + "Received unknown alert."); + break; } + return 0; + } - LogMessages(); + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state &state) + #else + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state state) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("CEC menu state %1") + .arg(state == CEC_MENU_STATE_ACTIVATED ? "Activated" : "Deactivated")); + return 1; } - void HandleKeyPresses(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address &address, const &uint8_t activated) + #else + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address address, const uint8_t activated) + #endif { - if (!adapter || !valid) - return; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("Source %1 %2") + .arg(address).arg(activated ? "Activated" : "Deactivated")); - cec_keypress key; - if (!adapter->GetNextKeypress(&key)) - return; + if (activated && resetSafe) + GetMythUI()->ResetScreensaver(); + else + resetSafe = true; + } + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress &key) + #else + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress key) + #endif + { // Ignore key down events and wait for the key 'up' if (key.duration < 1) - return; + return 0; QString code; int action = 0; @@ -595,13 +733,12 @@ .arg(code).arg(0 == action ? "(Not actioned)" : "")); if (0 == action) - return; + return 0; GetMythUI()->ResetScreensaver(); QKeyEvent* ke = new QKeyEvent(QEvent::KeyPress, action, Qt::NoModifier); qApp->postEvent(GetMythMainWindow(), (QEvent*)ke); - - LogMessages(); + return 0; } void HandleActions(void) @@ -629,7 +766,7 @@ // HDMI input if (switchInput && switchInputAllowed) { - if (adapter->SetActiveView()) + if (adapter->SetActiveSource()) LOG(VB_GENERAL, LOG_INFO, LOC + "Asked TV to switch to this input."); else LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to switch to this input."); @@ -638,14 +775,14 @@ powerOffTV = false; powerOnTV = false; switchInput = false; - - LogMessages(); } ICECAdapter *adapter; + ICECCallbacks callbacks; QString defaultDevice; int defaultHDMIPort; - cec_logical_address defaultDeviceID; + cec_device_type defaultDeviceID; + cec_logical_address base_device; QTimer *timer; bool valid; bool powerOffTV; @@ -728,8 +865,6 @@ void CECAdapter::Process(void) { gLock->lock(); - m_priv->HandleCommands(); - m_priv->HandleKeyPresses(); m_priv->HandleActions(); gLock->unlock(); } diff -Naur mythtv-0.27.orig/mythtv/libs/libmythui/cecadapter.h mythtv-0.27/mythtv/libs/libmythui/cecadapter.h --- mythtv-0.27.orig/mythtv/libs/libmythui/cecadapter.h 2013-09-18 15:06:08.000000000 -0500 +++ mythtv-0.27/mythtv/libs/libmythui/cecadapter.h 2013-10-30 14:48:50.184157885 -0500 @@ -7,6 +7,7 @@ #define LIBCEC_ENABLED QString("libCECEnabled") #define LIBCEC_DEVICE QString("libCECDevice") #define LIBCEC_PORT QString("libCECPort") +#define LIBCEC_BASE QString("libCECBase") #define LIBCEC_DEVICEID QString("libCECDeviceID") #define POWEROFFTV_ALLOWED QString("PowerOffTVAllowed") #define POWEROFFTV_ONEXIT QString("PowerOffTVOnExit")