mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-15 12:37:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from grejppi/stable-0.4-displaywaveform

Browse Source 
config option to enable waveform display by default
This commit is contained in:
tobydox
2014-01-16 04:58:48 -08:00
parent f37e69a383 9fc64418bd
commit 302a04f0ef
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/setup_dialog.h
View File

@@ -111,6 +111,7 @@ private slots:
void toggleSyncVSTPlugins( bool _enabled );
void toggleAnimateAFP( bool _enabled );
void toggleNoteLabels( bool en );
void toggleDisplayWaveform( bool en );
private:
@@ -162,6 +163,7 @@ private:
bool m_syncVSTPlugins;
bool m_animateAFP;
bool m_printNoteLabels;
bool m_displayWaveform;
typedef QMap<QString, AudioDevice::setupWidget *> AswMap;
typedef QMap<QString, MidiClient::setupWidget *> MswMap;

21
src/gui/setup_dialog.cpp
View File

@@ -123,7 +123,9 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
m_animateAFP(configManager::inst()->value( "ui",
"animateafp").toInt() ),
m_printNoteLabels(configManager::inst()->value( "ui",
"printnotelabels").toInt() )
"printnotelabels").toInt() ),
m_displayWaveform(configManager::inst()->value( "ui",
"displaywaveform").toInt() )
{
setWindowIcon( embed::getIconPixmap( "setup_general" ) );
setWindowTitle( tr( "Setup LMMS" ) );
@@ -282,6 +284,15 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
connect( noteLabels, SIGNAL( toggled( bool ) ),
this, SLOT( toggleNoteLabels( bool ) ) );
ledCheckBox * displayWaveform = new ledCheckBox(
tr( "Enable waveform display by default" ),
misc_tw );
labelNumber++;
displayWaveform->move( XDelta, YDelta*labelNumber );
displayWaveform->setChecked( m_displayWaveform );
connect( displayWaveform, SIGNAL( toggled( bool ) ),
this, SLOT( toggleDisplayWaveform( bool ) ) );
misc_tw->setFixedHeight( YDelta*labelNumber + HeaderSize );
@@ -826,6 +837,8 @@ void setupDialog::accept()
QString::number( m_animateAFP ) );
configManager::inst()->setValue( "ui", "printnotelabels",
QString::number( m_printNoteLabels ) );
configManager::inst()->setValue( "ui", "displaywaveform",
QString::number( m_displayWaveform ) );
configManager::inst()->setWorkingDir( m_workingDir );
@@ -1026,6 +1039,12 @@ void setupDialog::toggleNoteLabels( bool en )
}
void setupDialog::toggleDisplayWaveform( bool en )
{
m_displayWaveform = en;
}
void setupDialog::toggleOneInstrumentTrackWindow( bool _enabled )
{
m_oneInstrumentTrackWindow = _enabled;

3
src/gui/widgets/visualization_widget.cpp
View File

@@ -34,6 +34,8 @@
#include "tooltip.h"
#include "song.h"
#include "config_mgr.h"
visualizationWidget::visualizationWidget( const QPixmap & _bg, QWidget * _p,
@@ -45,6 +47,7 @@ visualizationWidget::visualizationWidget( const QPixmap & _bg, QWidget * _p,
{
setFixedSize( s_background.width(), s_background.height() );
setAttribute( Qt::WA_OpaquePaintEvent, true );
setActive( configManager::inst()->value( "ui", "displaywaveform").toInt() );
const fpp_t frames = engine::mixer()->framesPerPeriod();
m_buffer = new sampleFrame[frames];