[Performous-commit] Vincent Le Ligeour : Fixed man page generation

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: c0827faa96e70b6b5a1f43116d0eba4f0a35341a

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Oct 17 14:26:41 2009 +0200

Fixed man page generation

---

 docs/CMakeLists.txt |    2 +-
 editor/main.cc      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 0a4269d..24da6af 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -7,7 +7,7 @@ if(UNIX)
 	if(HELP2MAN AND GZIP)
 		set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz)
 		set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m)
-		set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/game/performous)
+		set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/game/performous.bin)
 		add_custom_command(
 			OUTPUT ${MANFILE}
 			COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N | ${GZIP} > ${MANFILE}
diff --git a/editor/main.cc b/editor/main.cc
index f5970f6..0c1eb4f 100644
--- a/editor/main.cc
+++ b/editor/main.cc
@@ -1,10 +1,11 @@
 #include "pitch.hh"
 #include "ffmpeg.hh"
 #include "notes.hh"
-//#include <boost/math/special_functions/fpclassify.hpp>
 
 #include <cmath>
 
+#include <Magick++.h>
+
 int main(int argc, char **argv) {
 
 	if (argc < 2)
@@ -33,7 +34,6 @@ int main(int argc, char **argv) {
 	da::pcm_data data(&sample[0], 1500, 2, 48000);
 	usleep(500000);
 	while( mpeg.audioQueue(data, position) ) {
-		usleep(500000);
 		std::cout << i << ": " << position << " " << double(position) / double(48000*2)<< std::endl;
 
 		analyzer.input(data.begin(0), data.end(0));
@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
 			Analyzer::tones_t tones = analyzer.getTones();
 			for (Analyzer::tones_t::const_iterator t = tones.begin(); t != tones.end(); ++t) {
 				if (t->age < Tone::MINAGE) continue;
-				std::cout << "  " << t->freq << std::endl;
+				std::cout << "  " << t->freq << " -> " << t->db << std::endl;
 				int note = scale.getNoteId(t->freq);
 				if (note < 0) continue;
 				// Here I could spot X=position, Y=note, Z=t->db