From 268133cbeeb8e34ca0266edf55c3f26f5611e89d Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Sun, 8 Jul 2007 23:01:32 +0000 Subject: [PATCH] more h -> hpp conversions. git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@255 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/BeatDetect.cpp | 6 +- .../{BeatDetect.h => BeatDetect.hpp} | 4 +- src/projectM-engine/BuiltinFuncs.hpp | 2 +- src/projectM-engine/BuiltinParams.cpp | 2 +- src/projectM-engine/CMakeLists.txt | 8 +- src/projectM-engine/CustomWave.cpp | 2 +- src/projectM-engine/Eval.cpp | 2 +- src/projectM-engine/Eval.hpp | 2 +- .../{pbuffer.cpp => PBuffer.cpp} | 2 +- .../{pbuffer.h => PBuffer.hpp} | 2 +- src/projectM-engine/PCM.cpp | 2 +- src/projectM-engine/{PCM.h => PCM.hpp} | 0 src/projectM-engine/Param.cpp | 2 +- src/projectM-engine/PerPixelEqn.cpp | 2 +- src/projectM-engine/PerPointEqn.cpp | 2 +- src/projectM-engine/PresetLoader.cpp | 2 +- src/projectM-engine/Renderer.hpp | 4 +- src/projectM-engine/SplayNode.hpp | 2 +- src/projectM-engine/browser.cpp | 2 +- src/projectM-engine/carbontoprojectM.h | 4 +- src/projectM-engine/console_interface.cpp | 4 +- src/projectM-engine/editor.cpp | 2 +- src/projectM-engine/glConsole.cpp | 2 +- src/projectM-engine/lvtoprojectM.h | 312 ++++++++--------- src/projectM-engine/menu.cpp | 2 +- src/projectM-engine/projectM.cpp | 6 +- .../{projectM.h => projectM.hpp} | 4 +- src/projectM-engine/sdltoprojectM.h | 330 +++++++++--------- 28 files changed, 358 insertions(+), 358 deletions(-) rename src/projectM-engine/{BeatDetect.h => BeatDetect.hpp} (97%) rename src/projectM-engine/{pbuffer.cpp => PBuffer.cpp} (99%) rename src/projectM-engine/{pbuffer.h => PBuffer.hpp} (97%) rename src/projectM-engine/{PCM.h => PCM.hpp} (100%) rename src/projectM-engine/{projectM.h => projectM.hpp} (98%) diff --git a/src/projectM-engine/BeatDetect.cpp b/src/projectM-engine/BeatDetect.cpp index 508340446..dd785a9fa 100755 --- a/src/projectM-engine/BeatDetect.cpp +++ b/src/projectM-engine/BeatDetect.cpp @@ -32,9 +32,9 @@ #include "wipemalloc.h" #include "Common.hpp" -#include "projectM.h" -#include "BeatDetect.h" -#include "PCM.h" +#include "projectM.hpp" +#include "BeatDetect.hpp" +#include "PCM.hpp" DLLEXPORT BeatDetect::BeatDetect() { int x,y; diff --git a/src/projectM-engine/BeatDetect.h b/src/projectM-engine/BeatDetect.hpp similarity index 97% rename from src/projectM-engine/BeatDetect.h rename to src/projectM-engine/BeatDetect.hpp index e7dc147bb..6f5f8083f 100755 --- a/src/projectM-engine/BeatDetect.h +++ b/src/projectM-engine/BeatDetect.hpp @@ -31,8 +31,8 @@ #ifndef _BEAT_DETECT_H #define _BEAT_DETECT_H -#include "projectM.h" -#include "PCM.h" +#include "projectM.hpp" +#include "PCM.hpp" class BeatDetect { public: diff --git a/src/projectM-engine/BuiltinFuncs.hpp b/src/projectM-engine/BuiltinFuncs.hpp index cc7808bad..eb82e3fa7 100644 --- a/src/projectM-engine/BuiltinFuncs.hpp +++ b/src/projectM-engine/BuiltinFuncs.hpp @@ -17,7 +17,7 @@ #include "Func.hpp" #include #include -#include "projectM.h" +#include "projectM.hpp" /* Wrappers for all the builtin functions The arg_list pointer is a list of floats. Its size is equal to the number of arguments the parameter diff --git a/src/projectM-engine/BuiltinParams.cpp b/src/projectM-engine/BuiltinParams.cpp index 84866a3c1..96abd48d1 100644 --- a/src/projectM-engine/BuiltinParams.cpp +++ b/src/projectM-engine/BuiltinParams.cpp @@ -1,7 +1,7 @@ #include "BuiltinParams.hpp" -#include "projectM.h" +#include "projectM.hpp" #include BuiltinParams::BuiltinParams() {} diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index 6d4b945c5..6a3b3c5f9 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -1,7 +1,7 @@ PROJECT(projectM) -ADD_LIBRARY(projectM SHARED projectM.cpp projectM.h pbuffer.cpp pbuffer.h InitCond.cpp InitCond.hpp - Expr.cpp PCM.cpp Parser.cpp Preset.cpp Common.hpp BeatDetect.cpp PCM.h PerPixelEqn.cpp Eval.hpp -Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.hpp CustomWave.hpp BeatDetect.h menu.cpp console_interface.h +ADD_LIBRARY(projectM SHARED projectM.cpp projectM.hpp PBuffer.cpp PBuffer.hpp InitCond.cpp InitCond.hpp + Expr.cpp PCM.cpp Parser.cpp Preset.cpp Common.hpp BeatDetect.cpp PCM.hpp PerPixelEqn.cpp Eval.hpp +Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.hpp CustomWave.hpp BeatDetect.hpp menu.cpp console_interface.h Func.hpp Func.cpp Eval.cpp wipemalloc.h browser.cpp PerFrameEqn.cpp PerPointEqn.cpp editor.cpp fftsg.cpp glConsole.cpp console_interface.cpp CValue.h Expr.hpp timer.cpp wipemalloc.cpp PerFrameEqn.h PerPixelEqn.hpp PerPointEqn.hpp browser.h BuiltinFuncs.hpp BuiltinFuncs.cpp compare.h editor.h event.h fatal.h SplayTree.hpp fftsg.h glConsole.h menu.h timer.h SplayNode.hpp BuiltinParams.hpp BuiltinParams.cpp Preset.hpp Renderer.cpp Renderer.hpp ParamUtils.hpp PresetLoader.cpp PresetLoader.hpp PresetChooser.hpp PresetChooser.cpp) @@ -24,7 +24,7 @@ ENDIF(USE_FTGL) TARGET_LINK_LIBRARIES(projectM GLEW m) INSTALL(TARGETS projectM DESTINATION lib) -INSTALL(FILES projectM.h pbuffer.h PCM.h BeatDetect.h Preset.hpp event.h console_interface.h dlldefs.h fatal.h PresetFrameIO.hpp PCM.h Renderer.hpp PresetChooser.hpp DESTINATION include/libprojectM) +INSTALL(FILES projectM.hpp PBuffer.hpp PCM.hpp BeatDetect.hpp Preset.hpp event.h console_interface.h dlldefs.h fatal.h PresetFrameIO.hpp PCM.hpp Renderer.hpp PresetChooser.hpp DESTINATION include/libprojectM) INSTALL(FILES config DESTINATION share/projectM) FILE(GLOB presets "presets/*.milk") INSTALL(FILES ${presets} DESTINATION share/projectM/presets) diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp index 7cf0d9d7f..c68caf8e3 100755 --- a/src/projectM-engine/CustomWave.cpp +++ b/src/projectM-engine/CustomWave.cpp @@ -23,7 +23,7 @@ #include #include -#include "projectM.h" +#include "projectM.hpp" #include "Common.hpp" #include "fatal.h" diff --git a/src/projectM-engine/Eval.cpp b/src/projectM-engine/Eval.cpp index 3ebf10be2..a2cdf359a 100755 --- a/src/projectM-engine/Eval.cpp +++ b/src/projectM-engine/Eval.cpp @@ -23,7 +23,7 @@ #include #include -#include "projectM.h" +#include "projectM.hpp" #include "Common.hpp" #include "fatal.h" diff --git a/src/projectM-engine/Eval.hpp b/src/projectM-engine/Eval.hpp index e74ff92e3..39e461978 100755 --- a/src/projectM-engine/Eval.hpp +++ b/src/projectM-engine/Eval.hpp @@ -31,7 +31,7 @@ #ifndef _EVAL_H #define _EVAL_H -#include "projectM.h" +#include "projectM.hpp" #include "Func.hpp" #include "Param.hpp" diff --git a/src/projectM-engine/pbuffer.cpp b/src/projectM-engine/PBuffer.cpp similarity index 99% rename from src/projectM-engine/pbuffer.cpp rename to src/projectM-engine/PBuffer.cpp index 73c8dbfe6..46c3bd74c 100755 --- a/src/projectM-engine/pbuffer.cpp +++ b/src/projectM-engine/PBuffer.cpp @@ -28,7 +28,7 @@ //#include #include "Common.hpp" -#include "pbuffer.h" +#include "PBuffer.hpp" #ifdef MACOS #include diff --git a/src/projectM-engine/pbuffer.h b/src/projectM-engine/PBuffer.hpp similarity index 97% rename from src/projectM-engine/pbuffer.h rename to src/projectM-engine/PBuffer.hpp index 177087d58..9748fca40 100755 --- a/src/projectM-engine/pbuffer.h +++ b/src/projectM-engine/PBuffer.hpp @@ -19,7 +19,7 @@ * */ /** - * $Id: pbuffer.h,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ + * $Id: PBuffer.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ * * Opaque render target * diff --git a/src/projectM-engine/PCM.cpp b/src/projectM-engine/PCM.cpp index 95c3b6237..d4db5f17e 100755 --- a/src/projectM-engine/PCM.cpp +++ b/src/projectM-engine/PCM.cpp @@ -31,7 +31,7 @@ #include "Common.hpp" #include "wipemalloc.h" #include "fftsg.h" -#include "PCM.h" +#include "PCM.hpp" //initPCM(int samples) // diff --git a/src/projectM-engine/PCM.h b/src/projectM-engine/PCM.hpp similarity index 100% rename from src/projectM-engine/PCM.h rename to src/projectM-engine/PCM.hpp diff --git a/src/projectM-engine/Param.cpp b/src/projectM-engine/Param.cpp index e4fbe71a6..ecdaf8bfc 100755 --- a/src/projectM-engine/Param.cpp +++ b/src/projectM-engine/Param.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "projectM.h" +#include "projectM.hpp" #include "fatal.h" #include "Common.hpp" diff --git a/src/projectM-engine/PerPixelEqn.cpp b/src/projectM-engine/PerPixelEqn.cpp index 1edb0fccf..be7f3a5b7 100755 --- a/src/projectM-engine/PerPixelEqn.cpp +++ b/src/projectM-engine/PerPixelEqn.cpp @@ -23,7 +23,7 @@ #include #include -#include "projectM.h" +#include "projectM.hpp" #include "fatal.h" #include "Common.hpp" diff --git a/src/projectM-engine/PerPointEqn.cpp b/src/projectM-engine/PerPointEqn.cpp index 1874babb3..8d27c01a1 100755 --- a/src/projectM-engine/PerPointEqn.cpp +++ b/src/projectM-engine/PerPointEqn.cpp @@ -23,7 +23,7 @@ #include #include -#include "projectM.h" +#include "projectM.hpp" #include "fatal.h" #include "Common.hpp" diff --git a/src/projectM-engine/PresetLoader.cpp b/src/projectM-engine/PresetLoader.cpp index 38ed3f33a..9dfdb2662 100644 --- a/src/projectM-engine/PresetLoader.cpp +++ b/src/projectM-engine/PresetLoader.cpp @@ -18,7 +18,7 @@ extern "C" { #include } #include -#include "projectM.h" +#include "projectM.hpp" const std::string PresetLoader::PROJECTM_FILE_EXTENSION(".prjm"); const std::string PresetLoader::MILKDROP_FILE_EXTENSION(".milk"); diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp index 2c705db9b..08d3b7a63 100644 --- a/src/projectM-engine/Renderer.hpp +++ b/src/projectM-engine/Renderer.hpp @@ -1,9 +1,9 @@ #ifndef Renderer_HPP #define Renderer_HPP -#include "pbuffer.h" +#include "PBuffer.hpp" #include "PresetFrameIO.hpp" -#include "BeatDetect.h" +#include "BeatDetect.hpp" #ifdef USE_FTGL #include diff --git a/src/projectM-engine/SplayNode.hpp b/src/projectM-engine/SplayNode.hpp index 224df5151..09fb19ce0 100644 --- a/src/projectM-engine/SplayNode.hpp +++ b/src/projectM-engine/SplayNode.hpp @@ -29,7 +29,7 @@ #ifndef _SPLAYNODE_HPP #define _SPLAYNODE_HPP -//#include "projectM.h" +//#include "projectM.hpp" #include "compare.h" diff --git a/src/projectM-engine/browser.cpp b/src/projectM-engine/browser.cpp index a74b1eb06..e8a76a5bd 100755 --- a/src/projectM-engine/browser.cpp +++ b/src/projectM-engine/browser.cpp @@ -24,7 +24,7 @@ #include "Common.hpp" #include "fatal.h" -#include "projectM.h" +#include "projectM.hpp" #include "glConsole.h" #include "event.h" diff --git a/src/projectM-engine/carbontoprojectM.h b/src/projectM-engine/carbontoprojectM.h index aba644c98..68f2567d6 100755 --- a/src/projectM-engine/carbontoprojectM.h +++ b/src/projectM-engine/carbontoprojectM.h @@ -19,7 +19,7 @@ * */ /** - * $Id: carbontoprojectM.h,v 1.2 2004/11/12 15:12:58 cvs Exp $ + * $Id: carbontoprojectM.hpp,v 1.2 2004/11/12 15:12:58 cvs Exp $ * * Translates CARBON -> projectM variables * @@ -29,7 +29,7 @@ #ifndef _CARBONTOPROJECTM_H #define _CARBONTOPROJECTM_H -#include "projectM.h" +#include "projectM.hpp" #ifdef WIN32 #else #endif diff --git a/src/projectM-engine/console_interface.cpp b/src/projectM-engine/console_interface.cpp index 393cd95d3..72bb94038 100755 --- a/src/projectM-engine/console_interface.cpp +++ b/src/projectM-engine/console_interface.cpp @@ -21,7 +21,7 @@ #include -#include "projectM.h" +#include "projectM.hpp" #include "Common.hpp" #include "fatal.h" //#include "menu.h" @@ -30,7 +30,7 @@ #include "browser.h" #include "editor.h" #include "event.h" -#include "BeatDetect.h" +#include "BeatDetect.hpp" #include "PresetChooser.hpp" diff --git a/src/projectM-engine/editor.cpp b/src/projectM-engine/editor.cpp index 01db48291..fbc97dfce 100755 --- a/src/projectM-engine/editor.cpp +++ b/src/projectM-engine/editor.cpp @@ -23,7 +23,7 @@ #include #include -#include "projectM.h" +#include "projectM.hpp" #ifdef MACOS #include diff --git a/src/projectM-engine/glConsole.cpp b/src/projectM-engine/glConsole.cpp index a73bd92aa..580d6b354 100755 --- a/src/projectM-engine/glConsole.cpp +++ b/src/projectM-engine/glConsole.cpp @@ -34,7 +34,7 @@ #endif /** MACOS */ #include -#include "projectM.h" +#include "projectM.hpp" #ifdef MACOS #include diff --git a/src/projectM-engine/lvtoprojectM.h b/src/projectM-engine/lvtoprojectM.h index e81634fe5..4215b8abe 100755 --- a/src/projectM-engine/lvtoprojectM.h +++ b/src/projectM-engine/lvtoprojectM.h @@ -1,156 +1,156 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: sdltoprojectM.h,v 1.1 2004/10/08 00:35:28 cvs Exp $ - * - * Translates SDL -> projectM variables - * - * $Log: sdltoprojectM.h,v $ - * Revision 1.1 2004/10/08 00:35:28 cvs - * Moved and imported - * - * Revision 1.1.1.1 2004/10/04 12:56:00 cvs - * Imported - * - */ - -#include - -projectMEvent lv2pmEvent( VisEventType event ) { - - switch ( event ) { - case VISUAL_EVENT_RESIZE: - return PROJECTM_VIDEORESIZE; - case VISUAL_EVENT_KEYUP: - return PROJECTM_KEYUP; - case VISUAL_EVENT_KEYDOWN: - return PROJECTM_KEYDOWN; - default: - return PROJECTM_KEYUP; - } - } -projectMKeycode lv2pmKeycode( VisKey keysym ) -{ - switch ( keysym ) - { - case VKEY_F1: - return PROJECTM_K_F1; - case VKEY_F2: - return PROJECTM_K_F2; - case VKEY_F3: - return PROJECTM_K_F3; - case VKEY_F4: - return PROJECTM_K_F4; - case VKEY_F5: - return PROJECTM_K_F5; - case VKEY_F6: - return PROJECTM_K_F6; - case VKEY_F7: - return PROJECTM_K_F7; - case VKEY_F8: - return PROJECTM_K_F8; - case VKEY_F9: - return PROJECTM_K_F9; - case VKEY_F10: - return PROJECTM_K_F10; - case VKEY_F11: - return PROJECTM_K_F11; - case VKEY_F12: - return PROJECTM_K_F12; - case VKEY_ESCAPE: - return PROJECTM_K_ESCAPE; - case VKEY_a: - return PROJECTM_K_a; - case VKEY_b: - return PROJECTM_K_b; - case VKEY_c: - return PROJECTM_K_c; - case VKEY_d: - return PROJECTM_K_d; - case VKEY_e: - return PROJECTM_K_e; - case VKEY_f: - return PROJECTM_K_f; - case VKEY_g: - return PROJECTM_K_g; - case VKEY_h: - return PROJECTM_K_h; - case VKEY_i: - return PROJECTM_K_i; - case VKEY_j: - return PROJECTM_K_j; - case VKEY_k: - return PROJECTM_K_k; - case VKEY_l: - return PROJECTM_K_l; - case VKEY_m: - return PROJECTM_K_m; - case VKEY_n: - return PROJECTM_K_n; - case VKEY_o: - return PROJECTM_K_o; - case VKEY_p: - return PROJECTM_K_p; - case VKEY_q: - return PROJECTM_K_q; - case VKEY_r: - return PROJECTM_K_r; - case VKEY_s: - return PROJECTM_K_s; - case VKEY_t: - return PROJECTM_K_t; - case VKEY_u: - return PROJECTM_K_u; - case VKEY_v: - return PROJECTM_K_v; - case VKEY_w: - return PROJECTM_K_w; - case VKEY_x: - return PROJECTM_K_x; - case VKEY_y: - return PROJECTM_K_y; - case VKEY_z: - return PROJECTM_K_z; - case VKEY_UP: - return PROJECTM_K_UP; - case VKEY_RETURN: - return PROJECTM_K_RETURN; - case VKEY_RIGHT: - return PROJECTM_K_RIGHT; - case VKEY_LEFT: - return PROJECTM_K_LEFT; - case VKEY_DOWN: - return PROJECTM_K_DOWN; - case VKEY_PAGEUP: - return PROJECTM_K_PAGEUP; - case VKEY_PAGEDOWN: - return PROJECTM_K_PAGEDOWN; - - - default: - return PROJECTM_K_NONE; - break; - } - } - -projectMModifier lv2pmModifier( int mod ) { - return mod && VKMOD_LSHIFT; - } +/** + * projectM -- Milkdrop-esque visualisation SDK + * Copyright (C)2003-2007 projectM Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * See 'LICENSE.txt' included within this release + * + */ +/** + * $Id: sdltoprojectM.hpp,v 1.1 2004/10/08 00:35:28 cvs Exp $ + * + * Translates SDL -> projectM variables + * + * $Log: sdltoprojectM.hpp,v $ + * Revision 1.1 2004/10/08 00:35:28 cvs + * Moved and imported + * + * Revision 1.1.1.1 2004/10/04 12:56:00 cvs + * Imported + * + */ + +#include + +projectMEvent lv2pmEvent( VisEventType event ) { + + switch ( event ) { + case VISUAL_EVENT_RESIZE: + return PROJECTM_VIDEORESIZE; + case VISUAL_EVENT_KEYUP: + return PROJECTM_KEYUP; + case VISUAL_EVENT_KEYDOWN: + return PROJECTM_KEYDOWN; + default: + return PROJECTM_KEYUP; + } + } +projectMKeycode lv2pmKeycode( VisKey keysym ) +{ + switch ( keysym ) + { + case VKEY_F1: + return PROJECTM_K_F1; + case VKEY_F2: + return PROJECTM_K_F2; + case VKEY_F3: + return PROJECTM_K_F3; + case VKEY_F4: + return PROJECTM_K_F4; + case VKEY_F5: + return PROJECTM_K_F5; + case VKEY_F6: + return PROJECTM_K_F6; + case VKEY_F7: + return PROJECTM_K_F7; + case VKEY_F8: + return PROJECTM_K_F8; + case VKEY_F9: + return PROJECTM_K_F9; + case VKEY_F10: + return PROJECTM_K_F10; + case VKEY_F11: + return PROJECTM_K_F11; + case VKEY_F12: + return PROJECTM_K_F12; + case VKEY_ESCAPE: + return PROJECTM_K_ESCAPE; + case VKEY_a: + return PROJECTM_K_a; + case VKEY_b: + return PROJECTM_K_b; + case VKEY_c: + return PROJECTM_K_c; + case VKEY_d: + return PROJECTM_K_d; + case VKEY_e: + return PROJECTM_K_e; + case VKEY_f: + return PROJECTM_K_f; + case VKEY_g: + return PROJECTM_K_g; + case VKEY_h: + return PROJECTM_K_h; + case VKEY_i: + return PROJECTM_K_i; + case VKEY_j: + return PROJECTM_K_j; + case VKEY_k: + return PROJECTM_K_k; + case VKEY_l: + return PROJECTM_K_l; + case VKEY_m: + return PROJECTM_K_m; + case VKEY_n: + return PROJECTM_K_n; + case VKEY_o: + return PROJECTM_K_o; + case VKEY_p: + return PROJECTM_K_p; + case VKEY_q: + return PROJECTM_K_q; + case VKEY_r: + return PROJECTM_K_r; + case VKEY_s: + return PROJECTM_K_s; + case VKEY_t: + return PROJECTM_K_t; + case VKEY_u: + return PROJECTM_K_u; + case VKEY_v: + return PROJECTM_K_v; + case VKEY_w: + return PROJECTM_K_w; + case VKEY_x: + return PROJECTM_K_x; + case VKEY_y: + return PROJECTM_K_y; + case VKEY_z: + return PROJECTM_K_z; + case VKEY_UP: + return PROJECTM_K_UP; + case VKEY_RETURN: + return PROJECTM_K_RETURN; + case VKEY_RIGHT: + return PROJECTM_K_RIGHT; + case VKEY_LEFT: + return PROJECTM_K_LEFT; + case VKEY_DOWN: + return PROJECTM_K_DOWN; + case VKEY_PAGEUP: + return PROJECTM_K_PAGEUP; + case VKEY_PAGEDOWN: + return PROJECTM_K_PAGEDOWN; + + + default: + return PROJECTM_K_NONE; + break; + } + } + +projectMModifier lv2pmModifier( int mod ) { + return mod && VKMOD_LSHIFT; + } diff --git a/src/projectM-engine/menu.cpp b/src/projectM-engine/menu.cpp index df613c30e..90c4fdc16 100755 --- a/src/projectM-engine/menu.cpp +++ b/src/projectM-engine/menu.cpp @@ -23,7 +23,7 @@ #include #include -#include "projectM.h" +#include "projectM.hpp" #ifdef MACOS #include diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp index b1810720c..e86867aff 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -34,15 +34,15 @@ #endif //#include -#include "projectM.h" -#include "BeatDetect.h" +#include "projectM.hpp" +#include "BeatDetect.hpp" #include "Eval.hpp" #include "Param.hpp" #include "Parser.hpp" #include "Preset.hpp" #include "PerPixelEqn.hpp" //#include "menu.h" -#include "PCM.h" //Sound data handler (buffering, FFT, etc.) +#include "PCM.hpp" //Sound data handler (buffering, FFT, etc.) #include "CustomWave.hpp" #include "CustomShape.hpp" #include "SplayTree.hpp" diff --git a/src/projectM-engine/projectM.h b/src/projectM-engine/projectM.hpp similarity index 98% rename from src/projectM-engine/projectM.h rename to src/projectM-engine/projectM.hpp index 75dd54d78..26c17a8e9 100755 --- a/src/projectM-engine/projectM.h +++ b/src/projectM-engine/projectM.hpp @@ -19,7 +19,7 @@ * */ /** - * $Id: projectM.h,v 1.1.1.1 2005/12/23 18:05:11 psperl Exp $ + * $Id: projectM.hpp,v 1.1.1.1 2005/12/23 18:05:11 psperl Exp $ * * Encapsulation of ProjectM engine * @@ -29,7 +29,7 @@ #ifndef _PROJECTM_H #define _PROJECTM_H -#include "pbuffer.h" +#include "PBuffer.hpp" #ifdef WIN32 #include "win32-dirent.h" diff --git a/src/projectM-engine/sdltoprojectM.h b/src/projectM-engine/sdltoprojectM.h index dd9e77e38..1628fdbd2 100755 --- a/src/projectM-engine/sdltoprojectM.h +++ b/src/projectM-engine/sdltoprojectM.h @@ -1,165 +1,165 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: sdltoprojectM.h,v 1.1 2004/10/08 00:35:28 cvs Exp $ - * - * Translates SDL -> projectM variables - * - * $Log: sdltoprojectM.h,v $ - * Revision 1.1 2004/10/08 00:35:28 cvs - * Moved and imported - * - * Revision 1.1.1.1 2004/10/04 12:56:00 cvs - * Imported - * - */ - -#ifndef _SDLTOPROJECTM_H -#define _SDLTOPROJECTM_H - -#include "event.h" - - //#include "projectM/projectM.h" -#ifdef WIN32 -#include -#else -#include -#endif - -projectMEvent sdl2pmEvent( SDL_Event event ) { \ - - switch ( event.type ) { \ - case SDL_VIDEORESIZE: - return PROJECTM_VIDEORESIZE; \ - case SDL_KEYUP: \ - return PROJECTM_KEYUP; \ - case SDL_KEYDOWN: \ - return PROJECTM_KEYDOWN; \ - default: - return PROJECTM_KEYUP; \ - } \ - } \ - -projectMKeycode sdl2pmKeycode( SDLKey keysym ) { \ - switch ( keysym ) { \ - case SDLK_F1: \ - return PROJECTM_K_F1; \ - case SDLK_F2: \ - return PROJECTM_K_F2; \ - case SDLK_F3: \ - return PROJECTM_K_F3; \ - case SDLK_F4: \ - return PROJECTM_K_F4; \ - case SDLK_F5: \ - return PROJECTM_K_F5; \ - case SDLK_F6: \ - return PROJECTM_K_F6; \ - case SDLK_F7: \ - return PROJECTM_K_F7; \ - case SDLK_F8: \ - return PROJECTM_K_F8; \ - case SDLK_F9: \ - return PROJECTM_K_F9; \ - case SDLK_F10: \ - return PROJECTM_K_F10; \ - case SDLK_F11: \ - return PROJECTM_K_F11; \ - case SDLK_F12: \ - return PROJECTM_K_F12; \ - case SDLK_ESCAPE: \ - return PROJECTM_K_ESCAPE; - case SDLK_a: - return PROJECTM_K_a; - case SDLK_b: - return PROJECTM_K_b; - case SDLK_c: - return PROJECTM_K_c; - case SDLK_d: - return PROJECTM_K_d; - case SDLK_e: - return PROJECTM_K_e; - case SDLK_f: - return PROJECTM_K_f; - case SDLK_g: - return PROJECTM_K_g; - case SDLK_h: - return PROJECTM_K_h; - case SDLK_i: - return PROJECTM_K_i; - case SDLK_j: - return PROJECTM_K_j; - case SDLK_k: - return PROJECTM_K_k; - case SDLK_l: - return PROJECTM_K_l; - case SDLK_m: - return PROJECTM_K_m; - case SDLK_n: - return PROJECTM_K_n; - case SDLK_o: - return PROJECTM_K_o; - case SDLK_p: - return PROJECTM_K_p; - case SDLK_q: - return PROJECTM_K_q; - case SDLK_r: - return PROJECTM_K_r; - case SDLK_s: - return PROJECTM_K_s; - case SDLK_t: - return PROJECTM_K_t; - case SDLK_u: - return PROJECTM_K_u; - case SDLK_v: - return PROJECTM_K_v; - case SDLK_w: - return PROJECTM_K_w; - case SDLK_x: - return PROJECTM_K_x; - case SDLK_y: - return PROJECTM_K_y; - case SDLK_z: - return PROJECTM_K_z; - case SDLK_UP: - return PROJECTM_K_UP; - case SDLK_RETURN: - return PROJECTM_K_RETURN; - case SDLK_RIGHT: - return PROJECTM_K_RIGHT; - case SDLK_LEFT: - return PROJECTM_K_LEFT; - case SDLK_DOWN: - return PROJECTM_K_DOWN; - case SDLK_PAGEUP: - return PROJECTM_K_PAGEUP; - case SDLK_PAGEDOWN: - return PROJECTM_K_PAGEDOWN; - - default: \ - return PROJECTM_K_NONE; \ - } \ - } \ - -projectMModifier sdl2pmModifier( SDLMod mod ) { \ - return PROJECTM_KMOD_LSHIFT; \ - } \ - -#endif /** _SDLTOPROJECTM_H */ +/** + * projectM -- Milkdrop-esque visualisation SDK + * Copyright (C)2003-2007 projectM Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * See 'LICENSE.txt' included within this release + * + */ +/** + * $Id: sdltoprojectM.hpp,v 1.1 2004/10/08 00:35:28 cvs Exp $ + * + * Translates SDL -> projectM variables + * + * $Log: sdltoprojectM.hpp,v $ + * Revision 1.1 2004/10/08 00:35:28 cvs + * Moved and imported + * + * Revision 1.1.1.1 2004/10/04 12:56:00 cvs + * Imported + * + */ + +#ifndef _SDLTOPROJECTM_H +#define _SDLTOPROJECTM_H + +#include "event.h" + + //#include "projectM/projectM.hpp" +#ifdef WIN32 +#include +#else +#include +#endif + +projectMEvent sdl2pmEvent( SDL_Event event ) { \ + + switch ( event.type ) { \ + case SDL_VIDEORESIZE: + return PROJECTM_VIDEORESIZE; \ + case SDL_KEYUP: \ + return PROJECTM_KEYUP; \ + case SDL_KEYDOWN: \ + return PROJECTM_KEYDOWN; \ + default: + return PROJECTM_KEYUP; \ + } \ + } \ + +projectMKeycode sdl2pmKeycode( SDLKey keysym ) { \ + switch ( keysym ) { \ + case SDLK_F1: \ + return PROJECTM_K_F1; \ + case SDLK_F2: \ + return PROJECTM_K_F2; \ + case SDLK_F3: \ + return PROJECTM_K_F3; \ + case SDLK_F4: \ + return PROJECTM_K_F4; \ + case SDLK_F5: \ + return PROJECTM_K_F5; \ + case SDLK_F6: \ + return PROJECTM_K_F6; \ + case SDLK_F7: \ + return PROJECTM_K_F7; \ + case SDLK_F8: \ + return PROJECTM_K_F8; \ + case SDLK_F9: \ + return PROJECTM_K_F9; \ + case SDLK_F10: \ + return PROJECTM_K_F10; \ + case SDLK_F11: \ + return PROJECTM_K_F11; \ + case SDLK_F12: \ + return PROJECTM_K_F12; \ + case SDLK_ESCAPE: \ + return PROJECTM_K_ESCAPE; + case SDLK_a: + return PROJECTM_K_a; + case SDLK_b: + return PROJECTM_K_b; + case SDLK_c: + return PROJECTM_K_c; + case SDLK_d: + return PROJECTM_K_d; + case SDLK_e: + return PROJECTM_K_e; + case SDLK_f: + return PROJECTM_K_f; + case SDLK_g: + return PROJECTM_K_g; + case SDLK_h: + return PROJECTM_K_h; + case SDLK_i: + return PROJECTM_K_i; + case SDLK_j: + return PROJECTM_K_j; + case SDLK_k: + return PROJECTM_K_k; + case SDLK_l: + return PROJECTM_K_l; + case SDLK_m: + return PROJECTM_K_m; + case SDLK_n: + return PROJECTM_K_n; + case SDLK_o: + return PROJECTM_K_o; + case SDLK_p: + return PROJECTM_K_p; + case SDLK_q: + return PROJECTM_K_q; + case SDLK_r: + return PROJECTM_K_r; + case SDLK_s: + return PROJECTM_K_s; + case SDLK_t: + return PROJECTM_K_t; + case SDLK_u: + return PROJECTM_K_u; + case SDLK_v: + return PROJECTM_K_v; + case SDLK_w: + return PROJECTM_K_w; + case SDLK_x: + return PROJECTM_K_x; + case SDLK_y: + return PROJECTM_K_y; + case SDLK_z: + return PROJECTM_K_z; + case SDLK_UP: + return PROJECTM_K_UP; + case SDLK_RETURN: + return PROJECTM_K_RETURN; + case SDLK_RIGHT: + return PROJECTM_K_RIGHT; + case SDLK_LEFT: + return PROJECTM_K_LEFT; + case SDLK_DOWN: + return PROJECTM_K_DOWN; + case SDLK_PAGEUP: + return PROJECTM_K_PAGEUP; + case SDLK_PAGEDOWN: + return PROJECTM_K_PAGEDOWN; + + default: \ + return PROJECTM_K_NONE; \ + } \ + } \ + +projectMModifier sdl2pmModifier( SDLMod mod ) { \ + return PROJECTM_KMOD_LSHIFT; \ + } \ + +#endif /** _SDLTOPROJECTM_H */