Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9995 Modified Files: mythtv-0.25-fixes.patch mythtv.spec Log Message: Add latest fixes. mythtv-0.25-fixes.patch: mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238 mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44 mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264 mythplugins/mythgame/i18n/mythgame_fi.qm |binary mythplugins/mythgame/i18n/mythgame_fi.ts | 178 mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++- mythplugins/mythmusic/mythmusic/visualize.cpp | 60 mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96 mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8 mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6 mythplugins/mythnews/i18n/mythnews_fi.qm |binary mythplugins/mythnews/i18n/mythnews_fi.ts | 44 mythplugins/mythweather/i18n/mythweather_fi.qm |binary mythplugins/mythweather/i18n/mythweather_fi.ts | 60 mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84 mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3 mythtv/VERSION | 2 mythtv/bindings/python/MythTV/mythproto.py | 4 mythtv/bindings/python/MythTV/static.py | 2 mythtv/bindings/python/setup.py | 2 mythtv/configure | 15 mythtv/docs/doxygen-create-developer-docs.cfg | 2 mythtv/filters/yadif/filter_yadif.c | 2 mythtv/i18n/mythfrontend_fi.qm |binary mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++---- mythtv/i18n/mythfrontend_nb.qm |binary mythtv/i18n/mythfrontend_nb.ts | 2 mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 mythtv/libs/libmyth/audio/audiooutputbase.h | 4 mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27 mythtv/libs/libmyth/remoteutil.cpp | 16 mythtv/libs/libmyth/remoteutil.h | 1 mythtv/libs/libmyth/rssparse.h | 1 mythtv/libs/libmythbase/bonjourregister.cpp | 5 mythtv/libs/libmythbase/compat.h | 2 mythtv/libs/libmythbase/logging.cpp | 3 mythtv/libs/libmythbase/serverpool.cpp | 46 mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6 mythtv/libs/libmythsoundtouch/STTypes.h | 2 mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1 mythtv/libs/libmythtv/audioinput.h | 1 mythtv/libs/libmythtv/avformatdecoder.cpp | 10 mythtv/libs/libmythtv/dtvrecorder.cpp | 4 mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 mythtv/libs/libmythtv/fileringbuffer.cpp | 6 mythtv/libs/libmythtv/libmythtv.pro | 1 mythtv/libs/libmythtv/mythairplayserver.cpp | 2 mythtv/libs/libmythtv/mythplayer.cpp | 30 mythtv/libs/libmythtv/mythplayer.h | 3 mythtv/libs/libmythtv/mythraopconnection.cpp | 262 mythtv/libs/libmythtv/mythraopconnection.h | 13 mythtv/libs/libmythtv/mythraopdevice.cpp | 13 mythtv/libs/libmythtv/osd.cpp | 2 mythtv/libs/libmythtv/playercontext.h | 4 mythtv/libs/libmythtv/ringbuffer.cpp | 8 mythtv/libs/libmythtv/teletextscreen.cpp | 8 mythtv/libs/libmythtv/tv_play.cpp | 26 mythtv/libs/libmythtv/tv_rec.cpp | 3 mythtv/libs/libmythtv/tvremoteutil.cpp | 55 mythtv/libs/libmythtv/tvremoteutil.h | 7 mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 mythtv/libs/libmythtv/videodisplayprofile.h | 2 mythtv/libs/libmythtv/videoout_xv.cpp | 7 mythtv/libs/libmythtv/videoout_xv.h | 1 mythtv/libs/libmythtv/videooutbase.cpp | 48 mythtv/libs/libmythui/mythmainwindow.cpp | 2 mythtv/libs/libmythupnp/httprequest.cpp | 1 mythtv/libs/libmythupnp/soapclient.h | 6 mythtv/programs/mythbackend/filetransfer.cpp | 4 mythtv/programs/mythbackend/housekeeper.cpp | 4 mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5 mythtv/programs/mythfrontend/globalsettings.cpp | 2 mythtv/programs/mythfrontend/guidegrid.cpp | 8 mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 mythtv/programs/mythtranscode/transcode.h | 5 mythtv/programs/mythutil/backendutils.cpp | 20 mythtv/programs/mythutil/commandlineparser.cpp | 4 mythtv/programs/mythutil/markuputils.cpp | 4 mythtv/programs/mythutil/mythutil.pro | 2 mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py | 2 mythtv/version.sh | 1 89 files changed, 5666 insertions(+), 2149 deletions(-) Index: mythtv-0.25-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.25-fixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythtv-0.25-fixes.patch 28 Apr 2012 20:33:29 -0000 1.4 +++ mythtv-0.25-fixes.patch 4 May 2012 18:47:49 -0000 1.5 @@ -23,6 +23,7 @@ mythtv/VERSION | 2 +- mythtv/bindings/python/MythTV/mythproto.py | 4 +- mythtv/bindings/python/MythTV/static.py | 2 +- + mythtv/bindings/python/setup.py | 2 +- mythtv/configure | 15 +- mythtv/docs/doxygen-create-developer-docs.cfg | 2 +- mythtv/filters/yadif/filter_yadif.c | 2 +- @@ -47,6 +48,7 @@ .../libs/libmythsoundtouch/libmythsoundtouch.pro | 1 + mythtv/libs/libmythtv/audioinput.h | 1 + mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +- + mythtv/libs/libmythtv/dtvrecorder.cpp | 4 +- mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +- mythtv/libs/libmythtv/fileringbuffer.cpp | 6 +- mythtv/libs/libmythtv/libmythtv.pro | 1 + @@ -71,15 +73,21 @@ mythtv/libs/libmythtv/videooutbase.cpp | 48 +- mythtv/libs/libmythui/mythmainwindow.cpp | 2 + mythtv/libs/libmythupnp/httprequest.cpp | 1 + + mythtv/libs/libmythupnp/soapclient.h | 6 + mythtv/programs/mythbackend/filetransfer.cpp | 4 + + mythtv/programs/mythbackend/housekeeper.cpp | 4 +- .../programs/mythfrontend/audiogeneralsettings.cpp | 5 +- mythtv/programs/mythfrontend/globalsettings.cpp | 2 +- mythtv/programs/mythfrontend/guidegrid.cpp | 8 +- mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +- mythtv/programs/mythtranscode/transcode.h | 5 +- + mythtv/programs/mythutil/backendutils.cpp | 20 + + mythtv/programs/mythutil/commandlineparser.cpp | 4 + mythtv/programs/mythutil/markuputils.cpp | 4 +- + mythtv/programs/mythutil/mythutil.pro | 2 +- .../nv_python_libs/bliptv/bliptv_api.py | 2 +- - 81 files changed, 5628 insertions(+), 2144 deletions(-) + mythtv/version.sh | 1 + + 89 files changed, 5666 insertions(+), 2149 deletions(-) diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm index 2fc0f91..8e2d841 100644 @@ -5784,6 +5792,19 @@ SCHEMA_VERSION = 1299 NVSCHEMA_VERSION = 1007 MUSICSCHEMA_VERSION = 1018 +diff --git a/mythtv/bindings/python/setup.py b/mythtv/bindings/python/setup.py +index f4bdbe6..44dcc5f 100755 +--- a/mythtv/bindings/python/setup.py ++++ b/mythtv/bindings/python/setup.py +@@ -78,7 +78,7 @@ class build(pybuild): + + setup( + name='MythTV', +- version='0.24.0', ++ version='0.25.0', + description='MythTV Python bindings.', + long_description='Provides canned database and protocol access to the MythTV database, mythproto, mythxml, and frontend remote control.', + packages=['MythTV', 'MythTV/tmdb', 'MythTV/tmdb3', 'MythTV/ttvdb', 'MythTV/wikiscripts'], diff --git a/mythtv/configure b/mythtv/configure index 5e9c8a8..09fbe4c 100755 --- a/mythtv/configure @@ -12925,6 +12946,21 @@ #ifdef USING_DXVA2 MythCodecID dxva2_mcid; PixelFormat pix_fmt = PIX_FMT_YUV420P; +diff --git a/mythtv/libs/libmythtv/dtvrecorder.cpp b/mythtv/libs/libmythtv/dtvrecorder.cpp +index 31a5971..9d7d89f 100644 +--- a/mythtv/libs/libmythtv/dtvrecorder.cpp ++++ b/mythtv/libs/libmythtv/dtvrecorder.cpp +@@ -32,7 +32,9 @@ extern "C" { + extern const uint8_t *ff_find_start_code(const uint8_t *p, const uint8_t *end, uint32_t *state); + } + +-#define LOC QString("DTVRec(%1): ").arg(tvrec->GetCaptureCardNum()) ++#define LOC ((tvrec) ? \ ++ QString("DTVRec(%1): ").arg(tvrec->GetCaptureCardNum()) : \ ++ QString("DTVRec(0x%1): ").arg(intptr_t(this),0,16)) + + const uint DTVRecorder::kMaxKeyFrameDistance = 80; + diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp index 5a445a0..3a0573a 100644 --- a/mythtv/libs/libmythtv/dvdringbuffer.cpp @@ -14171,6 +14207,23 @@ { "pdf" , "application/pdf" }, { "avi" , "video/avi" }, { "css" , "text/css" }, +diff --git a/mythtv/libs/libmythupnp/soapclient.h b/mythtv/libs/libmythupnp/soapclient.h +index 981d741..6b35a91 100644 +--- a/mythtv/libs/libmythupnp/soapclient.h ++++ b/mythtv/libs/libmythupnp/soapclient.h +@@ -47,6 +47,12 @@ class UPNP_PUBLIC SOAPClient + QString GetNodeValue(const QDomNode &node, + const QString &sName, + const QString &sDefault) const; ++ QString GetNodeValue(const QDomNode &node, ++ const QString &sName, ++ const char *sDefault) const ++ { ++ return GetNodeValue(node, sName, QString(sDefault)); ++ } + + QDomNode FindNode(const QString &sName, + const QDomNode &baseNode) const; diff --git a/mythtv/programs/mythbackend/filetransfer.cpp b/mythtv/programs/mythbackend/filetransfer.cpp index c339dc2..7c9d173 100644 --- a/mythtv/programs/mythbackend/filetransfer.cpp @@ -14207,6 +14260,21 @@ rbuffer->StartReads(); { QMutexLocker locker(&lock); +diff --git a/mythtv/programs/mythbackend/housekeeper.cpp b/mythtv/programs/mythbackend/housekeeper.cpp +index 866429e..29ab7ea 100644 +--- a/mythtv/programs/mythbackend/housekeeper.cpp ++++ b/mythtv/programs/mythbackend/housekeeper.cpp +@@ -429,8 +429,8 @@ void HouseKeeper::RunMFD(void) + if (mfpath == "mythfilldatabase") + mfpath = GetInstallPrefix() + "/bin/mythfilldatabase"; + +- QString command = QString("%1 %2").arg(mfpath).arg(mfarg); +- command += logPropagateArgs; ++ QString command = QString("%1 %2 %3").arg(mfpath).arg(logPropagateArgs) ++ .arg(mfarg); + + { + QMutexLocker locker(&fillDBLock); diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp index 7a676fd..7d40e09 100644 --- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp @@ -14322,6 +14390,68 @@ RingBuffer *inRingBuffer; RingBuffer *outRingBuffer; FIFOWriter *fifow; +diff --git a/mythtv/programs/mythutil/backendutils.cpp b/mythtv/programs/mythutil/backendutils.cpp +index 151fa7d..494e071 100644 +--- a/mythtv/programs/mythutil/backendutils.cpp ++++ b/mythtv/programs/mythutil/backendutils.cpp +@@ -1,8 +1,12 @@ ++// C++ includes ++#include <iostream> ++ + // libmyth* headers + #include "exitcodes.h" + #include "mythcorecontext.h" + #include "mythlogging.h" + #include "remoteutil.h" ++#include "videometadata.h" + + // local headers + #include "backendutils.h" +@@ -79,6 +83,21 @@ static int ScanVideos(const MythUtilCommandLineParser &cmdline) + return GENERIC_EXIT_CONNECT_ERROR; + } + ++static int ParseVideoFilename(const MythUtilCommandLineParser &cmdline) ++{ ++ QString filename = cmdline.toString("parsevideo"); ++ cout << "Title: " << VideoMetadata::FilenameToMeta(filename, 1) ++ .toLocal8Bit().constData() << endl ++ << "Season: " << VideoMetadata::FilenameToMeta(filename, 2) ++ .toLocal8Bit().constData() << endl ++ << "Episode: " << VideoMetadata::FilenameToMeta(filename, 3) ++ .toLocal8Bit().constData() << endl ++ << "Subtitle: " << VideoMetadata::FilenameToMeta(filename, 4) ++ .toLocal8Bit().constData() << endl; ++ ++ return GENERIC_EXIT_OK; ++} ++ + void registerBackendUtils(UtilMap &utilMap) + { + utilMap["clearcache"] = &ClearSettingsCache; +@@ -86,6 +105,7 @@ void registerBackendUtils(UtilMap &utilMap) + utilMap["resched"] = &Reschedule; + utilMap["scanvideos"] = &ScanVideos; + utilMap["systemevent"] = &SendSystemEvent; ++ utilMap["parsevideo"] = &ParseVideoFilename; + } + + /* vim: set expandtab tabstop=4 shiftwidth=4: */ +diff --git a/mythtv/programs/mythutil/commandlineparser.cpp b/mythtv/programs/mythutil/commandlineparser.cpp +index 7f00e50..f4a6035 100644 +--- a/mythtv/programs/mythutil/commandlineparser.cpp ++++ b/mythtv/programs/mythutil/commandlineparser.cpp +@@ -96,6 +96,10 @@ void MythUtilCommandLineParser::LoadArguments(void) + "local database settings cache used by each program, causing " + "options to be re-read from the database upon next use.") + ->SetGroup("Backend") ++ << add("--parse-video-filename", "parsevideo", "", "", ++ "Diagnostic tool for testing filename formats against what " ++ "the Video Library name parser will detect them as.") ++ ->SetGroup("Backend") + + // jobutils.cpp + << add("--queuejob", "queuejob", "", diff --git a/mythtv/programs/mythutil/markuputils.cpp b/mythtv/programs/mythutil/markuputils.cpp index 94fc136..fee2df3 100644 --- a/mythtv/programs/mythutil/markuputils.cpp @@ -14337,6 +14467,19 @@ return GENERIC_EXIT_OK; } +diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/mythutil.pro +index 774528f..066e618 100644 +--- a/mythtv/programs/mythutil/mythutil.pro ++++ b/mythtv/programs/mythutil/mythutil.pro +@@ -2,7 +2,7 @@ include ( ../../settings.pro ) + include ( ../../version.pro ) + include ( ../programs-libs.pro ) + +-QT += network sql ++QT += network sql xml + + TEMPLATE = app + CONFIG += thread diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py index 2f2ad3b..4abbf69 100644 --- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py @@ -14350,3 +14493,15 @@ self.config[u'urls'][u'categories'] = "http://www.blip.tv/?section=categories&cmd=view&skin=api" self.config[u'image_extentions'] = ["png", "jpg", "bmp"] # Acceptable image extentions +diff --git a/mythtv/version.sh b/mythtv/version.sh +index d2c53af..a8939c4 100755 +--- a/mythtv/version.sh ++++ b/mythtv/version.sh +@@ -22,6 +22,7 @@ GITREPOPATH="exported" + + cd ${GITTREEDIR} + ++git status > /dev/null 2>&1 + SOURCE_VERSION=$(git describe --dirty || git describe || echo Unknown) + + case "${SOURCE_VERSION}" in Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- mythtv.spec 4 May 2012 18:19:49 -0000 1.96 +++ mythtv.spec 4 May 2012 18:47:49 -0000 1.97 @@ -1507,6 +1507,7 @@ - Add Bonjour (Airplay) support. - Fix user creation for packages that create directories owned by mythtv user. Fixes BZ#2309. +- Update to latest 0.25/fixes. * Sun Apr 29 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25-5 - Update to latest 0.25/fixes.