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

Rename all Controller-family classes to new style

Browse Source 
Adjust capitialization on all Controller-related classes to new
standards and update all calling code
This commit is contained in:
Paul Giblock
2009-08-08 13:05:22 -04:00
parent a9a3c796f7
commit f1d60958f0
37 changed files with 352 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/controller.h → include/Controller.h
View File

@@ -1,8 +1,8 @@
/*
* controller.h - declaration of class controller, which provides a
* Controller.h - declaration of class controller, which provides a
* standard for all controllers and controller plugins
*
* Copyright (c) 2008 Paul Giblock <pgllama/at/gmail.com>
* Copyright (c) 2008-2009 Paul Giblock <pgllama/at/gmail.com>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -32,13 +32,13 @@
#include "mv_base.h"
#include "journalling_object.h"
class controllerDialog;
class controller;
class ControllerDialog;
class Controller;
typedef QVector<controller *> controllerVector;
typedef QVector<Controller *> ControllerVector;
class controller : public model, public journallingObject
class Controller : public model, public journallingObject
{
Q_OBJECT
public:
@@ -55,10 +55,10 @@ public:
NumControllerTypes
} ;
controller( ControllerTypes _type, model * _parent,
Controller( ControllerTypes _type, model * _parent,
const QString & _display_name );
virtual ~controller();
virtual ~Controller();
virtual float currentValue( int _offset );
@@ -103,8 +103,8 @@ public:
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
static controller * create( ControllerTypes _tt, model * _parent );
static controller * create( const QDomElement & _this,
static Controller * create( ControllerTypes _tt, model * _parent );
static Controller * create( const QDomElement & _this,
model * _parent );
inline static float fittedValue( float _val )
@@ -120,7 +120,7 @@ public:
public slots:
virtual controllerDialog * createDialog( QWidget * _parent );
virtual ControllerDialog * createDialog( QWidget * _parent );
virtual void setName( const QString & _new_name )
{
@@ -140,7 +140,7 @@ protected:
QString m_name;
ControllerTypes m_type;
static controllerVector s_controllers;
static ControllerVector s_controllers;
static unsigned int s_frames;
@@ -149,7 +149,7 @@ signals:
// The value changed while the mixer isn't running (i.e: MIDI CC)
void valueChanged( void );
friend class controllerDialog;
friend class ControllerDialog;
} ;

26
include/controller_connection.h → include/ControllerConnection.h
View File

@@ -1,5 +1,5 @@
/*
* controller_connection.h - declaration of a controller connect, which
* ControllerConnection.h - declaration of a controller connect, which
* provides a definition of the link between a controller and
* model, also handles deferred creation of links while
* loading project
@@ -32,30 +32,30 @@
#include <QtCore/QObject>
#include <QtCore/QVector>
#include "controller.h"
#include "Controller.h"
#include "journalling_object.h"
class controllerConnection;
class ControllerConnection;
typedef QVector<controllerConnection *> controllerConnectionVector;
typedef QVector<ControllerConnection *> ControllerConnectionVector;
class EXPORT controllerConnection : public QObject, public journallingObject
class EXPORT ControllerConnection : public QObject, public journallingObject
{
Q_OBJECT
public:
controllerConnection( controller * _controller );
controllerConnection( int _controllerId );
ControllerConnection( Controller * _controller );
ControllerConnection( int _controllerId );
virtual ~controllerConnection();
virtual ~ControllerConnection();
inline controller * getController( void )
inline Controller * getController( void )
{
return m_controller;
}
void setController( controller * _controller );
void setController( Controller * _controller );
inline void setController( int _controllerId );
@@ -87,19 +87,19 @@ public slots:
protected:
//virtual controllerDialog * createDialog( QWidget * _parent );
controller * m_controller;
Controller * m_controller;
QString m_targetName;
int m_controllerId;
bool m_ownsController;
static controllerConnectionVector s_connections;
static ControllerConnectionVector s_connections;
signals:
// The value changed while the mixer isn't running (i.e: MIDI CC)
void valueChanged( void );
friend class controllerConnectionDialog;
friend class ControllerConnectionDialog;
};
#endif

18
include/controller_connection_dialog.h → include/ControllerConnectionDialog.h
View File

@@ -1,5 +1,5 @@
/*
* controller_connection_dialog.h - dialog allowing the user to create and
* ControllerConnectionDialog.h - dialog allowing the user to create and
* modify links between controllers and models
*
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
@@ -31,14 +31,14 @@
#include <QtGui/QSortFilterProxyModel>
#include <QtGui/QStandardItemModel>
#include "controller.h"
#include "Controller.h"
#include "automatable_model.h"
class QLineEdit;
class QListView;
class QScrollArea;
class autoDetectMidiController;
class AutoDetectMidiController;
class comboBox;
class groupBox;
class tabWidget;
@@ -48,15 +48,15 @@ class midiPortMenu;
class controllerConnectionDialog : public QDialog
class ControllerConnectionDialog : public QDialog
{
Q_OBJECT
public:
controllerConnectionDialog( QWidget * _parent,
ControllerConnectionDialog( QWidget * _parent,
const automatableModel * _target_model );
virtual ~controllerConnectionDialog();
virtual ~ControllerConnectionDialog();
controller * chosenController( void )
Controller * chosenController( void )
{
return m_controller;
}
@@ -91,11 +91,11 @@ private:
tabWidget * m_mappingBox;
QLineEdit * m_mappingFunction;
controller * m_controller;
Controller * m_controller;
const automatableModel * m_targetModel;
// Temporary midiController
autoDetectMidiController * m_midiController;
AutoDetectMidiController * m_midiController;
} ;
#endif

15
include/controller_dialog.h → include/ControllerDialog.h
View File

@@ -1,8 +1,8 @@
/*
* controller_dialog.h - per-controller-specific view for changing a
* ControllerDialog.h - per-controller-specific view for changing a
* controller's settings
*
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
* Copyright (c) 2008-2009 Paul Giblock <drfaygo/at/gmail.com>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -30,25 +30,22 @@
#include "mv_base.h"
class controller;
class Controller;
class controllerDialog : public QWidget, public modelView
class ControllerDialog : public QWidget, public modelView
{
Q_OBJECT
public:
controllerDialog( controller * _controller, QWidget * _parent );
ControllerDialog( Controller * _controller, QWidget * _parent );
virtual ~controllerDialog();
virtual ~ControllerDialog();
signals:
void closed();
protected:
/* virtual void contextMenuEvent( QContextMenuEvent * _me ) {};
virtual void paintEvent( QPaintEvent * _pe ) {};
virtual void modelChanged( void ) {};*/
virtual void closeEvent( QCloseEvent * _ce );
} ;

