Permalink
Browse files

Merge branch 'fixes/0.24' of github.com:MythTV/mythtv into jyavenard/…

…backports/fixes/0.24
  • Loading branch information...
jyavenard committed Mar 13, 2012
2 parents 539dd5f + 7b992ca commit 910385cb6247d70e29099f1f03c9fee0d4a9af97
@@ -3725,12 +3725,7 @@ NULL
}
// Perform the actual upgrade
- QString qtmp = QString(
- "ALTER DATABASE %1 DEFAULT CHARACTER SET latin1;")
- .arg(gCoreContext->GetDatabaseParams().dbName);
- QByteArray tmp = qtmp.toAscii();
const char *updates[] = {
-tmp.constData(),
"ALTER TABLE callsignnetworkmap"
" MODIFY callsign varbinary(20) NOT NULL default '',"
" MODIFY network varbinary(20) NOT NULL default '';",
@@ -3974,13 +3969,7 @@ NULL
if (dbver == "1216")
{
- QString qtmp = QString(
- "ALTER DATABASE %1 DEFAULT CHARACTER SET "
- "utf8 COLLATE utf8_general_ci;")
- .arg(gCoreContext->GetDatabaseParams().dbName);
- QByteArray tmp = qtmp.toAscii();
const char *updates[] = {
-tmp.constData(),
"ALTER TABLE callsignnetworkmap"
" DEFAULT CHARACTER SET default,"
" MODIFY callsign varchar(20) CHARACTER SET utf8 NOT NULL default '',"
@@ -5184,7 +5173,7 @@ NULL
"INSERT INTO keybindings (SELECT 'Main Menu', 'EXIT', 'System Exit', "
"(CASE data WHEN '1' THEN 'Ctrl+Esc' WHEN '2' THEN 'Meta+Esc' "
"WHEN '3' THEN 'Alt+Esc' WHEN '4' THEN 'Esc' ELSE '' END), hostname "
- "FROM settings WHERE value = 'AllowQuitShutdown' LIMIT 1) "
+ "FROM settings WHERE value = 'AllowQuitShutdown' GROUP BY hostname) "
"ON DUPLICATE KEY UPDATE keylist = VALUES(keylist);",
NULL
};
@@ -5567,12 +5556,7 @@ bool InitializeMythSchema(void)
VERBOSE(VB_IMPORTANT, "Inserting MythTV initial database information.");
- QString qtmp = QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8;")
- .arg(gCoreContext->GetDatabaseParams().dbName);
- QByteArray tmp = qtmp.toAscii();
-
const char *updates[] = {
-tmp.constData(),
"CREATE TABLE callsignnetworkmap ("
" id int(11) NOT NULL AUTO_INCREMENT,"
" callsign varchar(20) NOT NULL default '',"
@@ -803,6 +803,10 @@ static void init_fixup(QMap<uint64_t,uint> &fix)
fix[ 2051LL << 32 | 2U << 16] = EITFixUp::kFixUK;
fix[ 2053LL << 32 | 2U << 16] = EITFixUp::kFixUK;
fix[ 2054LL << 32 | 2U << 16] = EITFixUp::kFixUK;
+ fix[ 2056LL << 32 | 2U << 16] = EITFixUp::kFixUK;
+ fix[ 2057LL << 32 | 2U << 16] = EITFixUp::kFixUK;
+ fix[ 2063LL << 32 | 2U << 16] = EITFixUp::kFixUK;
+ fix[ 2068LL << 32 | 2U << 16] = EITFixUp::kFixUK;
// ComHem Sweden
fix[40999U << 16 ] = EITFixUp::kFixComHem;
@@ -72,6 +72,8 @@ bool IPTVFeederRTP::Open(const QString &url)
if (!InitEnv())
return false;
+ ReceivingSocketAddr = our_inet_addr(parse.host().toLatin1());
+
Groupsock *socket = new Groupsock(*_live_env, addr, parse.port(), 0);
if (!socket)
{
@@ -8,7 +8,7 @@
#include <QFile>
// libmythdb headers
-#include "httpcomms.h"
+#include "mythdownloadmanager.h"
// libmyth headers
#include "mythverbose.h"
@@ -148,7 +148,7 @@ void ChannelData::handleChannels(int id, QList<ChanInfo> *chanlist)
localfile = fileprefix + filename;
QFile actualfile(localfile);
if (!actualfile.exists() &&
- !HttpComms::getHttpFile(localfile, (*i).iconpath))
+ !GetMythDownloadManager()->download((*i).iconpath, localfile))
{
VERBOSE(VB_IMPORTANT,
QString("Failed to fetch icon from '%1'")

0 comments on commit 910385c

Please sign in to comment.