Explorar o código

Revert "PlayerComponent: resolve plex.direct domains internally"

This reverts commit 50a6f89ae02b049d33196f4ee7fd79cc56ff7ee5.
Vincent Lang %!s(int64=7) %!d(string=hai) anos
pai
achega
ab54fb1834
Modificáronse 1 ficheiros con 1 adicións e 52 borrados
  1. 1 52
      src/player/PlayerComponent.cpp

+ 1 - 52
src/player/PlayerComponent.cpp

@@ -20,7 +20,6 @@
 #include <math.h>
 #include <string.h>
 #include <shared/Paths.h>
-#include <unistd.h>
 
 #if !defined(Q_OS_WIN)
 #include <unistd.h>
@@ -119,33 +118,6 @@ bool PlayerComponent::componentInitialize()
   // User-visible stream title used by some audio APIs (at least PulseAudio and wasapi).
   mpv::qt::set_property(m_mpv, "title", QCoreApplication::applicationName());
 
-  mpv::qt::set_property(m_mpv, "tls-verify", "yes");
-
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
-  QList<QByteArray> list;
-  list << "/etc/ssl/certs/ca-certificates.crt"
-       << "/etc/pki/tls/certs/ca-bundle.crt"
-       << "/usr/share/ssl/certs/ca-bundle.crt"
-       << "/usr/local/share/certs/ca-root-nss.crt"
-       << "/etc/ssl/cert.pem"
-       << "/usr/share/curl/curl-ca-bundle.crt"
-       << "/usr/local/share/curl/curl-ca-bundle.crt";
-
-  bool success = false;
-
-  for (auto path : list)
-  {
-    if (access(path.data(), R_OK) == 0) {
-      mpv::qt::set_property(m_mpv, "tls-ca-file", path.data());
-      success = true;
-      break;
-    }
-  }
-
-  if (!success)
-    throw FatalException(tr("Failed to locate CA bundle."));
-#endif
-
   // Apply some low-memory settings on RPI, which is relatively memory-constrained.
 #ifdef TARGET_RPI
   // The backbuffer makes seeking back faster (without having to do a HTTP-level seek)
@@ -274,17 +246,6 @@ bool PlayerComponent::load(const QString& url, const QVariantMap& options, const
   return true;
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-static QString ConvertPlexDirectURL(const QString& host)
-{
-    if (!host.endsWith(".plex.direct"))
-        return host;
-
-    QString substr = host.left(host.indexOf('.'));
-    substr.replace('-', '.');
-    return substr;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 void PlayerComponent::queueMedia(const QString& url, const QVariantMap& options, const QVariantMap &metadata, const QString& audioStream, const QString& subtitleStream)
 {
@@ -295,12 +256,8 @@ void PlayerComponent::queueMedia(const QString& url, const QVariantMap& options,
 
   updateVideoSettings();
 
-  QUrl qurl = url;
-  QString host = qurl.host();
-  qurl.setHost(ConvertPlexDirectURL(host));
-
   QVariantList command;
-  command << "loadfile" << qurl.toString();
+  command << "loadfile" << url;
   command << "append-play"; // if nothing is playing, play it now, otherwise just enqueue it
 
   QVariantMap extraArgs;
@@ -329,8 +286,6 @@ void PlayerComponent::queueMedia(const QString& url, const QVariantMap& options,
   extraArgs.insert("ad", "");
   extraArgs.insert("vd", "");
 
-  extraArgs.insert("stream-lavf-o", "verifyhost=" + host);
-
   command << extraArgs;
 
   mpv::qt::command(m_mpv, command);
@@ -819,12 +774,6 @@ void PlayerComponent::reselectStream(const QString &streamSelection, MediaType t
 
   if (!streamName.isEmpty())
   {
-    if (streamName.startsWith("https://")) {
-      QUrl qurl = streamName;
-      qurl.setHost(ConvertPlexDirectURL(qurl.host()));
-      streamName = qurl.toString();
-    }
-
     auto streams = findStreamsForURL(streamName);
     if (streams.isEmpty())
     {