Changeset 02d88eb79a in mythtv

Timestamp:

Nov 6, 2013, 2:00:00 PM (11 years ago)

Author:

Stuart Morgan <smorgan@…>

Branches:

fixes/0.27

Children:

4e1342491d

Parents:

dfe53966f

git-author:

Stuart Morgan <smorgan@…> (11/06/13 14:00:00)

git-committer:

Stuart Morgan <smorgan@…> (11/08/13 15:41:22)

Message:

Simplify MythCoreContext::GetMasterHostPrefix?(). It's a waste of time to get the IP/port from the socket when we can be using the values from the settings instead, if we're not already connected to the master we will soon be connecting anyway to conduct the file transfer.
(cherry picked from commit 22b48f435a97b6b973a2e0dea9e89548350bc01e)

Refs #11937

File:

• mythtv/libs/libmythbase/mythcorecontext.cpp (modified) (1 diff)

mythtv/libs/libmythbase/mythcorecontext.cpp

@@ -704 +704 @@
                                              const QString &path)
 {
-    QString ret;
-
-    if (IsMasterHost())
-    {
-        return GenMythURL(GetSetting("MasterServerIP"),
-                          GetNumSetting("MasterServerPort", 6543),
-                          path,
-                          storageGroup);
-    }
-
-    QMutexLocker locker(&d->m_sockLock);
-    if (!d->m_serverSock || !d->m_serverSock->IsConnected() ||
-        !d->m_eventSock || !d->m_eventSock->IsConnected())
-    {
-        bool blockingClient = GetNumSetting("idleTimeoutSecs",0) > 0;
-        ConnectToMasterServer(blockingClient);
-    }
-
-    if (d->m_serverSock)
-    {
-
-         ret = GenMythURL(d->m_serverSock->GetPeerAddress().toString(),
-                          d->m_serverSock->GetPeerPort(),
-                          path,
-                          storageGroup);
-    }
-    
-    return ret;
+    return GenMythURL(GetSetting("MasterServerIP"),
+                        GetNumSetting("MasterServerPort", 6543),
+                        path,
+                        storageGroup);
 }