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

Merge branch 'master' into calf-updates

Browse Source
This commit is contained in:
Tobias Doerffel
2010-05-21 16:52:59 +02:00
parent bbb91a923c 4d3040297c
commit 96a961bd8b
23 changed files with 276 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/modules/FindFLAC.cmake
View File

@@ -11,7 +11,10 @@ FIND_PATH(FLAC_INCLUDE_DIRS encoder.h /usr/include/FLAC++ /usr/local/include/FLA
FIND_PATH(FLAC_INCLUDE_DIRS export.h /usr/include/FLAC++ /usr/local/include/FLAC++ ${CMAKE_INSTALL_PREFIX}/include/FLAC++ ${CMAKE_INSTALL_PREFIX}/local/include/FLAC++)
FIND_PATH(FLAC_INCLUDE_DIRS metadata.h /usr/include/FLAC++ /usr/local/include/FLAC++ ${CMAKE_INSTALL_PREFIX}/include/FLAC++ ${CMAKE_INSTALL_PREFIX}/local/include/FLAC++)
FIND_PATH(FLAC_INCLUDE_DIRS all.h /usr/include/FLAC++ /usr/local/include/FLAC++ ${CMAKE_INSTALL_PREFIX}/include/FLAC++ ${CMAKE_INSTALL_PREFIX}/local/include/FLAC++)
FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC++ PATH /usr/lib /usr/local/lib ${CMAKE_INSTALL_PREFIX}/lib/FLAC++ ${CMAKE_INSTALL_PREFIX}/local/lib/FLAC++)
FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC PATH /usr/lib /usr/local/lib ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/local/lib)
FIND_LIBRARY(FLACPP_LIBRARIES NAMES FLAC++ PATH /usr/lib /usr/local/lib ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/local/lib)
SET(FLAC_LIBRARIES ${FLAC_LIBRARIES} ${FLACPP_LIBRARIES})
IF(FLAC_INCLUDE_DIRS AND FLAC_LIBRARIES)
SET(FLAC_FOUND TRUE)

1
data/CMakeLists.txt
View File

@@ -6,6 +6,7 @@ ADD_SUBDIRECTORY(samples)
ADD_SUBDIRECTORY(themes)
IF(LMMS_BUILD_LINUX)
INSTALL(FILES themes/default/icon.png DESTINATION ${DATA_DIR}/pixmaps RENAME lmms.png)
INSTALL(FILES lmms DESTINATION ${DATA_DIR}/menu)
INSTALL(FILES lmms.desktop DESTINATION ${DATA_DIR}/applications)
INSTALL(FILES lmms.xml DESTINATION ${DATA_DIR}/mime/packages)

2
data/lmms
View File

@@ -1,4 +1,4 @@
?package(lmms):needs="X11" section="Apps/Sound" \
title="LMMS" hints="Audio" command="/usr/bin/lmms" \
longtitle="Linux MultiMedia Studio" \
icon="/usr/share/lmms/themes/default/icon.png"
icon="/usr/share/pixmaps/lmms.png"

9
data/lmms.desktop
View File

@@ -5,10 +5,9 @@ GenericName[ca]=Programari de producció musical
GenericName[de]=Software zur Musik-Produktion
Comment=easy music production for everyone!
Comment[ca]=Producció fàcil de música per a tothom!
Icon=/usr/share/lmms/themes/default/icon.png
Exec=/usr/bin/lmms
Icon=lmms
Exec=lmms
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;AudioVideo;Qt
MimeType=application/x-lmms-project
Categories=Qt;AudioVideo;Audio;Midi;
MimeType=application/x-lmms-project;

18
include/EffectControls.h
View File

