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

Merge pull request #1353 from LMMS/rename

Browse Source 
Rename old style classes and files [wip]
This commit is contained in:
Vesa V
2014-11-26 13:59:45 +02:00
parent ed11ccbf50 5f4cdac802
commit bdbedaddb9
308 changed files with 4355 additions and 4274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/about_dialog.h → include/AboutDialog.h
View File

@@ -1,5 +1,5 @@
/*
* about_dialog.h - declaration of class aboutDialog
* AboutDialog.h - declaration of class AboutDialog
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -31,10 +31,10 @@
#include "ui_about_dialog.h"
class aboutDialog : public QDialog, public Ui::AboutDialog
class AboutDialog : public QDialog, public Ui::AboutDialog
{
public:
aboutDialog( void );
AboutDialog( void );
} ;

8
include/AudioDevice.h
View File

@@ -30,7 +30,7 @@
#include <QtCore/QThread>
#include "Mixer.h"
#include "tab_widget.h"
#include "TabWidget.h"
class AudioPort;
@@ -90,12 +90,12 @@ public:
class setupWidget : public tabWidget
class setupWidget : public TabWidget
{
public:
setupWidget( const QString & _caption, QWidget * _parent ) :
tabWidget( tabWidget::tr( "Settings for %1" ).arg(
tabWidget::tr( _caption.toLatin1() ) ).
TabWidget( TabWidget::tr( "Settings for %1" ).arg(
TabWidget::tr( _caption.toLatin1() ) ).
toUpper(), _parent )
{
}

6
include/AudioPortAudio.h
View File

@@ -56,7 +56,7 @@ public:
#endif
class comboBox;
class ComboBox;
class LcdSpinBox;
@@ -86,8 +86,8 @@ public:
virtual void saveSettings();
private:
comboBox * m_backend;
comboBox * m_device;
ComboBox * m_backend;
ComboBox * m_device;
AudioPortAudioSetupUtil m_setupUtil;
} ;

16
include/automatable_button.h → include/AutomatableButton.h
View File

@@ -1,5 +1,5 @@
/*
* automatable_button.h - class automatableButton, the base for all buttons
* AutomatableButton.h - class automatableButton, the base for all buttons
*
* Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -34,13 +34,13 @@
class automatableButtonGroup;
class EXPORT automatableButton : public QPushButton, public BoolModelView
class EXPORT AutomatableButton : public QPushButton, public BoolModelView
{
Q_OBJECT
public:
automatableButton( QWidget * _parent, const QString & _name
AutomatableButton( QWidget * _parent, const QString & _name
= QString::null );
virtual ~automatableButton();
virtual ~AutomatableButton();
inline void setCheckable( bool _on )
{
@@ -87,10 +87,10 @@ public:
= QString::null );
virtual ~automatableButtonGroup();
void addButton( automatableButton * _btn );
void removeButton( automatableButton * _btn );
void addButton( AutomatableButton * _btn );
void removeButton( AutomatableButton * _btn );
void activateButton( automatableButton * _btn );
void activateButton( AutomatableButton * _btn );
virtual void modelChanged();
@@ -100,7 +100,7 @@ private slots:
private:
QList<automatableButton *> m_buttons;
QList<AutomatableButton *> m_buttons;
} ;

8
include/automatable_slider.h → include/AutomatableSlider.h
View File

@@ -1,5 +1,5 @@
/*
* automatable_slider.h - class automatableSlider, a QSlider with automation
* AutomatableSlider.h - class automatableSlider, a QSlider with automation
*
* Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
@@ -32,12 +32,12 @@
class automatableSlider : public QSlider, public IntModelView
class AutomatableSlider : public QSlider, public IntModelView
{
Q_OBJECT
public:
automatableSlider( QWidget * _parent, const QString & _name = QString::null );
virtual ~automatableSlider();
AutomatableSlider( QWidget * _parent, const QString & _name = QString::null );
virtual ~AutomatableSlider();
bool showStatus()
{

44
include/AutomationEditor.h
View File

@@ -34,17 +34,17 @@
#include "MidiTime.h"
#include "AutomationPattern.h"
#include "ComboBoxModel.h"
#include "knob.h"
#include "Knob.h"
class QPainter;
class QPixmap;
class QScrollBar;
class comboBox;
class ComboBox;
class NotePlayHandle;
class timeLine;
class toolButton;
class Timeline;
class ToolButton;
class AutomationEditor : public QWidget, public JournallingObject
@@ -191,27 +191,27 @@ private:
QWidget * m_toolBar;
toolButton * m_playButton;
toolButton * m_stopButton;
ToolButton * m_playButton;
ToolButton * m_stopButton;
toolButton * m_drawButton;
toolButton * m_eraseButton;
toolButton * m_selectButton;
toolButton * m_moveButton;
ToolButton * m_drawButton;
ToolButton * m_eraseButton;
ToolButton * m_selectButton;
ToolButton * m_moveButton;
toolButton * m_discreteButton;
toolButton * m_linearButton;
toolButton * m_cubicHermiteButton;
knob * m_tensionKnob;
ToolButton * m_discreteButton;
ToolButton * m_linearButton;
ToolButton * m_cubicHermiteButton;
Knob * m_tensionKnob;
FloatModel * m_tensionModel;
toolButton * m_cutButton;
toolButton * m_copyButton;
toolButton * m_pasteButton;
ToolButton * m_cutButton;
ToolButton * m_copyButton;
ToolButton * m_pasteButton;
comboBox * m_zoomingXComboBox;
comboBox * m_zoomingYComboBox;
comboBox * m_quantizeComboBox;
ComboBox * m_zoomingXComboBox;
ComboBox * m_zoomingYComboBox;
ComboBox * m_quantizeComboBox;
ComboBoxModel m_zoomingXModel;
ComboBoxModel m_zoomingYModel;
@@ -258,7 +258,7 @@ private:
editModes m_editMode;
timeLine * m_timeLine;
Timeline * m_timeLine;
bool m_scrollBack;
void drawCross( QPainter & _p );
@@ -270,7 +270,7 @@ private:
QColor m_vertexColor;
QBrush m_scaleColor;
friend class engine;
friend class Engine;
signals:

4
include/AutomationPattern.h
View File

@@ -38,7 +38,7 @@ class MidiTime;
class EXPORT AutomationPattern : public trackContentObject
class EXPORT AutomationPattern : public TrackContentObject
{
Q_OBJECT
public:
@@ -148,7 +148,7 @@ public:
void processMidiTime( const MidiTime & _time );
virtual trackContentObjectView * createView( trackView * _tv );
virtual TrackContentObjectView * createView( TrackView * _tv );
static bool isAutomated( const AutomatableModel * _m );

6
include/AutomationPatternView.h
View File

@@ -30,7 +30,7 @@
class AutomationPattern;
class AutomationPatternView : public trackContentObjectView
class AutomationPatternView : public TrackContentObjectView
{
Q_OBJECT
@@ -39,7 +39,7 @@ class AutomationPatternView : public trackContentObjectView
Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
public:
AutomationPatternView( AutomationPattern * _pat, trackView * _parent );
AutomationPatternView( AutomationPattern * _pat, TrackView * _parent );
virtual ~AutomationPatternView();
public slots:
@@ -59,7 +59,7 @@ protected:
virtual void resizeEvent( QResizeEvent * _re )
{
m_needsUpdate = true;
trackContentObjectView::resizeEvent( _re );
TrackContentObjectView::resizeEvent( _re );
}
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );

6
include/AutomationTrack.h
View File

@@ -45,8 +45,8 @@ public:
return "automationtrack";
}
virtual trackView * createView( TrackContainerView* );
virtual trackContentObject * createTCO( const MidiTime & _pos );
virtual TrackView * createView( TrackContainerView* );
virtual TrackContentObject * createTCO( const MidiTime & _pos );
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent );
@@ -59,7 +59,7 @@ private:
class AutomationTrackView : public trackView
class AutomationTrackView : public TrackView
{
public:
AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );

22
include/bb_editor.h → include/BBEditor.h
View File

@@ -1,5 +1,5 @@
/*
* bb_editor.h - view-component of BB-Editor
* BBEditor.h - view-component of BB-Editor
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -29,17 +29,17 @@
#include "TrackContainerView.h"
class bbTrackContainer;
class comboBox;
class toolButton;
class BBTrackContainer;
class ComboBox;
class ToolButton;
class bbEditor : public TrackContainerView
class BBEditor : public TrackContainerView
{
Q_OBJECT
public:
bbEditor( bbTrackContainer * _tc );
virtual ~bbEditor();
BBEditor( BBTrackContainer * _tc );
virtual ~BBEditor();
virtual inline bool fixedTCOs() const
{
@@ -64,13 +64,13 @@ public slots:
private:
virtual void keyPressEvent( QKeyEvent * _ke );
bbTrackContainer * m_bbtc;
BBTrackContainer * m_bbtc;
QWidget * m_toolBar;
toolButton * m_playButton;
toolButton * m_stopButton;
ToolButton * m_playButton;
ToolButton * m_stopButton;
comboBox * m_bbComboBox;
ComboBox * m_bbComboBox;
} ;

50
include/bb_track.h → include/BBTrack.h
View File

@@ -1,5 +1,5 @@
/*
* bb_track.h - class bbTrack, a wrapper for using bbEditor
* BBTrack.h - class BBTrack, a wrapper for using bbEditor
* (which is a singleton-class) as track
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -32,15 +32,15 @@
#include "Track.h"
class trackLabelButton;
class TrackLabelButton;
class TrackContainer;
class bbTCO : public trackContentObject
class BBTCO : public TrackContentObject
{
public:
bbTCO( Track * _track );
virtual ~bbTCO();
BBTCO( Track * _track );
virtual ~BBTCO();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
@@ -71,25 +71,25 @@ public:
int bbTrackIndex();
virtual trackContentObjectView * createView( trackView * _tv );
virtual TrackContentObjectView * createView( TrackView * _tv );
private:
QColor m_color;
bool m_useStyleColor;
friend class bbTCOView;
friend class BBTCOView;
} ;
class bbTCOView : public trackContentObjectView
class BBTCOView : public TrackContentObjectView
{
Q_OBJECT
public:
bbTCOView( trackContentObject * _tco, trackView * _tv );
virtual ~bbTCOView();
BBTCOView( TrackContentObject * _tco, TrackView * _tv );
virtual ~BBTCOView();
QColor color() const
{
@@ -113,30 +113,30 @@ protected:
private:
bbTCO * m_bbTCO;
BBTCO * m_bbTCO;
} ;
class EXPORT bbTrack : public Track
class EXPORT BBTrack : public Track
{
Q_OBJECT
public:
bbTrack( TrackContainer* tc );
virtual ~bbTrack();
BBTrack( TrackContainer* tc );
virtual ~BBTrack();
virtual bool play( const MidiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
virtual trackView * createView( TrackContainerView* tcv );
virtual trackContentObject * createTCO( const MidiTime & _pos );
virtual TrackView * createView( TrackContainerView* tcv );
virtual TrackContentObject * createTCO( const MidiTime & _pos );
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent );
virtual void loadTrackSpecificSettings( const QDomElement & _this );
static bbTrack * findBBTrack( int _bb_num );
static BBTrack * findBBTrack( int _bb_num );
static void swapBBTracks( Track * _track1, Track * _track2 );
int index()
@@ -188,27 +188,27 @@ protected:
private:
QList<Track *> m_disabledTracks;
typedef QMap<bbTrack *, int> infoMap;
typedef QMap<BBTrack *, int> infoMap;
static infoMap s_infoMap;
static QColor * s_lastTCOColor;
friend class bbTrackView;
friend class BBTrackView;
} ;
class bbTrackView : public trackView
class BBTrackView : public TrackView
{
Q_OBJECT
public:
bbTrackView( bbTrack* bbt, TrackContainerView* tcv );
virtual ~bbTrackView();
BBTrackView( BBTrack* bbt, TrackContainerView* tcv );
virtual ~BBTrackView();
virtual bool close();
const bbTrack * getBBTrack() const
const BBTrack * getBBTrack() const
{
return( m_bbTrack );
}
@@ -219,8 +219,8 @@ public slots:
private:
bbTrack * m_bbTrack;
trackLabelButton * m_trackLabel;
BBTrack * m_bbTrack;
TrackLabelButton * m_trackLabel;
} ;

14
include/bb_track_container.h → include/BBTrackContainer.h
View File

@@ -1,5 +1,5 @@
/*
* bb_track_container.h - model-component of BB-Editor
* BBTrackContainer.h - model-component of BB-Editor
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -27,16 +27,16 @@
#define BB_TRACK_CONTAINER_H
#include "TrackContainer.h"
#include "combobox.h"
#include "ComboBox.h"
class EXPORT bbTrackContainer : public TrackContainer
class EXPORT BBTrackContainer : public TrackContainer
{
Q_OBJECT
mapPropertyFromModel(int,currentBB,setCurrentBB,m_bbComboBoxModel);
public:
bbTrackContainer();
virtual ~bbTrackContainer();
BBTrackContainer();
virtual ~BBTrackContainer();
virtual bool play( MidiTime _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
@@ -58,7 +58,7 @@ public:
void swapBB( int _bb1, int _bb2 );
void updateBBTrack( trackContentObject * _tco );
void updateBBTrack( TrackContentObject * _tco );
void fixIncorrectPositions();
void createTCOsForBB( int _bb );
@@ -74,7 +74,7 @@ private:
ComboBoxModel m_bbComboBoxModel;
friend class bbEditor;
friend class BBEditor;
} ;

4
include/BandLimitedWave.h
View File

@@ -35,7 +35,7 @@
#include "interpolation.h"
#include "lmms_basics.h"
#include "lmms_math.h"
#include "engine.h"
#include "Engine.h"
#include "Mixer.h"
#define MAXLEN 11
@@ -104,7 +104,7 @@ public:
*/
static inline float freqToLen( float f )
{
return freqToLen( f, engine::mixer()->processingSampleRate() );
return freqToLen( f, Engine::mixer()->processingSampleRate() );
}
/*! \brief This method converts frequency to wavelength, but you can use any custom sample rate with it.

12
include/basic_filters.h → include/BasicFilters.h
View File

@@ -1,5 +1,5 @@
/*
* basic_filters.h - simple but powerful filter-class with most used filters
* BasicFilters.h - simple but powerful filter-class with most used filters
*
* original file by ???
* modified and enhanced by Tobias Doerffel
@@ -49,7 +49,7 @@
//#include <cstdlib>
template<ch_cnt_t CHANNELS/* = DEFAULT_CHANNELS*/>
class basicFilters
class BasicFilters
{
MM_OPERATORS
public:
@@ -106,14 +106,14 @@ public:
: Moog;
if( m_subFilter == NULL )
{
m_subFilter = new basicFilters<CHANNELS>(
m_subFilter = new BasicFilters<CHANNELS>(
static_cast<sample_rate_t>(
m_sampleRate ) );
}
m_subFilter->m_type = m_type;
}
inline basicFilters( const sample_rate_t _sample_rate ) :
inline BasicFilters( const sample_rate_t _sample_rate ) :
m_doubleFilter( false ),
m_sampleRate( (float) _sample_rate ),
m_sampleRatio( 1.0f / m_sampleRate ),
@@ -123,7 +123,7 @@ public:
clearHistory();
}
inline ~basicFilters()
inline ~BasicFilters()
{
delete m_subFilter;
}
@@ -756,7 +756,7 @@ private:
float m_sampleRate;
float m_sampleRatio;
basicFilters<CHANNELS> * m_subFilter;
BasicFilters<CHANNELS> * m_subFilter;
} ;

