provide a way to sync between visualization and sound

workaround for http://musicpd.org/mantis/view.php?id=2503
This commit is contained in:
Andrzej Rybczak
2009-10-27 02:15:51 +01:00
parent 164d32c079
commit e43ea18d29
6 changed files with 46 additions and 1 deletions

View File

@@ -29,6 +29,7 @@
#include <cstring>
#include <fstream>
#include <fcntl.h>
#include <sys/time.h>
using Global::myScreen;
using Global::MainStartY;
@@ -53,6 +54,18 @@ void Visualizer::Init()
itsPlan = fftw_plan_dft_r2c_1d(Samples, itsInput, itsOutput, FFTW_ESTIMATE);
# endif // HAVE_FFTW3_H
itsOutputID = -1;
if (!Config.visualizer_output_name.empty())
{
MPD::OutputList outputs;
Mpd.GetOutputs(outputs);
for (unsigned i = 0; i < outputs.size(); ++i)
if (outputs[i].first == Config.visualizer_output_name)
itsOutputID = i;
if (itsOutputID == -1)
ShowMessage("There is no output named \"%s\"!", Config.visualizer_output_name.c_str());
}
isInitialized = 1;
}
@@ -72,6 +85,9 @@ void Visualizer::SwitchTo()
SetFD();
itsTimer.tv_sec = 0;
itsTimer.tv_usec = 0;
if (itsFifo >= 0)
Global::wFooter->SetTimeout(1000/25);
Global::RedrawHeader = 1;
@@ -101,6 +117,13 @@ void Visualizer::Update()
return;
}
if (itsOutputID != -1 && Global::Timer.tv_sec > itsTimer.tv_sec+5)
{
Mpd.DisableOutput(itsOutputID);
Mpd.EnableOutput(itsOutputID);
gettimeofday(&itsTimer, 0);
}
// it supports only PCM in format 44100:16:1
static int16_t buf[Samples];
ssize_t data = read(itsFifo, buf, sizeof(buf));