Add 'mediaserver' type to PlaybackSock.

This new shared type is used to differentiate between full slave mythbackends and simple mythmediaservers, and allows the latter to be identified as a client capable of taking part in file scans.
MythTV · Feb 12, 2012 · 2f6750b · 2f6750b
1 parent 0e08bc5
commit 2f6750b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -1299,6 +1299,7 @@ void MainServer::HandleVersion(MythSocket *socket, const QStringList &slist)
  * \par        ANN Monitor  \e host \e wantevents
  * Register \e host as a client, and allow shutdown of the socket
  * \par        ANN SlaveBackend \e IPaddress
+ * \par        ANN MediaServer \e IPaddress
  * \par        ANN FileTransfer stringlist(\e hostname, \e filename)
  * \par        ANN FileTransfer stringlist(\e hostname, \e filename) \e useReadahead \e retries
  */
@@ -1385,6 +1386,7 @@ void MainServer::HandleAnnounce(QStringList &slist, QStringList commands,
 
         PlaybackSock *pbs = new PlaybackSock(this, socket, commands[2],
                                               kPBSEvents_Normal);
+        pbs->setAsMediaServer();
         pbs->setBlockShutdown(false);
         sockListLock.lockForWrite();
         playbackList.push_back(pbs);
@@ -3016,7 +3018,7 @@ void MainServer::HandleQueryFileHash(QStringList &slist, PlaybackSock *pbs)
     }
     else
     {
-        PlaybackSock *slave = GetSlaveByHostname(hostname);
+        PlaybackSock *slave = GetMediaServerByHostname(hostname);
         if (slave)
         {
             hash = slave->GetFileHash(filename, storageGroup);
@@ -3033,7 +3035,7 @@ void MainServer::HandleQueryFileHash(QStringList &slist, PlaybackSock *pbs)
             if (query.exec() && query.next())
             {
                 hostname = query.value(0).toString();
-                slave = GetSlaveByHostname(hostname);
+                slave = GetMediaServerByHostname(hostname);
                 if (slave)
                 {
                     hash = slave->GetFileHash(filename, storageGroup);
@@ -3282,7 +3284,7 @@ void MainServer::HandleSGGetFileList(QStringList &sList,
     }
     else
     {
-        PlaybackSock *slave = GetSlaveByHostname(wantHost);
+        PlaybackSock *slave = GetMediaServerByHostname(wantHost);
         if (slave)
         {
             LOG(VB_FILE, LOG_INFO, "HandleSGGetFileList: Getting remote info");
@@ -3344,7 +3346,7 @@ void MainServer::HandleSGFileQuery(QStringList &sList,
     }
     else
     {
-        PlaybackSock *slave = GetSlaveByHostname(wantHost);
+        PlaybackSock *slave = GetMediaServerByHostname(wantHost);
         if (slave)
         {
             LOG(VB_FILE, LOG_INFO, "HandleSGFileQuery: Getting remote info");
@@ -4258,7 +4260,7 @@ void MainServer::GetActiveBackends(QStringList &hosts)
     vector<PlaybackSock*>::iterator it;
     for (it = playbackList.begin(); it != playbackList.end(); ++it)
     {
-        if ((*it)->isSlaveBackend())
+        if ((*it)->isMediaServer())
         {
             hostname = (*it)->getHostname();
             if (!hosts.contains(hostname))
@@ -4448,7 +4450,7 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
             PlaybackSock *pbs = *pbsit;
 
             if ((pbs->IsDisconnected()) ||
-                (!pbs->isSlaveBackend()) ||
+                (!pbs->isMediaServer()) ||
                 (pbs->isLocal()) ||
                 (backendsCounted.contains(pbs->getHostname())))
                 continue;
@@ -5835,6 +5837,29 @@ PlaybackSock *MainServer::GetSlaveByHostname(const QString &hostname)
     return NULL;
 }
 
+PlaybackSock *MainServer::GetMediaServerByHostname(const QString &hostname)
+{
+    if (!ismaster)
+        return NULL;
+
+    QReadLocker rlock(&sockListLock);
+
+    vector<PlaybackSock *>::iterator iter = playbackList.begin();
+    for (; iter != playbackList.end(); ++iter)
+    {
+        PlaybackSock *pbs = *iter;
+        if (pbs->isMediaServer() &&
+            ((pbs->getHostname().toLower() == hostname.toLower()) ||
+             (pbs->getIP() == hostname)))
+        {
+            pbs->UpRef();
+            return pbs;
+        }
+    }
+
+    return NULL;
+}
+
 /// Warning you must hold a sockListLock lock before calling this
 PlaybackSock *MainServer::GetPlaybackBySock(MythSocket *sock)
 {

diff --git a/mythtv/programs/mythbackend/mainserver.h b/mythtv/programs/mythbackend/mainserver.h
@@ -233,6 +233,7 @@ class MainServer : public QObject, public MythSocketCBs
     void getGuideDataThrough(QDateTime &GuideDataThrough);
 
     PlaybackSock *GetSlaveByHostname(const QString &hostname);
+    PlaybackSock *GetMediaServerByHostname(const QString &hostname);
     PlaybackSock *GetPlaybackBySock(MythSocket *socket);
     FileTransfer *GetFileTransferByID(int id);
     FileTransfer *GetFileTransferBySock(MythSocket *socket);

diff --git a/mythtv/programs/mythbackend/playbacksock.cpp b/mythtv/programs/mythbackend/playbacksock.cpp
@@ -27,6 +27,7 @@ PlaybackSock::PlaybackSock(MainServer *parent, MythSocket *lsock,
     m_eventsMode = eventsMode;
     ip = "";
     backend = false;
+    mediaserver = false;
     expectingreply = false;
 
     disconnected = false;

diff --git a/mythtv/programs/mythbackend/playbacksock.h b/mythtv/programs/mythbackend/playbacksock.h
@@ -51,7 +51,10 @@ class PlaybackSock
 
     // all backend<->backend stuff below here
     bool isSlaveBackend(void) const { return backend; }
-    void setAsSlaveBackend(void) { backend = true; }
+    void setAsSlaveBackend(void) { backend = true; mediaserver = true; }
+
+    bool isMediaServer(void) const { return mediaserver; }
+    void setAsMediaServer(void) { mediaserver = true; }
 
     bool isExpectingReply(void) const { return expectingreply; }
 
@@ -113,6 +116,7 @@ class PlaybackSock
     PlaybackSockEventsMode m_eventsMode;
     bool blockshutdown;
     bool backend;
+    bool mediaserver;
 
     QMutex refLock;
     QMutex sockLock;