Browse Source

Bump deps, adjust libmpv deprecations

Vincent Lang 8 years ago
parent
commit
0451a0df59
2 changed files with 5 additions and 5 deletions
  1. 2 2
      CMakeModules/DependencyConfiguration.cmake
  2. 3 3
      src/player/PlayerComponent.cpp

+ 2 - 2
CMakeModules/DependencyConfiguration.cmake

@@ -6,10 +6,10 @@ if(DEPENDENCY_TOKEN)
   set(DEPENDCY_FOLDER "")
   if(OPENELEC)
     set(DEPENDCY_FOLDER plexmediaplayer-openelec-codecs)
-    set(DEPS_BUILD_NUMBER 72)
+    set(DEPS_BUILD_NUMBER 73)
   elseif(APPLE OR WIN32)
     set(DEPENDCY_FOLDER plexmediaplayer-dependencies-codecs)
-    set(DEPS_BUILD_NUMBER 221)
+    set(DEPS_BUILD_NUMBER 223)
   endif()
   if(NOT (DEPENDCY_FOLDER STREQUAL ""))
     download_deps(

+ 3 - 3
src/player/PlayerComponent.cpp

@@ -939,7 +939,7 @@ void PlayerComponent::setAudioConfiguration()
   if (deviceType == AUDIO_DEVICE_TYPE_SPDIF)
     layout = "2.0";
 
-  mpv::qt::set_option_variant(m_mpv, "audio-channels", layout);
+  mpv::qt::set_property(m_mpv, "audio-channels", layout);
 
   // if the user has indicated that PCM only works for stereo, and that
   // the receiver supports AC3, set this extra option that allows us to transcode
@@ -1074,7 +1074,7 @@ void PlayerComponent::updateVideoSettings()
   setAudioDelay(m_playbackAudioDelay);
 
   QVariant cache = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "cache");
-  mpv::qt::set_option_variant(m_mpv, "cache", cache.toInt() * 1024);
+  mpv::qt::set_property(m_mpv, "cache", cache.toInt() * 1024);
 
   updateVideoAspectSettings();
 }
@@ -1263,7 +1263,7 @@ void PlayerComponent::setPreferredCodecs(const QList<CodecDriver>& codecs)
   {
     if (codec.type == CodecType::Decoder)
     {
-      items << QString("lavc:") + codec.driver;
+      items << codec.driver;
     }
   }
   QString opt = items.join(",");