@@ -1,8 +1,8 @@
/*
* EffectControls.h - model for effect-controls
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,8 @@ public:
EffectControls( Effect * _eff ) :
JournallingObject(),
Model( _eff ),
m_effect( _eff )
m_effect( _eff ),
m_viewVisible( false )
{
}
@@ -50,6 +51,16 @@ public:
virtual EffectControlDialog * createView() = 0;
void setViewVisible( bool _visible )
{
m_viewVisible = _visible;
}
bool isViewVisible() const
{
return m_viewVisible;
}
Effect * effect()
{
return m_effect;
@@ -58,6 +69,7 @@ public:
private:
Effect * m_effect;
bool m_viewVisible;
} ;

3
include/EffectView.h
View File

@@ -2,7 +2,7 @@
* EffectView.h - view-component for an effect
*
* Copyright (c) 2006-2007 Danny McRae <khjklujn/at/users.sourceforge.net>
* Copyright (c) 2007-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2007-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -87,7 +87,6 @@ private:
knob * m_gate;
QMdiSubWindow * m_subWindow;
EffectControlDialog * m_controlView;
bool m_show;
} ;

42
include/EnvelopeAndLfoParameters.h
View File

@@ -1,7 +1,7 @@
/*
* EnvelopeAndLfoParameters.h - class EnvelopeAndLfoParameters
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -22,7 +22,6 @@
*
*/
#ifndef _ENVELOPE_AND_LFO_PARAMETERS_H
#define _ENVELOPE_AND_LFO_PARAMETERS_H
@@ -35,11 +34,39 @@
#include "lmms_basics.h"
class EXPORT EnvelopeAndLfoParameters : public Model, public JournallingObject
{
Q_OBJECT
public:
class LfoInstances
{
public:
LfoInstances()
{
}
~LfoInstances()
{
}
inline bool isEmpty() const
{
return m_lfos.isEmpty();
}
void trigger();
void reset();
void add( EnvelopeAndLfoParameters * lfo );
void remove( EnvelopeAndLfoParameters * lfo );
private:
QMutex m_lfoListMutex;
typedef QList<EnvelopeAndLfoParameters *> LfoList;
LfoList m_lfos;
} ;
EnvelopeAndLfoParameters( float _value_for_zero_amount,
Model * _parent );
virtual ~EnvelopeAndLfoParameters();
@@ -49,8 +76,10 @@ public:
return ( ( _val < 0 ) ? -_val : _val ) * _val;
}
static void triggerLfo();
static void resetLfo();
static LfoInstances * instances()
{
return s_lfoInstances;
}
void fillLevel( float * _buf, f_cnt_t _frame,
const f_cnt_t _release_begin,
@@ -89,8 +118,7 @@ protected:
private:
static QVector<EnvelopeAndLfoParameters *> s_EaLParametersInstances;
static LfoInstances * s_lfoInstances;
bool m_used;

2
include/FxMixer.h
View File

@@ -69,7 +69,7 @@ class FxChannel : public ThreadableJob
class FxMixer : public JournallingObject, public Model
class EXPORT FxMixer : public JournallingObject, public Model
{
public:
FxMixer();

2
include/FxMixerView.h
View File

@@ -42,7 +42,7 @@
class QButtonGroup;
class FxLine;
class FxMixerView : public QWidget, public ModelView,
class EXPORT FxMixerView : public QWidget, public ModelView,
public SerializingObjectHook
{
Q_OBJECT

5
include/automation_editor.h
View File

@@ -24,10 +24,10 @@
*
*/
#ifndef _AUTOMATION_EDITOR_H
#define _AUTOMATION_EDITOR_H
#include <QtCore/QMutex>
#include <QtGui/QWidget>
#include "lmms_basics.h"
@@ -76,6 +76,7 @@ public:
public slots:
void update();
void updateAfterPatternChange();
protected:
@@ -190,6 +191,7 @@ private:
ComboBoxModel m_zoomingYModel;
ComboBoxModel m_quantizeModel;
QMutex m_patternMutex;
automationPattern * m_pattern;
float m_minLevel;
float m_maxLevel;
@@ -242,6 +244,7 @@ private:
signals:
void currentPatternChanged();
void positionChanged( const midiTime & );
} ;

12
include/engine.h
View File

@@ -1,7 +1,7 @@
/*
* engine.h - engine-system of LMMS
*
* Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -207,6 +207,16 @@ public:
}
private:
// small helper function which sets the pointer to NULL before actually deleting
// the object it refers to
template<class T>
static inline void deleteHelper( T * * ptr )
{
T * tmp = *ptr;
*ptr = NULL;
delete tmp;
}
static bool s_hasGUI;
static bool s_suppressMessages;
static float s_framesPerTick;

9
include/inline_automation.h
View File

@@ -1,8 +1,8 @@
/*
* inline_automation.h - class for automating something "inline"
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
*
*/
#ifndef _INLINE_AUTOMATION_H
#define _INLINE_AUTOMATION_H
@@ -44,7 +43,7 @@ public:
{
if( m_autoPattern )
{
m_autoPattern->deleteLater();
delete m_autoPattern;
}
}
@@ -65,7 +64,7 @@ public:
m_autoPattern = new automationPattern( NULL );
m_autoPattern->addObject( this );
}
return( m_autoPattern );
return m_autoPattern;
}
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );

