Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge liushuyu's commit
Browse files Browse the repository at this point in the history
senseab committed Jan 11, 2017
1 parent 0a2541a commit 19981ec
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion plugins/SmfImport/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ INCLUDE(BuildPlugin)
PKG_CHECK_MODULES(DRUMSTICK_FILE REQUIRED drumstick-file>=0.5.0)
IF(NOT DRUMSTICK_FILE_FOUND)
MESSAGE(FATAL_ERROR "LMMS requires libdrumstick-file and drumstick-dev >= 0.5.0 - please install, remove CMakeCache.txt and try again!")
ENDIF(NOT DRUMSTICK_FILE_FUND)
ENDIF(NOT DRUMSTICK_FILE_FOUND)

IF(LMMS_BUILD_APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
1 change: 0 additions & 1 deletion plugins/SmfImport/SmfImport.cpp
Original file line number Diff line number Diff line change
@@ -107,7 +107,6 @@ bool SmfImport::tryImport(TrackContainer *tc)
}
return false;
#endif
return true;

if( openFile() == false )
{
2 changes: 1 addition & 1 deletion plugins/SmfImport/commonReader.cpp
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@ void commonReader::programHandler(long tick, int chan, int patch,
{
CHECK_TRACK

QString trackName = QString( tr( "Track" ) + " %1").arg(chan+1);
QString trackName = QString( tr( "Track" ) + " %1").arg(track+1);
SmfMidiChannel * ch = chs[track].create( m_tc, trackName );

if( ch->isSF2 )

0 comments on commit 19981ec

Please sign in to comment.