Fix link bug, reorder warning, and vol value while importing.

LMMS · Jan 14, 2017 · 3fa2913 · 3fa2913
1 parent 4e93d88
commit 3fa2913
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/SmfImport/CMakeLists.txt b/plugins/SmfImport/CMakeLists.txt
@@ -11,7 +11,7 @@ INCLUDE(BuildPlugin)
 LINK_DIRECTORIES(${DRUMSTICK_FILE_LIBDIR})
 INCLUDE_DIRECTORIES(${DRUMSTICK_FILE_INCLUDEDIR})
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -ldrumstick-file -Wno-reorder")
 
 BUILD_PLUGIN(smfimport SmfImport.cpp commonReader.cpp midiReader.cpp oveReader.cpp wrkReader.cpp
     MOCFILES SmfImport.h commonReader.h midiReader.h oveReader.h wrkReader.h )

diff --git a/plugins/SmfImport/commonReader.cpp b/plugins/SmfImport/commonReader.cpp
@@ -387,7 +387,7 @@ void commonReader::addNoteEvent( long tick, int chan, int pitch, int vol,
 	QString trackName = TrackContainer::tr( "Track %1" ).arg( track + 1 );
 	SmfMidiChannel * ch = chs[track].create( m_tc, trackName );
 	double realDur = dur * tickRate;
-	Note n( ( realDur < 1 ? 1 : realDur ), static_cast<double>( tick ) * tickRate, pitch - 12, vol );
+	Note n( ( realDur < 1 ? 1 : realDur ), static_cast<double>( tick ) * tickRate, pitch - 12, vol * 200 / 127 );
 	ch->addNote( n );
 
 }