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

visualizer: properly skip frequency spectrum mode without fftw

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-10-26 23:42:52 +01:00
parent c45bd4b43e
commit 33c8eea7c0
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/enums.cpp
View File

@@ -148,9 +148,11 @@ std::ostream &operator<<(std::ostream& os, VisualizerType vt)
case VisualizerType::WaveFilled: case VisualizerType::WaveFilled:
os << "sound wave filled"; os << "sound wave filled";
break; break;
# ifdef HAVE_FFTW3_H
case VisualizerType::Spectrum: case VisualizerType::Spectrum:
os << "frequency spectrum"; os << "frequency spectrum";
break; break;
# endif // HAVE_FFTW3_H
case VisualizerType::Ellipse: case VisualizerType::Ellipse:
os << "sound ellipse"; os << "sound ellipse";
break; break;
@@ -166,8 +168,10 @@ std::istream &operator>>(std::istream& is, VisualizerType &vt)
vt = VisualizerType::Wave; vt = VisualizerType::Wave;
else if (svt == "wave_filled") else if (svt == "wave_filled")
vt = VisualizerType::WaveFilled; vt = VisualizerType::WaveFilled;
# ifdef HAVE_FFTW3_H
else if (svt == "spectrum") else if (svt == "spectrum")
vt = VisualizerType::Spectrum; vt = VisualizerType::Spectrum;
# endif // HAVE_FFTW3_H
else if (svt == "ellipse") else if (svt == "ellipse")
vt = VisualizerType::Ellipse; vt = VisualizerType::Ellipse;
else else

10
src/enums.h
View File

@@ -21,6 +21,7 @@
#ifndef NCMPCPP_ENUMS_H #ifndef NCMPCPP_ENUMS_H
#define NCMPCPP_ENUMS_H #define NCMPCPP_ENUMS_H
#include "config.h"
#include <iostream> #include <iostream>
enum class SpaceAddMode { AddRemove, AlwaysAdd }; enum class SpaceAddMode { AddRemove, AlwaysAdd };
@@ -39,7 +40,14 @@ enum class Design { Classic, Alternative };
std::ostream &operator<<(std::ostream &os, Design ui); std::ostream &operator<<(std::ostream &os, Design ui);
std::istream &operator>>(std::istream &is, Design &ui); std::istream &operator>>(std::istream &is, Design &ui);
enum class VisualizerType { Wave, WaveFilled, Spectrum, Ellipse }; enum class VisualizerType {
Wave,
WaveFilled,
# ifdef HAVE_FFTW3_H
Spectrum,
# endif // HAVE_FFTW3_H
Ellipse
};
std::ostream &operator<<(std::ostream &os, VisualizerType vt); std::ostream &operator<<(std::ostream &os, VisualizerType vt);
std::istream &operator>>(std::istream &is, VisualizerType &vt); std::istream &operator>>(std::istream &is, VisualizerType &vt);

6
src/visualizer.cpp
View File

@@ -195,11 +195,17 @@ void Visualizer::spacePressed()
Config.visualizer_type = VisualizerType::WaveFilled; Config.visualizer_type = VisualizerType::WaveFilled;
break; break;
case VisualizerType::WaveFilled: case VisualizerType::WaveFilled:
# ifdef HAVE_FFTW3_H
Config.visualizer_type = VisualizerType::Spectrum; Config.visualizer_type = VisualizerType::Spectrum;
# else
Config.visualizer_type = VisualizerType::Ellipse;
# endif // HAVE_FFTW3_H
break; break;
# ifdef HAVE_FFTW3_H
case VisualizerType::Spectrum: case VisualizerType::Spectrum:
Config.visualizer_type = VisualizerType::Ellipse; Config.visualizer_type = VisualizerType::Ellipse;
break; break;
# endif // HAVE_FFTW3_H
case VisualizerType::Ellipse: case VisualizerType::Ellipse:
Config.visualizer_type = VisualizerType::Wave; Config.visualizer_type = VisualizerType::Wave;
break; break;