RAOP: Don't try and start a service if there is no key.

(cherry picked from commit 5097e924e87d62e679bac408c88ac720ea3d98d6)

Signed-off-by: Gavin Hurlbut <ghurlbut@mythtv.org>

Author: Mark Kendall

mythtv/libs/libmythtv/mythraopconnection.cpp

@@ -712,7 +712,8 @@ RSA* MythRAOPConnection::LoadKey(void)
 
     if ( !file )
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to read key from " + GetConfDir().toUtf8() + sName.toUtf8());
+        LOG(VB_GENERAL, LOG_ERR, LOC + QString("Failed to read key from: %1")
+            .arg(GetConfDir() + sName));
         g_rsa = NULL;
         return NULL;
     }
@@ -728,7 +729,7 @@ RSA* MythRAOPConnection::LoadKey(void)
     }
 
     g_rsa = NULL;
-    LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to load RSA private key. Playback will fail.");
+    LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to load RSA private key.");
     return NULL;
 }
 

mythtv/libs/libmythtv/mythraopconnection.h

@@ -27,6 +27,8 @@ class MythRAOPConnection : public QObject
 {
     Q_OBJECT
 
+    friend class MythRAOPDevice;
+
   public:
     MythRAOPConnection(QObject *parent, QTcpSocket* socket, QByteArray id, int port);
    ~MythRAOPConnection();
@@ -41,6 +43,9 @@ class MythRAOPConnection : public QObject
     void timeout(void);
     void audioRetry(void);
 
+  protected:
+    static RSA* LoadKey(void);
+
   private:
     uint64_t FramesToMs(uint64_t timestamp);
     void    ProcessSyncPacket(const QByteArray &buf, uint64_t timenow);
@@ -54,7 +59,6 @@ class MythRAOPConnection : public QObject
     void    FinishResponse(QTextStream *stream, QTcpSocket *socket,
                            QByteArray &option, QByteArray &cseq);
     RawHash FindTags(const QList<QByteArray> &lines);
-    static RSA* LoadKey(void);
     bool    CreateDecoder(void);
     void    DestroyDecoder(void);
     bool    OpenAudioDevice(void);

mythtv/libs/libmythtv/mythraopdevice.cpp

@@ -20,6 +20,13 @@ bool MythRAOPDevice::Create(void)
 {
     QMutexLocker locker(gMythRAOPDeviceMutex);
 
+    // don't bother trying to start if there is no private key
+    if (!MythRAOPConnection::LoadKey())
+    {
+        LOG(VB_GENERAL, LOG_ERR, LOC + "Aborting startup - no key found.");
+        return false;
+    }
+
     // create the device thread
     if (!gMythRAOPDeviceThread)
         gMythRAOPDeviceThread = new MThread("RAOPDevice");