Skip to content

Commit

Permalink
always search for plugins under install prefix
Browse files Browse the repository at this point in the history
If pulseeffects was installed e.g. under /usr/local, gstreamer wouldn't
find the plugins that ship with it. Since some of these are actually
required, we ended up with a broken pipeline and no useful error
message.
  • Loading branch information
vmatare committed Dec 16, 2018
1 parent 1af05a4 commit 4410f1f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('LOCALE_DIR', localedir)
conf.set_quoted('VERSION', meson.project_version())
conf.set_quoted('PACKAGE', 'PulseEffects')
conf.set_quoted('PLUGINS_INSTALL_DIR', join_paths(prefix, plugins_install_dir))

configure_file(output: 'config.h', configuration: conf)

Expand Down
3 changes: 3 additions & 0 deletions src/pipeline_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <mutex>
#include "pipeline_base.hpp"
#include "util.hpp"
#include "config.h"

namespace {

Expand Down Expand Up @@ -207,6 +208,8 @@ PipelineBase::PipelineBase(const std::string& tag, const uint& sampling_rate)

// creating elements common to all pipelines

gst_registry_scan_path(gst_registry_get(), PLUGINS_INSTALL_DIR);

source = gst_element_factory_make("pulsesrc", "source");
capsfilter = gst_element_factory_make("capsfilter", nullptr);
adapter = gst_element_factory_make("peadapter", nullptr);
Expand Down

0 comments on commit 4410f1f

Please sign in to comment.