Changeset 173
- Timestamp:
- 06/01/08 21:43:48 (5 years ago)
- Location:
- trunk
- Files:
-
- 8 modified
-
gui/gui.pro (modified) (6 diffs)
-
gui/src/PreferencesDialog.cpp (modified) (1 diff)
-
gui/src/main.cpp (modified) (1 diff)
-
libs/hydrogen/hydrogen.pro (modified) (2 diffs)
-
libs/hydrogen/include/hydrogen/action.h (modified) (1 diff)
-
libs/hydrogen/src/IO/midi_input.cpp (modified) (1 diff)
-
libs/hydrogen/src/action.cpp (modified) (2 diffs)
-
libs/hydrogen/src/preferences.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/gui.pro
r162 r173 9 9 10 10 CONFIG += qt warn_on precompile_header release 11 PRECOMPILED_HEADER 11 PRECOMPILED_HEADER = src/Precompiled.h 12 12 LIBS += ../libs/libhydrogen.a 13 13 … … 22 22 23 23 24 exists(/usr/bin/doxygen) 25 # message("Doxygen is available.")26 # # Crea la documentazione con Doxygen27 # doxygen.target = ../docs/html/dummy28 # doxygen.commands = cd ../docs; doxygen29 # QMAKE_EXTRA_TARGETS += doxygen30 # POST_TARGETDEPS = ../docs/html/dummy24 exists(/usr/bin/doxygen){ 25 # message("Doxygen is available.") 26 # # Crea la documentazione con Doxygen 27 # doxygen.target = ../docs/html/dummy 28 # doxygen.commands = cd ../docs; doxygen 29 # QMAKE_EXTRA_TARGETS += doxygen 30 # POST_TARGETDEPS = ../docs/html/dummy 31 31 } 32 32 … … 38 38 39 39 linux-g++ { 40 41 42 40 message( *** LINUX BUILD *** ) 41 LIBS += -lsndfile 42 LIBS += -ltar 43 43 } 44 44 linux-g++-64 { 45 46 47 45 message( *** LINUX 64bit BUILD *** ) 46 LIBS += -lsndfile 47 LIBS += -ltar 48 48 } 49 49 50 50 win32 { 51 52 53 54 55 56 57 58 59 60 61 62 51 message( *** WIN32 BUILD *** ) 52 INCLUDEPATH += ../win32build/includes 53 INCLUDEPATH += ../win32build/libs/libpthread 54 INCLUDEPATH += ../win32build/libs/libsndfile 55 INCLUDEPATH += ../win32build/libs/flac 56 57 LIBS += ../win32build/libs/libsndfile/libsndfile.a 58 LIBS += ../win32build/libs/libpthread/libpthreadGC1.a 59 LIBS += ../win32build/libs/portaudio/libportaudio.a 60 LIBS += ../win32build/libs/portmidi/libporttime.a 61 LIBS += ../win32build/libs/portmidi/libportmidi.a 62 LIBS += -lwinmm 63 63 } 64 64 65 65 macx-g++ { 66 67 68 69 70 71 72 73 74 QMAKE_LFLAGS_SONAME= -Wl,-install_name,@executable_path/../Frameworks/75 66 message( *** MAC BUILD *** ) 67 CONFIG += x86 68 69 ICON = ../macos/Hydrogen.icns 70 LIBS += -L/opt/local/lib 71 LIBS += -lsndfile 72 LIBS += -ltar 73 INCLUDEPATH += /System/Library/Frameworks/Carbon.framework/Headers 74 QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/ 75 QMAKE_POST_LINK = cd ..;macos/fixlibs.sh 76 76 } 77 77 … … 79 79 DEFINES += $$H2DEFINES 80 80 contains(H2DEFINES, LRDF_SUPPORT ){ 81 81 LIBS += -llrdf 82 82 } 83 83 84 84 contains(H2DEFINES, ALSA_SUPPORT ){ 85 86 } 87 88 contains(H2DEFINES, JACK_SUPPORT ) 89 90 } 91 92 contains(H2DEFINES, FLAC_SUPPORT ) 93 94 95 96 97 98 99 100 101 102 103 104 105 85 LIBS += -lasound 86 } 87 88 contains(H2DEFINES, JACK_SUPPORT ){ 89 LIBS += -ljack 90 } 91 92 contains(H2DEFINES, FLAC_SUPPORT ){ 93 linux-g++ { 94 LIBS += -lFLAC -lFLAC++ 95 } 96 linux-g++-64 { 97 LIBS += -lFLAC -lFLAC++ 98 } 99 win32 { 100 LIBS += ../win32build/libs/flac/libFLAC++.a 101 LIBS += ../win32build/libs/flac/libFLAC.a 102 } 103 macx { 104 LIBS += -lFLAC -lFLAC++ 105 } 106 106 } 107 107 … … 133 133 ../data/i18n/hydrogen.ru.ts 134 134 135 FORMS 135 FORMS = \ 136 136 src/UI/about_dialog.ui \ 137 137 src/UI/AudioEngineInfoForm_UI.ui \ … … 205 205 src/SongPropertiesDialog.cpp \ 206 206 src/SplashScreen.cpp \ 207 src/main.cpp 207 src/main.cpp \ 208 ../libs/hydrogen/src/midiMap.cpp \ 209 ../libs/hydrogen/include/hydrogen/midiMap.cpp 208 210 209 211 -
trunk/gui/src/PreferencesDialog.cpp
r170 r173 33 33 #include <QFontDialog> 34 34 35 #include <hydrogen/midiMap.h> 35 36 #include <hydrogen/hydrogen.h> 36 37 #include <hydrogen/Preferences.h> -
trunk/gui/src/main.cpp
r144 r173 29 29 #include "MainForm.h" 30 30 31 #include <hydrogen/midiMap.h> 31 32 #include <hydrogen/audio_engine.h> 32 33 #include <hydrogen/hydrogen.h> -
trunk/libs/hydrogen/hydrogen.pro
r130 r173 58 58 include/hydrogen/data_path.h \ 59 59 include/hydrogen/event_queue.h \ 60 include/hydrogen/midiMap.h \ 60 61 include/hydrogen/SoundLibrary.h \ 61 62 include/hydrogen/h2_exception.h \ … … 139 140 src/instrument.cpp \ 140 141 src/local_file_mgr.cpp \ 142 src/midiMap.cpp \ 141 143 src/note.cpp \ 142 144 src/object.cpp \ -
trunk/libs/hydrogen/include/hydrogen/action.h
r166 r173 43 43 44 44 45 class midiMap : public Object46 {47 public:48 midiMap();49 ~midiMap();50 45 51 static midiMap * instance;52 static midiMap * getInstance();53 54 void registerMMCEvent( QString,action * );55 void registerNoteEvent( int , action * );56 57 map <QString , action *> getMMCMap();58 59 action * getMMCAction( QString );60 action * getNoteAction( int note );61 62 void setupNoteArray();63 64 65 66 private:67 68 action * noteArray[128];69 map <QString , action *> mmcMap;70 };71 46 72 47 -
trunk/libs/hydrogen/src/IO/midi_input.cpp
r166 r173 28 28 #include <hydrogen/note.h> 29 29 #include <hydrogen/action.h> 30 #include <hydrogen/midiMap.h> 30 31 31 32 namespace H2Core -
trunk/libs/hydrogen/src/action.cpp
r172 r173 32 32 33 33 actionManager* actionManager::instance = NULL; 34 midiMap * midiMap::instance = NULL;35 34 36 35 using namespace H2Core; … … 54 53 QStringList parameterList; 55 54 } 56 57 58 /* Class midiMap */59 60 midiMap::midiMap() : Object( "midiMap" )61 {62 //constructor63 for(int note = 0; note < 128; note++ ){64 noteArray[ note ] = new action("NOTHING");65 }66 }67 68 midiMap::~midiMap()69 {70 std::map< QString , action *>::iterator dIter(mmcMap.begin());71 72 for( dIter = mmcMap.begin(); dIter != mmcMap.end(); dIter++ )73 {74 delete dIter->second;75 }76 77 for(int i = 0; i < 128; i++){78 delete noteArray[i];79 }80 81 instance = NULL;82 }83 84 midiMap * midiMap::getInstance(){85 if( instance == NULL ){86 instance = new midiMap();87 }88 return instance;89 }90 91 map <QString,action *> midiMap::getMMCMap(){92 return mmcMap;93 }94 95 void midiMap::registerMMCEvent( QString eventString , action * pAction ){96 mmcMap[ eventString ] = pAction;97 }98 99 void midiMap::registerNoteEvent( int note , action * pAction ){100 101 if( note >= 0 && note < 128 ){102 delete noteArray[ note ];103 noteArray[ note ] = pAction;104 }105 }106 107 action * midiMap::getMMCAction( QString eventString ){108 109 std::map< QString , action *>::iterator dIter;110 dIter = mmcMap.find( eventString );111 if ( dIter == mmcMap.end() ){112 return NULL;113 }114 115 return mmcMap[eventString];116 }117 118 action * midiMap::getNoteAction( int note ){119 return noteArray[ note ];120 }121 122 123 55 124 56 -
trunk/libs/hydrogen/src/preferences.cpp
r166 r173 37 37 #include <cstdio> 38 38 #include <list> 39 #include <hydrogen/midiMap.h> 39 40 40 41 #include <hydrogen/data_path.h>