21
plugins/ladspa_effect/LadspaControls.cpp
View File

@@ -1,8 +1,8 @@
/*
* LadspaControls.cpp - model for LADSPA-plugin controls
* LadspaControls.cpp - model for LADSPA plugin controls
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
*
*/
#include <QtXml/QDomElement>
#include "LadspaEffect.h"
@@ -35,6 +34,10 @@ LadspaControls::LadspaControls( LadspaEffect * _eff ) :
m_noLink( false ),
m_stereoLinkModel( true, this )
{
connect( &m_stereoLinkModel, SIGNAL( dataChanged() ),
this, SLOT( updateLinkStatesFromGlobal() ) );
multi_proc_t controls = m_effect->getPortControls();
m_controlCount = controls.count();
@@ -163,7 +166,7 @@ void LadspaControls::linkPort( Uint16 _port, bool _state )
void LadspaControls::updateChannelLinkState()
void LadspaControls::updateLinkStatesFromGlobal()
{
if( m_stereoLinkModel.value() )
{
@@ -183,10 +186,10 @@ void LadspaControls::updateChannelLinkState()
m_controls[0][port]->setLink( false );
}
}
else
{
m_noLink = false;
}
// if global channel link state has changed, always ignore link
// status of individual ports in the future
m_noLink = false;
}

8
plugins/ladspa_effect/LadspaControls.h
View File

