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

Renamed all automation related files and classes to match new coding style

Browse Source 
All automation-related files and classes have been renamed to match the
new coding style.
(cherry picked from commit 9b280ffb3e)
This commit is contained in:
Tobias Doerffel
2010-08-16 20:18:24 +02:00
parent b16e81ebff
commit 89eae05a16
32 changed files with 303 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/automation_editor.h → include/AutomationEditor.h
View File

@@ -1,6 +1,6 @@
/*
* automation_editor.h - declaration of class automationEditor which is a window
* where you can edit dynamic values in an easy way
* AutomationEditor.h - declaration of class AutomationEditor which is a window
* where you can edit dynamic values in an easy way
*
* Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
@@ -32,7 +32,7 @@
#include "lmms_basics.h"
#include "JournallingObject.h"
#include "midi_time.h"
#include "automation_pattern.h"
#include "AutomationPattern.h"
#include "ComboBoxModel.h"
@@ -46,13 +46,13 @@ class timeLine;
class toolButton;
class automationEditor : public QWidget, public JournallingObject
class AutomationEditor : public QWidget, public JournallingObject
{
Q_OBJECT
public:
void setCurrentPattern( automationPattern * _new_pattern );
void setCurrentPattern( AutomationPattern * _new_pattern );
inline const automationPattern * currentPattern() const
inline const AutomationPattern * currentPattern() const
{
return( m_pattern );
}
@@ -79,7 +79,7 @@ public slots:
protected:
typedef automationPattern::timeMap timeMap;
typedef AutomationPattern::timeMap timeMap;
virtual void closeEvent( QCloseEvent * _ce );
virtual void keyPressEvent( QKeyEvent * _ke );
@@ -155,9 +155,9 @@ private:
static const int VALUES_WIDTH = 64;
automationEditor();
automationEditor( const automationEditor & );
virtual ~automationEditor();
AutomationEditor();
AutomationEditor( const AutomationEditor & );
virtual ~AutomationEditor();
static QPixmap * s_toolDraw;
@@ -189,7 +189,7 @@ private:
ComboBoxModel m_quantizeModel;
QMutex m_patternMutex;
automationPattern * m_pattern;
AutomationPattern * m_pattern;
float m_minLevel;
float m_maxLevel;
float m_step;

24
include/automation_pattern.h → include/AutomationPattern.h
View File

@@ -1,8 +1,8 @@
/*
* automation_pattern.h - declaration of class automationPattern, which contains
* all information about an automation pattern
* AutomationPattern.h - declaration of class AutomationPattern, which contains
* all information about an automation pattern
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
@@ -24,7 +24,6 @@
*
*/
#ifndef _AUTOMATION_PATTERN_H
#define _AUTOMATION_PATTERN_H
@@ -33,21 +32,21 @@
#include "track.h"
class automationTrack;
class AutomationTrack;
class midiTime;
class EXPORT automationPattern : public trackContentObject
class EXPORT AutomationPattern : public trackContentObject
{
Q_OBJECT
public:
typedef QMap<int, float> timeMap;
typedef QVector<QPointer<AutomatableModel> > objectVector;
automationPattern( automationTrack * _auto_track );
automationPattern( const automationPattern & _pat_to_copy );
virtual ~automationPattern();
AutomationPattern( AutomationTrack * _auto_track );
AutomationPattern( const AutomationPattern & _pat_to_copy );
virtual ~AutomationPattern();
void addObject( AutomatableModel * _obj, bool _search_dup = true );
@@ -99,8 +98,7 @@ public:
static bool isAutomated( const AutomatableModel * _m );
static automationPattern * globalAutomationPattern(
AutomatableModel * _m );
static AutomationPattern * globalAutomationPattern( AutomatableModel * _m );
static void resolveAllIDs();
@@ -111,14 +109,14 @@ public slots:
private:
automationTrack * m_autoTrack;
AutomationTrack * m_autoTrack;
QVector<jo_id_t> m_idsToResolve;
objectVector m_objects;
timeMap m_timeMap; // actual values
bool m_hasAutomation;
friend class automationPatternView;
friend class AutomationPatternView;
} ;

17
include/automation_pattern_view.h → include/AutomationPatternView.h
View File

