Ticket #12145: ceton3.diff

mythtv/libs/libmythtv/recorders/cetonrtsp.cpp

@@ -25 +25 @@
     _sessionId("0"),
     _responseCode(-1),
     _timeout(60),
-    _timer(0)
+    _timer(0),
+    _canGetParameter(false)
 {
     _requestUrl.setHost(ip);
     _requestUrl.setPort(port);
@@ -40 +41 @@
     _requestUrl(url),
     _responseCode(-1),
     _timeout(60),
-    _timer(0)
+    _timer(0),
+    _canGetParameter(false)
 {
     if (url.port() < 0)
     {
@@ -56 +58 @@
 
 bool CetonRTSP::ProcessRequest(
     const QString &method, const QStringList* headers,
-    bool use_control, bool waitforanswer)
+    bool use_control, bool waitforanswer, const QString &alternative)
 {
     QMutexLocker locker(&_rtspMutex);
 
@@ -106 +108 @@
     QStringList requestHeaders;
     requestHeaders.append(QString("%1 %2 RTSP/1.0")
         .arg(method)
-        .arg(use_control ? _controlUrl.toString() :  _requestUrl.toString()));
+        .arg(alternative.size() ? alternative :
+             (use_control ? _controlUrl.toString() : _requestUrl.toString())));
     requestHeaders.append(QString("User-Agent: MythTV Ceton Recorder"));
     requestHeaders.append(QString("CSeq: %1").arg(++_sequenceNumber));
     if (_sessionId != "0")
@@ -253 +256 @@
     if (ProcessRequest("OPTIONS"))
     {
         options = _responseHeaders.value("Public").split(QRegExp(",\\s*"));
+        _canGetParameter = options.contains("GET_PARAMETER");
+
         return true;
     }
     return false;
@@ -502 +507 @@
     QStringList dummy;
 
     LOG(VB_RECORD, LOG_DEBUG, LOC + "Sending KeepAlive");
-    ProcessRequest("GET_PARAMETER", NULL, false, false);
+    if (_canGetParameter)
+    {
+        ProcessRequest("GET_PARAMETER", NULL, false, false);
+    }
+    else
+    {
+        ProcessRequest("OPTIONS", NULL, false, false, "*");
+    }
 }

mythtv/libs/libmythtv/recorders/cetonrtsp.h

@@ -43 +43 @@
 protected:
     bool ProcessRequest(
         const QString &method, const QStringList *headers = NULL,
-                        bool use_control = false, bool waitforanswer = true);
+                        bool use_control = false, bool waitforanswer = true,
+                        const QString &alternative = QString());
 
   private:
     QStringList splitLines(const QByteArray &lines);
@@ -63 +64 @@
     QByteArray              _responseContent;
     int                     _timeout;
     int                     _timer;
+    bool                    _canGetParameter;
 
     static QMutex _rtspMutex;