dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix equalizer

Browse Source
This commit is contained in:
Jonas Kvinge
2019-04-20 22:23:22 +02:00
parent f761b8d4e1
commit 60a9154326
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/gstengine.cpp
View File

@@ -161,10 +161,6 @@ bool GstEngine::Load(const QUrl &media_url, const QUrl &original_url, Engine::Tr
return true; return true;
} }
//SetEqualizerEnabled(equalizer_enabled_);
//SetEqualizerParameters(equalizer_preamp_, equalizer_gains_);
//SetStereoBalance(stereo_balance_);
shared_ptr<GstEnginePipeline> pipeline = CreatePipeline(gst_url, original_url, force_stop_at_end ? end_nanosec : 0); shared_ptr<GstEnginePipeline> pipeline = CreatePipeline(gst_url, original_url, force_stop_at_end ? end_nanosec : 0);
if (!pipeline) return false; if (!pipeline) return false;
@@ -174,9 +170,8 @@ bool GstEngine::Load(const QUrl &media_url, const QUrl &original_url, Engine::Tr
current_pipeline_ = pipeline; current_pipeline_ = pipeline;
SetVolume(volume_); SetVolume(volume_);
SetEqualizerEnabled(equalizer_enabled_);
if (equalizer_preamp_) SetEqualizerParameters(equalizer_preamp_, equalizer_gains_);
SetStereoBalance(stereo_balance_); SetStereoBalance(stereo_balance_);
SetEqualizerParameters(equalizer_preamp_, equalizer_gains_);
// Maybe fade in this track // Maybe fade in this track
if (crossfade) if (crossfade)
@@ -439,6 +434,7 @@ void GstEngine::SetEqualizerParameters(int preamp, const QList<int> &band_gains)
if (current_pipeline_) if (current_pipeline_)
current_pipeline_->SetEqualizerParams(preamp, band_gains); current_pipeline_->SetEqualizerParams(preamp, band_gains);
} }
void GstEngine::SetStereoBalance(float value) { void GstEngine::SetStereoBalance(float value) {
@@ -446,6 +442,7 @@ void GstEngine::SetStereoBalance(float value) {
stereo_balance_ = value; stereo_balance_ = value;
if (current_pipeline_) current_pipeline_->SetStereoBalance(value); if (current_pipeline_) current_pipeline_->SetStereoBalance(value);
} }
void GstEngine::AddBufferConsumer(GstBufferConsumer *consumer) { void GstEngine::AddBufferConsumer(GstBufferConsumer *consumer) {
@@ -747,6 +744,7 @@ shared_ptr<GstEnginePipeline> GstEngine::CreatePipeline() {
ret->set_replaygain(rg_enabled_, rg_mode_, rg_preamp_, rg_compression_); ret->set_replaygain(rg_enabled_, rg_mode_, rg_preamp_, rg_compression_);
ret->set_buffer_duration_nanosec(buffer_duration_nanosec_); ret->set_buffer_duration_nanosec(buffer_duration_nanosec_);
ret->set_buffer_min_fill(buffer_min_fill_); ret->set_buffer_min_fill(buffer_min_fill_);
ret->SetEqualizerEnabled(equalizer_enabled_);
ret->AddBufferConsumer(this); ret->AddBufferConsumer(this);
for (GstBufferConsumer *consumer : buffer_consumers_) { for (GstBufferConsumer *consumer : buffer_consumers_) {

2
src/engine/gstenginepipeline.cpp
View File

@@ -106,7 +106,7 @@ GstEnginePipeline::GstEnginePipeline(GstEngine *engine)
{ {
if (!sElementDeleter) { if (!sElementDeleter) {
sElementDeleter = new GstElementDeleter; sElementDeleter = new GstElementDeleter(engine_);
} }
for (int i = 0; i < kEqBandCount; ++i) eq_band_gains_ << 0; for (int i = 0; i < kEqBandCount; ++i) eq_band_gains_ << 0;