@@ -1,8 +1,8 @@
/*
* ladspa_controls.h - model for LADSPA-plugin controls
* LadspaControls.h - model for LADSPA plugin controls
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -61,7 +61,7 @@ public:
protected slots:
void updateChannelLinkState();
void updateLinkStatesFromGlobal();
void linkPort( Uint16 _port, bool _state );

2
plugins/sf2_player/sf2_player.cpp
View File

@@ -636,6 +636,7 @@ void sf2Instrument::playNote( notePlayHandle * _n, sampleFrame * )
SF2PluginData * pluginData = static_cast<SF2PluginData *>(
_n->m_pluginData );
#ifdef SOMEONE_FIXED_PER_NOTE_PANNING
if( pluginData->fluidVoice &&
pluginData->lastPanning != _n->getPanning() )
{
@@ -650,6 +651,7 @@ void sf2Instrument::playNote( notePlayHandle * _n, sampleFrame * )
pluginData->lastPanning = _n->getPanning();
}
#endif
const float currentVelocity = _n->volumeLevel( tfp ) * 127;
if( pluginData->fluidVoice &&

9
plugins/spectrum_analyzer/spectrum_analyzer.cpp
View File

@@ -1,8 +1,8 @@
/*
* spectrum_analyzer.cpp - spectrum analyzer plugin
*
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -82,6 +82,11 @@ bool spectrumAnalyzer::processAudioBuffer( sampleFrame * _buf,
return( false );
}
if( !m_saControls.isViewVisible() )
{
return true;
}
fpp_t f = 0;
if( _frames > FFT_BUFFER_SIZE )
{

96
src/core/EnvelopeAndLfoParameters.cpp
View File

@@ -1,8 +1,8 @@
/*
* EnvelopeAndLfoParameters.cpp - class EnvelopeAndLfoParameters
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,53 @@ extern const float SECS_PER_ENV_SEGMENT = 5.0f;
extern const float SECS_PER_LFO_OSCILLATION = 20.0f;
QVector<EnvelopeAndLfoParameters *> EnvelopeAndLfoParameters::s_EaLParametersInstances;
EnvelopeAndLfoParameters::LfoInstances * EnvelopeAndLfoParameters::s_lfoInstances = NULL;
void EnvelopeAndLfoParameters::LfoInstances::trigger()
{
QMutexLocker m( &m_lfoListMutex );
for( LfoList::Iterator it = m_lfos.begin();
it != m_lfos.end(); ++it )
{
( *it )->m_lfoFrame +=
engine::getMixer()->framesPerPeriod();
( *it )->m_bad_lfoShapeData = true;
}
}
void EnvelopeAndLfoParameters::LfoInstances::reset()
{
QMutexLocker m( &m_lfoListMutex );
for( LfoList::Iterator it = m_lfos.begin();
it != m_lfos.end(); ++it )
{
( *it )->m_lfoFrame = 0;
( *it )->m_bad_lfoShapeData = true;
}
}
void EnvelopeAndLfoParameters::LfoInstances::add( EnvelopeAndLfoParameters * lfo )
{
QMutexLocker m( &m_lfoListMutex );
m_lfos.append( lfo );
}
void EnvelopeAndLfoParameters::LfoInstances::remove( EnvelopeAndLfoParameters * lfo )
{
QMutexLocker m( &m_lfoListMutex );
m_lfos.removeAll( lfo );
}
@@ -70,7 +116,12 @@ EnvelopeAndLfoParameters::EnvelopeAndLfoParameters(
m_lfoAmountIsZero( false ),
m_lfoShapeData( NULL )
{
s_EaLParametersInstances.push_back( this );
if( s_lfoInstances == NULL )
{
s_lfoInstances = new LfoInstances();
}
instances()->add( this );
connect( &m_predelayModel, SIGNAL( dataChanged() ),
this, SLOT( updateSampleVars() ) );
@@ -133,10 +184,12 @@ EnvelopeAndLfoParameters::~EnvelopeAndLfoParameters()
delete[] m_rEnv;
delete[] m_lfoShapeData;
QVector<EnvelopeAndLfoParameters *> & v = s_EaLParametersInstances;
if( qFind( v.begin(), v.end(), this ) != v.end() )
instances()->remove( this );
if( instances()->isEmpty() )
{
v.erase( qFind( v.begin(), v.end(), this ) );
delete instances();
s_lfoInstances = NULL;
}
}
@@ -187,35 +240,6 @@ void EnvelopeAndLfoParameters::updateLfoShapeData()
void EnvelopeAndLfoParameters::triggerLfo()
{
QVector<EnvelopeAndLfoParameters *> & v = s_EaLParametersInstances;
for( QVector<EnvelopeAndLfoParameters *>::iterator it = v.begin();
it != v.end(); ++it )
{
( *it )->m_lfoFrame +=
engine::getMixer()->framesPerPeriod();
( *it )->m_bad_lfoShapeData = true;
}
}
void EnvelopeAndLfoParameters::resetLfo()
{
QVector<EnvelopeAndLfoParameters *> & v = s_EaLParametersInstances;
for( QVector<EnvelopeAndLfoParameters *>::iterator it = v.begin();
it != v.end(); ++it )
{
( *it )->m_lfoFrame = 0;
( *it )->m_bad_lfoShapeData = true;
}
}
inline void EnvelopeAndLfoParameters::fillLfoLevel( float * _buf,
f_cnt_t _frame,
const fpp_t _frames )

4
src/core/Mixer.cpp
View File

@@ -1,7 +1,7 @@
/*
* Mixer.cpp - Mixer for audio processing and rendering
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -379,7 +379,7 @@ sampleFrameA * Mixer::renderNextBuffer()
emit nextAudioBuffer();
// and trigger LFOs
EnvelopeAndLfoParameters::triggerLfo();
EnvelopeAndLfoParameters::instances()->trigger();
Controller::triggerFrameCounter();
const float new_cpu_load = timer.elapsed() / 10000.0f *

47
src/core/engine.cpp
View File

@@ -1,7 +1,7 @@
/*
* engine.cpp - implementation of LMMS' engine-system
*
* Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -153,45 +153,32 @@ void engine::destroy()
s_mixer->stopProcessing();
delete s_projectNotes;
s_projectNotes = NULL;
delete s_songEditor;
s_songEditor = NULL;
delete s_bbEditor;
s_bbEditor = NULL;
delete s_pianoRoll;
s_pianoRoll = NULL;
delete s_automationEditor;
s_automationEditor = NULL;
delete s_fxMixerView;
s_fxMixerView = NULL;
deleteHelper( &s_projectNotes );
deleteHelper( &s_songEditor );
deleteHelper( &s_bbEditor );
deleteHelper( &s_pianoRoll );
deleteHelper( &s_automationEditor );
deleteHelper( &s_fxMixerView );
InstrumentTrackView::cleanupWindowPool();
s_song->clearProject();
delete s_bbTrackContainer;
s_bbTrackContainer = NULL;
delete s_dummyTC;
s_dummyTC = NULL;
delete s_mixer;
s_mixer = NULL;
delete s_fxMixer;
s_fxMixer = NULL;
deleteHelper( &s_bbTrackContainer );
deleteHelper( &s_dummyTC );
delete s_ladspaManager;
deleteHelper( &s_mixer );
deleteHelper( &s_fxMixer );
deleteHelper( &s_ladspaManager );
//delete configManager::inst();
delete s_projectJournal;
s_projectJournal = NULL;
deleteHelper( &s_projectJournal );
s_mainWindow = NULL;
delete s_song;
s_song = NULL;
delete s_automationRecorder;
s_automationRecorder = NULL;
deleteHelper( &s_song );
deleteHelper( &s_automationRecorder );
delete s_mergedResourceDB->provider();
s_mergedResourceDB = NULL;

6
src/core/song.cpp
View File

@@ -1,7 +1,7 @@
/*
* song.cpp - root of the model-tree
* song.cpp - root of the model tree
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -301,7 +301,7 @@ void song::processNextBuffer()
// at song-start we have to reset the LFOs
if( m_playPos[Mode_PlaySong] == 0 )
{
EnvelopeAndLfoParameters::resetLfo();
EnvelopeAndLfoParameters::instances()->reset();
}
break;

11
src/core/track.cpp
View File

@@ -2,8 +2,8 @@
* track.cpp - implementation of classes concerning tracks -> necessary for
* all track-like objects (beat/bassline, sample-track...)
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -1764,8 +1764,11 @@ void track::removeTCO( trackContentObject * _tco )
{
m_trackContentObjects.erase( it );
emit trackContentObjectRemoved( _tco );
engine::getSong()->updateLength();
engine::getSong()->setModified();
if( engine::getSong() )
{
engine::getSong()->updateLength();
engine::getSong()->setModified();
}
}
}

119
src/gui/automation_editor.cpp
View File

@@ -24,10 +24,8 @@
*
*/
#include "automation_editor.h"
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QKeyEvent>
@@ -77,6 +75,7 @@ automationEditor::automationEditor() :
m_zoomingXModel(),
m_zoomingYModel(),
m_quantizeModel(),
m_patternMutex( QMutex::Recursive ),
m_pattern( NULL ),
m_minLevel( 0 ),
m_maxLevel( 0 ),
@@ -94,6 +93,10 @@ automationEditor::automationEditor() :
m_editMode( ModeDraw ),
m_scrollBack( false )
{
connect( this, SIGNAL( currentPatternChanged() ),
this, SLOT( updateAfterPatternChange() ),
Qt::QueuedConnection );
// init pixmaps
if( s_toolDraw == NULL )
{
@@ -373,6 +376,8 @@ automationEditor::automationEditor() :
automationEditor::~automationEditor()
{
m_zoomingXModel.disconnect();
m_zoomingYModel.disconnect();
}
@@ -380,10 +385,39 @@ automationEditor::~automationEditor()
void automationEditor::setCurrentPattern( automationPattern * _new_pattern )
{
m_patternMutex.lock();
m_pattern = _new_pattern;
m_patternMutex.unlock();
emit currentPatternChanged();
}
void automationEditor::saveSettings( QDomDocument & _doc, QDomElement & _this )
{
MainWindow::saveWidgetState( this, _this );
}
void automationEditor::loadSettings( const QDomElement & _this )
{
MainWindow::restoreWidgetState( this, _this );
}
void automationEditor::updateAfterPatternChange()
{
QMutexLocker m( &m_patternMutex );
m_currentPosition = 0;
if( validPattern() == false )
if( !validPattern() )
{
setWindowTitle( tr( "Automation Editor - no pattern" ) );
m_minLevel = m_maxLevel = m_scrollLevel = 0;
@@ -401,8 +435,7 @@ void automationEditor::setCurrentPattern( automationPattern * _new_pattern )
// of levels and so on...)
resizeEvent( NULL );
setWindowTitle( tr( "Automation Editor - %1" ).arg(
m_pattern->name() ) );
setWindowTitle( tr( "Automation Editor - %1" ).arg( m_pattern->name() ) );
update();
}
@@ -410,17 +443,16 @@ void automationEditor::setCurrentPattern( automationPattern * _new_pattern )
void automationEditor::saveSettings( QDomDocument & _doc, QDomElement & _this )
void automationEditor::update()
{
MainWindow::saveWidgetState( this, _this );
}
QWidget::update();
void automationEditor::loadSettings( const QDomElement & _this )
{
MainWindow::restoreWidgetState( this, _this );
QMutexLocker m( &m_patternMutex );
// Note detuning?
if( m_pattern && !m_pattern->getTrack() )
{
engine::getPianoRoll()->update();
}
}
@@ -684,7 +716,8 @@ void automationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 )
void automationEditor::mousePressEvent( QMouseEvent * _me )
{
if( validPattern() == false )
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
return;
}
@@ -847,7 +880,8 @@ void automationEditor::mouseReleaseEvent( QMouseEvent * _me )
void automationEditor::mouseMoveEvent( QMouseEvent * _me )
{
if( validPattern() == false )
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
update();
return;
@@ -1221,6 +1255,8 @@ inline void automationEditor::drawCross( QPainter & _p )
void automationEditor::paintEvent( QPaintEvent * _pe )
{
QMutexLocker m( &m_patternMutex );
QStyleOption opt;
opt.initFrom( this );
QPainter p( this );
@@ -1242,7 +1278,7 @@ void automationEditor::paintEvent( QPaintEvent * _pe )
Qt::Alignment text_flags =
(Qt::Alignment)( Qt::AlignRight | Qt::AlignVCenter );
if( m_pattern )
if( validPattern() )
{
if( m_y_auto )
{
@@ -1391,7 +1427,7 @@ void automationEditor::paintEvent( QPaintEvent * _pe )
qSwap<float>( selLevel_start, selLevel_end );
}
if( validPattern() == true )
if( validPattern() )
{
timeMap & time_map = m_pattern->getTimeMap();
timeMap::iterator it = time_map.begin();
@@ -1528,7 +1564,7 @@ void automationEditor::paintEvent( QPaintEvent * _pe )
p.drawRect( x + ValuesWidth, y, w, h );
// TODO: Get this out of paint event
int l = ( validPattern() == true )? (int) m_pattern->length() : 0;
int l = validPattern() ? (int) m_pattern->length() : 0;
// reset scroll-range
if( m_leftRightScroll->maximum() != l )
@@ -1537,7 +1573,7 @@ void automationEditor::paintEvent( QPaintEvent * _pe )
m_leftRightScroll->setPageStep( l );
}
if( validPattern() == true )
if( validPattern() )
{
drawCross( p );
}
@@ -1666,7 +1702,9 @@ float automationEditor::getLevel( int _y )
inline bool automationEditor::inBBEditor()
{
return( m_pattern->getTrack()->getTrackContainer()
QMutexLocker m( &m_patternMutex );
return( validPattern() &&
m_pattern->getTrack()->getTrackContainer()
== engine::getBBTrackContainer() );
}
@@ -1675,7 +1713,9 @@ inline bool automationEditor::inBBEditor()
void automationEditor::play()
{
if( validPattern() == false )
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
return;
}
@@ -1749,6 +1789,8 @@ void automationEditor::play()
void automationEditor::stop()
{
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
return;
@@ -1832,7 +1874,8 @@ void automationEditor::moveButtonToggled()
void automationEditor::selectAll()
{
if( validPattern() == false )
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
return;
}
@@ -1870,7 +1913,8 @@ void automationEditor::selectAll()
// returns vector with pointers to all selected values
void automationEditor::getSelectedValues( timeMap & _selected_values )
{
if( validPattern() == false )
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
return;
}
@@ -1938,7 +1982,8 @@ void automationEditor::copySelectedValues()
void automationEditor::cutSelectedValues()
{
if( validPattern() == false )
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
return;
}
@@ -1969,12 +2014,8 @@ void automationEditor::cutSelectedValues()
void automationEditor::pasteValues()
{
if( validPattern() == false )
{
return;
}
if( !m_valuesToCopy.isEmpty() )
QMutexLocker m( &m_patternMutex );
if( validPattern() && !m_valuesToCopy.isEmpty() )
{
for( timeMap::iterator it = m_valuesToCopy.begin();
it != m_valuesToCopy.end(); ++it )
@@ -1996,7 +2037,8 @@ void automationEditor::pasteValues()
void automationEditor::deleteSelectedValues()
{
if( validPattern() == false )
QMutexLocker m( &m_patternMutex );
if( !validPattern() )
{
return;
}
@@ -2140,19 +2182,6 @@ void automationEditor::updateTopBottomLevels()
void automationEditor::update()
{
QWidget::update();
// Note detuning?
if( m_pattern && !m_pattern->getTrack() )
{
engine::getPianoRoll()->update();
}
}
#include "moc_automation_editor.cxx"

13
src/gui/widgets/EffectView.cpp
View File

@@ -2,7 +2,7 @@
* effect_view.cpp - view-component for an effect
*
* Copyright (c) 2006-2007 Danny McRae <khjklujn/at/users.sourceforge.net>
* Copyright (c) 2007-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2007-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -47,8 +47,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
PluginView( _model, _parent ),
m_bg( embed::getIconPixmap( "effect_plugin" ) ),
m_subWindow( NULL ),
m_controlView( NULL ),
m_show( true )
m_controlView( NULL )
{
setFixedSize( 210, 60 );
@@ -162,16 +161,16 @@ void EffectView::editControls()
{
if( m_subWindow )
{
if( m_show )
if( !effect()->controls()->isViewVisible() )
{
m_subWindow->show();
m_subWindow->raise();
m_show = false;
effect()->controls()->setViewVisible( true );
}
else
{
m_subWindow->hide();
m_show = true;
effect()->controls()->setViewVisible( false );
}
}
}
@@ -217,7 +216,7 @@ void EffectView::closeEffects()
{
m_subWindow->hide();
}
m_show = true;
effect()->controls()->setViewVisible( false );
}