2
include/BufferManager.h
View File

@@ -28,7 +28,7 @@
#include "MemoryManager.h"
#include "lmms_basics.h"
#include "engine.h"
#include "Engine.h"
#include "Mixer.h"
#include <QtCore/QAtomicInt>
#include <QtCore/QReadWriteLock>

8
include/cpuload_widget.h → include/CPULoadWidget.h
View File

@@ -1,5 +1,5 @@
/*
* cpuload_widget.h - widget for displaying CPU-load (partly based on
* CPULoadWidget.h - widget for displaying CPU-load (partly based on
* Hydrogen's CPU-load-widget)
*
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -34,12 +34,12 @@
#include "lmms_basics.h"
class cpuloadWidget : public QWidget
class CPULoadWidget : public QWidget
{
Q_OBJECT
public:
cpuloadWidget( QWidget * _parent );
virtual ~cpuloadWidget();
CPULoadWidget( QWidget * _parent );
virtual ~CPULoadWidget();
protected:

8
include/caption_menu.h → include/CaptionMenu.h
View File

@@ -1,5 +1,5 @@
/*
* caption_menu.h - context menu with a caption
* CaptionMenu.h - context menu with a caption
*
* Copyright (c) 2007-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
@@ -33,12 +33,12 @@
///
/// \brief A context menu with a caption
///
class EXPORT captionMenu : public QMenu
class EXPORT CaptionMenu : public QMenu
{
Q_OBJECT
public:
captionMenu( const QString & _title, QWidget * _parent = 0 );
virtual ~captionMenu();
CaptionMenu( const QString & _title, QWidget * _parent = 0 );
virtual ~CaptionMenu();
///
/// \brief Adds a "Help" action displaying the Menu's parent's WhatsThis

8
include/combobox.h → include/ComboBox.h
View File

@@ -1,5 +1,5 @@
/*
* combobox.h - class ComboBox, a combo box view for models
* ComboBox.h - class ComboBox, a combo box view for models
*
* Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -34,12 +34,12 @@
class EXPORT comboBox : public QWidget, public IntModelView
class EXPORT ComboBox : public QWidget, public IntModelView
{
Q_OBJECT
public:
comboBox( QWidget* parent = NULL, const QString& name = QString() );
virtual ~comboBox();
ComboBox( QWidget* parent = NULL, const QString& name = QString() );
virtual ~ComboBox();
ComboBoxModel* model()
{

4
include/ConfigManager.h
View File

@@ -36,7 +36,7 @@
#include "export.h"
#include "MemoryManager.h"
class engine;
class Engine;
const QString PROJECTS_PATH = "projects/";
@@ -221,7 +221,7 @@ private:
settingsMap m_settings;
friend class engine;
friend class Engine;
} ;

2
include/Controller.h
View File

@@ -27,7 +27,7 @@
#ifndef CONTROLLER_H
#define CONTROLLER_H
#include "engine.h"
#include "Engine.h"
#include "Mixer.h"
#include "Model.h"
#include "JournallingObject.h"

18
include/ControllerConnectionDialog.h
View File

@@ -39,11 +39,11 @@ class QLineEdit;
class QListView;
class QScrollArea;
class AutoDetectMidiController;
class comboBox;
class groupBox;
class tabWidget;
class ComboBox;
class GroupBox;
class TabWidget;
class LcdSpinBox;
class ledCheckBox;
class LedCheckBox;
class MidiPortMenu;
@@ -76,19 +76,19 @@ protected slots:
private:
// Midi
groupBox * m_midiGroupBox;
GroupBox * m_midiGroupBox;
LcdSpinBox * m_midiChannelSpinBox;
LcdSpinBox * m_midiControllerSpinBox;
ledCheckBox * m_midiAutoDetectCheckBox;
LedCheckBox * m_midiAutoDetectCheckBox;
MidiPortMenu * m_readablePorts;
BoolModel m_midiAutoDetect;
// User
groupBox * m_userGroupBox;
comboBox * m_userController;
GroupBox * m_userGroupBox;
ComboBox * m_userController;
// Mapping
tabWidget * m_mappingBox;
TabWidget * m_mappingBox;
QLineEdit * m_mappingFunction;
Controller * m_controller;

2
include/ControllerView.h
View File

@@ -36,7 +36,7 @@ class QLabel;
class QPushButton;
class QMdiSubWindow;
class ledCheckBox;
class LedCheckBox;
class ControllerView : public QWidget, public ModelView

2
include/drumsynth.h → include/DrumSynth.h
View File

@@ -1,5 +1,5 @@
/*
* drumsynth.h - DrumSynth DS file renderer
* DrumSynth.h - DrumSynth DS file renderer
*
* Copyright (c) 1998-2000 Paul Kellett (mda-vst.com)
* Copyright (c) 2007 Paul Giblock <drfaygo/at/gmail.com>

16
include/Effect.h
View File

@@ -27,7 +27,7 @@
#define EFFECT_H
#include "Plugin.h"
#include "engine.h"
#include "Engine.h"
#include "Mixer.h"
#include "AutomatableModel.h"
#include "TempoSyncKnobModel.h"
@@ -103,8 +103,8 @@ public:
inline f_cnt_t timeout() const
{
const float samples = engine::mixer()->processingSampleRate() * m_autoQuitModel.value() / 1000.0f;
return 1 + ( static_cast<int>( samples ) / engine::mixer()->framesPerPeriod() );
const float samples = Engine::mixer()->processingSampleRate() * m_autoQuitModel.value() / 1000.0f;
return 1 + ( static_cast<int>( samples ) / Engine::mixer()->framesPerPeriod() );
}
inline float wetLevel() const
@@ -177,9 +177,9 @@ protected:
sample_rate_t _dst_sr )
{
resample( 0, _src_buf,
engine::mixer()->processingSampleRate(),
Engine::mixer()->processingSampleRate(),
_dst_buf, _dst_sr,
engine::mixer()->framesPerPeriod() );
Engine::mixer()->framesPerPeriod() );
}
inline void sampleBack( const sampleFrame * _src_buf,
@@ -187,9 +187,9 @@ protected:
sample_rate_t _src_sr )
{
resample( 1, _src_buf, _src_sr, _dst_buf,
engine::mixer()->processingSampleRate(),
engine::mixer()->framesPerPeriod() * _src_sr /
engine::mixer()->processingSampleRate() );
Engine::mixer()->processingSampleRate(),
Engine::mixer()->framesPerPeriod() * _src_sr /
Engine::mixer()->processingSampleRate() );
}
void reinitSRC();

4
include/EffectRackView.h
View File

@@ -36,7 +36,7 @@ class QScrollArea;
class QVBoxLayout;
class EffectView;
class groupBox;
class GroupBox;
class EffectRackView : public QWidget, public ModelView
@@ -75,7 +75,7 @@ private:
QVector<EffectView *> m_effectViews;
groupBox* m_effectsGroupBox;
GroupBox* m_effectsGroupBox;
QScrollArea* m_scrollArea;
int m_lastY;

10
include/EffectView.h
View File

@@ -36,8 +36,8 @@ class QPushButton;
class QMdiSubWindow;
class EffectControlDialog;
class knob;
class ledCheckBox;
class Knob;
class LedCheckBox;
class TempoSyncKnob;
@@ -81,10 +81,10 @@ protected:
private:
QPixmap m_bg;
ledCheckBox * m_bypass;
knob * m_wetDry;
LedCheckBox * m_bypass;
Knob * m_wetDry;
TempoSyncKnob * m_autoQuit;
knob * m_gate;
Knob * m_gate;
QMdiSubWindow * m_subWindow;
EffectControlDialog * m_controlView;

34
include/engine.h → include/Engine.h
View File

@@ -1,5 +1,5 @@
/*
* engine.h - engine-system of LMMS
* Engine.h - engine-system of LMMS
*
* Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -34,8 +34,8 @@
#include "export.h"
class AutomationEditor;
class bbEditor;
class bbTrackContainer;
class BBEditor;
class BBTrackContainer;
class DummyTrackContainer;
class FxMixer;
class FxMixerView;
@@ -43,14 +43,14 @@ class ProjectJournal;
class MainWindow;
class Mixer;
class PianoRoll;
class projectNotes;
class song;
class ProjectNotes;
class Song;
class SongEditor;
class ladspa2LMMS;
class Ladspa2LMMS;
class ControllerRackView;
class EXPORT engine
class EXPORT Engine
{
public:
static void init( const bool _has_gui = true );
@@ -82,12 +82,12 @@ public:
return s_fxMixer;
}
static song * getSong()
static Song * getSong()
{
return s_song;
}
static bbTrackContainer * getBBTrackContainer()
static BBTrackContainer * getBBTrackContainer()
{
return s_bbTrackContainer;
}
@@ -113,7 +113,7 @@ public:
return s_songEditor;
}
static bbEditor * getBBEditor()
static BBEditor * getBBEditor()
{
return s_bbEditor;
}
@@ -123,7 +123,7 @@ public:
return s_pianoRoll;
}
static projectNotes * getProjectNotes()
static ProjectNotes * getProjectNotes()
{
return s_projectNotes;
}
@@ -133,7 +133,7 @@ public:
return s_automationEditor;
}
static ladspa2LMMS * getLADSPAManager()
static Ladspa2LMMS * getLADSPAManager()
{
return s_ladspaManager;
}
@@ -178,8 +178,8 @@ private:
// core
static Mixer *s_mixer;
static FxMixer * s_fxMixer;
static song * s_song;
static bbTrackContainer * s_bbTrackContainer;
static Song * s_song;
static BBTrackContainer * s_bbTrackContainer;
static ProjectJournal * s_projectJournal;
static DummyTrackContainer * s_dummyTC;
static ControllerRackView * s_controllerRackView;
@@ -189,10 +189,10 @@ private:
static FxMixerView * s_fxMixerView;
static SongEditor* s_songEditor;
static AutomationEditor * s_automationEditor;
static bbEditor * s_bbEditor;
static BBEditor * s_bbEditor;
static PianoRoll* s_pianoRoll;
static projectNotes * s_projectNotes;
static ladspa2LMMS * s_ladspaManager;
static ProjectNotes * s_projectNotes;
static Ladspa2LMMS * s_ladspaManager;
static QMap<QString, QString> s_pluginFileHandling;

32
include/EnvelopeAndLfoView.h
View File

@@ -36,9 +36,9 @@ class QPixmap;
class EnvelopeAndLfoParameters;
class automatableButtonGroup;
class knob;
class ledCheckBox;
class pixmapButton;
class Knob;
class LedCheckBox;
class PixmapButton;
class TempoSyncKnob;
@@ -72,24 +72,24 @@ private:
// envelope stuff
knob * m_predelayKnob;
knob * m_attackKnob;
knob * m_holdKnob;
knob * m_decayKnob;
knob * m_sustainKnob;
knob * m_releaseKnob;
knob * m_amountKnob;
Knob * m_predelayKnob;
Knob * m_attackKnob;
Knob * m_holdKnob;
Knob * m_decayKnob;
Knob * m_sustainKnob;
Knob * m_releaseKnob;
Knob * m_amountKnob;
// LFO stuff
knob * m_lfoPredelayKnob;
knob * m_lfoAttackKnob;
Knob * m_lfoPredelayKnob;
Knob * m_lfoAttackKnob;
TempoSyncKnob * m_lfoSpeedKnob;
knob * m_lfoAmountKnob;
pixmapButton * m_userLfoBtn;
Knob * m_lfoAmountKnob;
PixmapButton * m_userLfoBtn;
automatableButtonGroup * m_lfoWaveBtnGrp;
ledCheckBox * m_x100Cb;
ledCheckBox * m_controlEnvAmountCb;
LedCheckBox * m_x100Cb;
LedCheckBox * m_controlEnvAmountCb;
float m_randomGraph;
} ;

8
include/export_project_dialog.h → include/ExportProjectDialog.h
View File

@@ -1,5 +1,5 @@
/*
* export_project_dialog.h - declaration of class exportProjectDialog which is
* ExportProjectDialog.h - declaration of class ExportProjectDialog which is
* responsible for exporting project
*
* Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -34,12 +34,12 @@
#include "ProjectRenderer.h"
class exportProjectDialog : public QDialog, public Ui::ExportProjectDialog
class ExportProjectDialog : public QDialog, public Ui::ExportProjectDialog
{
Q_OBJECT
public:
exportProjectDialog( const QString & _file_name, QWidget * _parent, bool multi_export );
virtual ~exportProjectDialog();
ExportProjectDialog( const QString & _file_name, QWidget * _parent, bool multi_export );
virtual ~ExportProjectDialog();
protected:

8
include/fade_button.h → include/FadeButton.h
View File

@@ -1,5 +1,5 @@
/*
* fade_button.h - declaration of class fadeButton
* FadeButton.h - declaration of class fadeButton
*
* Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -31,14 +31,14 @@
#include <QColor>
class fadeButton : public QAbstractButton
class FadeButton : public QAbstractButton
{
Q_OBJECT
public:
fadeButton( const QColor & _normal_color, const QColor &
FadeButton( const QColor & _normal_color, const QColor &
_activated_color, QWidget * _parent );
virtual ~fadeButton();
virtual ~FadeButton();
public slots:

12
include/fader.h → include/Fader.h
View File

@@ -1,5 +1,5 @@
/*
* fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen
* Fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen
*
* Copyright (c) 2008-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -54,17 +54,17 @@
#include "AutomatableModelView.h"
class textFloat;
class TextFloat;
class fader : public QWidget, public FloatModelView
class Fader : public QWidget, public FloatModelView
{
Q_OBJECT
public:
Q_PROPERTY( QColor peakGreen READ peakGreen WRITE setPeakGreen )
Q_PROPERTY( QColor peakRed READ peakRed WRITE setPeakRed )
fader( FloatModel * _model, const QString & _name, QWidget * _parent );
virtual ~fader();
Fader( FloatModel * _model, const QString & _name, QWidget * _parent );
virtual ~Fader();
void setPeak_L( float fPeak );
float getPeak_L() { return m_fPeakValue_L; }
@@ -116,7 +116,7 @@ private:
int m_moveStartPoint;
float m_startValue;
static textFloat * s_textFloat;
static TextFloat * s_textFloat;
void updateTextFloat();
QColor m_peakGreen;

4
include/FxLine.h
View File

@@ -29,7 +29,7 @@
#include <QWidget>
#include <QLabel>
#include "knob.h"
#include "Knob.h"
#include "LcdWidget.h"
#include "SendButtonIndicator.h"
@@ -52,7 +52,7 @@ public:
inline int channelIndex() { return m_channelIndex; }
void setChannelIndex(int index);
knob * m_sendKnob;
Knob * m_sendKnob;
SendButtonIndicator * m_sendBtn;
QBrush backgroundActive() const;

14
include/FxMixerView.h
View File

@@ -33,10 +33,10 @@
#include "FxLine.h"
#include "FxMixer.h"
#include "ModelView.h"
#include "engine.h"
#include "fader.h"
#include "pixmap_button.h"
#include "tooltip.h"
#include "Engine.h"
#include "Fader.h"
#include "PixmapButton.h"
#include "ToolTip.h"
#include "embed.h"
#include "EffectRackView.h"
@@ -54,9 +54,9 @@ public:
FxChannelView(QWidget * _parent, FxMixerView * _mv, int _chIndex );
FxLine * m_fxLine;
pixmapButton * m_muteBtn;
pixmapButton * m_soloBtn;
fader * m_fader;
PixmapButton * m_muteBtn;
PixmapButton * m_soloBtn;
Fader * m_fader;
EffectRackView * m_rackView;
};

10
include/graph.h → include/Graph.h
View File

@@ -1,5 +1,5 @@
/*
* graph.h - a QT widget for displaying and manipulating waveforms
* Graph.h - a QT widget for displaying and manipulating waveforms
*
* Copyright (c) 2006-2007 Andreas Brandmaier <andy/at/brandmaier/dot/de>
* 2008 Paul Giblock <drfaygo/at/gmail/dot/com>
@@ -38,7 +38,7 @@
class graphModel;
class EXPORT graph : public QWidget, public ModelView
class EXPORT Graph : public QWidget, public ModelView
{
Q_OBJECT
public:
@@ -51,11 +51,11 @@ public:
NumGraphStyles
};
graph( QWidget * _parent, graphStyle _style = graph::LinearStyle,
Graph( QWidget * _parent, graphStyle _style = Graph::LinearStyle,
int _width = 132,
int _height = 104
);
virtual ~graph();
virtual ~Graph();
void setForeground( const QPixmap & _pixmap );
@@ -179,7 +179,7 @@ private:
float m_maxValue;
float m_step;
friend class graph;
friend class Graph;
};

14
include/group_box.h → include/GroupBox.h
View File

@@ -1,5 +1,5 @@
/*
* group_box.h - LMMS-groupbox
* GroupBox.h - LMMS-groupbox
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -29,22 +29,22 @@
#include <QWidget>
#include "AutomatableModelView.h"
#include "pixmap_button.h"
#include "PixmapButton.h"
class QPixmap;
class groupBox : public QWidget, public BoolModelView
class GroupBox : public QWidget, public BoolModelView
{
Q_OBJECT
public:
groupBox( const QString & _caption, QWidget * _parent = NULL );
virtual ~groupBox();
GroupBox( const QString & _caption, QWidget * _parent = NULL );
virtual ~GroupBox();
virtual void modelChanged();
pixmapButton * ledButton()
PixmapButton * ledButton()
{
return m_led;
}
@@ -63,7 +63,7 @@ protected:
private:
void updatePixmap();
pixmapButton * m_led;
PixmapButton * m_led;
QString m_caption;
const int m_titleBarHeight;

24
include/InstrumentFunctionViews.h
View File

@@ -30,9 +30,9 @@
#include <QWidget>
class QLabel;
class comboBox;
class groupBox;
class knob;
class ComboBox;
class GroupBox;
class Knob;
class TempoSyncKnob;
class InstrumentFunctionArpeggio;
@@ -53,9 +53,9 @@ private:
InstrumentFunctionNoteStacking * m_cc;
groupBox * m_chordsGroupBox;
comboBox * m_chordsComboBox;
knob * m_chordRangeKnob;
GroupBox * m_chordsGroupBox;
ComboBox * m_chordsComboBox;
Knob * m_chordRangeKnob;
} ;
@@ -75,14 +75,14 @@ private:
virtual void modelChanged();
InstrumentFunctionArpeggio * m_a;
groupBox * m_arpGroupBox;
comboBox * m_arpComboBox;
knob * m_arpRangeKnob;
GroupBox * m_arpGroupBox;
ComboBox * m_arpComboBox;
Knob * m_arpRangeKnob;
TempoSyncKnob * m_arpTimeKnob;
knob * m_arpGateKnob;
Knob * m_arpGateKnob;
comboBox * m_arpDirectionComboBox;
comboBox * m_arpModeComboBox;
ComboBox * m_arpDirectionComboBox;
ComboBox * m_arpModeComboBox;
} ;

6
include/InstrumentMidiIOView.h
View File

@@ -31,7 +31,7 @@
#include "ModelView.h"
class groupBox;
class GroupBox;
class LcdSpinBox;
class QToolButton;
@@ -47,12 +47,12 @@ public:
private:
virtual void modelChanged();
groupBox * m_midiInputGroupBox;
GroupBox * m_midiInputGroupBox;
LcdSpinBox * m_inputChannelSpinBox;
LcdSpinBox * m_fixedInputVelocitySpinBox;
QToolButton * m_rpBtn;
groupBox * m_midiOutputGroupBox;
GroupBox * m_midiOutputGroupBox;
LcdSpinBox * m_outputChannelSpinBox;
LcdSpinBox * m_fixedOutputVelocitySpinBox;
LcdSpinBox * m_outputProgramSpinBox;

18
include/InstrumentSoundShapingView.h
View File

@@ -33,10 +33,10 @@
class QLabel;
class EnvelopeAndLfoView;
class comboBox;
class groupBox;
class knob;
class tabWidget;
class ComboBox;
class GroupBox;
class Knob;
class TabWidget;
class InstrumentSoundShapingView : public QWidget, public ModelView
@@ -54,14 +54,14 @@ private:
InstrumentSoundShaping * m_ss;
tabWidget * m_targetsTabWidget;
TabWidget * m_targetsTabWidget;
EnvelopeAndLfoView * m_envLfoViews[InstrumentSoundShaping::NumTargets];
// filter-stuff
groupBox * m_filterGroupBox;
comboBox * m_filterComboBox;
knob * m_filterCutKnob;
knob * m_filterResKnob;
GroupBox * m_filterGroupBox;
ComboBox * m_filterComboBox;
Knob * m_filterCutKnob;
Knob * m_filterResKnob;
QLabel* m_singleStreamInfoLabel;

36
include/InstrumentTrack.h
View File

@@ -44,17 +44,17 @@ class InstrumentFunctionArpeggioView;
class InstrumentFunctionNoteStackingView;
class EffectRackView;
class InstrumentSoundShapingView;
class fadeButton;
class FadeButton;
class Instrument;
class InstrumentTrackWindow;
class InstrumentMidiIOView;
class knob;
class Knob;
class LcdSpinBox;
class midiPortMenu;
class DataFile;
class PluginView;
class tabWidget;
class trackLabelButton;
class TabWidget;
class TrackLabelButton;
class EXPORT InstrumentTrack : public Track, public MidiEventProcessor
@@ -125,10 +125,10 @@ public:
virtual bool play( const MidiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
// create new view for me
virtual trackView * createView( TrackContainerView* tcv );
virtual TrackView * createView( TrackContainerView* tcv );
// create new track-content-object = pattern
virtual trackContentObject * createTCO( const MidiTime & _pos );
virtual TrackContentObject * createTCO( const MidiTime & _pos );
// called by track
@@ -206,8 +206,8 @@ public:
signals:
void instrumentChanged();
void newNote();
void midiNoteOn( const note& );
void midiNoteOff( const note& );
void midiNoteOn( const Note& );
void midiNoteOff( const Note& );
void nameChanged();
@@ -269,7 +269,7 @@ private:
class InstrumentTrackView : public trackView
class InstrumentTrackView : public TrackView
{
Q_OBJECT
public:
@@ -321,10 +321,10 @@ private:
static QQueue<InstrumentTrackWindow *> s_windowCache;
// widgets in track-settings-widget
trackLabelButton * m_tlb;
knob * m_volumeKnob;
knob * m_panningKnob;
fadeButton * m_activityIndicator;
TrackLabelButton * m_tlb;
Knob * m_volumeKnob;
Knob * m_panningKnob;
FadeButton * m_activityIndicator;
QMenu * m_midiMenu;
@@ -350,7 +350,7 @@ public:
virtual ~InstrumentTrackWindow();
// parent for all internal tab-widgets
tabWidget * tabWidgetParent()
TabWidget * tabWidgetParent()
{
return m_tabWidget;
}
@@ -406,15 +406,15 @@ private:
// widgets on the top of an instrument-track-window
QLineEdit * m_nameLineEdit;
knob * m_volumeKnob;
knob * m_panningKnob;
knob * m_pitchKnob;
Knob * m_volumeKnob;
Knob * m_panningKnob;
Knob * m_pitchKnob;
LcdSpinBox* m_pitchRangeSpinBox;
LcdSpinBox * m_effectChannelNumber;
// tab-widget with all children
tabWidget * m_tabWidget;
TabWidget * m_tabWidget;
PluginView * m_instrumentView;
InstrumentSoundShapingView * m_ssView;
InstrumentFunctionNoteStackingView* m_noteStackingView;

14
include/knob.h → include/Knob.h
View File

@@ -1,5 +1,5 @@
/*
* knob.h - powerful knob-widget
* Knob.h - powerful knob-widget
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -34,7 +34,7 @@
class QPixmap;
class textFloat;
class TextFloat;
enum knobTypes
{
@@ -43,7 +43,7 @@ enum knobTypes
class EXPORT knob : public QWidget, public FloatModelView
class EXPORT Knob : public QWidget, public FloatModelView
{
Q_OBJECT
Q_ENUMS( knobTypes )
@@ -70,9 +70,9 @@ class EXPORT knob : public QWidget, public FloatModelView
void onKnobNumUpdated(); //!< to be called when you updated @a m_knobNum
public:
knob( knobTypes _knob_num, QWidget * _parent = NULL, const QString & _name = QString() );
knob( QWidget * _parent = NULL, const QString & _name = QString() ); //!< default ctor
virtual ~knob();
Knob( knobTypes _knob_num, QWidget * _parent = NULL, const QString & _name = QString() );
Knob( QWidget * _parent = NULL, const QString & _name = QString() ); //!< default ctor
virtual ~Knob();
// TODO: remove
inline void setHintText( const QString & _txt_before,
@@ -161,7 +161,7 @@ private:
}
static textFloat * s_textFloat;
static TextFloat * s_textFloat;
QString m_label;

16
include/ladspa_2_lmms.h → include/Ladspa2LMMS.h
View File

@@ -1,5 +1,5 @@
/*
* ladspa_2_lmms.h - class that identifies and instantiates LADSPA effects
* Ladspa2LMMS.h - class that identifies and instantiates LADSPA effects
* for use with LMMS
*
* Copyright (c) 2005-2008 Danny McRae <khjklujn@netscape.net>
@@ -23,14 +23,14 @@
*
*/
#ifndef _LADSPA_2_LMMS_H
#define _LADSPA_2_LMMS_H
#ifndef LADSPA_2_LMMS_H
#define LADSPA_2_LMMS_H
#include "ladspa_manager.h"
#include "LadspaManager.h"
class EXPORT ladspa2LMMS : public ladspaManager
class EXPORT Ladspa2LMMS : public LadspaManager
{
public:
@@ -62,8 +62,8 @@ public:
QString getShortName( const ladspa_key_t & _key );
private:
ladspa2LMMS();
virtual ~ladspa2LMMS();
Ladspa2LMMS();
virtual ~Ladspa2LMMS();
l_sortable_plugin_t m_instruments;
l_sortable_plugin_t m_validEffects;
@@ -71,7 +71,7 @@ private:
l_sortable_plugin_t m_analysisTools;
l_sortable_plugin_t m_otherPlugins;
friend class engine;
friend class Engine;
} ;

