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

Rename bbTrack, trackContentObject and friends

Browse Source
This commit is contained in:
Lukas W
2014-11-26 10:53:47 +01:00
parent 95798da9d0
commit 6d4a6ed9cd
32 changed files with 375 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,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 );
@@ -58,7 +58,7 @@ private:
class AutomationTrackView : public trackView
class AutomationTrackView : public TrackView
{
public:
AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );

46
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>
@@ -36,11 +36,11 @@ 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,7 +219,7 @@ public slots:
private:
bbTrack * m_bbTrack;
BBTrack * m_bbTrack;
TrackLabelButton * m_trackLabel;
} ;

2
include/BBTrackContainer.h
View File

@@ -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 );

6
include/InstrumentTrack.h
View File

@@ -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
@@ -269,7 +269,7 @@ private:
class InstrumentTrackView : public trackView
class InstrumentTrackView : public TrackView
{
Q_OBJECT
public:

10
include/Pattern.h
View File

@@ -46,7 +46,7 @@ class SampleBuffer;
class EXPORT Pattern : public trackContentObject
class EXPORT Pattern : public TrackContentObject
{
Q_OBJECT
public:
@@ -110,7 +110,7 @@ public:
bool empty();
virtual trackContentObjectView * createView( trackView * _tv );
virtual TrackContentObjectView * createView( TrackView * _tv );
using Model::dataChanged;
@@ -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 );

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;
} ;

14
include/SampleTrack.h
View File

@@ -35,7 +35,7 @@ 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:

94
include/Track.h
View File

@@ -47,11 +47,11 @@ class QPushButton;
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:
@@ -245,8 +245,8 @@ private:
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;
@@ -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;
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,9 +651,9 @@ 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;
@@ -662,7 +662,7 @@ private:
private slots:
void createTCOView( trackContentObject * _tco );
void createTCOView( TrackContentObject * _tco );
} ;

16
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;

6
include/TrackLabelButton.h
View File

@@ -29,14 +29,14 @@
#include <QToolButton>
class trackView;
class TrackView;
class TrackLabelButton : public QToolButton
{
Q_OBJECT
public:
TrackLabelButton( trackView * _tv, QWidget * _parent );
TrackLabelButton( TrackView * _tv, QWidget * _parent );
virtual ~TrackLabelButton();
@@ -53,7 +53,7 @@ protected:
private:
trackView * m_trackView;
TrackView * m_trackView;
QString m_iconName;
} ;