Fixes #10305. Remove mysql.txt support.

MythTV · May 4, 2012 · 3fb9d6e · 3fb9d6e
1 parent fe11b61
commit 3fb9d6e
Show file tree

Hide file tree

Showing 25 changed files with 376 additions and 433 deletions.
diff --git a/mythtv/bindings/perl/MythTV.pm b/mythtv/bindings/perl/MythTV.pm
@@ -8,7 +8,7 @@
 #
 
 # Version
-    $VERSION = '.25svn';
+    $VERSION = '.26git';
 
 # Load sub libraries
     use IO::Socket::INET::MythTV;
@@ -106,8 +106,8 @@ package MythTV;
 # Note: as of July 21, 2010, this is actually a string, to account for proto
 # versions of the form "58a".  This will get used if protocol versions are 
 # changed on a fixes branch ongoing.
-    our $PROTO_VERSION = "73";
-    our $PROTO_TOKEN = "D7FE8D6F";
+    our $PROTO_VERSION = "74";
+    our $PROTO_TOKEN = "SingingPotato";
 
 # currentDatabaseVersion is defined in libmythtv in
 # mythtv/libs/libmythtv/dbcheck.cpp and should be the current MythTV core

diff --git a/mythtv/bindings/php/MythBackend.php b/mythtv/bindings/php/MythBackend.php
@@ -11,8 +11,8 @@ class MythBackend {
 
 // MYTH_PROTO_VERSION is defined in libmyth in mythtv/libs/libmyth/mythcontext.h
 // and should be the current MythTV protocol version.
-    static $protocol_version        = '73';
-    static $protocol_token          = 'D7FE8D6F';
+    static $protocol_version        = '74';
+    static $protocol_token          = 'SingingPotato';
 
 // The character string used by the backend to separate records
     static $backend_separator       = '[]:[]';

diff --git a/mythtv/bindings/python/MythTV/static.py b/mythtv/bindings/python/MythTV/static.py
@@ -8,8 +8,8 @@
 SCHEMA_VERSION = 1302
 NVSCHEMA_VERSION = 1007
 MUSICSCHEMA_VERSION = 1018
-PROTO_VERSION = '73'
-PROTO_TOKEN = 'D7FE8D6F'
+PROTO_VERSION = '74'
+PROTO_TOKEN = 'SingingPotato'
 BACKEND_SEP = '[]:[]'
 INSTALL_PREFIX = '/usr/local'
 

diff --git a/mythtv/docs/doxygen-architecture-document.cpp b/mythtv/docs/doxygen-architecture-document.cpp
@@ -576,7 +576,7 @@ Most MythTV programs follow a common sequence:
   <li>Initialise the MythContext, which:</li>
   <ul>
     <li>Tries to find a database on localhost,
-        or on the host specified in mysql.txt,</li>
+        or on the host specified in config.xml,</li>
     <li>Tries to locate exactly one backend host via UPnP,
         to find its database,</li>
     <li>If possible, displays a list of all backends located via UPnP

diff --git a/mythtv/libs/libmyth/backendselect.h b/mythtv/libs/libmyth/backendselect.h
@@ -19,9 +19,11 @@ struct DatabaseParams;
 //       location at this moment in time
 // Some common UPnP search and XML value strings
 const QString gBackendURI = "urn:schemas-mythtv-org:device:MasterMediaServer:1";
-const QString kDefaultBE  = "UPnP/MythFrontend/DefaultBackend/";
-const QString kDefaultPIN = kDefaultBE + "SecurityPin";
-const QString kDefaultUSN = kDefaultBE + "USN";
+const QString kDefaultDB  = "Database/";
+const QString kDefaultWOL = "WakeOnLAN/";
+const QString kDefaultMFE = "UPnP/MythFrontend/DefaultBackend/";
+const QString kDefaultPIN = kDefaultMFE + "SecurityPin";
+const QString kDefaultUSN = kDefaultMFE + "USN";
 
 typedef QMap <QString, DeviceLocation*> ItemMap;
 

diff --git a/mythtv/libs/libmyth/langsettings.cpp b/mythtv/libs/libmyth/langsettings.cpp
@@ -187,13 +187,11 @@ void LanguageSelection::Save(void)
     MythUIButtonListItem *item = m_languageList->GetItemCurrent();
 
     QString langCode = item->GetData().toString();
-    gCoreContext->SetSetting("Language", langCode);
     gCoreContext->SaveSetting("Language", langCode);
 
     item = m_countryList->GetItemCurrent();
 
     QString countryCode = item->GetData().toString();
-    gCoreContext->SetSetting("Country", countryCode);
     gCoreContext->SaveSetting("Country", countryCode);
 
     if (m_language != langCode)