2
include/LadspaBase.h
View File

@@ -26,7 +26,7 @@
#ifndef LADSPA_BASE_H
#define LADSPA_BASE_H
#include "ladspa_manager.h"
#include "LadspaManager.h"
#include "Plugin.h"
class LadspaControl;

8
include/ladspa_manager.h → include/LadspaManager.h
View File

@@ -1,5 +1,5 @@
/*
* ladspa_manager.h - declaration of class ladspaManager
* LadspaManager.h - declaration of class ladspaManager
* a class to manage loading and instantiation
* of ladspa plugins
*
@@ -80,12 +80,12 @@ typedef struct ladspaManagerStorage
} ladspaManagerDescription;
class EXPORT ladspaManager
class EXPORT LadspaManager
{
public:
ladspaManager();
virtual ~ladspaManager();
LadspaManager();
virtual ~LadspaManager();
l_sortable_plugin_t getSortedPlugins();
ladspaManagerDescription * getDescription( const ladspa_key_t &

12
include/led_checkbox.h → include/LedCheckbox.h
View File

@@ -1,5 +1,5 @@
/*
* led_checkbox.h - class ledCheckBox, an improved QCheckBox
* LedCheckbox.h - class LedCheckBox, an improved QCheckBox
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -26,13 +26,13 @@
#ifndef LED_CHECKBOX_H
#define LED_CHECKBOX_H
#include "automatable_button.h"
#include "AutomatableButton.h"
class QPixmap;
class EXPORT ledCheckBox : public automatableButton
class EXPORT LedCheckBox : public AutomatableButton
{
Q_OBJECT
public:
@@ -44,14 +44,14 @@ public:
NumColors
} ;
ledCheckBox( const QString & _txt, QWidget * _parent,
LedCheckBox( const QString & _txt, QWidget * _parent,
const QString & _name = QString::null,
LedColors _color = Yellow );
ledCheckBox( QWidget * _parent,
LedCheckBox( QWidget * _parent,
const QString & _name = QString::null,
LedColors _color = Yellow );
virtual ~ledCheckBox();
virtual ~LedCheckBox();
inline const QString & text()

16
include/LfoController.h
View File

@@ -35,10 +35,10 @@
#include "Oscillator.h"
class automatableButtonGroup;
class knob;
class ledCheckBox;
class Knob;
class LedCheckBox;
class TempoSyncKnob;
class pixmapButton;
class PixmapButton;
class LfoController : public Controller
@@ -103,17 +103,17 @@ protected:
LfoController * m_lfo;
knob * m_baseKnob;
Knob * m_baseKnob;
TempoSyncKnob * m_speedKnob;
knob * m_amountKnob;
knob * m_phaseKnob;
pixmapButton * m_userLfoBtn;
Knob * m_amountKnob;
Knob * m_phaseKnob;
PixmapButton * m_userLfoBtn;
automatableButtonGroup * m_waveBtnGrp;
automatableButtonGroup * m_multiplierBtnGrp;
private:
pixmapButton * m_userWaveBtn;
PixmapButton * m_userWaveBtn;
private slots:
void askUserDefWave();

4
include/MainWindow.h
View File

@@ -37,7 +37,7 @@ class QMdiArea;
class ConfigManager;
class PluginView;
class toolButton;
class ToolButton;
class MainWindow : public QMainWindow
@@ -177,7 +177,7 @@ private:
QList<QString>* m_errors;
friend class engine;
friend class Engine;
private slots:

6
include/MidiClient.h
View File

@@ -31,7 +31,7 @@
#include "MidiEvent.h"
#include "MidiEventProcessor.h"
#include "tab_widget.h"
#include "TabWidget.h"
class MidiPort;
@@ -107,11 +107,11 @@ public:
static MidiClient * openMidiClient();
class setupWidget : public tabWidget
class setupWidget : public TabWidget
{
public:
setupWidget( const QString & _caption, QWidget * _parent ) :
tabWidget( tabWidget::tr( "Settings for %1" ).arg(
TabWidget( TabWidget::tr( "Settings for %1" ).arg(
tr( _caption.toLatin1() ) ).toUpper(),
_parent )
{

4
include/Mixer.h
View File

@@ -53,7 +53,7 @@
#include "lmms_basics.h"
#include "note.h"
#include "Note.h"
#include "fifo_buffer.h"
#include "MixerProfiler.h"
@@ -462,7 +462,7 @@ private:
MixerProfiler m_profiler;
friend class engine;
friend class Engine;
friend class MixerWorkerThread;
} ;

10
include/nstate_button.h → include/NStateButton.h
View File

@@ -1,5 +1,5 @@
/*
* nstate_button.h - declaration of class nStateButton
* NStateButton.h - declaration of class nStateButton
*
* Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -30,15 +30,15 @@
#include <QtCore/QVector>
#include <QtCore/QPair>
#include "tool_button.h"
#include "ToolButton.h"
class nStateButton : public toolButton
class NStateButton : public ToolButton
{
Q_OBJECT
public:
nStateButton( QWidget * _parent );
virtual ~nStateButton();
NStateButton( QWidget * _parent );
virtual ~NStateButton();
void addState( const QPixmap & _pixmap, const QString & _tooltip = "" );
inline void setGeneralToolTip( const QString & _tooltip )

14
include/note.h → include/Note.h
View File

@@ -1,5 +1,5 @@
/*
* note.h - declaration of class note which contains all informations about a
* Note.h - declaration of class note which contains all informations about a
* note + definitions of several constants and enums
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -78,17 +78,17 @@ const float MaxDetuning = 4 * 12.0f;
class EXPORT note : public SerializingObject
class EXPORT Note : public SerializingObject
{
public:
note( const MidiTime & _length = MidiTime( 0 ),
Note( const MidiTime & _length = MidiTime( 0 ),
const MidiTime & _pos = MidiTime( 0 ),
int key = DefaultKey,
volume_t _volume = DefaultVolume,
panning_t _panning = DefaultPanning,
DetuningHelper * _detuning = NULL );
note( const note & _note );
virtual ~note();
Note( const Note & _note );
virtual ~Note();
// used by GUI
inline void setSelected( const bool _selected ){ m_selected = _selected; }
@@ -112,7 +112,7 @@ public:
void quantizeLength( const int _q_grid );
void quantizePos( const int _q_grid );
static inline bool lessThan( note * &lhs, note * &rhs )
static inline bool lessThan( Note * &lhs, Note * &rhs )
{
// function to compare two notes - must be called explictly when
// using qSort
@@ -234,7 +234,7 @@ private:
} ;
typedef QVector<note *> NoteVector;
typedef QVector<Note *> NoteVector;
#endif

12
include/NotePlayHandle.h
View File

@@ -27,7 +27,7 @@
#define NOTE_PLAY_HANDLE_H
#include "lmmsconfig.h"
#include "note.h"
#include "Note.h"
#include "PlayHandle.h"
#include "Track.h"
#include "MemoryManager.h"
@@ -37,17 +37,17 @@
class InstrumentTrack;
class NotePlayHandle;
template<ch_cnt_t=DEFAULT_CHANNELS> class basicFilters;
template<ch_cnt_t=DEFAULT_CHANNELS> class BasicFilters;
typedef QList<NotePlayHandle *> NotePlayHandleList;
typedef QList<const NotePlayHandle *> ConstNotePlayHandleList;
class EXPORT NotePlayHandle : public PlayHandle, public note
class EXPORT NotePlayHandle : public PlayHandle, public Note
{
MM_OPERATORS
public:
void * m_pluginData;
basicFilters<> * m_filter;
BasicFilters<> * m_filter;
// specifies origin of NotePlayHandle
enum Origins
@@ -63,7 +63,7 @@ public:
NotePlayHandle( InstrumentTrack* instrumentTrack,
const f_cnt_t offset,
const f_cnt_t frames,
const note& noteToPlay,
const Note& noteToPlay,
NotePlayHandle* parent = NULL,
int midiEventChannel = -1,
Origin origin = OriginPattern );
@@ -326,7 +326,7 @@ public:
static NotePlayHandle * acquire( InstrumentTrack* instrumentTrack,
const f_cnt_t offset,
const f_cnt_t frames,
const note& noteToPlay,
const Note& noteToPlay,
NotePlayHandle* parent = NULL,
int midiEventChannel = -1,
NotePlayHandle::Origin origin = NotePlayHandle::OriginPattern );

22
include/Pattern.h
View File

@@ -33,7 +33,7 @@
#include <QPixmap>
#include "note.h"
#include "Note.h"
#include "Track.h"
@@ -46,7 +46,7 @@ class SampleBuffer;
class EXPORT Pattern : public trackContentObject
class EXPORT Pattern : public TrackContentObject
{
Q_OBJECT
public:
@@ -67,13 +67,13 @@ public:
MidiTime beatPatternLength() const;
// note management
note * addNote( const note & _new_note, const bool _quant_pos = true );
Note * addNote( const Note & _new_note, const bool _quant_pos = true );
void removeNote( const note * _note_to_del );
void removeNote( const Note * _note_to_del );
note * noteAtStep( int _step );
Note * noteAtStep( int _step );
note * rearrangeNote( const note * _note_to_proc,
Note * rearrangeNote( const Note * _note_to_proc,
const bool _quant_pos = true );
void rearrangeAllNotes();
void clearNotes();
@@ -110,7 +110,7 @@ public:
bool empty();
virtual trackContentObjectView * createView( trackView * _tv );
virtual TrackContentObjectView * createView( TrackView * _tv );
using Model::dataChanged;
@@ -138,7 +138,7 @@ private:
int m_steps;
friend class PatternView;
friend class bbEditor;
friend class BBEditor;
signals:
@@ -148,7 +148,7 @@ signals:
class PatternView : public trackContentObjectView
class PatternView : public TrackContentObjectView
{
Q_OBJECT
@@ -156,7 +156,7 @@ class PatternView : public trackContentObjectView
Q_PROPERTY( QColor fgColor READ fgColor WRITE setFgColor )
Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
public:
PatternView( Pattern* pattern, trackView* parent );
PatternView( Pattern* pattern, TrackView* parent );
virtual ~PatternView();
@@ -179,7 +179,7 @@ protected:
virtual void resizeEvent( QResizeEvent * _re )
{
m_needsUpdate = true;
trackContentObjectView::resizeEvent( _re );
TrackContentObjectView::resizeEvent( _re );
}
virtual void wheelEvent( QWheelEvent * _we );

2
include/PeakController.h
View File

@@ -33,7 +33,7 @@
#include "ControllerDialog.h"
class automatableButtonGroup;
class knob;
class Knob;
class PeakControllerEffect;
typedef QVector<PeakControllerEffect *> PeakControllerEffectVector;

2
include/Piano.h
View File

@@ -25,7 +25,7 @@
#ifndef PIANO_H
#define PIANO_H
#include "note.h"
#include "Note.h"
#include "Model.h"
class InstrumentTrack;

68
include/PianoRoll.h
View File

@@ -32,10 +32,10 @@
#include "ComboBoxModel.h"
#include "SerializingObject.h"
#include "note.h"
#include "Note.h"
#include "lmms_basics.h"
#include "song.h"
#include "tooltip.h"
#include "Song.h"
#include "ToolTip.h"
class QPainter;
class QPixmap;
@@ -44,11 +44,11 @@ class QString;
class QMenu;
class QSignalMapper;
class comboBox;
class ComboBox;
class NotePlayHandle;
class Pattern;
class timeLine;
class toolButton;
class Timeline;
class ToolButton;
class PianoRoll : public QWidget, public SerializingObject
{
@@ -83,7 +83,7 @@ public:
return m_pattern != NULL;
}
song::PlayModes desiredPlayModeForAccompany() const;
Song::PlayModes desiredPlayModeForAccompany() const;
int quantization() const;
@@ -123,7 +123,7 @@ protected:
int getKey( int _y ) const;
static inline void drawNoteRect( QPainter & _p, int _x, int _y,
int _width, note * _n, const QColor & noteCol );
int _width, Note * _n, const QColor & noteCol );
void removeSelection();
void selectAll();
void getSelectedNotes( NoteVector & _selected_notes );
@@ -137,8 +137,8 @@ protected slots:
void recordAccompany();
void stop();
void startRecordNote( const note & _n );
void finishRecordNote( const note & _n );
void startRecordNote( const Note & _n );
void finishRecordNote( const Note & _n );
void horScrolled( int _new_pos );
void verScrolled( int _new_pos );
@@ -232,7 +232,7 @@ private:
void shiftSemiTone(int amount);
bool isSelection() const;
int selectionCount() const;
void testPlayNote( note * n );
void testPlayNote( Note * n );
void testPlayKey( int _key, int _vol, int _pan );
void pauseTestNotes( bool _pause = true );
@@ -262,29 +262,29 @@ private:
static PianoRollKeyTypes prKeyOrder[];
static textFloat * s_textFloat;
static TextFloat * s_textFloat;
QWidget * m_toolBar;
toolButton * m_playButton;
toolButton * m_recordButton;
toolButton * m_recordAccompanyButton;
toolButton * m_stopButton;
ToolButton * m_playButton;
ToolButton * m_recordButton;
ToolButton * m_recordAccompanyButton;
ToolButton * m_stopButton;
toolButton * m_drawButton;
toolButton * m_eraseButton;
toolButton * m_selectButton;
toolButton * m_detuneButton;
ToolButton * m_drawButton;
ToolButton * m_eraseButton;
ToolButton * m_selectButton;
ToolButton * m_detuneButton;
toolButton * m_cutButton;
toolButton * m_copyButton;
toolButton * m_pasteButton;
ToolButton * m_cutButton;
ToolButton * m_copyButton;
ToolButton * m_pasteButton;
comboBox * m_zoomingComboBox;
comboBox * m_quantizeComboBox;
comboBox * m_noteLenComboBox;
comboBox * m_scaleComboBox;
comboBox * m_chordComboBox;
ComboBox * m_zoomingComboBox;
ComboBox * m_quantizeComboBox;
ComboBox * m_noteLenComboBox;
ComboBox * m_scaleComboBox;
ComboBox * m_chordComboBox;
ComboBoxModel m_zoomingModel;
ComboBoxModel m_quantizeModel;
@@ -300,9 +300,9 @@ private:
MidiTime m_currentPosition;
bool m_recording;
QList<note> m_recordingNotes;
QList<Note> m_recordingNotes;
note * m_currentNote;
Note * m_currentNote;
actions m_action;
noteEditMode m_noteEditMode;
@@ -350,14 +350,14 @@ private:
bool m_mouseDownLeft; //true if left click is being held down
bool m_mouseDownRight; //true if right click is being held down
timeLine * m_timeLine;
Timeline * m_timeLine;
bool m_scrollBack;
void copy_to_clipboard( const NoteVector & _notes ) const;
void drawDetuningInfo( QPainter & _p, note * _n, int _x, int _y );
void drawDetuningInfo( QPainter & _p, Note * _n, int _x, int _y );
bool mouseOverNote();
note * noteUnderMouse();
Note * noteUnderMouse();
// turn a selection rectangle into selected notes
void computeSelectedNotes( bool shift );
@@ -366,7 +366,7 @@ private:
// did we start a mouseclick with shift pressed
bool m_startedWithShift;
friend class engine;
friend class Engine;
// qproperty fields
QColor m_gridColor;

10
include/pixmap_button.h → include/PixmapButton.h
View File

@@ -1,5 +1,5 @@
/*
* pixmap_button.h - declaration of class pixmapButton
* PixmapButton.h - declaration of class pixmapButton
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -28,16 +28,16 @@
#include <QPixmap>
#include "automatable_button.h"
#include "AutomatableButton.h"
class EXPORT pixmapButton : public automatableButton
class EXPORT PixmapButton : public AutomatableButton
{
Q_OBJECT
public:
pixmapButton( QWidget * _parent,
PixmapButton( QWidget * _parent,
const QString & _name = QString::null );
virtual ~pixmapButton();
virtual ~PixmapButton();
void setActiveGraphic( const QPixmap & _pm );
void setInactiveGraphic( const QPixmap & _pm, bool _update = true );

8
include/project_notes.h → include/ProjectNotes.h
View File

@@ -1,5 +1,5 @@
/*
* project_notes.h - header for project-notes-editor
* ProjectNotes.h - header for project-notes-editor
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -36,12 +36,12 @@ class QTextCharFormat;
class QTextEdit;
class EXPORT projectNotes : public QMainWindow, public SerializingObject
class EXPORT ProjectNotes : public QMainWindow, public SerializingObject
{
Q_OBJECT
public:
projectNotes();
virtual ~projectNotes();
ProjectNotes();
virtual ~ProjectNotes();
void clear();
void setText( const QString & _text );

14
include/project_version.h → include/ProjectVersion.h
View File

@@ -1,5 +1,5 @@
/*
* project_version.h - version compared in import upgrades
* ProjectVersion.h - version compared in import upgrades
*
* Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
@@ -29,25 +29,25 @@
#include <QtCore/QString>
class projectVersion : public QString
class ProjectVersion : public QString
{
public:
projectVersion( const QString & _s ) :
ProjectVersion( const QString & _s ) :
QString( _s )
{
}
static int compare( const projectVersion & _v1,
const projectVersion & _v2 );
static int compare( const ProjectVersion & _v1,
const ProjectVersion & _v2 );
} ;
inline bool operator<( const projectVersion & _v1, const char * _str )
inline bool operator<( const ProjectVersion & _v1, const char * _str )
{
return projectVersion::compare( _v1, projectVersion( _str ) ) < 0;
return ProjectVersion::compare( _v1, ProjectVersion( _str ) ) < 0;
}

8
include/rename_dialog.h → include/RenameDialog.h
View File

@@ -1,5 +1,5 @@
/*
* rename_dialog.h - declaration of class renameDialog, a simple dialog for
* RenameDialog.h - declaration of class renameDialog, a simple dialog for
* changing the content of a string
*
* Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -33,12 +33,12 @@
class QLineEdit;
class renameDialog : public QDialog
class RenameDialog : public QDialog
{
Q_OBJECT
public:
renameDialog( QString & _string );
~renameDialog();
RenameDialog( QString & _string );
~RenameDialog();
protected:

8
include/rubberband.h → include/Rubberband.h
View File

@@ -1,5 +1,5 @@
/*
* rubberband.h - rubberband - either own implementation for Qt3 or wrapper for
* Rubberband.h - rubberband - either own implementation for Qt3 or wrapper for
* Qt4
*
* Copyright (c) 2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -72,11 +72,11 @@ private:
class rubberBand : public QRubberBand
class RubberBand : public QRubberBand
{
public:
rubberBand( QWidget * _parent );
virtual ~rubberBand();
RubberBand( QWidget * _parent );
virtual ~RubberBand();
QVector<selectableObject *> selectedObjects() const;

6
include/SamplePlayHandle.h
View File

@@ -29,7 +29,7 @@
#include "SampleBuffer.h"
#include "AutomatableModel.h"
class bbTrack;
class BBTrack;
class SampleTCO;
class Track;
class AudioPort;
@@ -64,7 +64,7 @@ public:
m_doneMayReturnTrue = _enable;
}
void setBBTrack( bbTrack * _bb_track )
void setBBTrack( BBTrack * _bb_track )
{
m_bbTrack = _bb_track;
}
@@ -88,7 +88,7 @@ private:
FloatModel * m_volumeModel;
Track * m_track;
bbTrack * m_bbTrack;
BBTrack * m_bbTrack;
} ;

4
include/SampleRecordHandle.h
View File

@@ -32,7 +32,7 @@
#include "Mixer.h"
#include "SampleBuffer.h"
class bbTrack;
class BBTrack;
class SampleTCO;
class Track;
@@ -62,7 +62,7 @@ private:
MidiTime m_minLength;
Track * m_track;
bbTrack * m_bbTrack;
BBTrack * m_bbTrack;
SampleTCO * m_tco;
} ;

18
include/SampleTrack.h
View File

@@ -31,11 +31,11 @@
#include "Track.h"
class EffectRackView;
class knob;
class Knob;
class SampleBuffer;
class SampleTCO : public trackContentObject
class SampleTCO : public TrackContentObject
{
Q_OBJECT
mapPropertyFromModel(bool,isRecord,setRecord,m_recordModel);
@@ -60,7 +60,7 @@ public:
MidiTime sampleLength() const;
virtual trackContentObjectView * createView( trackView * _tv );
virtual TrackContentObjectView * createView( TrackView * _tv );
public slots:
@@ -85,7 +85,7 @@ signals:
class SampleTCOView : public trackContentObjectView
class SampleTCOView : public TrackContentObjectView
{
Q_OBJECT
@@ -94,7 +94,7 @@ class SampleTCOView : public trackContentObjectView
Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
public:
SampleTCOView( SampleTCO * _tco, trackView * _tv );
SampleTCOView( SampleTCO * _tco, TrackView * _tv );
virtual ~SampleTCOView();
@@ -127,8 +127,8 @@ public:
virtual bool play( const MidiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
virtual trackView * createView( TrackContainerView* tcv );
virtual trackContentObject * createTCO( const MidiTime & _pos );
virtual TrackView * createView( TrackContainerView* tcv );
virtual TrackContentObject * createTCO( const MidiTime & _pos );
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
@@ -157,7 +157,7 @@ private:
class SampleTrackView : public trackView
class SampleTrackView : public TrackView
{
Q_OBJECT
public:
@@ -180,7 +180,7 @@ protected:
private:
EffectRackView * m_effectRack;
QWidget * m_effWindow;
knob * m_volumeKnob;
Knob * m_volumeKnob;
} ;

12
include/setup_dialog.h → include/SetupDialog.h
View File

@@ -1,5 +1,5 @@
/*
* setup_dialog.h - dialog for setting up LMMS
* SetupDialog.h - dialog for setting up LMMS
*
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -38,10 +38,10 @@ class QLabel;
class QLineEdit;
class QSlider;
class tabBar;
class TabBar;
class setupDialog : public QDialog
class SetupDialog : public QDialog
{
Q_OBJECT
public:
@@ -54,8 +54,8 @@ public:
MidiSettings
} ;
setupDialog( ConfigTabs _tab_to_open = GeneralSettings );
virtual ~setupDialog();
SetupDialog( ConfigTabs _tab_to_open = GeneralSettings );
virtual ~SetupDialog();
protected slots:
@@ -114,7 +114,7 @@ private slots:
private:
tabBar * m_tabBar;
TabBar * m_tabBar;
QSlider * m_bufSizeSlider;
QLabel * m_bufSizeLbl;

18
include/song.h → include/Song.h
View File

@@ -1,5 +1,5 @@
/*
* song.h - class song - the root of the model-tree
* Song.h - class song - the root of the model-tree
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -36,7 +36,7 @@
class AutomationTrack;
class Pattern;
class timeLine;
class Timeline;
const bpm_t MinTempo = 10;
@@ -45,7 +45,7 @@ const bpm_t MaxTempo = 999;
const tick_t MaxSongLength = 9999 * DefaultTicksPerTact;
class EXPORT song : public TrackContainer
class EXPORT Song : public TrackContainer
{
Q_OBJECT
mapPropertyFromModel(int,getTempo,setTempo,m_tempoModel);
@@ -83,7 +83,7 @@ public:
{
return m_currentFrame;
}
timeLine * m_timeLine;
Timeline * m_timeLine;
bool m_timeLineUpdate;
private:
@@ -300,9 +300,9 @@ private slots:
private:
song();
song( const song & );
virtual ~song();
Song();
Song( const Song & );
virtual ~Song();
inline tact_t currentTact() const
@@ -317,7 +317,7 @@ private:
inline f_cnt_t currentFrame() const
{
return m_playPos[m_playMode].getTicks() * engine::framesPerTick() + m_playPos[m_playMode].currentFrame();
return m_playPos[m_playMode].getTicks() * Engine::framesPerTick() + m_playPos[m_playMode].currentFrame();
}
void setPlayPos( tick_t _ticks, PlayModes _play_mode );
@@ -364,7 +364,7 @@ private:
VstSyncController m_vstSyncController;
friend class engine;
friend class Engine;
friend class SongEditor;
friend class mainWindow;
friend class ControllerRackView;

46
include/SongEditor.h
View File

@@ -32,14 +32,14 @@
class QLabel;
class QScrollBar;
class automatableSlider;
class comboBox;
class AutomatableSlider;
class ComboBox;
class LcdSpinBox;
class MeterDialog;
class song;
class textFloat;
class timeLine;
class toolButton;
class Song;
class TextFloat;
class Timeline;
class ToolButton;
class positionLine : public QWidget
{
@@ -56,7 +56,7 @@ class SongEditor : public TrackContainerView
{
Q_OBJECT
public:
SongEditor( song * _song );
SongEditor( Song * _song );
virtual ~SongEditor();
void setPauseIcon( bool pause );
@@ -98,35 +98,35 @@ private:
virtual bool allowRubberband() const;
song * m_s;
Song * m_song;
QScrollBar * m_leftRightScroll;
QWidget * m_toolBar;
toolButton * m_playButton;
toolButton * m_recordButton;
toolButton * m_recordAccompanyButton;
toolButton * m_stopButton;
ToolButton * m_playButton;
ToolButton * m_recordButton;
ToolButton * m_recordAccompanyButton;
ToolButton * m_stopButton;
LcdSpinBox * m_tempoSpinBox;
timeLine * m_timeLine;
Timeline * m_timeLine;
MeterDialog * m_timeSigDisplay;
automatableSlider * m_masterVolumeSlider;
automatableSlider * m_masterPitchSlider;
AutomatableSlider * m_masterVolumeSlider;
AutomatableSlider * m_masterPitchSlider;
textFloat * m_mvsStatus;
textFloat * m_mpsStatus;
TextFloat * m_mvsStatus;
TextFloat * m_mpsStatus;
toolButton * m_addBBTrackButton;
toolButton * m_addSampleTrackButton;
toolButton * m_addAutomationTrackButton;
ToolButton * m_addBBTrackButton;
ToolButton * m_addSampleTrackButton;
ToolButton * m_addAutomationTrackButton;
toolButton * m_drawModeButton;
toolButton * m_editModeButton;
ToolButton * m_drawModeButton;
ToolButton * m_editModeButton;
comboBox * m_zoomingComboBox;
ComboBox * m_zoomingComboBox;
positionLine * m_positionLine;

8
include/string_pair_drag.h → include/StringPairDrag.h
View File

@@ -1,5 +1,5 @@
/*
* string_pair_drag.h - class stringPairDrag which provides general support
* StringPairDrag.h - class StringPairDrag which provides general support
* for drag'n'drop of string-pairs
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -36,12 +36,12 @@
class QPixmap;
class EXPORT stringPairDrag : public QDrag
class EXPORT StringPairDrag : public QDrag
{
public:
stringPairDrag( const QString & _key, const QString & _value,
StringPairDrag( const QString & _key, const QString & _value,
const QPixmap & _icon, QWidget * _w );
~stringPairDrag();
~StringPairDrag();
static bool processDragEnterEvent( QDragEnterEvent * _dee,
const QString & _allowed_keys );

14
include/tab_bar.h → include/TabBar.h
View File

@@ -1,5 +1,5 @@
/*
* tab_bar.h - class tabBar
* TabBar.h - class tabBar
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -33,18 +33,18 @@
#include "export.h"
class tabButton;
class TabButton;
class EXPORT tabBar : public QWidget
class EXPORT TabBar : public QWidget
{
Q_OBJECT
public:
tabBar( QWidget * _parent,
TabBar( QWidget * _parent,
QBoxLayout::Direction _dir = QBoxLayout::LeftToRight );
virtual ~tabBar();
virtual ~TabBar();
tabButton * addTab( QWidget * _w, const QString & _text,
TabButton * addTab( QWidget * _w, const QString & _text,
int _id, bool _add_stretch = false,
bool _text_is_tooltip = false );
void removeTab( int _id );
@@ -73,7 +73,7 @@ protected slots:
private:
QMap<int, QPair<tabButton *, QWidget *> > m_tabs;
QMap<int, QPair<TabButton *, QWidget *> > m_tabs;
QBoxLayout * m_layout;
bool m_exclusive;

8
include/tab_button.h → include/TabButton.h
View File

@@ -1,5 +1,5 @@
/*
* tab_button.h - declaration of class tabButton
* TabButton.h - declaration of class TabButton
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -29,11 +29,11 @@
#include <QPushButton>
class tabButton : public QPushButton
class TabButton : public QPushButton
{
Q_OBJECT
public:
tabButton( const QString & _text, int _id, QWidget * _parent ) :
TabButton( const QString & _text, int _id, QWidget * _parent ) :
QPushButton( _text, _parent ),
m_id( _id )
{
@@ -42,7 +42,7 @@ public:
SLOT( slotClicked() ) );
}
~tabButton()
~TabButton()
{
}

8
include/tab_widget.h → include/TabWidget.h
View File

@@ -1,5 +1,5 @@
/*
* tab_widget.h - LMMS-tabwidget
* TabWidget.h - LMMS-tabwidget
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -30,12 +30,12 @@
#include <QtCore/QMap>
class tabWidget : public QWidget
class TabWidget : public QWidget
{
Q_OBJECT
public:
tabWidget( const QString & _caption, QWidget * _parent );
virtual ~tabWidget();
TabWidget( const QString & _caption, QWidget * _parent );
virtual ~TabWidget();
void addTab( QWidget * _w, const QString & _name, int _idx = -1 );

4
include/TempoSyncKnob.h
View File

@@ -29,12 +29,12 @@
#include <QPixmap>
#include <QtCore/QPointer>
#include "knob.h"
#include "Knob.h"
#include "TempoSyncKnobModel.h"
class MeterDialog;
class EXPORT TempoSyncKnob : public knob
class EXPORT TempoSyncKnob : public Knob
{
Q_OBJECT
public:

12
include/text_float.h → include/TextFloat.h
View File

@@ -1,5 +1,5 @@
/*
* text_float.h - class textFloat, a floating text-label
* TextFloat.h - class textFloat, a floating text-label
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -32,12 +32,12 @@
#include "export.h"
class EXPORT textFloat : public QWidget
class EXPORT TextFloat : public QWidget
{
Q_OBJECT
public:
textFloat();
virtual ~textFloat()
TextFloat();
virtual ~TextFloat()
{
}
@@ -48,11 +48,11 @@ public:
void setVisibilityTimeOut( int _msecs );
static textFloat * displayMessage( const QString & _msg,
static TextFloat * displayMessage( const QString & _msg,
int _timeout = 2000,
QWidget * _parent = NULL,
int _add_y_margin = 0 );
static textFloat * displayMessage( const QString & _title,
static TextFloat * displayMessage( const QString & _title,
const QString & _msg,
const QPixmap & _pixmap =
QPixmap(),

20
include/timeline.h → include/Timeline.h
View File

@@ -1,5 +1,5 @@
/*
* timeline.h - class timeLine, representing a time-line with position marker
* Timeline.h - class timeLine, representing a time-line with position marker
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -28,15 +28,15 @@
#include <QWidget>
#include "song.h"
#include "Song.h"
class QPixmap;
class nStateButton;
class textFloat;
class NStateButton;
class TextFloat;
class timeLine : public QWidget, public JournallingObject
class Timeline : public QWidget, public JournallingObject
{
Q_OBJECT
public:
@@ -60,11 +60,11 @@ public:
} ;
timeLine( int _xoff, int _yoff, float _ppt, song::playPos & _pos,
Timeline( int _xoff, int _yoff, float _ppt, Song::playPos & _pos,
const MidiTime & _begin, QWidget * _parent );
virtual ~timeLine();
virtual ~Timeline();
inline song::playPos & pos()
inline Song::playPos & pos()
{
return( m_pos );
}
@@ -162,14 +162,14 @@ private:
int m_xOffset;
int m_posMarkerX;
float m_ppt;
song::playPos & m_pos;
Song::playPos & m_pos;
const MidiTime & m_begin;
MidiTime m_loopPos[2];
MidiTime m_savedPos;
textFloat * m_hint;
TextFloat * m_hint;
enum actions

10
include/tool_button.h → include/ToolButton.h
View File

@@ -1,5 +1,5 @@
/*
* tool_button.h - declaration of class toolButton
* ToolButton.h - declaration of class toolButton
*
* Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -30,15 +30,15 @@
#include <QColor>
class toolButton : public QToolButton
class ToolButton : public QToolButton
{
Q_OBJECT
public:
toolButton( const QPixmap & _pixmap, const QString & _tooltip,
ToolButton( const QPixmap & _pixmap, const QString & _tooltip,
QObject * _receiver, const char * _slot,
QWidget * _parent );
inline toolButton( QWidget * _parent ) :
inline ToolButton( QWidget * _parent ) :
QToolButton( _parent ),
m_colorStandard( s_stdColor ),
m_colorHighlighted( s_hlColor )
@@ -47,7 +47,7 @@ public:
leaveEvent( NULL );
}
virtual ~toolButton();
virtual ~ToolButton();
inline void setStandardColor( const QColor & _color )
{

4
include/tooltip.h → include/ToolTip.h
View File

@@ -1,5 +1,5 @@
/*
* tooltip.h - namespace toolTip, a tooltip-wrapper for LMMS
* ToolTip.h - namespace toolTip, a tooltip-wrapper for LMMS
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -33,7 +33,7 @@
class QWidget;
struct toolTip
struct ToolTip
{
static void EXPORT add( QWidget * _w, const QString & _txt );
} ;

110
include/Track.h
View File

@@ -34,7 +34,7 @@
#include "lmms_basics.h"
#include "MidiTime.h"
#include "rubberband.h"
#include "Rubberband.h"
#include "JournallingObject.h"
#include "AutomatableModel.h"
#include "ModelView.h"
@@ -44,14 +44,14 @@
class QMenu;
class QPushButton;
class pixmapButton;
class textFloat;
class PixmapButton;
class TextFloat;
class Track;
class trackContentObjectView;
class TrackContentObjectView;
class TrackContainer;
class TrackContainerView;
class trackContentWidget;
class trackView;
class TrackContentWidget;
class TrackView;
typedef QWidget trackSettingsWidget;
@@ -73,15 +73,15 @@ const int DEFAULT_TRACK_HEIGHT = 32;
const int TCO_BORDER_WIDTH = 2;
class trackContentObject : public Model, public JournallingObject
class TrackContentObject : public Model, public JournallingObject
{
Q_OBJECT
MM_OPERATORS
mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
public:
trackContentObject( Track * _track );
virtual ~trackContentObject();
TrackContentObject( Track * _track );
virtual ~TrackContentObject();
inline Track * getTrack() const
{
@@ -124,7 +124,7 @@ public:
virtual void movePosition( const MidiTime & _pos );
virtual void changeLength( const MidiTime & _length );
virtual trackContentObjectView * createView( trackView * _tv ) = 0;
virtual TrackContentObjectView * createView( TrackView * _tv ) = 0;
inline void selectViewOnCreate( bool select )
{
@@ -168,13 +168,13 @@ private:
bool m_selectViewOnCreate;
friend class trackContentObjectView;
friend class TrackContentObjectView;
} ;
class trackContentObjectView : public selectableObject, public ModelView
class TrackContentObjectView : public selectableObject, public ModelView
{
Q_OBJECT
@@ -183,12 +183,12 @@ class trackContentObjectView : public selectableObject, public ModelView
Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
public:
trackContentObjectView( trackContentObject * _tco, trackView * _tv );
virtual ~trackContentObjectView();
TrackContentObjectView( TrackContentObject * _tco, TrackView * _tv );
virtual ~TrackContentObjectView();
bool fixedTCOs();
inline trackContentObject * getTrackContentObject()
inline TrackContentObject * getTrackContentObject()
{
return m_tco;
}
@@ -219,12 +219,12 @@ protected:
void setAutoResizeEnabled( bool _e = false );
float pixelsPerTact();
inline trackView * getTrackView()
inline TrackView * getTrackView()
{
return m_trackView;
}
DataFile createTCODataFiles(const QVector<trackContentObjectView *> & tcos) const;
DataFile createTCODataFiles(const QVector<TrackContentObjectView *> & tcos) const;
protected slots:
@@ -243,16 +243,16 @@ private:
ToggleSelected
} ;
static textFloat * s_textFloat;
static TextFloat * s_textFloat;
trackContentObject * m_tco;
trackView * m_trackView;
TrackContentObject * m_tco;
TrackView * m_trackView;
Actions m_action;
bool m_autoResize;
QPoint m_initialMousePos;
QPoint m_initialMouseGlobalPos;
textFloat * m_hint;
TextFloat * m_hint;
MidiTime m_oldTime;// used for undo/redo while mouse-button is pressed
@@ -274,7 +274,7 @@ private:
class trackContentWidget : public QWidget, public JournallingObject
class TrackContentWidget : public QWidget, public JournallingObject
{
Q_OBJECT
@@ -283,14 +283,14 @@ class trackContentWidget : public QWidget, public JournallingObject
Q_PROPERTY( QBrush lighterColor READ lighterColor WRITE setLighterColor )
public:
trackContentWidget( trackView * _parent );
virtual ~trackContentWidget();
TrackContentWidget( TrackView * _parent );
virtual ~TrackContentWidget();
/*! \brief Updates the background tile pixmap. */
void updateBackground();
void addTCOView( trackContentObjectView * _tcov );
void removeTCOView( trackContentObjectView * _tcov );
void addTCOView( TrackContentObjectView * _tcov );
void removeTCOView( TrackContentObjectView * _tcov );
void removeTCOView( int _tco_num )
{
if( _tco_num >= 0 && _tco_num < m_tcoViews.size() )
@@ -345,9 +345,9 @@ private:
Track * getTrack();
MidiTime getPosition( int _mouse_x );
trackView * m_trackView;
TrackView * m_trackView;
typedef QVector<trackContentObjectView *> tcoViewVector;
typedef QVector<TrackContentObjectView *> tcoViewVector;
tcoViewVector m_tcoViews;
QPixmap m_background;
@@ -361,12 +361,12 @@ private:
class trackOperationsWidget : public QWidget
class TrackOperationsWidget : public QWidget
{
Q_OBJECT
public:
trackOperationsWidget( trackView * _parent );
~trackOperationsWidget();
TrackOperationsWidget( TrackView * _parent );
~TrackOperationsWidget();
protected:
@@ -385,17 +385,17 @@ private slots:
private:
static QPixmap * s_grip;
trackView * m_trackView;
TrackView * m_trackView;
QPushButton * m_trackOps;
pixmapButton * m_muteBtn;
pixmapButton * m_soloBtn;
PixmapButton * m_muteBtn;
PixmapButton * m_soloBtn;
friend class trackView;
friend class TrackView;
signals:
void trackRemovalScheduled( trackView * _t );
void trackRemovalScheduled( TrackView * _t );
} ;
@@ -411,7 +411,7 @@ class EXPORT Track : public Model, public JournallingObject
mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
public:
typedef QVector<trackContentObject *> tcoVector;
typedef QVector<TrackContentObject *> tcoVector;
enum TrackTypes
{
@@ -444,8 +444,8 @@ public:
const f_cnt_t _frame_base, int _tco_num = -1 ) = 0;
virtual trackView * createView( TrackContainerView * _view ) = 0;
virtual trackContentObject * createTCO( const MidiTime & _pos ) = 0;
virtual TrackView * createView( TrackContainerView * _view ) = 0;
virtual TrackContentObject * createTCO( const MidiTime & _pos ) = 0;
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent ) = 0;
@@ -460,15 +460,15 @@ public:
m_simpleSerializingMode = true;
}
// -- for usage by trackContentObject only ---------------
trackContentObject * addTCO( trackContentObject * _tco );
void removeTCO( trackContentObject * _tco );
// -- for usage by TrackContentObject only ---------------
TrackContentObject * addTCO( TrackContentObject * _tco );
void removeTCO( TrackContentObject * _tco );
// -------------------------------------------------------
void deleteTCOs();
int numOfTCOs();
trackContentObject * getTCO( int _tco_num );
int getTCONum( trackContentObject * _tco );
TrackContentObject * getTCO( int _tco_num );
int getTCONum( TrackContentObject * _tco );
const tcoVector & getTCOs() const
{
@@ -549,25 +549,25 @@ private:
QMutex m_processingLock;
friend class trackView;
friend class TrackView;
signals:
void destroyedTrack();
void nameChanged();
void trackContentObjectAdded( trackContentObject * );
void trackContentObjectAdded( TrackContentObject * );
} ;
class trackView : public QWidget, public ModelView, public JournallingObject
class TrackView : public QWidget, public ModelView, public JournallingObject
{
Q_OBJECT
public:
trackView( Track * _track, TrackContainerView* tcv );
virtual ~trackView();
TrackView( Track * _track, TrackContainerView* tcv );
virtual ~TrackView();
inline const Track * getTrack() const
{
@@ -584,7 +584,7 @@ public:
return m_trackContainerView;
}
inline trackOperationsWidget * getTrackOperationsWidget()
inline TrackOperationsWidget * getTrackOperationsWidget()
{
return( &m_trackOperationsWidget );
}
@@ -594,7 +594,7 @@ public:
return( &m_trackSettingsWidget );
}
inline trackContentWidget * getTrackContentWidget()
inline TrackContentWidget * getTrackContentWidget()
{
return( &m_trackContentWidget );
}
@@ -651,18 +651,18 @@ private:
Track * m_track;
TrackContainerView * m_trackContainerView;
trackOperationsWidget m_trackOperationsWidget;
TrackOperationsWidget m_trackOperationsWidget;
trackSettingsWidget m_trackSettingsWidget;
trackContentWidget m_trackContentWidget;
TrackContentWidget m_trackContentWidget;
Actions m_action;
friend class trackLabelButton;
friend class TrackLabelButton;
private slots:
void createTCOView( trackContentObject * _tco );
void createTCOView( TrackContentObject * _tco );
} ;

