mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-19 20:26:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into zynaddsubfx-master

Browse Source
This commit is contained in:
Tobias Doerffel
2009-10-01 14:12:49 +02:00
parent 765975283f f6507b52ee
commit 5eac2629bb
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/themes/cusis/style.css
View File

@@ -139,7 +139,7 @@ QToolBar {
}
fxMixerView QPushButton, effectRackView QPushButton, controllerRackView QPushButton {
FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
font-size: 10px;
}
@@ -149,7 +149,7 @@ timeLine {
/* Plugins */
tripleOscillatorView knob {
TripleOscillatorView knob {
color: rgb(1, 114, 216);
qproperty-outerColor: rgb(0, 0, 0);
qproperty-innerRadius: 1;
@@ -171,7 +171,7 @@ kickerInstrumentView knob {
}
audioFileProcessorView knob {
AudioFileProcessorView knob {
color: rgb(240, 147, 14);
qproperty-outerColor: rgb(30, 35, 37);
qproperty-innerRadius: 4;

6
data/themes/default/style.css
View File

@@ -150,7 +150,7 @@ QToolButton:checked {
padding: 3px 0px 0px 3px;
}
fxMixerView QPushButton, effectRackView QPushButton, controllerRackView QPushButton {
FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
font-size: 10px;
}
@@ -160,7 +160,7 @@ timeLine {
/* Plugins */
tripleOscillatorView knob {
TripleOscillatorView knob {
color: rgb(1, 114, 216);
qproperty-outerColor: rgb(0, 0, 0);
qproperty-innerRadius: 1;
@@ -182,7 +182,7 @@ kickerInstrumentView knob {
}
audioFileProcessorView knob {
AudioFileProcessorView knob {
color: rgb(240, 147, 14);
qproperty-outerColor: rgb(30, 35, 37);
qproperty-innerRadius: 4;

8
plugins/midi_import/MidiImport.cpp
View File

@@ -229,9 +229,11 @@ public:
if( it_inst )
{
isSF2 = true;
it_inst->loadResource(
configManager::inst()->
defaultSoundfont() );
if( configManager::inst()->defaultSoundfont() )
{
it_inst->loadResource(
configManager::inst()->defaultSoundfont() );
}
it_inst->childModel( "bank" )->setValue( 0 );
it_inst->childModel( "patch" )->setValue( 0 );
}

4
plugins/vst_base/remote_vst_plugin.cpp
View File

@@ -1069,14 +1069,10 @@ VstIntPtr RemoteVstPlugin::hostCallback( AEffect * _effect, VstInt32 _opcode,
case audioMasterGetSampleRate:
SHOW_CALLBACK( "amc: audioMasterGetSampleRate\n" );
__plugin->pluginDispatch( effSetSampleRate,
0, 0, NULL, (float)__plugin->sampleRate() );
return __plugin->sampleRate();
case audioMasterGetBlockSize:
SHOW_CALLBACK( "amc: audioMasterGetBlockSize\n" );
__plugin->pluginDispatch( effSetBlockSize,
0, __plugin->bufferSize() );
return __plugin->bufferSize();

2
src/core/lame_library.cpp
View File

@@ -44,6 +44,7 @@ LameLibrary::LameLibrary() :
QMessageBox::Ok | QMessageBox::Default );
delete m_lameLib;
m_lameLib = NULL;
return;
}
// grab the functions and stuff we need
@@ -155,6 +156,7 @@ LameLibrary::LameLibrary() :
m_lameLib->unload();
delete m_lameLib;
m_lameLib = NULL;
return;
}
}