Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Toggle the fifo output once if synchronization is disabled

Browse Source
This commit is contained in:
Andrzej Rybczak
2020-12-13 17:12:41 +01:00
parent ecdc77b960
commit 2f07252ed9
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/screens/visualizer.cpp
View File

@@ -112,7 +112,8 @@ void Visualizer::switchTo()
SwitchTo::execute(this); SwitchTo::execute(this);
w.clear(); w.clear();
SetFD(); SetFD();
m_timer = boost::posix_time::from_time_t(0); // negative infinity to toggle output in update() at least once
m_timer = boost::posix_time::neg_infin;
drawHeader(); drawHeader();
memset(m_sample_buffer.data(), 0, m_sample_buffer.size()*sizeof(int16_t)); memset(m_sample_buffer.data(), 0, m_sample_buffer.size()*sizeof(int16_t));
# ifdef HAVE_FFTW3_H # ifdef HAVE_FFTW3_H
@@ -160,15 +161,12 @@ void Visualizer::update()
memcpy(sdata_end - data, temp_sdata, data); memcpy(sdata_end - data, temp_sdata, data);
} }
if (Config.visualizer_sync_interval > boost::posix_time::seconds(0)) if (m_output_id != -1 && Global::Timer - m_timer > Config.visualizer_sync_interval)
{ {
if (m_output_id != -1 && Global::Timer - m_timer > Config.visualizer_sync_interval) Mpd.DisableOutput(m_output_id);
{ usleep(50000);
Mpd.DisableOutput(m_output_id); Mpd.EnableOutput(m_output_id);
usleep(50000); m_timer = Global::Timer;
Mpd.EnableOutput(m_output_id);
m_timer = Global::Timer;
}
} }
void (Visualizer::*draw)(int16_t *, ssize_t, size_t, size_t); void (Visualizer::*draw)(int16_t *, ssize_t, size_t, size_t);

5
src/settings.cpp
View File

@@ -282,8 +282,9 @@ bool Configuration::read(const std::vector<std::string> &config_paths, bool igno
p.add("visualizer_sync_interval", &visualizer_sync_interval, "0", p.add("visualizer_sync_interval", &visualizer_sync_interval, "0",
[](std::string v) { [](std::string v) {
unsigned sync_interval = verbose_lexical_cast<unsigned>(v); unsigned sync_interval = verbose_lexical_cast<unsigned>(v);
if (sync_interval > 0) if (sync_interval == 0)
lowerBoundCheck<unsigned>(sync_interval, 10); sync_interval = std::numeric_limits<unsigned>::max();
lowerBoundCheck<unsigned>(sync_interval, 10);
return boost::posix_time::seconds(sync_interval); return boost::posix_time::seconds(sync_interval);
}); });
p.add("visualizer_type", &visualizer_type, "wave"); p.add("visualizer_type", &visualizer_type, "wave");