Merge remote-tracking branch 'origin/stable-1.1'

Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp

plugins/CMakeLists.txt

@@ -14,7 +14,7 @@ ADD_SUBDIRECTORY(ladspa_browser)
 ADD_SUBDIRECTORY(LadspaEffect)
 ADD_SUBDIRECTORY(lb302)
 #ADD_SUBDIRECTORY(lb303)
-ADD_SUBDIRECTORY(midi_import)
+ADD_SUBDIRECTORY(MidiImport)
 ADD_SUBDIRECTORY(monstro)
 ADD_SUBDIRECTORY(nes)
 ADD_SUBDIRECTORY(opl2)

plugins/HydrogenImport/HydrogenImport.cpp

@@ -13,7 +13,7 @@
 #include "Instrument.h"
 #include "InstrumentTrack.h"
 #include "note.h"
-#include "pattern.h"
+#include "Pattern.h"
 #include "track.h"
 #include "bb_track.h"
 #include "bb_track_container.h"
@@ -270,7 +270,7 @@ bool HydrogenImport::readSong()
 				QString instrId = LocalFileMng::readXmlString( noteNode, "instrument", 0,false, false );
 				int i = pattern_count - 1 + nbb;
 				pattern_id[sName] = pattern_count - 1;
-				pattern *p = dynamic_cast<pattern *>( drum_track[instrId]->getTCO( i ) );
+				Pattern*p = dynamic_cast<Pattern*>( drum_track[instrId]->getTCO( i ) );
 				note n; 
 				n.setPos( nPosition );
 				if ( (nPosition + 48) <= nSize ) 

plugins/MidiImport/MidiImport.cpp

@@ -35,7 +35,7 @@
 #include "AutomationTrack.h"
 #include "AutomationPattern.h"
 #include "config_mgr.h"
-#include "pattern.h"
+#include "Pattern.h"
 #include "Instrument.h"
 #include "MainWindow.h"
 #include "MidiTime.h"
@@ -209,7 +209,7 @@ public:
 	{ }
 	
 	InstrumentTrack * it;
-	pattern * p;
+	Pattern* p;
 	Instrument * it_inst;
 	bool isSF2; 
 	bool hasNotes;
@@ -249,7 +249,7 @@ public:
 		if( !p || n.pos() > lastEnd + DefaultTicksPerTact )
 		{
 			MidiTime pPos = MidiTime( n.pos().getTact(), 0 );
-			p = dynamic_cast<pattern *>( it->createTCO( 0 ) );
+			p = dynamic_cast<Pattern*>( it->createTCO( 0 ) );
 			p->movePosition( pPos );
 		}
 		hasNotes = true;

plugins/flp_import/FlpImport.cpp

@@ -48,7 +48,7 @@
 #include "EnvelopeAndLfoParameters.h"
 #include "knob.h"
 #include "Oscillator.h"
-#include "pattern.h"
+#include "Pattern.h"
 #include "Piano.h"
 #include "ProjectJournal.h"
 #include "project_notes.h"
@@ -1542,8 +1542,7 @@ else
 		{
 			const int pat = *jt / 256;
 			const int pos = *jt % 256;
-			pattern * p =
-				dynamic_cast<pattern *>( t->getTCO( pat ) );
+			Pattern* p = dynamic_cast<Pattern*>( t->getTCO( pat ) );
 			if( p == NULL )
 			{
 				continue;
@@ -1567,7 +1566,7 @@ else
 			{
 				continue;
 			}
-			pattern * p = dynamic_cast<pattern *>( t->getTCO( pat ) );
+			Pattern* p = dynamic_cast<Pattern*>( t->getTCO( pat ) );
 			if( p != NULL )
 			{
 				p->addNote( jt->second, false );

plugins/vst_base/CMakeLists.txt

@@ -40,7 +40,7 @@ ENDIF(LMMS_HOST_X86_64)
 ADD_CUSTOM_COMMAND(
 		SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp"
 		COMMAND ${WINE_CXX}
-		ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -mwindows -lpthread ${EXTRA_FLAGS} -o RemoteVstPlugin
+		ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -ansi -mwindows -lpthread ${EXTRA_FLAGS} -o RemoteVstPlugin
 		COMMAND find -name RemoteVstPlugin.exe -exec mv "'{}'" RemoteVstPlugin "';'"
 		TARGET vstbase
 		OUTPUTS RemoteVstPlugin