From 7dd764db6b5ee6634c50996a56081ba387495925 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 23 Mar 2014 16:49:03 -0700 Subject: [PATCH] Remove the option to disable the PCM audio provider --- src/audio_provider.cpp | 2 +- src/libresrc/default_config.json | 3 --- src/libresrc/osx/default_config.json | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/audio_provider.cpp b/src/audio_provider.cpp index c48211326..6b013c1bf 100644 --- a/src/audio_provider.cpp +++ b/src/audio_provider.cpp @@ -154,7 +154,7 @@ std::unique_ptr AudioProviderFactory::GetProvider(agi::fs::path c }); // Try a PCM provider first - if (!provider && !OPT_GET("Provider/Audio/PCM/Disable")->GetBool()) + if (!provider) provider = creator.try_create("PCM audio provider", [&]() { return CreatePCMAudioProvider(filename); }); if (!provider) { diff --git a/src/libresrc/default_config.json b/src/libresrc/default_config.json index aed115ae9..8f3088db0 100644 --- a/src/libresrc/default_config.json +++ b/src/libresrc/default_config.json @@ -324,9 +324,6 @@ }, "FFmpegSource" : { "Decode Error Handling" : "stop" - }, - "PCM" : { - "Disable" : false } }, "Avisynth" : { diff --git a/src/libresrc/osx/default_config.json b/src/libresrc/osx/default_config.json index f6f5630bb..8d411aaf2 100644 --- a/src/libresrc/osx/default_config.json +++ b/src/libresrc/osx/default_config.json @@ -324,9 +324,6 @@ }, "FFmpegSource" : { "Decode Error Handling" : "stop" - }, - "PCM" : { - "Disable" : false } }, "Avisynth" : {