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

Merge pull request #933 from LMMS/stable-1.1

Browse Source 
Stable 1.1
This commit is contained in:
Vesa V
2014-07-05 16:34:34 +03:00
parent 6ffcc0e799 ddae5a8446
commit 8407427c4b
25 changed files with 135 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -3,3 +3,7 @@
.*.sw?
*~
/CMakeLists.txt.user
/plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Controller/Makefile
/plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Spliter/Makefile
/plugins/zynaddsubfx/zynaddsubfx/doc/Makefile
/plugins/zynaddsubfx/zynaddsubfx/doc/gen/Makefile

5
CMakeLists.txt
View File

@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "0")
SET(VERSION_PATCH "91")
SET(VERSION_PATCH "92")
#SET(VERSION_SUFFIX "")
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
IF(VERSION_SUFFIX)
@@ -461,13 +461,16 @@ IF(LMMS_BUILD_WIN32)
INSTALL(FILES
"${MINGW_PREFIX}/bin/QtCore4.dll"
"${MINGW_PREFIX}/bin/QtGui4.dll"
"${MINGW_PREFIX}/bin/QtSvg4.dll"
"${MINGW_PREFIX}/bin/QtXml4.dll"
"${MINGW_PREFIX}/bin/libsamplerate-0.dll"
"${MINGW_PREFIX}/bin/libsndfile-1.dll"
"${MINGW_PREFIX}/bin/libvorbis-0.dll"
"${MINGW_PREFIX}/bin/libvorbisenc-2.dll"
"${MINGW_PREFIX}/bin/libvorbisfile-3.dll"
"${MINGW_PREFIX}/bin/libjpeg-9.dll"
"${MINGW_PREFIX}/bin/libogg-0.dll"
"${MINGW_PREFIX}/lib/libfltk.dll"
"${MINGW_PREFIX}/bin/libfluidsynth.dll"
"${MINGW_PREFIX}/bin/libfftw3f-3.dll"
"${MINGW_PREFIX}/bin/libFLAC-8.dll"

2
README
View File

@@ -1,4 +1,4 @@
LMMS 1.0.2
LMMS 1.0.92
===========
Copyright (c) 2004-2014 by LMMS developers

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

@@ -7,10 +7,6 @@ QLabel, QTreeWidget, QListWidget, QGroupBox {
color: #e0e0e0;
}
QWhatsThat {
color: black;
}
QMdiArea {
background-image: url(resources:background_artwork.png);
}
@@ -55,6 +51,14 @@ QToolTip {
color: #4afd85;
}
textFloat {
border-radius: 4px;
background: qlineargradient(spread:reflect, x1:0.5, y1:0.5, x2:0.5, y2:0, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(50, 50, 50, 220));
opacity: 175;
border: 1.0px solid rgba(0,0,0,255);
color: #4afd85;
}
QMenu {
border:1px solid #747474;
@@ -748,5 +752,8 @@ LmmsPalette {
qproperty-brightText: #4afd85;
qproperty-highlight: #202020;
qproperty-highlightedText: #ffffff;
/* the next two are used for whatsthis dialogs */
qproperty-toolTipText: #000;
qproperty-toolTipBase: #c9c9c9;
}

6
include/LmmsPalette.h
View File

@@ -43,6 +43,8 @@ class EXPORT LmmsPalette : public QWidget
Q_PROPERTY( QColor brightText READ brightText WRITE setBrightText )
Q_PROPERTY( QColor highlight READ highlight WRITE setHighlight )
Q_PROPERTY( QColor highlightedText READ highlightedText WRITE setHighlightedText )
Q_PROPERTY( QColor toolTipText READ toolTipText WRITE setToolTipText )
Q_PROPERTY( QColor toolTipBase READ toolTipBase WRITE setToolTipBase )
public:
LmmsPalette( QWidget * parent, QStyle * stylearg );
@@ -63,6 +65,8 @@ public:
ACCESSMET( brightText, setBrightText )
ACCESSMET( highlight, setHighlight )
ACCESSMET( highlightedText, setHighlightedText )
ACCESSMET( toolTipText, setToolTipText )
ACCESSMET( toolTipBase, setToolTipBase )
#undef ACCESSMET
@@ -79,6 +83,8 @@ private:
QColor m_brightText;
QColor m_highlight;
QColor m_highlightedText;
QColor m_toolTipText;
QColor m_toolTipBase;
};

10
include/lmms_math.h
View File

@@ -28,10 +28,20 @@
#include <stdint.h>
#include "lmms_constants.h"
#include "lmmsconfig.h"
#include <QtCore/QtGlobal>
#include <math.h>
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE)
#ifndef isnanf
#define isnanf(x) isnan(x)
#endif
#ifndef isinff
#define isinff(x) isinf(x)
#endif
#endif
#ifdef __INTEL_COMPILER
static inline float absFraction( const float _x )