17
include/controller_rack_view.h → include/ControllerRackView.h
View File

@@ -1,5 +1,5 @@
/*
* controller_rack_view.h - view for song's controllers
* ControllerRackView.h - view for song's controllers
*
* Copyright (c) 2008-2009 Paul Giblock <drfaygo/at/gmail.com>
*
@@ -33,29 +33,28 @@
class QPushButton;
class QScrollArea;
//class QVBoxLayout;
class controllerView;
class ControllerView;
class controllerRackView : public QWidget, public serializingObject
class ControllerRackView : public QWidget, public serializingObject
{
Q_OBJECT
public:
controllerRackView();
virtual ~controllerRackView();
ControllerRackView();
virtual ~ControllerRackView();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
{
return( "controllerrackview" );
return( "ControllerRackView" );
}
public slots:
void deleteController( controllerView * _view );
void deleteController( ControllerView * _view );
private slots:
@@ -64,7 +63,7 @@ private slots:
private:
QVector<controllerView *> m_controllerViews;
QVector<ControllerView *> m_controllerViews;
QVBoxLayout * m_mainLayout;
QScrollArea * m_scrollArea;

22
include/controller_view.h → include/ControllerView.h
View File

@@ -1,5 +1,5 @@
/*
* controller_view.h - view-component for an control
* ControllerView.h - view-component for an control
*
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
*
@@ -28,7 +28,7 @@
#include <QtGui/QWidget>
#include "automatable_model.h"
#include "controller.h"
#include "Controller.h"
#include "mv_base.h"
class QGroupBox;
@@ -39,21 +39,21 @@ class QMdiSubWindow;
class ledCheckBox;
class controllerView : public QWidget, public modelView
class ControllerView : public QWidget, public modelView
{
Q_OBJECT
public:
controllerView( controller * _controller, QWidget * _parent );
virtual ~controllerView();
ControllerView( Controller * _controller, QWidget * _parent );
virtual ~ControllerView();
inline controller * getController( void )
inline Controller * getController( void )
{
return( castModel<controller>() );
return( castModel<Controller>() );
}
inline const controller * getController( void ) const
inline const Controller * getController( void ) const
{
return( castModel<controller>() );
return( castModel<Controller>() );
}
@@ -65,7 +65,7 @@ public slots:
signals:
void deleteController( controllerView * _view );
void deleteController( ControllerView * _view );
protected:
@@ -79,7 +79,7 @@ private:
QPixmap m_bg;
ledCheckBox * m_bypass;
QMdiSubWindow * m_subWindow;
controllerDialog * m_controllerDlg;
ControllerDialog * m_controllerDlg;
bool m_show;
} ;

24
include/lfo_controller.h → include/LfoController.h
View File

@@ -1,5 +1,5 @@
/*
* lfo_controller.h - A LFO-based controller and dialog
* LfoController.h - A LFO-based controller and dialog
*
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
*
@@ -29,8 +29,8 @@
#include "mv_base.h"
#include "automatable_model.h"
#include "controller.h"
#include "controller_dialog.h"
#include "Controller.h"
#include "ControllerDialog.h"
#include "tempo_sync_knob.h"
#include "oscillator.h"
@@ -42,13 +42,13 @@ class tempoSyncKnob;
class pixmapButton;
class oscillator;
class lfoController : public controller
class LfoController : public Controller
{
Q_OBJECT
public:
lfoController( model * _parent );
LfoController( model * _parent );
virtual ~lfoController();
virtual ~LfoController();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
@@ -56,7 +56,7 @@ public:
public slots:
virtual controllerDialog * createDialog( QWidget * _parent );
virtual ControllerDialog * createDialog( QWidget * _parent );
protected:
@@ -80,24 +80,24 @@ protected:
protected slots:
void updateSampleFunction( void );
friend class lfoControllerDialog;
friend class LfoControllerDialog;
} ;
class lfoControllerDialog : public controllerDialog
class LfoControllerDialog : public ControllerDialog
{
Q_OBJECT
public:
lfoControllerDialog( controller * _controller, QWidget * _parent );
virtual ~lfoControllerDialog();
LfoControllerDialog( Controller * _controller, QWidget * _parent );
virtual ~LfoControllerDialog();
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void modelChanged( void );
lfoController * m_lfo;
LfoController * m_lfo;
knob * m_baseKnob;
tempoSyncKnob * m_speedKnob;

16
include/midi_controller.h → include/MidiController.h
View File

@@ -1,5 +1,5 @@
/*
* midi_controller.h - A controller to receive MIDI control-changes
* MidiController.h - A controller to receive MIDI control-changes
*
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
*
@@ -28,7 +28,7 @@
#include <QtGui/QWidget>
#include "automatable_model.h"
#include "controller.h"
#include "Controller.h"
#include "midi_event_processor.h"
#include "midi_port.h"
@@ -36,12 +36,12 @@
class midiPort;
class midiController : public controller, public MidiEventProcessor
class MidiController : public Controller, public MidiEventProcessor
{
Q_OBJECT
public:
midiController( model * _parent );
virtual ~midiController();
MidiController( model * _parent );
virtual ~MidiController();
virtual void processInEvent( const midiEvent & _me,
const midiTime & _time );
@@ -61,7 +61,7 @@ public:
public slots:
virtual controllerDialog * createDialog( QWidget * _parent );
virtual ControllerDialog * createDialog( QWidget * _parent );
void updateName( void );
@@ -75,8 +75,8 @@ protected:
float m_lastValue;
friend class controllerConnectionDialog;
friend class autoDetectMidiController;
friend class ControllerConnectionDialog;
friend class AutoDetectMidiController;
} ;

26
include/peak_controller.h → include/PeakController.h
View File

@@ -1,7 +1,7 @@
/*
* peak_controller.h - peak-controller class
* PeakController.h - peak-controller class
*
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
* Copyright (c) 2008-2009 Paul Giblock <drfaygo/at/gmail.com>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -29,8 +29,8 @@
#include "mv_base.h"
#include "automatable_model.h"
#include "controller.h"
#include "controller_dialog.h"
#include "Controller.h"
#include "ControllerDialog.h"
class automatableButtonGroup;
class knob;
@@ -39,15 +39,15 @@ class peakControllerEffect;
typedef QVector<peakControllerEffect *> peakControllerEffectVector;
class EXPORT peakController : public controller
class EXPORT PeakController : public Controller
{
Q_OBJECT
public:
peakController( model * _parent,
PeakController( model * _parent,
peakControllerEffect *_peak_effect = NULL );
virtual ~peakController();
virtual ~PeakController();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
@@ -58,7 +58,7 @@ public:
public slots:
virtual controllerDialog * createDialog( QWidget * _parent );
virtual ControllerDialog * createDialog( QWidget * _parent );
void handleDestroyedEffect( );
protected:
@@ -67,24 +67,24 @@ protected:
peakControllerEffect * m_peakEffect;
friend class peakControllerDialog;
friend class PeakControllerDialog;
} ;
class peakControllerDialog : public controllerDialog
class PeakControllerDialog : public ControllerDialog
{
Q_OBJECT
public:
peakControllerDialog( controller * _controller, QWidget * _parent );
virtual ~peakControllerDialog();
PeakControllerDialog( Controller * _controller, QWidget * _parent );
virtual ~PeakControllerDialog();
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
virtual void modelChanged( void );
peakController * m_peakController;
PeakController * m_peakController;
} ;

8
include/automatable_model.h
View File

@@ -59,7 +59,7 @@
class controllerConnection;
class ControllerConnection;
class EXPORT automatableModel : public model, public journallingObject
@@ -94,13 +94,13 @@ public:
bool isAutomated( void ) const;
inline controllerConnection * getControllerConnection( void ) const
inline ControllerConnection * getControllerConnection( void ) const
{
return m_controllerConnection;
}
void setControllerConnection( controllerConnection * _c );
void setControllerConnection( ControllerConnection * _c );
template<class T>
@@ -253,7 +253,7 @@ private:
bool m_hasLinkedModels;
controllerConnection * m_controllerConnection;
ControllerConnection * m_controllerConnection;
bool m_armed; // record this model during automation recording?

1
include/automation_recorder.h
View File

@@ -31,7 +31,6 @@
#include <QObject>
#include "controller.h"
#include "automation_track.h"
#include "automation_pattern.h"

6
include/engine.h
View File

@@ -49,7 +49,7 @@ class UnifiedResourceProvider;
class song;
class songEditor;
class ladspa2LMMS;
class controllerRackView;
class ControllerRackView;
class MidiControlListener;
class QDomDocument;
@@ -157,7 +157,7 @@ public:
return s_dummyTC;
}
static controllerRackView * getControllerRackView( void )
static ControllerRackView * getControllerRackView( void )
{
return s_controllerRackView;
}
@@ -205,7 +205,7 @@ private:
static bbTrackContainer * s_bbTrackContainer;
static projectJournal * s_projectJournal;
static dummyTrackContainer * s_dummyTC;
static controllerRackView * s_controllerRackView;
static ControllerRackView * s_controllerRackView;
static MidiControlListener * s_midiControlListener;
// GUI

2
include/midi_port.h
View File

@@ -172,7 +172,7 @@ private:
map m_writablePorts;
friend class controllerConnectionDialog;
friend class ControllerConnectionDialog;
friend class instrumentMidiIOView;

12
include/song.h
View File

@@ -30,7 +30,7 @@
#include "track_container.h"
#include "automatable_model.h"
#include "controller.h"
#include "Controller.h"
#include "meter_model.h"
@@ -177,11 +177,11 @@ public:
return false;
}
void addController( controller * _c );
void removeController( controller * _c );
void addController( Controller * _c );
void removeController( Controller * _c );
const controllerVector & controllers( void ) const
const ControllerVector & controllers( void ) const
{
return m_controllers;
}
@@ -274,7 +274,7 @@ private:
intModel m_masterVolumeModel;
intModel m_masterPitchModel;
controllerVector m_controllers;
ControllerVector m_controllers;
QString m_fileName;
@@ -313,7 +313,7 @@ private:
friend class engine;
friend class songEditor;
friend class mainWindow;
friend class controllerRackView;
friend class ControllerRackView;
signals:
void lengthChanged( int _tacts );