@@ -1,8 +1,8 @@
/*
* automation_pattern_view.h - declaration of class automationPatternView
* AutomationPatternView.h - declaration of class AutomationPatternView
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -22,21 +22,20 @@
*
*/
#ifndef _AUTOMATION_PATTERN_VIEW_H
#define _AUTOMATION_PATTERN_VIEW_H
#include "track.h"
class automationPattern;
class AutomationPattern;
class automationPatternView : public trackContentObjectView
class AutomationPatternView : public trackContentObjectView
{
Q_OBJECT
public:
automationPatternView( automationPattern * _pat, trackView * _parent );
virtual ~automationPatternView();
AutomationPatternView( AutomationPattern * _pat, trackView * _parent );
virtual ~AutomationPatternView();
public slots:
@@ -63,7 +62,7 @@ protected:
private:
automationPattern * m_pat;
AutomationPattern * m_pat;
QPixmap m_paintPixmap;
bool m_needsUpdate;

25
include/automation_track.h → include/AutomationTrack.h
View File

@@ -1,10 +1,10 @@
/*
* automation_track.h - declaration of class automationTrack, which handles
* automation of objects without a track
* AutomationTrack.h - declaration of class AutomationTrack, which handles
* automation of objects without a track
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -24,18 +24,17 @@
*
*/
#ifndef _AUTOMATION_TRACK_H
#define _AUTOMATION_TRACK_H
#include "track.h"
class automationTrack : public track
class AutomationTrack : public track
{
public:
automationTrack( trackContainer * _tc, bool _hidden = false );
virtual ~automationTrack();
AutomationTrack( trackContainer * _tc, bool _hidden = false );
virtual ~AutomationTrack();
virtual bool play( const midiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base,
@@ -43,7 +42,7 @@ public:
virtual QString nodeName() const
{
return( "automationtrack" );
return "automationtrack";
}
virtual trackView * createView( trackContainerView * );
@@ -54,17 +53,17 @@ public:
virtual void loadTrackSpecificSettings( const QDomElement & _this );
private:
friend class automationTrackView;
friend class AutomationTrackView;
} ;
class automationTrackView : public trackView
class AutomationTrackView : public trackView
{
public:
automationTrackView( automationTrack * _at, trackContainerView * _tcv );
virtual ~automationTrackView();
AutomationTrackView( AutomationTrack * _at, trackContainerView * _tcv );
virtual ~AutomationTrackView();
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );

21
include/detuning_helper.h → include/DetuningHelper.h
View File

@@ -2,8 +2,8 @@
* detuning_helper.h - detuning automation helper
*
* Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -23,38 +23,37 @@
*
*/
#ifndef _DETUNING_HELPER_H
#define _DETUNING_HELPER_H
#include "inline_automation.h"
#include "InlineAutomation.h"
class detuningHelper : public inlineAutomation
class DetuningHelper : public InlineAutomation
{
public:
detuningHelper() :
inlineAutomation()
DetuningHelper() :
InlineAutomation()
{
}
virtual ~detuningHelper()
virtual ~DetuningHelper()
{
}
virtual float defaultValue() const
{
return( 0 );
return 0;
}
virtual QString displayName() const
{
return( tr( "Note detuning" ) );
return tr( "Note detuning" );
}
inline virtual QString nodeName() const
{
return( "detuning" );
return "detuning";
}
} ;

16
include/inline_automation.h → include/InlineAutomation.h
View File

@@ -1,5 +1,5 @@
/*
* inline_automation.h - class for automating something "inline"
* InlineAutomation.h - class for automating something "inline"
*
* Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -25,21 +25,21 @@
#ifndef _INLINE_AUTOMATION_H
#define _INLINE_AUTOMATION_H
#include "automation_pattern.h"
#include "AutomationPattern.h"
#include "shared_object.h"
class inlineAutomation : public FloatModel, public sharedObject
class InlineAutomation : public FloatModel, public sharedObject
{
public:
inlineAutomation() :
InlineAutomation() :
FloatModel(),
sharedObject(),
m_autoPattern( NULL )
{
}
virtual ~inlineAutomation()
virtual ~InlineAutomation()
{
if( m_autoPattern )
{
@@ -57,11 +57,11 @@ public:
defaultValue() );
}
automationPattern * getAutomationPattern()
AutomationPattern * automationPattern()
{
if( m_autoPattern == NULL )
{
m_autoPattern = new automationPattern( NULL );
m_autoPattern = new AutomationPattern( NULL );
m_autoPattern->addObject( this );
}
return m_autoPattern;
@@ -72,7 +72,7 @@ public:
private:
automationPattern * m_autoPattern;
AutomationPattern * m_autoPattern;
} ;

6
include/engine.h
View File

@@ -32,7 +32,7 @@
#include "export.h"
class automationEditor;
class AutomationEditor;
class bbEditor;
class bbTrackContainer;
class DummyTrackContainer;
@@ -127,7 +127,7 @@ public:
return s_projectNotes;
}
static automationEditor * getAutomationEditor()
static AutomationEditor * automationEditor()
{
return s_automationEditor;
}
@@ -187,7 +187,7 @@ private:
static MainWindow * s_mainWindow;
static FxMixerView * s_fxMixerView;
static songEditor * s_songEditor;
static automationEditor * s_automationEditor;
static AutomationEditor * s_automationEditor;
static bbEditor * s_bbEditor;
static pianoRoll * s_pianoRoll;
static projectNotes * s_projectNotes;

13
include/note.h
View File

@@ -2,8 +2,8 @@
* note.h - declaration of class note which contains all informations about a
* note + definitions of several constants and enums
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
@@ -23,7 +23,6 @@
*
*/
#ifndef _NOTE_H
#define _NOTE_H
@@ -34,7 +33,7 @@
#include "midi_time.h"
#include "SerializingObject.h"
class detuningHelper;
class DetuningHelper;
enum Keys
@@ -87,7 +86,7 @@ public:
int key = DefaultKey,
volume_t _volume = DefaultVolume,
panning_t _panning = DefaultPanning,
detuningHelper * _detuning = NULL );
DetuningHelper * _detuning = NULL );
note( const note & _note );
virtual ~note();
@@ -194,7 +193,7 @@ public:
static midiTime quantized( const midiTime & _m, const int _q_grid );
detuningHelper * detuning() const
DetuningHelper * detuning() const
{
return m_detuning;
}
@@ -236,7 +235,7 @@ private:
panning_t m_panning;
midiTime m_length;
midiTime m_pos;
detuningHelper * m_detuning;
DetuningHelper * m_detuning;
void createDetuning();

