bugfixes and some small new features
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@89 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
@@ -60,6 +60,7 @@
|
||||
#include "string_pair_drag.h"
|
||||
#include "mmp.h"
|
||||
|
||||
#undef SINGLE_SOURCE_COMPILE
|
||||
#include "embed.cpp"
|
||||
|
||||
|
||||
@@ -171,7 +172,7 @@ audioFileProcessor::audioFileProcessor( channelTrack * _channel_track ) :
|
||||
m_ampKnob = new knob( knobDark_28, this, tr( "Amplify" ), eng() );
|
||||
m_ampKnob->setRange( 0, 500, 1.0f );
|
||||
m_ampKnob->move( 6, 114 );
|
||||
m_ampKnob->setValue( 100.0f, TRUE );
|
||||
m_ampKnob->setInitValue( 100.0f );
|
||||
m_ampKnob->setHintText( tr( "Amplify:" )+" ", "%" );
|
||||
m_ampKnob->setLabel( tr( "AMP" ) );
|
||||
connect( m_ampKnob, SIGNAL( valueChanged( float ) ), this,
|
||||
@@ -190,7 +191,7 @@ audioFileProcessor::audioFileProcessor( channelTrack * _channel_track ) :
|
||||
eng() );
|
||||
m_startKnob->setRange( 0.0f, 1.0f, 0.00001f );
|
||||
m_startKnob->move( 46, 114 );
|
||||
m_startKnob->setValue( 0.0f, TRUE );
|
||||
m_startKnob->setInitValue( 0.0f );
|
||||
m_startKnob->setHintText( tr( "Startpoint:" )+" ", "" );
|
||||
m_startKnob->setLabel( tr( "START" ) );
|
||||
connect( m_startKnob, SIGNAL( valueChanged( float ) ), this,
|
||||
@@ -209,7 +210,7 @@ audioFileProcessor::audioFileProcessor( channelTrack * _channel_track ) :
|
||||
m_endKnob = new knob( knobDark_28, this, tr( "End of sample" ), eng() );
|
||||
m_endKnob->setRange( 0.0f, 1.0f, 0.00001f );
|
||||
m_endKnob->move( 84, 114 );
|
||||
m_endKnob->setValue( 1.0f, TRUE );
|
||||
m_endKnob->setInitValue( 1.0f );
|
||||
m_endKnob->setHintText( tr( "Endpoint:" )+" ", "" );
|
||||
m_endKnob->setLabel( tr( "END" ) );
|
||||
connect( m_endKnob, SIGNAL( valueChanged( float ) ), this,
|
||||
|
||||
@@ -67,9 +67,10 @@ using namespace std;
|
||||
#include "song_editor.h"
|
||||
#include "oscillator.h"
|
||||
#include "sample_buffer.h"
|
||||
#include "embed.cpp"
|
||||
#include "base64.h"
|
||||
|
||||
#undef SINGLE_SOURCE_COMPILE
|
||||
#include "embed.cpp"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
@@ -193,7 +194,7 @@ bitInvader::bitInvader( channelTrack * _channel_track ) :
|
||||
m_sampleLengthKnob = new knob( knobDark_28, this, tr( "Samplelength" ),
|
||||
eng() );
|
||||
m_sampleLengthKnob->setRange( 8, 128, 1 );
|
||||
m_sampleLengthKnob->setValue( 128, TRUE );
|
||||
m_sampleLengthKnob->setInitValue( 128 );
|
||||
m_sampleLengthKnob->move( 10, 120 );
|
||||
m_sampleLengthKnob->setHintText( tr( "Sample Length" ) + " ", "" );
|
||||
|
||||
|
||||
@@ -67,9 +67,11 @@ using namespace std;
|
||||
#include "song_editor.h"
|
||||
#include "oscillator.h"
|
||||
#include "sample_buffer.h"
|
||||
#include "embed.cpp"
|
||||
#include "base64.h"
|
||||
|
||||
#undef SINGLE_SOURCE_COMPILE
|
||||
#include "embed.cpp"
|
||||
|
||||
|
||||
extern "C"
|
||||
{
|
||||
@@ -120,7 +122,7 @@ organicInstrument::organicInstrument( channelTrack * _channel_track ) :
|
||||
"Osc %1 waveform" ).arg( i+1 ), eng() );
|
||||
m_osc[i].oscKnob->move( 25+i*20, 90 );
|
||||
m_osc[i].oscKnob->setRange( 0.0f, 5.0f, 0.25f );
|
||||
m_osc[i].oscKnob->setValue( 0.0f, TRUE );
|
||||
m_osc[i].oscKnob->setInitValue( 0.0f );
|
||||
m_osc[i].oscKnob->setHintText( tr( "Osc %1 waveform:" ).arg(
|
||||
i+1 ) + " ", "%" );
|
||||
|
||||
@@ -133,7 +135,7 @@ organicInstrument::organicInstrument( channelTrack * _channel_track ) :
|
||||
"Osc %1 volume" ).arg( i+1 ), eng() );
|
||||
m_osc[i].volKnob->move( 25+i*20, 110 );
|
||||
m_osc[i].volKnob->setRange( 0, 100, 1.0f );
|
||||
m_osc[i].volKnob->setValue( 100, TRUE );
|
||||
m_osc[i].volKnob->setInitValue( 100 );
|
||||
m_osc[i].volKnob->setHintText( tr( "Osc %1 volume:" ).arg(
|
||||
i+1 ) + " ", "%" );
|
||||
|
||||
@@ -142,7 +144,7 @@ organicInstrument::organicInstrument( channelTrack * _channel_track ) :
|
||||
tr( "Osc %1 panning" ).arg( i + 1 ), eng() );
|
||||
m_osc[i].panKnob->move( 25+i*20, 130 );
|
||||
m_osc[i].panKnob->setRange( PANNING_LEFT, PANNING_RIGHT, 1.0f );
|
||||
m_osc[i].panKnob->setValue( DEFAULT_PANNING, TRUE );
|
||||
m_osc[i].panKnob->setInitValue( DEFAULT_PANNING );
|
||||
m_osc[i].panKnob->setHintText( tr("Osc %1 panning:").arg( i+1 )
|
||||
+ " ", "" );
|
||||
|
||||
@@ -152,7 +154,7 @@ organicInstrument::organicInstrument( channelTrack * _channel_track ) :
|
||||
eng() );
|
||||
m_osc[i].detuneKnob->move( 25+i*20, 150 );
|
||||
m_osc[i].detuneKnob->setRange( -100.0f, 100.0f, 1.0f );
|
||||
m_osc[i].detuneKnob->setValue( 0.0f, TRUE );
|
||||
m_osc[i].detuneKnob->setInitValue( 0.0f );
|
||||
m_osc[i].detuneKnob->setHintText( tr( "Osc %1 fine detuning "
|
||||
"left:" ).arg( i + 1 )
|
||||
+ " ", " " +
|
||||
@@ -164,18 +166,17 @@ organicInstrument::organicInstrument( channelTrack * _channel_track ) :
|
||||
|
||||
// setup knob for FX1
|
||||
fx1Knob = new knob( knobGreen_17, this,
|
||||
tr( "FX1" ),
|
||||
eng() );
|
||||
tr( "FX1" ), eng() );
|
||||
fx1Knob->move( 20, 200 );
|
||||
fx1Knob->setRange( 0.0f, 0.99f, 0.01f );
|
||||
fx1Knob->setValue( 0.0f, TRUE );
|
||||
fx1Knob->setInitValue( 0.0f);
|
||||
|
||||
// setup volume-knob
|
||||
volKnob = new knob( knobGreen_17, this, tr(
|
||||
"Osc %1 volume" ).arg( 1 ), eng() );
|
||||
volKnob->move( 50, 200 );
|
||||
volKnob->setRange( 0, 200, 1.0f );
|
||||
volKnob->setValue( 100, TRUE );
|
||||
volKnob->setInitValue( 100 );
|
||||
volKnob->setHintText( tr( "Osc %1 volume:" ).arg(
|
||||
1 ) + " ", "%" );
|
||||
|
||||
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "buffer_allocator.h"
|
||||
#include "knob.h"
|
||||
|
||||
#undef SINGLE_SOURCE_COMPILE
|
||||
#include "embed.cpp"
|
||||
|
||||
|
||||
@@ -75,14 +76,14 @@ pluckedStringSynth::pluckedStringSynth( channelTrack * _channel_track ) :
|
||||
m_pickKnob = new knob( knobDark_28, this, tr( "Pick position" ),
|
||||
eng() );
|
||||
m_pickKnob->setRange( 0.0f, 0.5f, 0.005f );
|
||||
m_pickKnob->setValue( 0.0f, TRUE );
|
||||
m_pickKnob->setInitValue( 0.0f );
|
||||
m_pickKnob->move( 86, 134 );
|
||||
m_pickKnob->setHintText( tr( "Pick position:" ) + " ", "" );
|
||||
|
||||
m_pickupKnob = new knob( knobDark_28, this, tr( "Pickup position" ),
|
||||
eng() );
|
||||
m_pickupKnob->setRange( 0.0f, 0.5f, 0.005f );
|
||||
m_pickupKnob->setValue( 0.05f, TRUE );
|
||||
m_pickupKnob->setInitValue( 0.05f );
|
||||
m_pickupKnob->move( 138, 134 );
|
||||
m_pickupKnob->setHintText( tr( "Pickup position:" ) + " ", "" );
|
||||
#ifdef QT4
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
#include "tooltip.h"
|
||||
#include "sample_buffer.h"
|
||||
|
||||
#undef SINGLE_SOURCE_COMPILE
|
||||
#include "embed.cpp"
|
||||
|
||||
|
||||
@@ -268,7 +269,7 @@ tripleOscillator::tripleOscillator( channelTrack * _channel_track ) :
|
||||
"Osc %1 volume" ).arg( i+1 ), eng() );
|
||||
m_osc[i].volKnob->move( 6, 104+i*50 );
|
||||
m_osc[i].volKnob->setRange( MIN_VOLUME, MAX_VOLUME, 1.0f );
|
||||
m_osc[i].volKnob->setValue( DEFAULT_VOLUME / 3, TRUE );
|
||||
m_osc[i].volKnob->setInitValue( DEFAULT_VOLUME / 3 );
|
||||
m_osc[i].volKnob->setHintText( tr( "Osc %1 volume:" ).arg(
|
||||
i+1 ) + " ", "%" );
|
||||
#ifdef QT4
|
||||
@@ -287,7 +288,7 @@ tripleOscillator::tripleOscillator( channelTrack * _channel_track ) :
|
||||
tr( "Osc %1 panning" ).arg( i + 1 ), eng() );
|
||||
m_osc[i].panKnob->move( 33, 104+i*50 );
|
||||
m_osc[i].panKnob->setRange( PANNING_LEFT, PANNING_RIGHT, 1.0f );
|
||||
m_osc[i].panKnob->setValue( DEFAULT_PANNING, TRUE );
|
||||
m_osc[i].panKnob->setInitValue( DEFAULT_PANNING );
|
||||
m_osc[i].panKnob->setHintText( tr("Osc %1 panning:").arg( i+1 )
|
||||
+ " ", "" );
|
||||
#ifdef QT4
|
||||
@@ -307,7 +308,7 @@ tripleOscillator::tripleOscillator( channelTrack * _channel_track ) :
|
||||
m_osc[i].coarseKnob->move( 66, 104 + i * 50 );
|
||||
m_osc[i].coarseKnob->setRange( -2 * NOTES_PER_OCTAVE,
|
||||
2 * NOTES_PER_OCTAVE, 1.0f );
|
||||
m_osc[i].coarseKnob->setValue( 0.0f, TRUE );
|
||||
m_osc[i].coarseKnob->setInitValue( 0.0f );
|
||||
m_osc[i].coarseKnob->setHintText( tr( "Osc %1 coarse detuning:"
|
||||
).arg( i + 1 ) + " ",
|
||||
" " + tr( "semitones" ) );
|
||||
@@ -328,7 +329,7 @@ tripleOscillator::tripleOscillator( channelTrack * _channel_track ) :
|
||||
eng() );
|
||||
m_osc[i].fineLKnob->move( 90, 104 + i * 50 );
|
||||
m_osc[i].fineLKnob->setRange( -100.0f, 100.0f, 1.0f );
|
||||
m_osc[i].fineLKnob->setValue( 0.0f, TRUE );
|
||||
m_osc[i].fineLKnob->setInitValue( 0.0f );
|
||||
m_osc[i].fineLKnob->setHintText( tr( "Osc %1 fine detuning "
|
||||
"left:" ).arg( i + 1 )
|
||||
+ " ", " " +
|
||||
@@ -350,7 +351,7 @@ tripleOscillator::tripleOscillator( channelTrack * _channel_track ) :
|
||||
).arg( i + 1 ), eng() );
|
||||
m_osc[i].fineRKnob->move( 110, 104 + i * 50 );
|
||||
m_osc[i].fineRKnob->setRange( -100.0f, 100.0f, 1.0f );
|
||||
m_osc[i].fineRKnob->setValue( 0.0f, TRUE );
|
||||
m_osc[i].fineRKnob->setInitValue( 0.0f );
|
||||
m_osc[i].fineRKnob->setHintText( tr( "Osc %1 fine detuning "
|
||||
"right:").arg( i + 1 ) +
|
||||
" ", " " + tr( "cents" ) );
|
||||
@@ -372,7 +373,7 @@ tripleOscillator::tripleOscillator( channelTrack * _channel_track ) :
|
||||
eng() );
|
||||
m_osc[i].phaseOffsetKnob->move( 142, 104 + i * 50 );
|
||||
m_osc[i].phaseOffsetKnob->setRange( 0.0f, 360.0f, 1.0f );
|
||||
m_osc[i].phaseOffsetKnob->setValue( 0.0f, TRUE );
|
||||
m_osc[i].phaseOffsetKnob->setInitValue( 0.0f );
|
||||
m_osc[i].phaseOffsetKnob->setHintText( tr( "Osc %1 phase-"
|
||||
"offset:" ).
|
||||
arg( i + 1 ) +
|
||||
@@ -399,7 +400,7 @@ tripleOscillator::tripleOscillator( channelTrack * _channel_track ) :
|
||||
m_osc[i].stereoPhaseDetuningKnob->move( 166, 104 + i * 50 );
|
||||
m_osc[i].stereoPhaseDetuningKnob->setRange( 0.0f, 360.0f,
|
||||
1.0f );
|
||||
m_osc[i].stereoPhaseDetuningKnob->setValue( 0.0f, TRUE );
|
||||
m_osc[i].stereoPhaseDetuningKnob->setInitValue( 0.0f );
|
||||
m_osc[i].stereoPhaseDetuningKnob->setHintText( tr("Osc %1 "
|
||||
"stereo phase-"
|
||||
"detuning:" ).
|
||||
|
||||
@@ -62,6 +62,7 @@
|
||||
#include "song_editor.h"
|
||||
#include "lvsl_client.h"
|
||||
|
||||
#undef SINGLE_SOURCE_COMPILE
|
||||
#include "embed.cpp"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user