rpms/mythtv/EL-6 mythtv-0.25-fixes.patch, NONE, 1.1 mythtv_0.25_gcc_4.7.patch, NONE, 1.1
Richard Shaw
hobbes1069 at rpmfusion.org
Sat Jun 9 04:22:27 CEST 2012
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24286
Added Files:
mythtv-0.25-fixes.patch mythtv_0.25_gcc_4.7.patch
Log Message:
Add missing patches to cvs.
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(-)
--- NEW FILE mythtv-0.25-fixes.patch ---
mythplugins/mytharchive/i18n/mytharchive_fi.qm | Bin 29996 -> 33814 bytes
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238 ++-
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm | Bin 6953 -> 6977 bytes
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44 +-
mythplugins/mythgallery/i18n/mythgallery_fi.qm | Bin 13503 -> 18780 bytes
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264 ++-
mythplugins/mythgame/i18n/mythgame_fi.qm | Bin 15868 -> 16084 bytes
mythplugins/mythgame/i18n/mythgame_fi.ts | 178 +-
mythplugins/mythmusic/i18n/mythmusic_fi.qm | Bin 56677 -> 56868 bytes
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 ++++++++++--
mythplugins/mythmusic/mythmusic/visualize.cpp | 60 +-
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm | Bin 10270 -> 11758 bytes
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96 +-
.../mythnetvision/mythnetvision/nettree.cpp | 8 +-
.../mythnetvision/mythnetvision/rsseditor.cpp | 6 -
mythplugins/mythnews/i18n/mythnews_fi.qm | Bin 4889 -> 4512 bytes
mythplugins/mythnews/i18n/mythnews_fi.ts | 44 +-
mythplugins/mythweather/i18n/mythweather_fi.qm | Bin 24061 -> 23685 bytes
mythplugins/mythweather/i18n/mythweather_fi.ts | 60 +-
.../mythzoneminder/i18n/mythzoneminder_fi.qm | Bin 6899 -> 7281 bytes
.../mythzoneminder/i18n/mythzoneminder_fi.ts | 84 +-
.../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 | Bin 532091 -> 613881 bytes
mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++-------
mythtv/i18n/mythfrontend_nb.qm | Bin 603663 -> 603587 bytes
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 +-
.../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 +-
.../requesthandler/deletethread.cpp | 6 +-
mythtv/libs/libmythsoundtouch/STTypes.h | 2 +-
.../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 +-
.../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 +-
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
Binary files a/mythplugins/mytharchive/i18n/mytharchive_fi.qm and b/mythplugins/mytharchive/i18n/mytharchive_fi.qm differ
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.ts b/mythplugins/mytharchive/i18n/mytharchive_fi.ts
index 1a10407..48fb51e 100644
--- a/mythplugins/mytharchive/i18n/mytharchive_fi.ts
+++ b/mythplugins/mytharchive/i18n/mytharchive_fi.ts
@@ -13,10 +13,64 @@
</message>
</context>
<context>
+ <name>BurnThemeUI</name>
+ <message>
+ <source>Has an intro and contains a main menu with 4 recordings per page. Does not have a chapter selection submenu.</source>
+ <translation>Sisältää intron ja päävalikon jossa 4 tallennetta per sivu.Ei ole kappaleita alivalikkona. </translation>
+ </message>
+ <message>
+ <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>Sisältää intron ja koostepäävalikon jossa 4 tallennetta per sivu.Ei ole kappaleita alivalikkona, tallenteiden nimiä, päivämääriä tai luokkaa.</translation>
+ </message>
+ <message>
+ <source>Has an intro and contains a main menu with 6 recordings per page. Does not have a scene selection submenu.</source>
+ <translation>Sisältää intron ja päävalikon jossa 6 tallennetta per sivu.Ei ole kohtauksia alivalikkona.</translation>
+ </message>
+ <message>
+ <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>Sisältää intron ja koostepäävalikon jossa 3 tallennetta per sivu ja kohtaukset alivalikossa ja 8 kappalepistettä. Näyttää ohjelmatietosivun ennen jokaista tallennetta.</translation>
+ </message>
+ <message>
+ <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>Sisältää intron ja koostepäävalikon jossa 3 tallennetta per sivu ja kohtaukset alivalikossa ja 8 kappalepistettä. Näyttää ohjelmatietosivun ennen jokaista tallennetta. Animoi pienoiskuvat.</translation>
+ </message>
+ <message>
+ <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>Sisältää intron ja päävalikon jossa 3 tallennetta per sivu ja kohtausvalikon jossa 8 kappaletta alivalikkona. </translation>
+ </message>
+ <message>
+ <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>Sisältää intron ja päävalikon jossa 3 tallennetta per sivu ja 8:n kappaleen alivalikko. Kaikki pienoiskuvat on animoituja.</translation>
+ </message>
+ <message>
+ <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>Luo automaattisesti käynnistyvän DVD:n ilman menuja. Näyttää introvideon ja jokaiselle nimikkeelle näytetään lisätietosivu jota seuraa videot järjestyksessä.</translation>
+ </message>
+ <message>
+ <source>Creates an auto play DVD with no menus and no intro.</source>
+ <translation>Luo automaattisesti käynnistyvän DVD:n ilman valikkoja ja introja.</translation>
+ </message>
+</context>
+<context>
+ <name>DVDThemeSelector</name>
+ <message>
+ <source>No theme description file found!</source>
+ <translation>Teeman kuvausta ei löydy!</translation>
+ </message>
+ <message>
+ <source>Empty theme description!</source>
+ <translation>Tyhjä teeman kuvaus!</translation>
+ </message>
+ <message>
+ <source>Unable to open theme description file!</source>
+ <translation>Ei saada teeman kuvaustiedostoa auki!</translation>
+ </message>
+</context>
+<context>
<name>ExportNative</name>
<message>
<source>Cancel</source>
- <translation>Peruuta</translation>
+ <translation type="obsolete">Peruuta</translation>
</message>
<message>
<source>You need to add at least one item to archive!</source>
@@ -24,7 +78,7 @@
</message>
<message>
<source>Menu</source>
- <translation></translation>
+ <translation>Menu</translation>
</message>
<message>
<source>Remove Item</source>
@@ -58,6 +112,10 @@
<name>ImportNative</name>
<message>
<source>You need to select a valid chanID!</source>
+ <translation type="obsolete">Valitse kelvollinen kanava-id!</translation>
+ </message>
+ <message>
+ <source>You need to select a valid channel id!</source>
<translation>Valitse kelvollinen kanava-id!</translation>
</message>
<message>
@@ -65,27 +123,39 @@
<translation>Ei ollut mahdollista tuoda arkistoa. Tapahtui virhe ajettaessa 'mytharchivehelperiä'</translation>
</message>
<message>
- <source>Select a ChanID</source>
+ <source>Select a channel id</source>
<translation>Valitse kanava-id</translation>
</message>
<message>
- <source>Select a ChanNo</source>
+ <source>Select a channel number</source>
<translation>Valitse kanavanumero</translation>
</message>
<message>
+ <source>Select a channel name</source>
[...14108 lines suppressed...]
-#ifdef USING_OPENGL
+#ifdef USING_OPENGL_VIDEO
if (!profiles.contains("OpenGL Normal") &&
!profiles.contains("OpenGL High Quality") &&
!profiles.contains("OpenGL Slim"))
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 6dbf1aa..4ddac0e 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
+++ b/mythtv/programs/mythfrontend/guidegrid.cpp
@@ -1390,11 +1390,11 @@ void GuideGrid::customEvent(QEvent *event)
}
else if (resultid == "guidemenu")
{
- if (resulttext == tr("Record"))
+ if (resulttext == tr("Record This"))
{
quickRecord();
}
- else if (resulttext == tr("Change Channel"))
+ else if (resulttext == tr("Change to Channel"))
{
enter();
}
@@ -1578,7 +1578,7 @@ void GuideGrid::updateChannels(void)
if (!chinfo->icon.isEmpty())
{
QString iconurl =
- gCoreContext->GetMasterHostPrefix("ChannelIcon",
+ gCoreContext->GetMasterHostPrefix("ChannelIcons",
chinfo->icon);
item->SetImage(iconurl, "channelicon");
}
@@ -1612,7 +1612,7 @@ void GuideGrid::updateInfo(void)
m_channelImage->Reset();
if (!chinfo->icon.isEmpty())
{
- QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcon",
+ QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcons",
chinfo->icon);
m_channelImage->SetFilename(iconurl);
diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp
index 4f85c70..877371a 100644
--- a/mythtv/programs/mythfrontend/scheduleeditor.cpp
+++ b/mythtv/programs/mythfrontend/scheduleeditor.cpp
@@ -1476,12 +1476,7 @@ void MetadataOptions::PerformQuery()
void MetadataOptions::OnSearchListSelection(MetadataLookup *lookup)
{
- if (!lookup)
- return;
-
- m_lookup = lookup;
-
- m_metadataFactory->Lookup(lookup);
+ QueryComplete(lookup);
}
void MetadataOptions::OnImageSearchListSelection(ArtworkInfo info,
diff --git a/mythtv/programs/mythtranscode/transcode.h b/mythtv/programs/mythtranscode/transcode.h
index a99a871..ce5b909 100644
--- a/mythtv/programs/mythtranscode/transcode.h
+++ b/mythtv/programs/mythtranscode/transcode.h
@@ -1,9 +1,10 @@
+#include <QPointer>
#include "recordingprofile.h"
#include "fifowriter.h"
#include "transcodedefs.h"
#include "programtypes.h"
+#include "playercontext.h"
-class PlayerContext;
class ProgramInfo;
class NuppelVideoRecorder;
class MythPlayer;
@@ -49,7 +50,7 @@ class Transcode : public QObject
int keyframedist;
NuppelVideoRecorder *nvr;
MythPlayer *player;
- PlayerContext *player_ctx;
+ QPointer<PlayerContext> player_ctx;
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
+++ b/mythtv/programs/mythutil/markuputils.cpp
@@ -144,8 +144,8 @@ static int CopySkipListToCutList(const MythUtilCommandLineParser &cmdline)
cutlist[it.key()] = MARK_CUT_END;
pginfo.SaveCutList(cutlist);
- cout << QString("Cutlist copied to Commercial Skip List\n")
- .toLocal8Bit().constData();
+ cout << "Commercial Skip List copied to Cutlist\n";
+ LOG(VB_GENERAL, LOG_NOTICE, "Commercial Skip List copied to Cutlist");
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
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
@@ -187,7 +187,7 @@ class Videos(object):
self.config[u'urls'] = {}
# v2 api calls - An example that must be customized for each target site
- self.config[u'urls'][u'video.search'] = "http://www.blip.tv/search?q=%s;&page=%s;&pagelen=%s;&language_code=%s;&skin=rss"
+ self.config[u'urls'][u'video.search'] = "http://www.blip.tv/?search=%s;&page=%s;&pagelen=%s;&language_code=%s;&skin=rss"
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
mythtv_0.25_gcc_4.7.patch:
h264_qpel_mmx.c | 8 !!!!!!!!
1 file changed, 8 modifications(!)
--- NEW FILE mythtv_0.25_gcc_4.7.patch ---
*** ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c.org 2012-03-31 20:52:29.923150437 -0400
--- ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400
***************
*** 398,404 ****
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
: "memory"\
);\
src += 4-(h+5)*srcStride;\
--- 398,404 ----
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: "memory"\
);\
src += 4-(h+5)*srcStride;\
***************
*** 446,452 ****
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
"2: \n\t"\
: "+a"(src)\
! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
: "memory"\
);\
tmp += 4;\
--- 446,452 ----
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
"2: \n\t"\
: "+a"(src)\
! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
: "memory"\
);\
tmp += 4;\
***************
*** 823,829 ****
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
"memory"\
--- 823,829 ----
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
"memory"\
***************
*** 878,884 ****
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
"2: \n\t"
: "+a"(src)
! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)
"memory"
--- 878,884 ----
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
"2: \n\t"
: "+a"(src)
! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)
"memory"
More information about the rpmfusion-commits
mailing list