18
include/TrackContainerView.h
View File

@@ -73,7 +73,7 @@ public:
void setPixelsPerTact( int _ppt );
const trackView * trackViewAt( const int _y ) const;
const TrackView * trackViewAt( const int _y ) const;
virtual bool allowRubberband() const;
@@ -102,12 +102,12 @@ public:
return m_tc;
}
void moveTrackViewUp( trackView * _tv );
void moveTrackViewDown( trackView * _tv );
void moveTrackViewUp( TrackView * _tv );
void moveTrackViewDown( TrackView * _tv );
// -- for usage by trackView only ---------------
trackView * addTrackView( trackView * _tv );
void removeTrackView( trackView * _tv );
TrackView * addTrackView( TrackView * _tv );
void removeTrackView( TrackView * _tv );
// -------------------------------------------------------
void clearAllTracks();
@@ -121,13 +121,13 @@ public:
public slots:
void realignTracks();
void createTrackView( Track * _t );
void deleteTrackView( trackView * _tv );
void deleteTrackView( TrackView * _tv );
protected:
static const int DEFAULT_PIXELS_PER_TACT = 16;
const QList<trackView *> & trackViews() const
const QList<TrackView *> & trackViews() const
{
return( m_trackViews );
}
@@ -164,7 +164,7 @@ private:
} ;
TrackContainer* m_tc;
typedef QList<trackView *> trackViewList;
typedef QList<TrackView *> trackViewList;
trackViewList m_trackViews;
scrollArea * m_scrollArea;
@@ -172,7 +172,7 @@ private:
float m_ppt;
rubberBand * m_rubberBand;
RubberBand * m_rubberBand;
QPoint m_origin;