8
include/text_float.h
View File

@@ -23,8 +23,8 @@
*/
#ifndef _TEXT_FLOAT
#define _TEXT_FLOAT
#ifndef TEXT_FLOAT_H
#define TEXT_FLOAT_H
#include <QtGui/QWidget>
#include <QtGui/QPixmap>
@@ -34,6 +34,7 @@
class EXPORT textFloat : public QWidget
{
Q_OBJECT
public:
textFloat();
virtual ~textFloat()
@@ -76,7 +77,6 @@ private:
QString m_text;
QPixmap m_pixmap;
} ;
};
#endif

2
lmms.rc.in
View File

@@ -2,7 +2,7 @@ lmmsicon ICON data/lmms.ico
#include <windows.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,2,0
FILEVERSION 1,0,92,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP

9
plugins/dynamics_processor/dynamics_processor.cpp
View File

@@ -30,15 +30,6 @@
#include "embed.cpp"
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE)
#ifndef isnanf
#define isnanf(x) isnan(x)
#endif
#ifndef isinff
#define isinff(x) isinf(x)
#endif
#endif
extern "C"
{

BIN
plugins/lb302/artwork.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 97 KiB

8
plugins/lb302/lb302.cpp
View File

@@ -837,12 +837,12 @@ lb302SynthView::lb302SynthView( Instrument * _instrument, QWidget * _parent ) :
m_slideToggle = new ledCheckBox( "", this );
m_slideToggle->move( 10, 180 );
m_accentToggle = new ledCheckBox( "", this );
/* m_accentToggle = new ledCheckBox( "", this );
m_accentToggle->move( 10, 200 );
m_accentToggle->setDisabled(true);
m_accentToggle->setDisabled(true);*/ // accent removed pending real implementation - no need for non-functional buttons
m_deadToggle = new ledCheckBox( "", this );
m_deadToggle->move( 10, 220 );
m_deadToggle->move( 10, 200 );
m_db24Toggle = new ledCheckBox( "", this );
m_db24Toggle->setWhatsThis(
@@ -1025,7 +1025,7 @@ void lb302SynthView::modelChanged()
m_waveBtnGrp->setModel( &syn->wave_shape );
m_slideToggle->setModel( &syn->slideToggle );
m_accentToggle->setModel( &syn->accentToggle );
/*m_accentToggle->setModel( &syn->accentToggle );*/
m_deadToggle->setModel( &syn->deadToggle );
m_db24Toggle->setModel( &syn->db24Toggle );
}

2
plugins/lb302/lb302.h
View File

@@ -270,7 +270,7 @@ private:
automatableButtonGroup * m_waveBtnGrp;
ledCheckBox * m_slideToggle;
ledCheckBox * m_accentToggle;
/*ledCheckBox * m_accentToggle;*/ // removed pending accent implementation
ledCheckBox * m_deadToggle;
ledCheckBox * m_db24Toggle;

4
plugins/sf2_player/sf2_player.cpp
View File

@@ -109,7 +109,7 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
m_settings = new_fluid_settings();
fluid_settings_setint( m_settings, (char *) "audio.period-size", engine::mixer()->framesPerPeriod() );
//fluid_settings_setint( m_settings, (char *) "audio.period-size", engine::mixer()->framesPerPeriod() );
// This is just our starting instance of synth. It is recreated
// everytime we load a new soundfont.
@@ -626,8 +626,6 @@ void sf2Instrument::playNote( NotePlayHandle * _n, sampleFrame * )
// Could we get iph-based instruments support sample-exact models by using a
// frame-length of 1 while rendering?
void sf2Instrument::play( sampleFrame * _working_buffer )
{
const fpp_t frames = engine::mixer()->framesPerPeriod();

2
plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
View File

@@ -174,7 +174,7 @@ private:
void RemoteZynAddSubFx::guiThread()
{
int exitProgram;
int exitProgram = 0;
MasterUI * ui = NULL;
while( !m_guiExit )

48
plugins/zynaddsubfx/zynaddsubfx/src/UI/ADnoteUI.fl
View File

@@ -64,7 +64,7 @@ class ADvoicelistitem {open : {public Fl_Group}
} {
Fl_Value_Slider voicevolume {
callback {pars->VoicePar[nvoice].PVolume=(int)o->value();}
tooltip Volume xywh {90 5 115 20} type {Horz Knob} box NO_BOX labelsize 8 align 5 maximum 127 step 1
tooltip Volume xywh {90 5 115 20} type {Horz Knob} box FLAT_BOX labelsize 8 align 5 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PVolume);}
}
Fl_Check_Button voiceresonanceenabled {
@@ -74,7 +74,7 @@ class ADvoicelistitem {open : {public Fl_Group}
}
Fl_Value_Slider voicelfofreq {
callback {pars->VoicePar[nvoice].FreqLfo->Pintensity=(int)o->value();}
tooltip {Frequency LFO amount} xywh {500 5 115 20} type {Horz Knob} box NO_BOX labelsize 8 align 5 maximum 127 step 1
tooltip {Frequency LFO amount} xywh {500 5 115 20} type {Horz Knob} box FLAT_BOX labelsize 8 align 5 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].FreqLfo->Pintensity);}
}
Fl_Dial voicepanning {
@@ -97,7 +97,7 @@ class ADvoicelistitem {open : {public Fl_Group}
Fl_Slider voicedetune {
callback {pars->VoicePar[nvoice].PDetune=(int)o->value()+8192;
detunevalueoutput->do_callback();}
tooltip {Fine Detune (cents)} xywh {315 5 185 20} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
tooltip {Fine Detune (cents)} xywh {315 5 185 20} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
code0 {o->value(pars->VoicePar[nvoice].PDetune-8192);}
}
Fl_Box noiselabel {
@@ -178,7 +178,7 @@ class ADvoiceUI {open : {public Fl_Group}
} {
Fl_Window ADnoteVoiceParameters {
label Voice open
xywh {84 305 765 590} type Double box NO_BOX
xywh {84 305 765 590} type Double box FLAT_BOX
class Fl_Group visible
} {
Fl_Group voiceparametersgroup {open
@@ -239,7 +239,7 @@ pars->VoicePar[nvoice].PFMCoarseDetune = k*1024+
Fl_Slider {} {
callback {pars->VoicePar[nvoice].PFMDetune=(int)o->value()+8192;
fmdetunevalueoutput->do_callback();}
tooltip {Fine Detune (cents)} xywh {590 245 155 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
tooltip {Fine Detune (cents)} xywh {590 245 155 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
code0 {o->value(pars->VoicePar[nvoice].PFMDetune-8192);}
}
Fl_Value_Output fmdetunevalueoutput {
@@ -265,13 +265,13 @@ fmdetunevalueoutput->do_callback();} open
Fl_Value_Slider {} {
label Vol
callback {pars->VoicePar[nvoice].PFMVolume=(int)o->value();}
tooltip Volume xywh {540 80 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip Volume xywh {540 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PFMVolume);}
}
Fl_Value_Slider {} {
label {V.Sns}
callback {pars->VoicePar[nvoice].PFMVelocityScaleFunction=(int) o->value();}
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {540 100 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {540 100 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PFMVelocityScaleFunction);}
}
Fl_Group voiceFMampenvgroup {
@@ -293,7 +293,7 @@ o->redraw();}
Fl_Value_Slider {} {
label {F.Damp}
callback {pars->VoicePar[nvoice].PFMVolumeDamp=(int) o->value()+64;}
tooltip {Modulator Damp at Higher frequency} xywh {540 120 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 minimum -64 maximum 63 step 1
tooltip {Modulator Damp at Higher frequency} xywh {540 120 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 minimum -64 maximum 63 step 1
code0 {o->value(pars->VoicePar[nvoice].PFMVolumeDamp-64);}
}
}
@@ -326,7 +326,7 @@ oscedit=new OscilEditor(pars->VoicePar[nv].FMSmp,fmoscil,NULL,NULL,master);}
callback {pars->VoicePar[nvoice].PFMoscilphase=64-(int)o->value();
oscFM->phase=64-(int) o->value();
fmoscil->redraw();}
xywh {645 415 105 15} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
xywh {645 415 105 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
code0 {o->value(64-pars->VoicePar[nvoice].PFMoscilphase);}
}
Fl_Choice {} {
@@ -460,7 +460,7 @@ pars->VoicePar[nvoice].PCoarseDetune = k+
Fl_Slider {} {
callback {pars->VoicePar[nvoice].PDetune=(int)o->value()+8192;
detunevalueoutput->do_callback();}
tooltip {Fine Detune (cents)} xywh {58 287 392 13} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
tooltip {Fine Detune (cents)} xywh {58 287 392 13} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
code0 {o->value(pars->VoicePar[nvoice].PDetune-8192);}
}
Fl_Value_Output detunevalueoutput {
@@ -521,7 +521,7 @@ oscedit=new OscilEditor(pars->VoicePar[nv].OscilSmp,voiceoscil,NULL,NULL,master)
callback {pars->VoicePar[nvoice].Poscilphase=64-(int)o->value();
osc->phase=64-(int) o->value();
voiceoscil->redraw();}
xywh {10 435 65 10} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
xywh {10 435 65 10} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
code0 {o->value(64-pars->VoicePar[nvoice].Poscilphase);}
}
Fl_Check_Button {} {
@@ -583,7 +583,7 @@ voiceonbutton->redraw();} open
label {Frequency Spread}
callback {pars->VoicePar[nvoice].Unison_frequency_spread=(int)o->value();
unisonspreadoutput->do_callback();}
tooltip {Frequency Spread of the Unison} xywh {95 562 125 13} type {Horz Knob} box NO_BOX labelsize 12 align 1 maximum 127 step 1 value 64
tooltip {Frequency Spread of the Unison} xywh {95 562 125 13} type {Horz Knob} box FLAT_BOX labelsize 12 align 1 maximum 127 step 1 value 64
code0 {o->value(pars->VoicePar[nvoice].Unison_frequency_spread);}
}
Fl_Value_Output unisonspreadoutput {
@@ -608,13 +608,13 @@ unisonspreadoutput->do_callback();}
Fl_Value_Slider {} {
label Vol
callback {pars->VoicePar[nvoice].PVolume=(int)o->value();}
tooltip Volume xywh {10 60 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip Volume xywh {10 60 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PVolume);}
}
Fl_Value_Slider {} {
label {V.Sns}
callback {pars->VoicePar[nvoice].PAmpVelocityScaleFunction=(int) o->value();}
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 80 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PAmpVelocityScaleFunction);}
}
Fl_Group voiceampenvgroup {
@@ -743,7 +743,7 @@ noiselabel->do_callback();}
Fl_Value_Slider {} {
label Delay
callback {pars->VoicePar[nvoice].PDelay=(int)o->value();}
tooltip Volume xywh {120 21 84 12} type {Horz Knob} box NO_BOX labelsize 11 align 5 maximum 127 step 1
tooltip Volume xywh {120 21 84 12} type {Horz Knob} box FLAT_BOX labelsize 11 align 5 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PDelay);}
}
}
@@ -854,7 +854,7 @@ pars->GlobalPar.PCoarseDetune = k+
Fl_Slider freq {
callback {pars->GlobalPar.PDetune=(int)o->value()+8192;
detunevalueoutput->do_callback();}
tooltip {Fine Detune (cents)} xywh {60 300 385 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
tooltip {Fine Detune (cents)} xywh {60 300 385 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
code0 {o->value(pars->GlobalPar.PDetune-8192);}
}
Fl_Value_Output detunevalueoutput {
@@ -892,13 +892,13 @@ for (int i=0;i<NUM_VOICES;i++){
Fl_Value_Slider volume {
label Vol
callback {pars->GlobalPar.PVolume=(int)o->value();}
tooltip Volume xywh {10 30 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip Volume xywh {10 30 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PVolume);}
}
Fl_Value_Slider vsns {
label {V.Sns}
callback {pars->GlobalPar.PAmpVelocityScaleFunction=(int) o->value();}
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 50 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PAmpVelocityScaleFunction);}
}
Fl_Dial pan {
@@ -1065,27 +1065,27 @@ ADnoteVoice->redraw();}
} {
Fl_Text_Display {} {
label {No.}
xywh {10 15 30 10} box NO_BOX labelfont 1 labelsize 11
xywh {10 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label Vol
xywh {145 15 30 10} box NO_BOX labelfont 1 labelsize 11
xywh {145 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label Detune
xywh {384 15 25 10} box NO_BOX labelfont 1 labelsize 11
xywh {384 15 25 10} box FLAT_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label Pan
xywh {210 15 30 10} box NO_BOX labelfont 1 labelsize 11
xywh {210 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label {Vib. Depth}
xywh {560 15 30 10} box NO_BOX labelfont 1 labelsize 11
xywh {560 15 30 10} box FLAT_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label {R.}
xywh {245 15 25 10} box NO_BOX labelfont 1 labelsize 11
xywh {245 15 25 10} box FLAT_BOX labelfont 1 labelsize 11
}
Fl_Button {} {
label {Hide Voice List}

10
plugins/zynaddsubfx/zynaddsubfx/src/UI/BankUI.fl
View File

@@ -125,27 +125,27 @@ class BankUI {open : {public BankProcess_}
} {
Fl_Pack {} {
xywh {10 39 150 481} box BORDER_FRAME
code0 {o->box(FL_NO_BOX);}
code0 {o->box(FL_FLAT_BOX);}
code1 {for (int i=0;i<32;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
} {}
Fl_Pack {} {
xywh {163 39 150 481} box BORDER_FRAME
code0 {o->box(FL_NO_BOX);}
code0 {o->box(FL_FLAT_BOX);}
code1 {for (int i=32;i<64;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
} {}
Fl_Pack {} {
xywh {316 39 150 481} box BORDER_FRAME
code0 {o->box(FL_NO_BOX);}
code0 {o->box(FL_FLAT_BOX);}
code1 {for (int i=64;i<96;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
} {}
Fl_Pack {} {
xywh {469 39 150 481} box BORDER_FRAME
code0 {o->box(FL_NO_BOX);}
code0 {o->box(FL_FLAT_BOX);}
code1 {for (int i=96;i<128;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
} {}
Fl_Pack {} {
xywh {622 39 150 481} box BORDER_FRAME
code0 {o->box(FL_NO_BOX);}
code0 {o->box(FL_FLAT_BOX);}
code1 {for (int i=128;i<160;i++){bs[i]=new BankSlot (0,0,o->w(),15," ");bs[i]->init(i,&what,&slot,&BankProcess_::process,(BankProcess_ *)this,bank,&nselected);};}
} {}
}

6
plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl
View File

@@ -315,7 +315,7 @@ class Panellistitem {open : {public Fl_Group}
Function {make_window()} {open private
} {
Fl_Window panellistitem {open
private xywh {608 711 100 260} type Double box NO_BOX
private xywh {608 711 100 260} type Double box FLAT_BOX
class Fl_Group visible
} {
Fl_Group panellistitemgroup {open
@@ -344,7 +344,7 @@ bankui->show();}
}
Fl_Slider partvolume {
callback {master->part[npart]->setPvolume((int) o->value());}
xywh {10 65 30 110} type {Vert Knob} box NO_BOX minimum 127 maximum 0 step 1 value 127
xywh {10 65 30 110} type {Vert Knob} box FLAT_BOX minimum 127 maximum 0 step 1 value 127
code0 {o->value(master->part[npart]->Pvolume);}
}
Fl_Dial partpanning {
@@ -1243,7 +1243,7 @@ bankui->show();}
Fl_Slider partpanning {
label Pan
callback {master->part[npart]->setPpanning((int) o->value());}
xywh {185 95 145 15} type {Horz Knob} box NO_BOX labelsize 11 maximum 127 step 1 value 64
xywh {185 95 145 15} type {Horz Knob} box FLAT_BOX labelsize 11 maximum 127 step 1 value 64
code0 {o->value(master->part[npart]->Ppanning);}
}
Fl_Choice partrcv {

10
plugins/zynaddsubfx/zynaddsubfx/src/UI/OscilGenUI.fl
View File

@@ -252,7 +252,7 @@ class Oscilharmonic {: {public Fl_Group}
Function {make_window()} {open private
} {
Fl_Window harmonic {open
private xywh {338 259 100 225} type Double box NO_BOX
private xywh {338 259 100 225} type Double box FLAT_BOX
class Fl_Group visible
} {
Fl_Slider mag {
@@ -278,7 +278,7 @@ if (cbwidget!=NULL) {
applybutton->color(FL_RED);
applybutton->redraw();
};}
xywh {0 15 15 115} type {Vert Knob} box NO_BOX selection_color 222 maximum 127 step 1 value 64
xywh {0 15 15 115} type {Vert Knob} box FLAT_BOX selection_color 222 maximum 127 step 1 value 64
code0 {o->value(127-oscil->Phmag[n]);}
code1 {if (oscil->Phmag[n]==64) o->selection_color(0);}
class PSlider
@@ -300,7 +300,7 @@ if (cbwidget!=NULL) {
applybutton->color(FL_RED);
applybutton->redraw();
};}
xywh {0 135 15 75} type {Vert Knob} box NO_BOX selection_color 222 maximum 127 step 1 value 64
xywh {0 135 15 75} type {Vert Knob} box FLAT_BOX selection_color 222 maximum 127 step 1 value 64
code0 {o->value(oscil->Phphase[n]);}
class PSlider
}
@@ -397,7 +397,7 @@ if (cbapplywidget!=NULL) {
callback {oscil->Prand=(int)o->value()+64;
oscildisplaygroup->redraw();
oldosc->redraw();}
tooltip {Oscilator Phase Randomness: smaller than 0 is "group", larger than 0 is for each harmonic} xywh {140 285 100 10} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
tooltip {Oscilator Phase Randomness: smaller than 0 is "group", larger than 0 is for each harmonic} xywh {140 285 100 10} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum -64 maximum 63 step 1
code0 {if (oscil->ADvsPAD) o->hide();}
}
Fl_Group {} {open
@@ -982,7 +982,7 @@ redrawoscil();}
Fl_Slider adhrpar {
callback {oscil->Padaptiveharmonicspar=(int)o->value();
redrawoscil();}
xywh {670 445 55 10} type {Horz Knob} box NO_BOX maximum 100 step 1 value 50
xywh {670 445 55 10} type {Horz Knob} box FLAT_BOX maximum 100 step 1 value 50
}
}
Fl_Group {} {

6
plugins/zynaddsubfx/zynaddsubfx/src/UI/PADnoteUI.fl
View File

@@ -826,7 +826,7 @@ pars->PCoarseDetune = k+
Fl_Slider detune {
callback {pars->PDetune=(int)o->value()+8192;
detunevalueoutput->do_callback();}
tooltip {Fine Detune (cents)} xywh {60 295 295 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
tooltip {Fine Detune (cents)} xywh {60 295 295 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
code0 {o->value(pars->PDetune-8192);}
}
Fl_Value_Output detunevalueoutput {
@@ -868,13 +868,13 @@ if (x==0) fixedfreqetdial->deactivate();
Fl_Value_Slider volume {
label Vol
callback {pars->PVolume=(int)o->value();}
tooltip Volume xywh {10 50 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip Volume xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PVolume);}
}
Fl_Value_Slider vsns {
label {V.Sns}
callback {pars->PAmpVelocityScaleFunction=(int) o->value();}
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 70 160 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 70 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PAmpVelocityScaleFunction);}
}
Fl_Dial pan {

14
plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl
View File

@@ -47,7 +47,7 @@ class PartSysEffSend {open : {public Fl_Group}
Function {make_window()} {open private
} {
Fl_Window syseffsend {
private xywh {589 129 100 100} type Double box NO_BOX
private xywh {589 129 100 100} type Double box FLAT_BOX
class Fl_Group visible
} {
Fl_Dial {} {
@@ -88,7 +88,7 @@ class PartKitItem {open : {public Fl_Group}
Function {make_window()} {open private
} {
Fl_Window partkititem {
private xywh {473 406 670 100} type Double box NO_BOX
private xywh {473 406 670 100} type Double box FLAT_BOX
class Fl_Group visible
} {
Fl_Group partkititemgroup {
@@ -274,7 +274,7 @@ class PartUI {open : {public Fl_Group}
Function {make_window()} {open private
} {
Fl_Window partgroup {open
private xywh {688 264 385 180} type Double box NO_BOX
private xywh {688 264 385 180} type Double box FLAT_BOX
class Fl_Group visible
} {
Fl_Group partgroupui {open
@@ -452,7 +452,7 @@ if (part->Penabled==0) partgroupui->deactivate();
}
Fl_Window ctlwindow {
label Controllers open
private xywh {777 261 500 130} type Double box NO_BOX visible
private xywh {777 261 500 130} type Double box FLAT_BOX visible
} {
Fl_Check_Button {} {
label Expr
@@ -635,7 +635,7 @@ else {propta->deactivate();proptb->deactivate();}}
}
Fl_Window partfx {
label {Part's Insert Effects} selected
private xywh {554 660 390 145} type Double box NO_BOX visible
private xywh {554 660 390 145} type Double box FLAT_BOX visible
} {
Fl_Counter inseffnocounter {
label {FX No.}
@@ -756,7 +756,7 @@ pthread_mutex_unlock(&master->mutex);}
}
Fl_Window instrumentkitlist {
label {Instrument Kit} open
xywh {586 566 670 370} type Double box NO_BOX visible
xywh {586 566 670 370} type Double box FLAT_BOX visible
} {
Fl_Button {} {
label {Close Window}
@@ -837,7 +837,7 @@ if (part->Pkitmode==0) {
}
Fl_Window instrumenteditwindow {
label {Instrument Edit} open
xywh {247 621 395 360} type Double box NO_BOX visible
xywh {247 621 395 360} type Double box FLAT_BOX visible
} {
Fl_Group {} {
xywh {0 220 395 110} box UP_FRAME

10
plugins/zynaddsubfx/zynaddsubfx/src/UI/SUBnoteUI.fl
View File

@@ -132,13 +132,13 @@ class SUBnoteUI {open : {public PresetsUI_}
Fl_Value_Slider vol {
label Vol
callback {pars->PVolume=(int)o->value();}
tooltip Volume xywh {10 25 140 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip Volume xywh {10 25 140 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PVolume);}
}
Fl_Value_Slider vsns {
label {V.Sns}
callback {pars->PAmpVelocityScaleFunction=(int) o->value();}
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 45 140 15} type {Horz Knob} box NO_BOX labelsize 11 align 8 maximum 127 step 1
tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 45 140 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PAmpVelocityScaleFunction);}
}
Fl_Dial pan {
@@ -256,7 +256,7 @@ pars->PCoarseDetune = k+
Fl_Slider detune {
callback {pars->PDetune=(int)o->value()+8192;
detunevalueoutput->do_callback();}
tooltip {Fine Detune (cents)} xywh {495 25 230 15} type {Horz Knob} box NO_BOX minimum -8192 maximum 8191 step 1
tooltip {Fine Detune (cents)} xywh {495 25 230 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
code0 {o->value(pars->PDetune-8192);}
}
Fl_Value_Output detunevalueoutput {
@@ -334,13 +334,13 @@ bandwidthsettingsui->redraw();}
Fl_Value_Slider bandwidth {
label {Band Width}
callback {pars->Pbandwidth=(int) o->value();}
xywh {225 40 115 15} type {Horz Knob} box NO_BOX labelsize 10 align 1 maximum 127 step 1
xywh {225 40 115 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Pbandwidth);}
}
Fl_Value_Slider bwidthscale {
label {B.Width Scale}
callback {pars->Pbwscale=(int) o->value()+64;}
tooltip {How much I increase the BandWidth according to lower/higher harmonics} xywh {345 40 90 15} type {Horz Knob} box NO_BOX labelsize 10 align 1 minimum -64 maximum 63 step 1
tooltip {How much I increase the BandWidth according to lower/higher harmonics} xywh {345 40 90 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 1 minimum -64 maximum 63 step 1
code0 {o->value(pars->Pbwscale-64);}
}
}

2
plugins/zynaddsubfx/zynaddsubfx/src/UI/VirKeyboard.fl
View File

@@ -335,7 +335,7 @@ virkeys->take_focus();}
label Vel
callback {virkeys->midivel=(int) o->value();
virkeys->take_focus();} selected
tooltip Velocity xywh {95 105 100 15} type {Horz Knob} box NO_BOX labelsize 10 align 5 minimum 1 maximum 127 step 1
tooltip Velocity xywh {95 105 100 15} type {Horz Knob} box FLAT_BOX labelsize 10 align 5 minimum 1 maximum 127 step 1
code0 {o->value(virkeys->midivel);}
}
Fl_Counter {} {

18
src/core/FxMixer.cpp
View File

@@ -56,7 +56,7 @@ void FxRoute::updateName()
{
if( m_amount)
{
m_amount->setDisplayName(
m_amount->setDisplayName(
tr( "Amount to send from channel %1 to channel %2" ).arg( m_from->m_channelIndex ).arg( m_to->m_channelIndex ) );
}
}
@@ -258,7 +258,7 @@ void FxMixer::deleteChannel( int index )
// actually delete the channel
delete m_fxChannels[index];
m_fxChannels.remove(index);
for( int i = index; i < m_fxChannels.size(); ++i )
{
validateChannelName( i, i + 1 );
@@ -308,7 +308,7 @@ void FxMixer::moveChannelLeft( int index )
FxChannel * tmpChannel = m_fxChannels[a];
m_fxChannels[a] = m_fxChannels[b];
m_fxChannels[b] = tmpChannel;
validateChannelName( a, b );
validateChannelName( b, a );
}
@@ -353,13 +353,13 @@ void FxMixer::createRoute( FxChannel * from, FxChannel * to, float amount )
}
m_sendsMutex.lock();
FxRoute * route = new FxRoute( from, to, amount );
// add us to from's sends
from->m_sends.append( route );
// add us to to's receives
to->m_receives.append( route );
// add us to fxmixer's list
engine::fxMixer()->m_fxRoutes.append( route );
m_sendsMutex.unlock();
@@ -414,13 +414,13 @@ bool FxMixer::isInfiniteLoop( fx_ch_t sendFrom, fx_ch_t sendTo )
bool FxMixer::checkInfiniteLoop( FxChannel * from, FxChannel * to )
{
// can't send master to anything
if( from == m_fxChannels[0] )
{
if( from == m_fxChannels[0] )
{
return true;
}
// can't send channel to itself
if( from == to )
if( from == to )
{
return true;
}

10
src/gui/LmmsPalette.cpp
View File

@@ -43,7 +43,9 @@ LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) :
m_buttonText( 0,0,0 ),
m_brightText( 74, 253, 133 ),
m_highlight( 100, 100, 100 ),
m_highlightedText( 255, 255, 255 )
m_highlightedText( 255, 255, 255 ),
m_toolTipText( 0, 0, 0 ),
m_toolTipBase( 128, 128, 128 )
{
setStyle( stylearg );
stylearg->polish( this );
@@ -70,7 +72,8 @@ LmmsPalette::~LmmsPalette()
ACCESSMET( brightText, setBrightText )
ACCESSMET( highlight, setHighlight )
ACCESSMET( highlightedText, setHighlightedText )
ACCESSMET( toolTipText, setToolTipText )
ACCESSMET( toolTipBase, setToolTipBase )
QPalette LmmsPalette::palette() const
@@ -87,7 +90,8 @@ QPalette LmmsPalette::palette() const
pal.setColor( QPalette::Shadow, shadow() );
pal.setColor( QPalette::Highlight, highlight() );
pal.setColor( QPalette::HighlightedText, highlightedText() );
pal.setBrush( QPalette::ToolTipText, QBrush( toolTipText() ) );
pal.setBrush( QPalette::ToolTipBase, QBrush( toolTipBase() ) );
return pal;
}

30
src/gui/widgets/text_float.cpp
View File

@@ -24,6 +24,7 @@
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#include <QtGui/QStyleOption>
#include "text_float.h"
#include "gui_templates.h"
@@ -41,6 +42,8 @@ textFloat::textFloat() :
resize( 20, 20 );
hide();
setAttribute( Qt::WA_TranslucentBackground, true );
setStyle( QApplication::style() );
setFont( pointSize<8>( font() ) );
}
@@ -125,35 +128,38 @@ textFloat * textFloat::displayMessage( const QString & _title,
void textFloat::paintEvent( QPaintEvent * _pe )
{
QStyleOption opt;
opt.init( this );
QPainter p( this );
p.fillRect( 0, 0, width(), height(), QColor( 0, 0, 0, 0 ) );
p.setPen( QColor( 0, 0, 0 ) );
p.setBrush( QColor( 224, 224, 224 ) );
/* p.setPen( p.pen().brush().color() );
p.setBrush( p.background() );*/
p.setFont( pointSize<8>( p.font() ) );
style()->drawPrimitive( QStyle::PE_Widget, &opt, &p, this );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
/* p.drawRect( 0, 0, rect().right(), rect().bottom() );*/
// p.setPen( Qt::black );
// small message?
if( m_title.isEmpty() )
{
p.drawText( 2, p.fontMetrics().height()-2, m_text );
p.drawText( opt.rect, Qt::AlignCenter, m_text );
}
else
{
int text_x = 2;
int text_x = opt.rect.left() + 2;
int text_y = opt.rect.top() + 12;
if( m_pixmap.isNull() == false )
{
p.drawPixmap( 5, 5, m_pixmap );
p.drawPixmap( opt.rect.topLeft() + QPoint( 5, 5 ), m_pixmap );
text_x += m_pixmap.width() + 8;
}
p.drawText( text_x, 28, m_text );
p.drawText( text_x, text_y + 16, m_text );
QFont f = p.font();
f.setBold( true );
p.setFont( f );
p.drawText( text_x, 12, m_title );
p.drawText( text_x, text_y, m_title );
}
}
@@ -194,4 +200,4 @@ void textFloat::updateSize()
#include "moc_text_float.cxx"