hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Conflicts:
	CMakeLists.txt
	data/CMakeLists.txt
	include/SampleBuffer.h
	plugins/CMakeLists.txt
	plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
	src/core/SampleBuffer.cpp
This commit is contained in:
Tobias Doerffel
2014-05-12 21:54:52 +02:00
parent 7dd9ee04e1 90496600f2
commit 28cf4a5f8d
134 changed files with 1277 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/config_mgr.cpp
View File

@@ -344,8 +344,10 @@ void configManager::loadConfigFile()
if( m_ladDir.isEmpty() || m_ladDir == QDir::separator() ||
( !m_ladDir.contains( ':' ) && !QDir( m_ladDir ).exists() ) )
{
#ifdef LMMS_BUILD_WIN32
#if defined(LMMS_BUILD_WIN32)
m_ladDir = m_pluginDir + "ladspa" + QDir::separator();
#elif defined(LMMS_BUILD_APPLE)
m_ladDir = qApp->applicationDirPath() + "/../lib/lmms/ladspa/";
#else
m_ladDir = qApp->applicationDirPath() + '/' + LIB_DIR + "/ladspa/";
#endif
@@ -355,8 +357,10 @@ void configManager::loadConfigFile()
if( m_stkDir.isEmpty() || m_stkDir == QDir::separator() ||
!QDir( m_stkDir ).exists() )
{
#ifdef LMMS_BUILD_WIN32
#if defined(LMMS_BUILD_WIN32)
m_stkDir = m_dataDir + "stk/rawwaves/";
#elif defined(LMMS_BUILD_APPLE)
m_stkDir = qApp->applicationDirPath() + "/../share/stk/rawwaves/";
#else
m_stkDir = "/usr/share/stk/rawwaves/";
#endif

5
src/core/song.cpp
View File

@@ -748,6 +748,11 @@ void song::clearProject()
engine::automationEditor()->setCurrentPattern( NULL );
}
if( engine::pianoRoll() )
{
engine::pianoRoll()->reset();
}
m_tempoModel.reset();
m_masterVolumeModel.reset();
m_masterPitchModel.reset();

2
src/gui/AutomationEditor.cpp
View File

@@ -1600,8 +1600,6 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe )
++it;
}
Q_ASSERT( it == time_map.end()-1 );
for( int i = it.key(), x = xCoordOfTick( i ); x <= width();
i++, x = xCoordOfTick( i ) )
{

9
src/gui/PianoRoll.cpp
View File

@@ -649,6 +649,15 @@ PianoRoll::PianoRoll() :
}
void PianoRoll::reset()
{
m_lastNoteVolume = DefaultVolume;
m_lastNotePanning = DefaultPanning;
}
void PianoRoll::changeNoteEditMode( int i )
{
m_noteEditMode = (noteEditMode) i;