12
include/track_label_button.h → include/TrackLabelButton.h
View File

@@ -1,5 +1,5 @@
/*
* track_label_button.h - class trackLabelButton
* TrackLabelButton.h - class trackLabelButton
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -29,15 +29,15 @@
#include <QToolButton>
class trackView;
class TrackView;
class trackLabelButton : public QToolButton
class TrackLabelButton : public QToolButton
{
Q_OBJECT
public:
trackLabelButton( trackView * _tv, QWidget * _parent );
virtual ~trackLabelButton();
TrackLabelButton( TrackView * _tv, QWidget * _parent );
virtual ~TrackLabelButton();
public slots:
@@ -53,7 +53,7 @@ protected:
private:
trackView * m_trackView;
TrackView * m_trackView;
QString m_iconName;
} ;

8
include/transformable_auto_model.h → include/TransformableAutoModel.h
View File

@@ -1,5 +1,5 @@
/*
* transformable_auto_model.h - template transformableAutoModel
* TransformableAutoModel.h - template transformableAutoModel
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -41,10 +41,10 @@ struct AutoModelTransformer
template<typename T, typename EDIT_STEP_TYPE>
class transformableAutoModel : public AutomatableModel<T, EDIT_STEP_TYPE>
class TransformableAutoModel : public AutomatableModel<T, EDIT_STEP_TYPE>
{
public:
transformableAutoModel( const AutoModelTransformer<T> * _transformer,
TransformableAutoModel( const AutoModelTransformer<T> * _transformer,
const T _val = 0,
const T _min = 0,
const T _max = 0,
@@ -57,7 +57,7 @@ public:
{
}
inline virtual ~transformableAutoModel()
inline virtual ~TransformableAutoModel()
{
}

8
include/visualization_widget.h → include/VisualizationWidget.h
View File

@@ -1,5 +1,5 @@
/*
* visualization_widget.h - widget for visualization of sound-data
* VisualizationWidget.h - widget for visualization of sound-data
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -32,7 +32,7 @@
#include "Mixer.h"
class visualizationWidget : public QWidget
class VisualizationWidget : public QWidget
{
Q_OBJECT
public:
@@ -41,9 +41,9 @@ public:
Simple // add more here
} ;
visualizationWidget( const QPixmap & _bg, QWidget * _parent,
VisualizationWidget( const QPixmap & _bg, QWidget * _parent,
visualizationTypes _vtype = Simple );
virtual ~visualizationWidget();
virtual ~VisualizationWidget();
void setActive( bool _active );

8
plugins/Amplifier/AmplifierControlDialog.cpp
View File

@@ -40,27 +40,27 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) :
setPalette( pal );
setFixedSize( 100, 125 );
knob * volumeKnob = new knob( knobBright_26, this);
Knob * volumeKnob = new Knob( knobBright_26, this);
volumeKnob -> move( 20, 30 );
volumeKnob -> setVolumeKnob( true );
volumeKnob->setModel( &controls->m_volumeModel );
volumeKnob->setLabel( tr( "VOL" ) );
volumeKnob->setHintText( tr( "Volume:" ) + " ", "%" );
knob * panKnob = new knob( knobBright_26, this);
Knob * panKnob = new Knob( knobBright_26, this);
panKnob -> move( 60, 30 );
panKnob->setModel( &controls->m_panModel );
panKnob->setLabel( tr( "PAN" ) );
panKnob->setHintText( tr( "Panning:" ) + " ", "" );
knob * leftKnob = new knob( knobBright_26, this);
Knob * leftKnob = new Knob( knobBright_26, this);
leftKnob -> move( 20, 80 );
leftKnob -> setVolumeKnob( true );
leftKnob->setModel( &controls->m_leftModel );
leftKnob->setLabel( tr( "LEFT" ) );
leftKnob->setHintText( tr( "Left gain:" ) + " ", "%" );
knob * rightKnob = new knob( knobBright_26, this);
Knob * rightKnob = new Knob( knobBright_26, this);
rightKnob -> move( 60, 80 );
rightKnob -> setVolumeKnob( true );
rightKnob->setModel( &controls->m_rightModel );

4
plugins/Amplifier/AmplifierControls.cpp
View File

@@ -28,8 +28,8 @@
#include "AmplifierControls.h"
#include "Amplifier.h"
#include "engine.h"
#include "song.h"
#include "Engine.h"
#include "Song.h"
AmplifierControls::AmplifierControls( AmplifierEffect* effect ) :

2
plugins/Amplifier/AmplifierControls.h
View File

@@ -28,7 +28,7 @@
#include "EffectControls.h"
#include "AmplifierControlDialog.h"
#include "knob.h"
#include "Knob.h"
class AmplifierEffect;

2
plugins/BassBooster/BassBooster.cpp
View File

@@ -105,7 +105,7 @@ bool BassBoosterEffect::processAudioBuffer( sampleFrame* buf, const fpp_t frames
inline void BassBoosterEffect::changeFrequency()
{
const sample_t fac = engine::mixer()->processingSampleRate() / 44100.0f;
const sample_t fac = Engine::mixer()->processingSampleRate() / 44100.0f;
m_bbFX.leftFX().setFrequency( m_bbControls.m_freqModel.value() * fac );
m_bbFX.rightFX().setFrequency( m_bbControls.m_freqModel.value() * fac );

6
plugins/BassBooster/BassBoosterControlDialog.cpp
View File

@@ -44,17 +44,17 @@ BassBoosterControlDialog::BassBoosterControlDialog( BassBoosterControls* control
QHBoxLayout * l = new QHBoxLayout;
knob * freqKnob = new knob( knobBright_26, this);
Knob * freqKnob = new Knob( knobBright_26, this);
freqKnob->setModel( &controls->m_freqModel );
freqKnob->setLabel( tr( "FREQ" ) );
freqKnob->setHintText( tr( "Frequency:" ) + " ", "Hz" );
knob * gainKnob = new knob( knobBright_26, this );
Knob * gainKnob = new Knob( knobBright_26, this );
gainKnob->setModel( &controls->m_gainModel );
gainKnob->setLabel( tr( "GAIN" ) );
gainKnob->setHintText( tr( "Gain:" ) + " ", "" );
knob * ratioKnob = new knob( knobBright_26, this );
Knob * ratioKnob = new Knob( knobBright_26, this );
ratioKnob->setModel( &controls->m_ratioModel );
ratioKnob->setLabel( tr( "RATIO" ) );
ratioKnob->setHintText( tr( "Ratio:" ) + " ", "" );

2
plugins/BassBooster/BassBoosterControls.cpp
View File

@@ -37,7 +37,7 @@ BassBoosterControls::BassBoosterControls( BassBoosterEffect* effect ) :
m_gainModel( 1.0f, 0.1f, 5.0f, 0.05f, this, tr( "Gain" ) ),
m_ratioModel( 2.0f, 0.1f, 10.0f, 0.1f, this, tr( "Ratio" ) )
{
connect( engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( changeFrequency() ) );
connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( changeFrequency() ) );
}

2
plugins/BassBooster/BassBoosterControls.h
View File

@@ -27,7 +27,7 @@
#include "EffectControls.h"
#include "BassBoosterControlDialog.h"
#include "knob.h"
#include "Knob.h"
class BassBoosterEffect;

6
plugins/DualFilter/DualFilter.cpp
View File

@@ -26,7 +26,7 @@
#include "DualFilter.h"
#include "embed.cpp"
#include "basic_filters.h"
#include "BasicFilters.h"
extern "C"
@@ -53,8 +53,8 @@ DualFilterEffect::DualFilterEffect( Model* parent, const Descriptor::SubPluginFe
Effect( &dualfilter_plugin_descriptor, parent, key ),
m_dfControls( this )
{
m_filter1 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
m_filter2 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
m_filter1 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
m_filter2 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
// ensure filters get updated
m_filter1changed = true;

6
plugins/DualFilter/DualFilter.h
View File

@@ -29,7 +29,7 @@
#include "Effect.h"
#include "DualFilterControls.h"
#include "basic_filters.h"
#include "BasicFilters.h"
class DualFilterEffect : public Effect
{
@@ -47,8 +47,8 @@ public:
private:
DualFilterControls m_dfControls;
basicFilters<2> * m_filter1;
basicFilters<2> * m_filter2;
BasicFilters<2> * m_filter1;
BasicFilters<2> * m_filter2;
bool m_filter1changed;
bool m_filter2changed;

24
plugins/DualFilter/DualFilterControlDialog.cpp
View File

@@ -28,13 +28,13 @@
#include "DualFilterControlDialog.h"
#include "DualFilterControls.h"
#include "embed.h"
#include "led_checkbox.h"
#include "combobox.h"
#include "tooltip.h"
#include "LedCheckbox.h"
#include "ComboBox.h"
#include "ToolTip.h"
#include "gui_templates.h"
#define makeknob( name, x, y, model, label, hint, unit ) \
knob * name = new knob( knobBright_26, this); \
Knob * name = new Knob( knobBright_26, this); \
name -> move( x, y ); \
name ->setModel( &controls-> model ); \
name ->setLabel( tr( label ) ); \
@@ -62,24 +62,24 @@ DualFilterControlDialog::DualFilterControlDialog( DualFilterControls* controls )
gain1Knob-> setVolumeKnob( true );
gain2Knob-> setVolumeKnob( true );
ledCheckBox * enabled1Toggle = new ledCheckBox( "", this,
tr( "Filter 1 enabled" ), ledCheckBox::Green );
ledCheckBox * enabled2Toggle = new ledCheckBox( "", this,
tr( "Filter 2 enabled" ), ledCheckBox::Green );
LedCheckBox * enabled1Toggle = new LedCheckBox( "", this,
tr( "Filter 1 enabled" ), LedCheckBox::Green );
LedCheckBox * enabled2Toggle = new LedCheckBox( "", this,
tr( "Filter 2 enabled" ), LedCheckBox::Green );
enabled1Toggle -> move( 5, 30 );
enabled1Toggle -> setModel( &controls -> m_enabled1Model );
toolTip::add( enabled1Toggle, tr( "Click to enable/disable Filter 1" ) );
ToolTip::add( enabled1Toggle, tr( "Click to enable/disable Filter 1" ) );
enabled2Toggle -> move( 5, 145 );
enabled2Toggle -> setModel( &controls -> m_enabled2Model );
toolTip::add( enabled2Toggle, tr( "Click to enable/disable Filter 2" ) );
ToolTip::add( enabled2Toggle, tr( "Click to enable/disable Filter 2" ) );
comboBox * m_filter1ComboBox = new comboBox( this );
ComboBox * m_filter1ComboBox = new ComboBox( this );
m_filter1ComboBox->setGeometry( 5, 70, 140, 22 );
m_filter1ComboBox->setFont( pointSize<8>( m_filter1ComboBox->font() ) );
m_filter1ComboBox->setModel( &controls->m_filter1Model );
comboBox * m_filter2ComboBox = new comboBox( this );
ComboBox * m_filter2ComboBox = new ComboBox( this );
m_filter2ComboBox->setGeometry( 5, 185, 140, 22 );
m_filter2ComboBox->setFont( pointSize<8>( m_filter2ComboBox->font() ) );
m_filter2ComboBox->setModel( &controls->m_filter2Model );

16
plugins/DualFilter/DualFilterControls.cpp
View File

@@ -28,9 +28,9 @@
#include "DualFilterControls.h"
#include "DualFilter.h"
#include "engine.h"
#include "song.h"
#include "basic_filters.h"
#include "Engine.h"
#include "Song.h"
#include "BasicFilters.h"
#include "embed.h"
DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
@@ -40,7 +40,7 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_enabled1Model( true, this, tr( "Filter 1 enabled" ) ),
m_filter1Model( this, tr( "Filter 1 type" ) ),
m_cut1Model( 7000.0f, 1.0f, 14000.0f, 1.0f, this, tr( "Cutoff 1 frequency" ) ),
m_res1Model( 0.5, basicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 1" ) ),
m_res1Model( 0.5, BasicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 1" ) ),
m_gain1Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 1" ) ),
m_mixModel( 0.0f, -1.0f, 1.0f, 0.01f, this, tr( "Mix" ) ),
@@ -48,7 +48,7 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_enabled2Model( true, this, tr( "Filter 2 enabled" ) ),
m_filter2Model( this, tr( "Filter 2 type" ) ),
m_cut2Model( 7000.0f, 1.0f, 14000.0f, 1.0f, this, tr( "Cutoff 2 frequency" ) ),
m_res2Model( 0.5, basicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ),
m_res2Model( 0.5, BasicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ),
m_gain2Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 2" ) )
{
m_filter1Model.addItem( tr( "LowPass" ), new PixmapLoader( "filter_lp" ) );
@@ -97,7 +97,7 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_filter2Model.addItem( tr( "Fast Formant" ), new PixmapLoader( "filter_hp" ) );
m_filter2Model.addItem( tr( "Tripole" ), new PixmapLoader( "filter_lp" ) );
connect( engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( updateFilters() ) );
connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( updateFilters() ) );
}
@@ -108,8 +108,8 @@ void DualFilterControls::updateFilters()
delete m_effect->m_filter1;
delete m_effect->m_filter2;
m_effect->m_filter1 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
m_effect->m_filter2 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
m_effect->m_filter1 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
m_effect->m_filter2 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
// flag filters as needing recalculation

2
plugins/DualFilter/DualFilterControls.h
View File

@@ -28,7 +28,7 @@
#include "EffectControls.h"
#include "DualFilterControlDialog.h"
#include "knob.h"
#include "Knob.h"
#include "ComboBoxModel.h"
class DualFilterEffect;

34
plugins/GigPlayer/GigPlayer.cpp
View File

@@ -37,17 +37,17 @@
#include "FileDialog.h"
#include "GigPlayer.h"
#include "engine.h"
#include "Engine.h"
#include "InstrumentTrack.h"
#include "InstrumentPlayHandle.h"
#include "NotePlayHandle.h"
#include "knob.h"
#include "song.h"
#include "Knob.h"
#include "Song.h"
#include "ConfigManager.h"
#include "endian_handling.h"
#include "PatchesDialog.h"
#include "tooltip.h"
#include "ToolTip.h"
#include "LcdSpinBox.h"
#include "embed.cpp"
@@ -87,13 +87,13 @@ GigInstrument::GigInstrument( InstrumentTrack * _instrument_track ) :
m_currentKeyDimension( 0 )
{
InstrumentPlayHandle * iph = new InstrumentPlayHandle( this, _instrument_track );
engine::mixer()->addPlayHandle( iph );
Engine::mixer()->addPlayHandle( iph );
updateSampleRate();
connect( &m_bankNum, SIGNAL( dataChanged() ), this, SLOT( updatePatch() ) );
connect( &m_patchNum, SIGNAL( dataChanged() ), this, SLOT( updatePatch() ) );
connect( engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( updateSampleRate() ) );
connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( updateSampleRate() ) );
}
@@ -101,7 +101,7 @@ GigInstrument::GigInstrument( InstrumentTrack * _instrument_track ) :
GigInstrument::~GigInstrument()
{
engine::mixer()->removePlayHandles( instrumentTrack() );
Engine::mixer()->removePlayHandles( instrumentTrack() );
freeInstance();
}
@@ -316,8 +316,8 @@ void GigInstrument::playNote( NotePlayHandle * _n, sampleFrame * )
// the preferences)
void GigInstrument::play( sampleFrame * _working_buffer )
{
const fpp_t frames = engine::mixer()->framesPerPeriod();
const int rate = engine::mixer()->processingSampleRate();
const fpp_t frames = Engine::mixer()->framesPerPeriod();
const int rate = Engine::mixer()->processingSampleRate();
// Initialize to zeros
std::memset( &_working_buffer[0][0], 0, DEFAULT_CHANNELS * frames * sizeof( float ) );
@@ -753,7 +753,7 @@ void GigInstrument::addSamples( GigNote & gignote, bool wantReleaseSample )
if( gignote.midiNote >= keyLow && gignote.midiNote <= keyHigh )
{
float attenuation = pDimRegion->GetVelocityAttenuation( gignote.velocity );
float length = (float) pSample->SamplesTotal / engine::mixer()->processingSampleRate();
float length = (float) pSample->SamplesTotal / Engine::mixer()->processingSampleRate();
// TODO: sample panning? crossfade different layers?
@@ -904,11 +904,11 @@ void GigInstrument::updateSampleRate()
class gigKnob : public knob
class gigKnob : public Knob
{
public:
gigKnob( QWidget * _parent ) :
knob( knobBright_26, _parent )
Knob( knobBright_26, _parent )
{
setFixedSize( 31, 38 );
}
@@ -926,7 +926,7 @@ GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _paren
connect( &k->m_patchNum, SIGNAL( dataChanged() ), this, SLOT( updatePatchName() ) );
// File Button
m_fileDialogButton = new pixmapButton( this );
m_fileDialogButton = new PixmapButton( this );
m_fileDialogButton->setCursor( QCursor( Qt::PointingHandCursor ) );
m_fileDialogButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "fileselect_on" ) );
m_fileDialogButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fileselect_off" ) );
@@ -934,12 +934,12 @@ GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _paren
connect( m_fileDialogButton, SIGNAL( clicked() ), this, SLOT( showFileDialog() ) );
toolTip::add( m_fileDialogButton, tr( "Open other GIG file" ) );
ToolTip::add( m_fileDialogButton, tr( "Open other GIG file" ) );
m_fileDialogButton->setWhatsThis( tr( "Click here to open another GIG file" ) );
// Patch Button
m_patchDialogButton = new pixmapButton( this );
m_patchDialogButton = new PixmapButton( this );
m_patchDialogButton->setCursor( QCursor( Qt::PointingHandCursor ) );
m_patchDialogButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "patches_on" ) );
m_patchDialogButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "patches_off" ) );
@@ -948,7 +948,7 @@ GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _paren
connect( m_patchDialogButton, SIGNAL( clicked() ), this, SLOT( showPatchDialog() ) );
toolTip::add( m_patchDialogButton, tr( "Choose the patch" ) );
ToolTip::add( m_patchDialogButton, tr( "Choose the patch" ) );
m_patchDialogButton->setWhatsThis( tr( "Click here to change which patch of the GIG file to use" ) );
@@ -1094,7 +1094,7 @@ void GigInstrumentView::showFileDialog()
if( f != "" )
{
k->openFile( f );
engine::getSong()->setModified();
Engine::getSong()->setModified();
}
}

12
plugins/GigPlayer/GigPlayer.h
View File

@@ -32,11 +32,11 @@
#include <QMutexLocker>
#include "Instrument.h"
#include "pixmap_button.h"
#include "PixmapButton.h"
#include "InstrumentView.h"
#include "knob.h"
#include "Knob.h"
#include "LcdSpinBox.h"
#include "led_checkbox.h"
#include "LedCheckbox.h"
#include "SampleBuffer.h"
#include "MemoryManager.h"
#include "gig.h"
@@ -345,8 +345,8 @@ public:
private:
virtual void modelChanged();
pixmapButton * m_fileDialogButton;
pixmapButton * m_patchDialogButton;
PixmapButton * m_fileDialogButton;
PixmapButton * m_patchDialogButton;
LcdSpinBox * m_bankNumLcd;
LcdSpinBox * m_patchNumLcd;
@@ -354,7 +354,7 @@ private:
QLabel * m_filenameLabel;
QLabel * m_patchLabel;
knob * m_gainKnob;
Knob * m_gainKnob;
static PatchesDialog * s_patchDialog;

22
plugins/HydrogenImport/HydrogenImport.cpp
View File

@@ -8,15 +8,15 @@
#include "LocalFileMng.h"
#include "HydrogenImport.h"
#include "song.h"
#include "engine.h"
#include "Song.h"
#include "Engine.h"
#include "Instrument.h"
#include "InstrumentTrack.h"
#include "note.h"
#include "Note.h"
#include "Pattern.h"
#include "Track.h"
#include "bb_track.h"
#include "bb_track_container.h"
#include "BBTrack.h"
#include "BBTrackContainer.h"
#include "Instrument.h"
#define MAX_LAYERS 4
@@ -143,7 +143,7 @@ bool HydrogenImport::readSong()
QHash<QString, int> pattern_length;
QHash<QString, int> pattern_id;
song *s = engine::getSong();
Song *s = Engine::getSong();
int song_num_tracks = s->tracks().size();
if ( QFile( filename ).exists() == false )
{
@@ -213,7 +213,7 @@ bool HydrogenImport::readSong()
if ( nLayer == 0 )
{
drum_track[sId] = ( InstrumentTrack * ) Track::create( Track::InstrumentTrack,engine::getBBTrackContainer() );
drum_track[sId] = ( InstrumentTrack * ) Track::create( Track::InstrumentTrack,Engine::getBBTrackContainer() );
drum_track[sId]->volumeModel()->setValue( fVolume * 100 );
drum_track[sId]->panningModel()->setValue( ( fPan_R - fPan_L ) * 100 );
ins = drum_track[sId]->loadInstrument( "audiofileprocessor" );
@@ -237,7 +237,7 @@ bool HydrogenImport::readSong()
}
QDomNode patterns = songNode.firstChildElement( "patternList" );
int pattern_count = 0;
int nbb = engine::getBBTrackContainer()->numOfBBs();
int nbb = Engine::getBBTrackContainer()->numOfBBs();
QDomNode patternNode = patterns.firstChildElement( "pattern" );
int pn = 1;
while ( !patternNode.isNull() )
@@ -271,7 +271,7 @@ bool HydrogenImport::readSong()
int i = pattern_count - 1 + nbb;
pattern_id[sName] = pattern_count - 1;
Pattern*p = dynamic_cast<Pattern*>( drum_track[instrId]->getTCO( i ) );
note n;
Note n;
n.setPos( nPosition );
if ( (nPosition + 48) <= nSize )
{
@@ -305,8 +305,8 @@ bool HydrogenImport::readSong()
patternId = ( QDomNode ) patternId.nextSiblingElement( "patternID" );
int i = pattern_id[patId]+song_num_tracks;
Track *t = ( bbTrack * ) s->tracks().at( i );
trackContentObject *tco = t->createTCO( pos );
Track *t = ( BBTrack * ) s->tracks().at( i );
TrackContentObject *tco = t->createTCO( pos );
tco->movePosition( pos );

4
plugins/LadspaEffect/LadspaControlDialog.cpp
View File

@@ -31,7 +31,7 @@
#include "LadspaEffect.h"
#include "LadspaControlDialog.h"
#include "LadspaControlView.h"
#include "led_checkbox.h"
#include "LedCheckbox.h"
@@ -52,7 +52,7 @@ LadspaControlDialog::LadspaControlDialog( LadspaControls * _ctl ) :
mainLay->addSpacing( 3 );
QHBoxLayout * center = new QHBoxLayout();
mainLay->addLayout( center );
m_stereoLink = new ledCheckBox( tr( "Link Channels" ), this );
m_stereoLink = new LedCheckBox( tr( "Link Channels" ), this );
m_stereoLink->setModel( &_ctl->m_stereoLinkModel );
center->addWidget( m_stereoLink );
}

4
plugins/LadspaEffect/LadspaControlDialog.h
View File

@@ -32,7 +32,7 @@
class QHBoxLayout;
class LadspaControls;
class ledCheckBox;
class LedCheckBox;
class LadspaControlDialog : public EffectControlDialog
@@ -49,7 +49,7 @@ private slots:
private:
QHBoxLayout * m_effectLayout;
ledCheckBox * m_stereoLink;
LedCheckBox * m_stereoLink;
} ;

28
plugins/LadspaEffect/LadspaEffect.cpp
View File

@@ -30,7 +30,7 @@
#include "DataFile.h"
#include "AudioDevice.h"
#include "ConfigManager.h"
#include "ladspa_2_lmms.h"
#include "Ladspa2LMMS.h"
#include "LadspaControl.h"
#include "LadspaSubPluginFeatures.h"
#include "Mixer.h"
@@ -71,10 +71,10 @@ LadspaEffect::LadspaEffect( Model * _parent,
m_maxSampleRate( 0 ),
m_key( LadspaSubPluginFeatures::subPluginKeyToLadspaKey( _key ) )
{
ladspa2LMMS * manager = engine::getLADSPAManager();
Ladspa2LMMS * manager = Engine::getLADSPAManager();
if( manager->getDescription( m_key ) == NULL )
{
if( !engine::suppressMessages() )
if( !Engine::suppressMessages() )
{
QMessageBox::warning( 0, tr( "Effect" ),
tr( "Unknown LADSPA plugin %1 requested." ).
@@ -89,7 +89,7 @@ LadspaEffect::LadspaEffect( Model * _parent,
pluginInstantiation();
connect( engine::mixer(), SIGNAL( sampleRateChanged() ),
connect( Engine::mixer(), SIGNAL( sampleRateChanged() ),
this, SLOT( changeSampleRate() ) );
}
@@ -147,13 +147,13 @@ bool LadspaEffect::processAudioBuffer( sampleFrame * _buf,
sampleFrame * o_buf = NULL;
sampleFrame sBuf [_frames];
if( m_maxSampleRate < engine::mixer()->processingSampleRate() )
if( m_maxSampleRate < Engine::mixer()->processingSampleRate() )
{
o_buf = _buf;
_buf = &sBuf[0];
sampleDown( o_buf, _buf, m_maxSampleRate );
frames = _frames * m_maxSampleRate /
engine::mixer()->processingSampleRate();
Engine::mixer()->processingSampleRate();
}
// Copy the LMMS audio buffer to the LADSPA input buffer and initialize
@@ -291,10 +291,10 @@ void LadspaEffect::pluginInstantiation()
{
m_maxSampleRate = maxSamplerate( displayName() );
ladspa2LMMS * manager = engine::getLADSPAManager();
Ladspa2LMMS * manager = Engine::getLADSPAManager();
// Calculate how many processing units are needed.
const ch_cnt_t lmms_chnls = engine::mixer()->audioDev()->channels();
const ch_cnt_t lmms_chnls = Engine::mixer()->audioDev()->channels();
int effect_channels = manager->getDescription( m_key )->inputChannels;
setProcessorCount( lmms_chnls / effect_channels );
@@ -329,7 +329,7 @@ void LadspaEffect::pluginInstantiation()
manager->isPortInput( m_key, port ) )
{
p->rate = CHANNEL_IN;
p->buffer = MM_ALLOC( LADSPA_Data, engine::mixer()->framesPerPeriod() );
p->buffer = MM_ALLOC( LADSPA_Data, Engine::mixer()->framesPerPeriod() );
inbuf[ inputch ] = p->buffer;
inputch++;
}
@@ -344,19 +344,19 @@ void LadspaEffect::pluginInstantiation()
}
else
{
p->buffer = MM_ALLOC( LADSPA_Data, engine::mixer()->framesPerPeriod() );
p->buffer = MM_ALLOC( LADSPA_Data, Engine::mixer()->framesPerPeriod() );
m_inPlaceBroken = true;
}
}
else if( manager->isPortInput( m_key, port ) )
{
p->rate = AUDIO_RATE_INPUT;
p->buffer = MM_ALLOC( LADSPA_Data, engine::mixer()->framesPerPeriod() );
p->buffer = MM_ALLOC( LADSPA_Data, Engine::mixer()->framesPerPeriod() );
}
else
{
p->rate = AUDIO_RATE_OUTPUT;
p->buffer = MM_ALLOC( LADSPA_Data, engine::mixer()->framesPerPeriod() );
p->buffer = MM_ALLOC( LADSPA_Data, Engine::mixer()->framesPerPeriod() );
}
}
else
@@ -548,7 +548,7 @@ void LadspaEffect::pluginDestruction()
for( ch_cnt_t proc = 0; proc < processorCount(); proc++ )
{
ladspa2LMMS * manager = engine::getLADSPAManager();
Ladspa2LMMS * manager = Engine::getLADSPAManager();
manager->deactivate( m_key, m_handles[proc] );
manager->cleanup( m_key, m_handles[proc] );
for( int port = 0; port < m_portCount; port++ )
@@ -587,7 +587,7 @@ sample_rate_t LadspaEffect::maxSamplerate( const QString & _name )
{
return( __buggy_plugins[_name] );
}
return( engine::mixer()->processingSampleRate() );
return( Engine::mixer()->processingSampleRate() );
}

10
plugins/LadspaEffect/LadspaSubPluginFeatures.cpp
View File

@@ -30,8 +30,8 @@
#include "LadspaSubPluginFeatures.h"
#include "AudioDevice.h"
#include "engine.h"
#include "ladspa_2_lmms.h"
#include "Engine.h"
#include "Ladspa2LMMS.h"
#include "LadspaBase.h"
#include "Mixer.h"
@@ -48,7 +48,7 @@ void LadspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
const Key * _key ) const
{
const ladspa_key_t & lkey = subPluginKeyToLadspaKey( _key );
ladspa2LMMS * lm = engine::getLADSPAManager();
Ladspa2LMMS * lm = Engine::getLADSPAManager();
QLabel * label = new QLabel( _parent );
label->setText( QWidget::tr( "Name: " ) + lm->getName( lkey ) );
@@ -119,7 +119,7 @@ void LadspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
void LadspaSubPluginFeatures::listSubPluginKeys(
const Plugin::Descriptor * _desc, KeyList & _kl ) const
{
ladspa2LMMS * lm = engine::getLADSPAManager();
Ladspa2LMMS * lm = Engine::getLADSPAManager();
l_sortable_plugin_t plugins;
switch( m_type )
@@ -145,7 +145,7 @@ void LadspaSubPluginFeatures::listSubPluginKeys(
it != plugins.end(); ++it )
{
if( lm->getDescription( ( *it ).second )->inputChannels <=
engine::mixer()->audioDev()->channels() )
Engine::mixer()->audioDev()->channels() )
{
_kl.push_back( ladspaKeyToSubPluginKey( _desc, ( *it ).first, ( *it ).second ) );
}

2
plugins/LadspaEffect/LadspaSubPluginFeatures.h
View File

@@ -28,7 +28,7 @@
#ifndef _LADSPA_SUBPLUGIN_FEATURES_H
#define _LADSPA_SUBPLUGIN_FEATURES_H
#include "ladspa_manager.h"
#include "LadspaManager.h"
#include "Plugin.h"

Some files were not shown because too many files have changed in this diff Show More