6
include/note_play_handle.h
View File

@@ -2,7 +2,7 @@
* note_play_handle.h - declaration of class notePlayHandle which is needed
* by LMMS-Play-Engine
*
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -203,7 +203,7 @@ private:
class baseDetuning
{
public:
baseDetuning( detuningHelper * _detuning );
baseDetuning( DetuningHelper * _detuning );
void setValue( float _val )
{
@@ -217,7 +217,7 @@ private:
private:
detuningHelper * m_detuning;
DetuningHelper * m_detuning;
float m_value;
} ;

8
include/song.h
View File

@@ -34,7 +34,7 @@
#include "MeterModel.h"
class automationTrack;
class AutomationTrack;
class pattern;
class timeLine;
@@ -141,9 +141,9 @@ public:
bpm_t getTempo();
virtual automationPattern * tempoAutomationPattern();
virtual AutomationPattern * tempoAutomationPattern();
automationTrack * globalAutomationTrack()
AutomationTrack * globalAutomationTrack()
{
return m_globalAutomationTrack;
}
@@ -262,7 +262,7 @@ private:
void restoreControllerStates( const QDomElement & _this );
automationTrack * m_globalAutomationTrack;
AutomationTrack * m_globalAutomationTrack;
IntModel m_tempoModel;
MeterModel m_timeSigModel;

4
include/surround_area.h
View File

@@ -69,8 +69,8 @@ public:
m_posY.addJournalEntryFromOldToCurVal();
}
// automationPattern * automationPatternX();
// automationPattern * automationPatternY();
// AutomationPattern * automationPatternX();
// AutomationPattern * automationPatternY();
private:

4
include/track_container.h
View File

@@ -32,7 +32,7 @@
#include "JournallingObject.h"
class automationPattern;
class AutomationPattern;
class InstrumentTrack;
class trackContainerView;
@@ -51,7 +51,7 @@ public:
virtual void loadSettings( const QDomElement & _this );
virtual automationPattern * tempoAutomationPattern()
virtual AutomationPattern * tempoAutomationPattern()
{
return NULL;
}