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

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	data/locale/de.qm
	data/locale/zh.qm
	data/locale/zh.ts
This commit is contained in:
Vesa
2014-10-19 14:58:23 +03:00
parent 886bf2b16e 7e4933541d
commit b084e91345
38 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/FxMixer.cpp
View File

@@ -147,9 +147,8 @@ void FxChannel::doProcessing( sampleFrame * _buf )
const float v = sender->m_volumeModel.value();
MixHelpers::addMultipliedByBuffer( _buf, ch_buf, v, sendBuf, fpp );
}
m_hasInput = true;
}
// if sender channel hasInput, then we hasInput too
if( sender->m_hasInput ) { m_hasInput = true; }
}
}

8
src/core/main.cpp
View File

@@ -131,13 +131,13 @@ int main( int argc, char * * argv )
if( QString( argv[i] ) == "--version" ||
QString( argv[i] ) == "-v" )
{
printf( "\nLinux MultiMedia Studio %s\n(%s %s, Qt %s, %s)\n\n"
printf( "LMMS %s\n(%s %s, Qt %s, %s)\n\n"
"Copyright (c) 2004-2014 LMMS developers.\n\n"
"This program is free software; you can redistribute it and/or\n"
"modify it under the terms of the GNU General Public\n"
"License as published by the Free Software Foundation; either\n"
"version 2 of the License, or (at your option) any later version.\n\n"
"Try \"%s --help\" for more information.\n\n", LMMS_VERSION,
"Try \"%s --help\" for more information.\n\n", LMMS_VERSION,
PLATFORM, MACHINE, QT_VERSION_STR, GCC_VERSION,
argv[0] );
@@ -146,7 +146,7 @@ int main( int argc, char * * argv )
else if( argc > i && ( QString( argv[i] ) == "--help" ||
QString( argv[i] ) == "-h" ) )
{
printf( "\nLinux MultiMedia Studio %s\n"
printf( "LMMS %s\n"
"Copyright (c) 2004-2014 LMMS developers.\n\n"
"usage: lmms [ -r <project file> ] [ options ]\n"
" [ -u <in> <out> ]\n"
@@ -397,7 +397,7 @@ int main( int argc, char * * argv )
// init style and palette
LmmsStyle * lmmsstyle = new LmmsStyle();
QApplication::setStyle( lmmsstyle );
LmmsPalette * lmmspal = new LmmsPalette( NULL, lmmsstyle );
QPalette lpal = lmmspal->palette();