Revert "Use new RPI rendering method"

This partially reverts commit bb530260d8627208681f2cc03b6fec1381d0289b.

It restores the behavior on RPI before that commit. Though the code is a
bit different: the debug.force_vo option can now be set to "opengl-cb"
to test the new rendering code. We hope to use the new rendering code as
soon as the performance issues have been analyzed.

This commit is actually untested on RPI, so I'm hoping for the best.

src/player/PlayerComponent.cpp

@@ -188,26 +188,30 @@ void PlayerComponent::setQtQuickWindow(QQuickWindow* window)
   if (!video)
     throw FatalException(tr("Failed to load video element."));
 
-  mpv::qt::set_property(m_mpv, "vo", "opengl-cb");
-
   video->initMpv(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 void PlayerComponent::setWindow(QQuickWindow* window)
 {
-  m_window = window;
-  if (!window)
-    return;
+  QString vo = "opengl-cb";
 
 #ifdef TARGET_RPI
   window->setFlags(Qt::FramelessWindowHint);
+  vo = "rpi";
 #endif
 
+  m_window = window;
+  if (!window)
+    return;
+
   QString forceVo = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "debug.force_vo").toString();
   if (forceVo.size())
-    mpv::qt::set_property(m_mpv, "vo", forceVo);
-  else
+    vo = forceVo;
+
+  mpv::qt::set_property(m_mpv, "vo", vo);
+
+  if (vo == "opengl-cb")
     setQtQuickWindow(window);
 }
 
@@ -1049,8 +1053,10 @@ void PlayerComponent::updateVideoSettings()
   QVariant deinterlace = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "deinterlace");
   mpv::qt::set_property(m_mpv, "deinterlace", deinterlace.toBool() ? "yes" : "no");
 
+#ifndef TARGET_RPI
   double displayFps = DisplayComponent::Get().currentRefreshRate();
   mpv::qt::set_property(m_mpv, "display-fps", displayFps);
+#endif
 
   setAudioDelay(m_playbackAudioDelay);